Skip to content

Commit 1b5b810

Browse files
oleksii-unnamedoleksii-unnamed
committed
Updated samples to use Comparison for Java v21.6
1 parent 7dd34c5 commit 1b5b810

29 files changed

Lines changed: 102 additions & 59 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>GroupDocs.Comparison.Examples.Java</groupId>
55
<artifactId>GroupDocs.Comparison.Examples.Java</artifactId>
6-
<version>20.11</version>
6+
<version>21.6</version>
77
<properties>
88
<maven.compiler.source>7</maven.compiler.source>
99
<maven.compiler.target>7</maven.compiler.target>

‎Examples/GroupDocs.Comparison.Examples.Java/src/main/java/com/groupdocs/comparison/examples/advanced_usage/GetMeteredCreditsLimit.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import java.io.FileOutputStream;
1111
import java.io.OutputStream;
12+
import java.nio.file.Path;
1213

1314
/**
1415
* This example demonstrates how to get credit consumption quantity
@@ -19,7 +20,7 @@ public static void run() throws Exception {
1920
try (OutputStream resultStream = new FileOutputStream(SampleFiles.RESULT_WORD);
2021
Comparer comparer = new Comparer(SampleFiles.SOURCE_WORD)) {
2122
comparer.add(SampleFiles.TARGET1_WORD);
22-
comparer.compare(resultStream, new SaveOptions(), new CompareOptions());
23+
final Path resultPath = comparer.compare(resultStream, new SaveOptions(), new CompareOptions());
2324
}
2425
System.out.println("Credits after using Comparer: " + Metered.getConsumptionQuantity());
2526
System.out.println("\nDocuments compared successfully.\nCheck output in " + Utils.OUTPUT_PATH + ".");

‎Examples/GroupDocs.Comparison.Examples.Java/src/main/java/com/groupdocs/comparison/examples/advanced_usage/comparison/AcceptRejectDetectedChangesPath.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import java.io.FileOutputStream;
1111
import java.io.OutputStream;
12+
import java.nio.file.Path;
1213

1314
/**
1415
* This example demonstrates how to update changes from path
@@ -21,7 +22,7 @@ public static void run() throws Exception {
2122
try (OutputStream resultStream = new FileOutputStream(outputFileName);
2223
Comparer comparer = new Comparer(SampleFiles.SOURCE_WORD)) {
2324
comparer.add(SampleFiles.TARGET1_WORD);
24-
comparer.compare();
25+
final Path resultPath = comparer.compare();
2526
ChangeInfo[] changes = comparer.getChanges();
2627
// inserted word "Cool" was not be added to result document
2728
changes[0].setComparisonAction(ComparisonAction.REJECT);

‎Examples/GroupDocs.Comparison.Examples.Java/src/main/java/com/groupdocs/comparison/examples/advanced_usage/comparison/AcceptRejectDetectedChangesStream.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.io.FileOutputStream;
1212
import java.io.InputStream;
1313
import java.io.OutputStream;
14+
import java.nio.file.Path;
1415

1516

1617
/**
@@ -27,7 +28,7 @@ public static void run() throws Exception {
2728
Comparer comparer = new Comparer(sourceStream)) {
2829

2930
comparer.add(targetStream);
30-
comparer.compare();
31+
final Path resultPath = comparer.compare();
3132
ChangeInfo[] changes = comparer.getChanges();
3233
// inserted word "Cool" was not be added to result document
3334
changes[0].setComparisonAction(ComparisonAction.REJECT);

‎Examples/GroupDocs.Comparison.Examples.Java/src/main/java/com/groupdocs/comparison/examples/advanced_usage/comparison/CompareDocumentsSettingsStream.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.io.FileOutputStream;
1212
import java.io.InputStream;
1313
import java.io.OutputStream;
14+
import java.nio.file.Path;
1415

1516
/**
1617
* This example demonstrates using some of compare settings
@@ -28,7 +29,7 @@ public static void run() throws Exception {
2829

2930
{
3031
// Note: It is the same with commented code below
31-
comparer.compare(resultStream,
32+
final Path resultPath = comparer.compare(resultStream,
3233
new CompareOptions.Builder()
3334
.setInsertedItemStyle(
3435
new StyleSettings.Builder()
@@ -45,7 +46,7 @@ public static void run() throws Exception {
4546
// styleSettings.setUnderline(true);
4647
// CompareOptions compareOptions = new CompareOptions();
4748
// compareOptions.setInsertedItemStyle(styleSettings);
48-
// comparer.compare(new FileOutputStream(outputFileName), compareOptions);
49+
// final Path resultPath = comparer.compare(new FileOutputStream(outputFileName), compareOptions);
4950
}
5051

5152
}

‎Examples/GroupDocs.Comparison.Examples.Java/src/main/java/com/groupdocs/comparison/examples/advanced_usage/comparison/CompareMultipleDocumentsPath.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.io.FileOutputStream;
1212
import java.io.IOException;
1313
import java.io.OutputStream;
14+
import java.nio.file.Path;
1415

1516
/**
1617
* This class demonstrates comparing of multi documents
@@ -35,7 +36,7 @@ public static void compareMultipleWordsDocuments() throws IOException {
3536
// comparer.add(SampleFiles.TARGET3_WORD);
3637
}
3738

38-
comparer.compare(outputFileName);
39+
final Path resultPath = comparer.compare(outputFileName);
3940
}
4041

4142
System.out.println("\nChanges updated successfully.\nCheck output in " + Utils.OUTPUT_PATH + ".");
@@ -60,7 +61,7 @@ public static void compareMultipleTxtDocuments() throws IOException {
6061
// comparer.add(SampleFiles.TARGET3_TXT);
6162
}
6263

63-
comparer.compare(resultStream, new SaveOptions(), new CompareOptions());
64+
final Path resultPath = comparer.compare(resultStream, new SaveOptions(), new CompareOptions());
6465
}
6566

6667
System.out.println("\nText documents compared successfully.\nCheck output in " + Utils.OUTPUT_PATH + ".");
@@ -85,7 +86,7 @@ public static void compareMultipleEmailDocuments() throws IOException {
8586
// comparer.add(SampleFiles.TARGET3_EMAIL);
8687
}
8788

88-
comparer.compare(resultStream, new SaveOptions(), new CompareOptions());
89+
final Path resultPath = comparer.compare(resultStream, new SaveOptions(), new CompareOptions());
8990
}
9091

9192
System.out.println("\nEmail documents compared successfully.\nCheck output in " + Utils.OUTPUT_PATH + ".");
@@ -110,7 +111,7 @@ public static void compareMultiplePdfDocuments() throws IOException {
110111
// comparer.add(SampleFiles.TARGET2_PDF);
111112
// comparer.add(SampleFiles.TARGET3_PDF);
112113
}
113-
comparer.compare(resultStream, new SaveOptions(), new CompareOptions());
114+
final Path resultPath = comparer.compare(resultStream, new SaveOptions(), new CompareOptions());
114115
} catch (ComparisonException e) {
115116
if (e.getMessage() != null && e.getMessage().contains("It is impossible to process this document without license")) {
116117
System.err.println("Valid license is required to run this sample");
@@ -143,7 +144,7 @@ public static void compareMultipleDiagramDocuments() throws IOException {
143144

144145
{
145146
// Note: It is the same with commented code below
146-
comparer.compare(resultStream, new SaveOptions(),
147+
final Path resultPath = comparer.compare(resultStream, new SaveOptions(),
147148
new CompareOptions.Builder()
148149
.setDiagramMasterSetting(
149150
new DiagramMasterSetting.Builder()
@@ -155,7 +156,7 @@ public static void compareMultipleDiagramDocuments() throws IOException {
155156
// diagramMasterSetting.setMasterPath(SampleFiles.DIAGRAM_SETTINGS);
156157
// final CompareOptions compareOptions = new CompareOptions();
157158
// compareOptions.setDiagramMasterSetting(diagramMasterSetting);
158-
// comparer.compare(new FileOutputStream(outputFileName), new SaveOptions(), compareOptions);
159+
// final Path resultPath = comparer.compare(new FileOutputStream(outputFileName), new SaveOptions(), compareOptions);
159160
}
160161
}
161162
System.out.println("\nDiagram documents compared successfully.\nCheck output in " + Utils.OUTPUT_PATH + ".");

‎Examples/GroupDocs.Comparison.Examples.Java/src/main/java/com/groupdocs/comparison/examples/advanced_usage/comparison/CompareMultipleDocumentsProtectedPath.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import com.groupdocs.comparison.examples.Utils;
66
import com.groupdocs.comparison.options.load.LoadOptions;
77

8+
import java.nio.file.Path;
9+
810
/**
911
* This example demonstrates comparing of multi protected documents from path
1012
*/
@@ -17,7 +19,7 @@ public static void run() throws Exception {
1719
comparer.add(SampleFiles.TARGET_WORD_PROTECTED, new LoadOptions("5678"));
1820
comparer.add(SampleFiles.TARGET2_WORD_PROTECTED, new LoadOptions("5678"));
1921
comparer.add(SampleFiles.TARGET3_WORD_PROTECTED, new LoadOptions("5678"));
20-
comparer.compare(outputFileName);
22+
final Path resultPath = comparer.compare(outputFileName);
2123
}
2224
System.out.println("\nDocuments compared successfully.\nCheck output in " + Utils.OUTPUT_PATH + ".");
2325
}

‎Examples/GroupDocs.Comparison.Examples.Java/src/main/java/com/groupdocs/comparison/examples/advanced_usage/comparison/CompareMultipleDocumentsProtectedStream.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.io.FileOutputStream;
1010
import java.io.InputStream;
1111
import java.io.OutputStream;
12+
import java.nio.file.Path;
1213

1314
/**
1415
* This example demonstrates comparing of multi protected documents from stream
@@ -26,7 +27,7 @@ public static void run() throws Exception {
2627
comparer.add(target1Stream, new LoadOptions("5678"));
2728
comparer.add(target2Stream, new LoadOptions("5678"));
2829
comparer.add(target3Stream, new LoadOptions("5678"));
29-
comparer.compare(resultStream);
30+
final Path resultPath = comparer.compare(resultStream);
3031
}
3132
System.out.println("\nDocuments compared successfully.\nCheck output in " + Utils.OUTPUT_PATH + ".");
3233
}

‎Examples/GroupDocs.Comparison.Examples.Java/src/main/java/com/groupdocs/comparison/examples/advanced_usage/comparison/CompareMultipleDocumentsSettingsPath.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.awt.*;
1010
import java.io.FileOutputStream;
1111
import java.io.OutputStream;
12+
import java.nio.file.Path;
1213

1314
/**
1415
* This example demonstrates comparing of multi documents from path
@@ -32,7 +33,7 @@ public static void run() throws Exception {
3233
}
3334
{
3435
// Note: It is the same with the code above
35-
comparer.compare(resultStream,
36+
final Path resultPath = comparer.compare(resultStream,
3637
new CompareOptions.Builder()
3738
.setInsertedItemStyle(
3839
new StyleSettings.Builder()
@@ -44,7 +45,7 @@ public static void run() throws Exception {
4445
// styleSettings.setFontColor(Color.YELLOW);
4546
// CompareOptions compareOptions = new CompareOptions();
4647
// compareOptions.setInsertedItemStyle(styleSettings);
47-
// comparer.compare(new FileOutputStream(outputFileName), compareOptions);
48+
// final Path resultPath = comparer.compare(new FileOutputStream(outputFileName), compareOptions);
4849
}
4950
}
5051
System.out.println("\nDocuments compared successfully.\nCheck output in " + Utils.OUTPUT_PATH + ".");

‎Examples/GroupDocs.Comparison.Examples.Java/src/main/java/com/groupdocs/comparison/examples/advanced_usage/comparison/CompareMultipleDocumentsSettingsStream.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.io.FileOutputStream;
1212
import java.io.InputStream;
1313
import java.io.OutputStream;
14+
import java.nio.file.Path;
1415

1516
/**
1617
* This example demonstrates comparing of multi documents from stream
@@ -38,7 +39,7 @@ public static void run() throws Exception {
3839
}
3940
{
4041
// Note: It is the same with commented code below
41-
comparer.compare(resultStream,
42+
final Path resultPath = comparer.compare(resultStream,
4243
new CompareOptions.Builder()
4344
.setInsertedItemStyle(
4445
new StyleSettings.Builder()
@@ -51,7 +52,7 @@ public static void run() throws Exception {
5152
// styleSettings.setFontColor(Color.YELLOW);
5253
// CompareOptions compareOptions = new CompareOptions();
5354
// compareOptions.setInsertedItemStyle(styleSettings);
54-
// comparer.compare(new FileOutputStream(outputFileName), compareOptions);
55+
// final Path resultPath = comparer.compare(new FileOutputStream(outputFileName), compareOptions);
5556
}
5657
}
5758
System.out.println("\nDocuments compared successfully.\nCheck output in " + Utils.OUTPUT_PATH + ".");

0 commit comments

Comments
 (0)