Merge pull request #43 from samicheemagroupdocs/master

Examples updated for 19.6

Author: samicheemagroupdocs

Examples/GroupDocs.Comparison.Examples.Java/Data/ResultFiles/Result Pages/result_1.png

@@ -13,7 +13,7 @@
 		<dependency>
 			<groupId>com.groupdocs</groupId>
 			<artifactId>groupdocs-comparison</artifactId>
-			<version>19.3</version>
+			<version>19.6</version>
 		</dependency>
 	</dependencies>
 	<repositories>

Examples/GroupDocs.Comparison.Examples.Java/Data/ResultFiles/output.docx

@@ -192,6 +192,9 @@ public static void main(String[] args) throws Throwable {
 
 		// compare pdf documents files without saving and settings
 		//PdfDocumentsComparision.ComparePdfFromFileWithoutSettings("source.pdf", "target.pdf");
+		
+		// compare pdf documents files and get image representation of document pages
+		// PdfDocumentsComparision.getImageRepresentationOfDocumentPages("source.pdf", "target.pdf");
 
 		// End pdf
 		// comparison_____________________________________________________________

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

@@ -1,10 +1,15 @@
 package com.groupdocs.comparison.examples;
 
-import java.awt.Color;
-import java.io.FileInputStream;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.util.List;
+
+import javax.imageio.ImageIO;
 
 import com.groupdocs.comparison.Comparer;
+import com.groupdocs.comparison.common.PageImage;
 import com.groupdocs.comparison.common.compareresult.ICompareResult;
 import com.groupdocs.comparison.common.comparisonsettings.ComparisonSettings;
 
@@ -140,4 +145,34 @@ public static void ComparePdfFromFileWithoutSettings(String sourceFile, String t
 		result.saveDocument(Utilities.outputFileName(".pdf"));
 		//ExEnd:ComparePdfFromFileWithoutSettings
 	}	
+	
+	 /* Compare two pdf documents from files and get image representation of result document*/
+	 
+	public static void getImageRepresentationOfDocumentPages(String sourceFile, String targetFile) throws Exception {
+		//ExStart:getImageRepresentationOfDocumentPages
+		String sourcePath = Utilities.sourcePath + sourceFile;
+		String targetPath = Utilities.targetPath + targetFile;
+		// Create instance of GroupDocs.Comparison.Comparer and call method
+		// Compare.
+		ComparisonSettings settings = new ComparisonSettings();  
+		settings.setGenerateSummaryPage(false);
+		Comparer comparison = new Comparer();
+		ICompareResult result = comparison.compare(sourcePath, targetPath, settings);
+		result.saveDocument(Utilities.outputFileName(".pdf"));
+		//get list of pages
+		List<PageImage> resultImages = comparison.convertToImages(sourcePath,targetPath);
+		  
+		  
+		//save them as bitmap to separate folder
+		if (!new File(Utilities.resultFilePath + "/Result Pages").exists()) 
+		   new File(Utilities.resultFilePath + "/Result Pages").mkdir();
+		  
+		  
+		for (PageImage image : resultImages){ 
+		     BufferedImage bitmap = ImageIO.read(image.getPageStream()); 
+		     ImageIO.write(bitmap, "png", new FileOutputStream(Utilities.resultFilePath + "/Result Pages/result_" + image.getPageNumber() + ".png")); 
+		}
+		//ExEnd:getImageRepresentationOfDocumentPages
+	}
+
 }

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

@@ -16,13 +16,13 @@ public class Utilities {
 
 	public final static String sourcePath = "./Data/SourceFiles/";
 	public final static String targetPath = "./Data/TargetFiles/";
-	public static final Path resultFilePath = getProjectBaseDir().resolve("Data/ResultFiles/output");
+	public static final String resultFilePath = "./Data/ResultFiles/";
 	public final static String resultFile = "result";
-	public static final Path licensePath = getProjectBaseDir().resolve("GroupDocs.Total.Java.lic");
+	public static final String licensePath = "E://GroupDocs.Total.Java.lic";
 	public final static String sourcePassword = "pass";
 	public final static String targetPassword = "pass";
 	public static String outputFileName(String extension) {
-		String resultPath = resultFilePath + extension;
+		String resultPath = resultFilePath + resultFile + extension;
 		return resultPath;
 	}
 	// ExEnd:CommonProperties
@@ -36,8 +36,8 @@ public static void applyLicenseFromFile() {
 		try {
 			// Setup license
 			License lic = new License();
-			lic.setLicense(licensePath.toString());
-			if(lic.isValidLicense()){
+			lic.setLicense(licensePath);
+			if(License.isValidLicense()){
 				System.out.println("License is validated");
 			}
 		} catch (Exception exp) {

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

@@ -173,14 +173,18 @@ public static void comparisonSettingsWhenComparingFiles(String sourceFile, Strin
 		settings.setUseFramesForDelInsElements(false);
 		/**Inserted, deleted and style changed items styles setting**/
 
-		settings.getInsertedItemsStyle().setColor(Color.LIGHT_GRAY);
+		settings.getInsertedItemsStyle().setFontColor(Color.LIGHT_GRAY);
+		settings.getInsertedItemsStyle().setHighlightColor(Color.GRAY);
 		settings.getInsertedItemsStyle().setBeginSeparatorString("<inserted>");
 		settings.getInsertedItemsStyle().setEndSeparatorString("</inserted>");
-		settings.getDeletedItemsStyle().setColor(Color.CYAN);
+		
+		settings.getDeletedItemsStyle().setFontColor(Color.CYAN);
+		settings.getDeletedItemsStyle().setHighlightColor(Color.PINK);
 		settings.getDeletedItemsStyle().setBeginSeparatorString("<deleted>");
 		settings.getDeletedItemsStyle().setEndSeparatorString("</deleted>");
 
-		settings.getStyleChangedItemsStyle().setColor(Color.BLUE);
+		settings.getStyleChangedItemsStyle().setFontColor(Color.BLUE);
+		settings.getStyleChangedItemsStyle().setHighlightColor(Color.LIGHT_GRAY);
 		settings.getStyleChangedItemsStyle().setBeginSeparatorString("<style>");
 		settings.getStyleChangedItemsStyle().setEndSeparatorString("</style>");