Skip to content

Commit 5f86369

Browse files
atirtahirgroupdocsatirtahirgroupdocs
committed
code updated
1 parent 8f57498 commit 5f86369

4 files changed

Lines changed: 142 additions & 2 deletions

File tree

‎Examples/bin/Main/MainClass.class‎

0 Bytes
Binary file not shown.

‎Examples/bin/Main/OtherComparisonOperations.class‎

2.85 KB
Binary file not shown.

‎Examples/src/Main/MainClass.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,42 @@ public static void main(String[] args) throws Throwable {
216216
//compare two slides with compareWith method
217217
//OtherComparisonOperations.compareSlidesWithCompareWith("source.pptx","target.pptx");
218218

219+
//compare documents from string
220+
//OtherComparisonOperations.compareDocsFromStrings("source.pptx","target.pptx");
221+
219222
//compare documents from string with result path and target extension
220223
//OtherComparisonOperations.compareDocsFromStringWithTargetExtension("source.docx","target.docx");
221224

225+
//compare documents from string with result path and settings
226+
//OtherComparisonOperations.compareDocsFromStringWithSettings("source.docx","target.docx");
227+
228+
//compare documents from string with result path, settings and file extension
229+
//OtherComparisonOperations.compareDocsFromStringWithSettingsAndFileExtension("source.docx","target.docx");
230+
231+
//compare documents from string with result path and type
232+
//OtherComparisonOperations.compareDocsWithResultAndType("source.docx","target.docx");
233+
234+
//compare documents from string with result path, comparison type and target extension
235+
//OtherComparisonOperations.compareDocsWithResultAndTargetExtension("source.docx","target.docx");
236+
222237
//compare encrypted documents from string
223238
//OtherComparisonOperations.compareEncryptedDocumentsFromStrings("source.docx","target.docx");
224239

240+
//compare encrypted documents from string with result path and target extension
241+
//OtherComparisonOperations.compareEncryptedDocsWithResultAndTargetExtension("source.docx","target.docx");
242+
225243
//compare encrypted documents from string with result path setting target extension
226244
//OtherComparisonOperations.compareEncryptedDocumentsWithSettingsAndSaving("source.docx","target.docx");
227245

246+
//compare encrypted documents from string with result path and type
247+
//OtherComparisonOperations.compareEncryptedDocsWithResultAndType("source.docx","target.docx");
248+
249+
//compare encrypted documents from string with result path type and target extension
250+
//OtherComparisonOperations.compareEncryptedDocsWithResultTypeAndTargetExtension("source.docx","target.docx");
251+
252+
//compare encrypted documents from strings with type
253+
//OtherComparisonOperations.compareEncryptedDocsFromStringsWithType("source.docx","target.docx");
254+
228255
//End other options
229256

230257

‎Examples/src/Main/OtherComparisonOperations.java‎

Lines changed: 115 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.groupdocs.comparison.cells.contracts.nodes.ComparisonParagraphBase;
1212
import com.groupdocs.comparison.cells.nodes.ComparisonCell;
1313
import com.groupdocs.comparison.cells.nodes.ComparisonWorkbook;
14+
import com.groupdocs.comparison.common.ComparisonType;
1415
import com.groupdocs.comparison.common.FileType;
1516
import com.groupdocs.comparison.common.comparisonsettings.CellsComparisonSettings;
1617
import com.groupdocs.comparison.common.comparisonsettings.PdfComparisonSettings;
@@ -293,6 +294,17 @@ public static void compareSlidesWithCompareWith(String sourceFile, String target
293294
ISlidesCompareResult result = source.compareWith(target, new SlidesComparisonSettings());
294295
//ExEnd:compareSlidesWithCompareWith
295296
}
297+
/*
298+
* Compare documents from strings
299+
*/
300+
public static void compareDocsFromStrings(String sourceFile, String targetFile) throws Throwable{
301+
//ExStart:compareDocsFromStrings
302+
String sourcePath = Main.Utilities.sourcePath + sourceFile;
303+
String targetPath = Main.Utilities.targetPath + targetFile;
304+
Comparison comparison = new Comparison();
305+
InputStream result = comparison.compare(sourcePath, targetPath);
306+
//ExEnd:compareDocsFromStrings
307+
}
296308
/*
297309
* Compare documents from string with result path and target extension
298310
*/
@@ -301,10 +313,58 @@ public static void compareDocsFromStringWithTargetExtension(String sourceFile, S
301313
String sourcePath = Main.Utilities.sourcePath + sourceFile;
302314
String targetPath = Main.Utilities.targetPath + targetFile;
303315
Comparison comparison = new Comparison();
304-
InputStream result = comparison.compare(sourcePath, targetPath, Utilities.outputFileName("docx"), FileType.Docx);
316+
InputStream result = comparison.compare(sourcePath, targetPath, Utilities.outputFileName(".docx"), FileType.Docx);
317+
//ExEnd:compareDocsFromStringWithTargetExtension
318+
}
319+
320+
/*
321+
* Compare documents from string with result path and settings
322+
*/
323+
public static void compareDocsFromStringWithSettings(String sourceFile, String targetFile) throws Throwable{
324+
//ExStart:compareDocsFromStringWithTargetExtension
325+
String sourcePath = Main.Utilities.sourcePath + sourceFile;
326+
String targetPath = Main.Utilities.targetPath + targetFile;
327+
Comparison comparison = new Comparison();
328+
InputStream result = comparison.compare(sourcePath, targetPath, new WordsComparisonSettings());
305329
//ExEnd:compareDocsFromStringWithTargetExtension
306330
}
307331

332+
/*
333+
* Compare documents from strings with result path and target extension
334+
*/
335+
public static void compareDocsFromStringWithSettingsAndFileExtension(String sourceFile, String targetFile) throws Throwable{
336+
//ExStart:compareDocsFromStringWithSettingsAndFileExtension
337+
String sourcePath = Main.Utilities.sourcePath + sourceFile;
338+
String targetPath = Main.Utilities.targetPath + targetFile;
339+
Comparison comparison = new Comparison();
340+
InputStream result = comparison.compare(sourcePath, targetPath, Utilities.outputFileName(".docx") , new WordsComparisonSettings(), FileType.Docx);
341+
//ExEnd:compareDocsFromStringWithSettingsAndFileExtension
342+
}
343+
344+
/*
345+
* Compare documents from strings with result path and type.
346+
*/
347+
public static void compareDocsWithResultAndType(String sourceFile, String targetFile) throws Throwable{
348+
//ExStart:compareDocsWithResultAndType
349+
String sourcePath = Main.Utilities.sourcePath + sourceFile;
350+
String targetPath = Main.Utilities.targetPath + targetFile;
351+
Comparison comparison = new Comparison();
352+
InputStream result = comparison.compare(sourcePath, targetPath, Utilities.outputFileName(".docx") , ComparisonType.Words);
353+
//ExEnd:compareDocsWithResultAndType
354+
}
355+
356+
/*
357+
* Compare documents from strings with result path type and target extension
358+
*/
359+
public static void compareDocsWithResultAndTargetExtension(String sourceFile, String targetFile) throws Throwable{
360+
//ExStart:compareDocsWithResultAndTargetExtension
361+
String sourcePath = Main.Utilities.sourcePath + sourceFile;
362+
String targetPath = Main.Utilities.targetPath + targetFile;
363+
Comparison comparison = new Comparison();
364+
InputStream result = comparison.compare(sourcePath, targetPath, Utilities.outputFileName(".docx"),ComparisonType.Words, FileType.Docx);
365+
//ExEnd:compareDocsWithResultAndTargetExtension
366+
}
367+
308368
/*
309369
* Compare encrypted documents from strings.
310370
*/
@@ -317,6 +377,20 @@ public static void compareEncryptedDocumentsFromStrings(String sourceFile, Strin
317377
System.out.println(result.available());
318378
//ExEnd:compareEncryptedDocumentsFromStrings
319379
}
380+
381+
/*
382+
* Compare encrypted documents from strings with result path and target extension.
383+
*/
384+
public static void compareEncryptedDocsWithResultAndTargetExtension(String sourceFile, String targetFile) throws Throwable{
385+
//ExStart:compareEncryptedDocsWithResultAndTargetExtension
386+
Comparison comparison = new Comparison();
387+
String sourcePass = Utilities.sourcePassword;
388+
String targetPass = Utilities.targetPassword;
389+
InputStream result = comparison.compare(sourceFile, sourcePass, targetFile, targetPass, Utilities.outputFileName(".docx"), FileType.Docx);
390+
System.out.println(result.available());
391+
//ExEnd:compareEncryptedDocsWithResultAndTargetExtension
392+
}
393+
320394
/*
321395
* Compare encrypted documents from strings with result path settings and target extension
322396
*/
@@ -325,10 +399,49 @@ public static void compareEncryptedDocumentsWithSettingsAndSaving(String sourceF
325399
Comparison comparison = new Comparison();
326400
String sourcePass = Utilities.sourcePassword;
327401
String targetPass = Utilities.targetPassword;
328-
InputStream result = comparison.compare(sourceFile, sourcePass, targetFile, targetPass, Utilities.outputFileName("docx"), new WordsComparisonSettings(), FileType.Docx);
402+
InputStream result = comparison.compare(sourceFile, sourcePass, targetFile, targetPass, Utilities.outputFileName(".docx"), new WordsComparisonSettings(), FileType.Docx);
329403
System.out.println(result.available());
330404
//ExEnd:compareEncryptedDocumentsWithSettingsAndSaving
331405
}
332406

407+
/*
408+
* Compare encrypted documents from strings with result path and type
409+
*/
410+
public static void compareEncryptedDocsWithResultAndType(String sourceFile, String targetFile) throws Throwable{
411+
//ExStart:compareEncryptedDocsWithResultAndType
412+
Comparison comparison = new Comparison();
413+
String sourcePass = Utilities.sourcePassword;
414+
String targetPass = Utilities.targetPassword;
415+
InputStream result = comparison.compare(sourceFile, sourcePass, targetFile, targetPass, Utilities.outputFileName(".docx"), ComparisonType.Words);
416+
System.out.println(result.available());
417+
//ExEnd:compareEncryptedDocsWithResultAndType
418+
}
419+
420+
/*
421+
* Compare encypted documents from strings with result path type and target extension
422+
*/
423+
public static void compareEncryptedDocsWithResultTypeAndTargetExtension(String sourceFile, String targetFile) throws Throwable{
424+
//ExStart:compareEncryptedDocsWithResultTypeAndTargetExtension
425+
Comparison comparison = new Comparison();
426+
String sourcePass = Utilities.sourcePassword;
427+
String targetPass = Utilities.targetPassword;
428+
InputStream result = comparison.compare(sourceFile, sourcePass, targetFile, targetPass, Utilities.outputFileName(".docx"), ComparisonType.Words, FileType.Docx);
429+
System.out.println(result.available());
430+
//ExEnd:compareEncryptedDocsWithResultTypeAndTargetExtension
431+
}
432+
433+
/*
434+
* Compare encrypted documents from strings with type.
435+
*/
436+
public static void compareEncryptedDocsFromStringsWithType(String sourceFile, String targetFile) throws Exception{
437+
//ExStart:compareEncryptedDocsFromStringsWithType
438+
Comparison comparison = new Comparison();
439+
String sourcePass = Utilities.sourcePassword;
440+
String targetPass = Utilities.targetPassword;
441+
InputStream result = comparison.compare(sourceFile, sourcePass, targetFile, targetPass, ComparisonType.Words);
442+
System.out.println(result.available());
443+
//ExEnd:compareEncryptedDocsFromStringsWithType
444+
}
445+
333446

334447
}

0 commit comments

Comments
 (0)