Skip to content

Commit 47995d8

Browse files
Muhammad SamiMuhammad Sami
authored andcommitted
Examples updated for 19.3
1 parent fff683f commit 47995d8

2 files changed

Lines changed: 16 additions & 21 deletions

File tree

Examples/GroupDocs.Comparison.Examples.Java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependency>
1414
<groupId>com.groupdocs</groupId>
1515
<artifactId>groupdocs-comparison</artifactId>
16-
<version>18.6.3</version>
16+
<version>19.3</version>
1717
</dependency>
1818
</dependencies>
1919
<repositories>

Examples/GroupDocs.Comparison.Examples.Java/src/main/java/com/groupdocs/comparison/examples/WordDocumentComparison.java

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import java.io.FileInputStream;
44
import java.io.InputStream;
55
import java.util.Arrays;
6-
import java.util.Collection;
76
import java.util.List;
87

98
import com.groupdocs.comparison.Comparer;
109
import com.groupdocs.comparison.MultiComparer;
1110
import com.groupdocs.comparison.common.changes.ChangeInfo;
11+
import com.groupdocs.comparison.common.changes.ComparisonAction;
1212
import com.groupdocs.comparison.common.compareresult.ICompareResult;
1313
import com.groupdocs.comparison.common.comparisonsettings.ComparisonSettings;
14-
import com.groupdocs.comparison.internal.c.a.m.System.e.q;
14+
import com.groupdocs.comparison.common.comparisonsettings.DetailLevel;
1515

1616
public class WordDocumentComparison {
1717

@@ -166,13 +166,13 @@ public static void comparisonSettingsWhenComparingFiles(String sourceFile, Strin
166166
settings.setGenerateSummaryPage(true);
167167
settings.setShowDeletedContent(true);
168168
settings.setStyleChangeDetection(true);
169-
//settings.setDetailLevel(DetailLevel.Low);
169+
settings.setDetailLevel(DetailLevel.Low);
170170
/**WordsSeparatorChars is array that contain separators for compared text**/
171-
//settings.setWordsSeparatorChars(new char[] {' '});
171+
settings.setWordsSeparatorChars(new char[] {' '});
172172
/**setting to draw frames for shapes in Comparison.Words**/
173-
//settings.setUseFramesForDelInsElements(false);
173+
settings.setUseFramesForDelInsElements(false);
174174
/**Inserted, deleted and style changed items styles setting**/
175-
/*
175+
176176
settings.getInsertedItemsStyle().setColor(Color.LIGHT_GRAY);
177177
settings.getInsertedItemsStyle().setBeginSeparatorString("<inserted>");
178178
settings.getInsertedItemsStyle().setEndSeparatorString("</inserted>");
@@ -183,7 +183,7 @@ public static void comparisonSettingsWhenComparingFiles(String sourceFile, Strin
183183
settings.getStyleChangedItemsStyle().setColor(Color.BLUE);
184184
settings.getStyleChangedItemsStyle().setBeginSeparatorString("<style>");
185185
settings.getStyleChangedItemsStyle().setEndSeparatorString("</style>");
186-
*/
186+
187187
Comparer comparer = new Comparer();
188188
ICompareResult result = comparer.compare(sourcePath, targetPath,settings);
189189
result.saveDocument(Utilities.outputFileName(extension));
@@ -267,8 +267,8 @@ public static void multiComparerForDocsFromStream(String sourceFile, String targ
267267
new FileInputStream(Utilities.targetPath + targetFile_3)
268268
);
269269
MultiComparer comparer = new MultiComparer();
270-
/*ICompareResult result = comparer.compare(source, targets, new ComparisonSettings());
271-
result.saveDocument(Utilities.outputFileName(extension));*/
270+
ICompareResult result = comparer.compare(source, targets, new ComparisonSettings());
271+
result.saveDocument(Utilities.outputFileName(extension));
272272
//ExEnd:multiComparerForDocsFromStream
273273
}
274274

@@ -311,8 +311,8 @@ public static void multiComparerForEncryptedDocsFromStream(String sourceFile, St
311311
);
312312

313313
MultiComparer comparer = new MultiComparer();
314-
/*ICompareResult result = comparer.compare(sourcePassword, targetPasswords, new ComparisonSettings());
315-
result.saveDocument(Utilities.outputFileName(extension));*/
314+
ICompareResult result = comparer.compare(sourceStream,sourcePassword,targets,targetPasswords, new ComparisonSettings());
315+
result.saveDocument(Utilities.outputFileName(extension));
316316
//ExEnd:multiComparerForEncryptedDocsFromStream
317317
}
318318

@@ -338,17 +338,12 @@ public static void propertiesOfICompareResult(String sourceFile, String targetFi
338338

339339
//Get array of changes
340340
ChangeInfo[] changes = result.getChanges();
341-
342-
//Update changes in CompareResult object (this method updated result document)
343-
result.updateChanges(changes);
344-
345341
/**To update changes use the following algorithm:**/
346342
//Set actions of changes as Accept or Reject
347-
348-
/*ChangeInfo[] changes = result.getChanges();
349-
changes[0].setAction(ComparisonAction.Accept);
350-
changes[1].setAction(ComparisonAction.Reject);
351-
result.updateChanges(changes);*/
343+
changes[0].setAction(ComparisonAction.ACCEPT);
344+
changes[1].setAction(ComparisonAction.REJECT);
345+
//Update changes in CompareResult object (this method updated result document)
346+
result.updateChanges(changes);
352347
//ExEnd:propertiesOfICompareResult
353348
}
354349
}

0 commit comments

Comments
 (0)