EDITORJAVA-1042 - Updated GroupDocs.Editor up to 23.9 version.

efimovevgen · efimovevgen · commit ded49ce04949 · 2023-09-20T12:39:45.000+03:00
diff --git a/Examples/Resources/sample.docx b/Examples/Resources/sample.docx
diff --git a/Examples/Resources/sample.pptx b/Examples/Resources/sample.pptx
diff --git a/Examples/Resources/sample.xlsx b/Examples/Resources/sample.xlsx
diff --git a/Examples/pom.xml b/Examples/pom.xml
@@ -13,7 +13,7 @@
 		<dependency>
     		<groupId>com.groupdocs</groupId>
    			<artifactId>groupdocs-editor</artifactId>
-    		<version>23.5</version>
+    		<version>23.9</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
diff --git a/Examples/src/main/java/com/groupdocs/editor/examples/Constants.java b/Examples/src/main/java/com/groupdocs/editor/examples/Constants.java
@@ -19,7 +19,9 @@ public class Constants {
     public static final String SamplesPath = "\\Resources\\";
     public static final String OutputPath = "\\Output\\";
     
-    public static String SAMPLE_DOCX = getSampleFilePath("SampleDoc1.docx");
+    public static String SAMPLE_DOCX = getSampleFilePath("sample.docx");
+
+    public static String SAMPLE_DOCX2 = getSampleFilePath("SampleDoc1.docx");
 
     public static String SAMPLE_HTML = getSampleFilePath("SampleDoc1.html");
 
@@ -31,13 +33,13 @@ public class Constants {
 
     public static String SAMPLE_XLSX = getSampleFilePath("Sample_2SpreadSheet.xlsx");
 
-    public static String SAMPLE_XLS_PROTECTED = getSampleFilePath("Timesheet - excel_password.xls");
+    public static String SAMPLE_XLS_PROTECTED = getSampleFilePath("sample.xlsx");
 
     public static String SAMPLE_XML = getSampleFilePath("SampleXmlCorrect.xml");
 
     public static String SAMPLE_TXT = getSampleFilePath("SamplePlainText1.txt");
 
-    public static String SAMPLE_PPTX = getSampleFilePath("ComplexTest.pptx");
+    public static String SAMPLE_PPTX = getSampleFilePath("sample.pptx");
 
     public static String SAMPLE_MSG = getSampleFilePath("ComplexExample.msg");
 
diff --git a/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/WorkingWithPresentations.java b/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/WorkingWithPresentations.java
@@ -5,6 +5,7 @@
  */
 package com.groupdocs.editor.examples.advancedusage;
 
+import java.io.*;
 import java.util.List;
 import com.groupdocs.editor.EditableDocument;
 import com.groupdocs.editor.Editor;
@@ -14,10 +15,6 @@
 import com.groupdocs.editor.options.PresentationEditOptions;
 import com.groupdocs.editor.options.PresentationLoadOptions;
 import com.groupdocs.editor.options.PresentationSaveOptions;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
 
 /**
  *
@@ -73,15 +70,19 @@ public static void run() throws Exception {
 
         //11. Save it
         //11.1. Prepare saving filename and path
-        String outputPath = Constants.getOutputFilePath(inputFilePath, saveOptions.getOutputFormat().getExtension());
+        String outputPath = Constants.getOutputFilePath("sample_out", saveOptions.getOutputFormat().getExtension());
 
         //11.2. Prepare stream for saving
-        OutputStream outputStream = new ByteArrayOutputStream();
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         //FileStream outputStream = File.create(outputPath)
 
         //11.3. Save
         editor.save(afterEdit, outputStream, saveOptions);
 
+        try(OutputStream outputFile = new FileOutputStream(outputPath)) {
+            outputStream.writeTo(outputFile);
+        }
+
         System.out.println("WorkingWithPresentations routine has successfully finished");
     }
 }
diff --git a/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/WorkingWithSpreadsheetMultiTab.java b/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/WorkingWithSpreadsheetMultiTab.java
@@ -13,10 +13,8 @@
 import com.groupdocs.editor.options.SpreadsheetEditOptions;
 import com.groupdocs.editor.options.SpreadsheetLoadOptions;
 import com.groupdocs.editor.options.SpreadsheetSaveOptions;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
+
+import java.io.*;
 
 /**
  *
@@ -57,11 +55,15 @@ public static void run() throws Exception {
         SpreadsheetSaveOptions saveOptions2 = new SpreadsheetSaveOptions(SpreadsheetFormats.Xlsb);
         String outputPath2 = Constants.getOutputFilePath(Constants.removeExtension(Path.getFileName(inputFilePath)) + "_tab2", "xlsb");
 
-        OutputStream outputStream1 = new ByteArrayOutputStream();
+        ByteArrayOutputStream outputStream1 = new ByteArrayOutputStream();
         //FileStream outputStream1 = File.create(outputPath)
 
         editor.save(secondTabBeforeEdit, outputPath2, saveOptions2);
 
+        try(OutputStream outputFile = new FileOutputStream(outputPath2)) {
+            outputStream1.writeTo(outputFile);
+        }
+
         //7. Dispose both EditableDocument instances
         firstTabBeforeEdit.dispose();
         secondTabBeforeEdit.dispose();
diff --git a/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/WorkingWithWordProcessing.java b/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/WorkingWithWordProcessing.java
@@ -5,6 +5,7 @@
  */
 package com.groupdocs.editor.examples.advancedusage;
 
+import java.io.*;
 import java.util.List;
 import com.groupdocs.editor.EditableDocument;
 import com.groupdocs.editor.Editor;
@@ -18,10 +19,7 @@
 import com.groupdocs.editor.options.WordProcessingProtection;
 import com.groupdocs.editor.options.WordProcessingProtectionType;
 import com.groupdocs.editor.options.WordProcessingSaveOptions;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
+
 import java.util.Locale;
 
 /**
@@ -93,11 +91,15 @@ public static void run() throws Exception {
         String outputPath = Constants.getOutputFilePath(Constants.removeExtension(Path.getFileName(inputFilePath)), docmFormat.getExtension());
 
         //11.2. Prepare stream for saving
-        OutputStream outputStream = new ByteArrayOutputStream();
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         //FileStream outputStream1 = File.create(outputPath)
 
         //11.3. Save
         editor.save(afterEdit, outputStream, saveOptions);
+
+        try(OutputStream outputFile = new FileOutputStream(outputPath)) {
+            outputStream.writeTo(outputFile);
+        }
         System.out.println("WorkingWithWordProcessing routine has successfully finished");
     }
 }
diff --git a/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/WorkingWithXml.java b/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/WorkingWithXml.java
@@ -17,6 +17,7 @@
 import com.groupdocs.editor.htmlcss.css.properties.FontSize;
 import com.groupdocs.editor.htmlcss.css.properties.FontStyle;
 import com.groupdocs.editor.htmlcss.css.properties.FontWeight;
+import com.groupdocs.editor.htmlcss.css.properties.TextDecorationLineType;
 import com.groupdocs.editor.htmlcss.resources.IHtmlResource;
 import com.groupdocs.editor.htmlcss.serialization.QuoteType;
 import com.groupdocs.editor.internal.c.a.ms.System.IO.Path;
@@ -136,15 +137,15 @@ public static void highlightOptionsDemo()
 
         //Setting attribute names font settings
         highlightOptions.getAttributeNamesFontSettings().setName("Arial");
-        highlightOptions.getAttributeNamesFontSettings().setLine(WebFont.TextDecorationLine.Underline);
+        highlightOptions.getAttributeNamesFontSettings().setLine(TextDecorationLineType.Underline);
         highlightOptions.getAttributeNamesFontSettings().setWeight(FontWeight.Lighter);
 
         //Setting attribute values font settings
-        highlightOptions.getAttributeValuesFontSettings().setLine((byte) (WebFont.TextDecorationLine.Underline + WebFont.TextDecorationLine.Overline));
+        highlightOptions.getAttributeValuesFontSettings().setLine(TextDecorationLineType.op_Addition(TextDecorationLineType.Underline,TextDecorationLineType.Overline));
         highlightOptions.getAttributeValuesFontSettings().setStyle(FontStyle.Italic);
 
         //Setting CDATA sections font settings
-        highlightOptions.getCDataFontSettings().setLine(WebFont.TextDecorationLine.LineThrough);
+        highlightOptions.getCDataFontSettings().setLine(TextDecorationLineType.LineThrough);
         highlightOptions.getCDataFontSettings().setSize(FontSize.Smaller);
 
         //Setting HTML comments font settings
@@ -202,15 +203,15 @@ public static void complexEditDemo()
         editOptions1.setFixIncorrectStructure(true);
         editOptions1.setAttributeValuesQuoteType(QuoteType.SingleQuote);
         editOptions1.getFormatOptions().setLeftIndent(Length.parse("20px"));
-        editOptions1.getHighlightOptions().getXmlTagsFontSettings().setLine((byte) (WebFont.TextDecorationLine.Underline + WebFont.TextDecorationLine.Overline));
+        editOptions1.getHighlightOptions().getXmlTagsFontSettings().setLine(TextDecorationLineType.op_Addition(TextDecorationLineType.Underline,TextDecorationLineType.Overline));
         editOptions1.getHighlightOptions().getXmlTagsFontSettings().setWeight(FontWeight.Bold);
 
         XmlEditOptions editOptions2 = new XmlEditOptions();
         editOptions2.setTrimTrailingWhitespaces(true);
         editOptions2.setAttributeValuesQuoteType(QuoteType.DoubleQuote);
         editOptions2.getFormatOptions().setLeafTextNodesOnNewline(true);
         editOptions2.getHighlightOptions().getXmlTagsFontSettings().setSize(FontSize.XLarge);
-        editOptions2.getHighlightOptions().getHtmlCommentsFontSettings().setLine(WebFont.TextDecorationLine.LineThrough);
+        editOptions2.getHighlightOptions().getHtmlCommentsFontSettings().setLine(TextDecorationLineType.LineThrough);
 
         Editor editor = new Editor(xmlInputPath);
         try /*JAVA: was using*/
diff --git a/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/editabledocumentexamples/EditableDocumentAdvancedUsage.java b/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/editabledocumentexamples/EditableDocumentAdvancedUsage.java
@@ -69,7 +69,7 @@ public static void run() throws Exception {
 
             //3.2. Generating prefixed HTML markup to a String.
             // Now, for example, <img src="car.jpg" /> is turned into <img src="http://example.com/ImagesHandler/id=car.jpg" />
-            String prefixedHtmlMarkup = beforeEdit.getContent(customImagesRequesthandlerUri, customCssRequesthandlerUri);
+            String prefixedHtmlMarkup = beforeEdit.getContentString(customImagesRequesthandlerUri, customCssRequesthandlerUri);
 
             //3.3. Some WYSIWYG-editors can handle only pure TML markup, without header (in other words, only internals of HTML->BODY element).
             // EditableDocument can provide such part of a document.
diff --git a/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/editabledocumentexamples/GetHtmlContentWithPrefix.java b/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/editabledocumentexamples/GetHtmlContentWithPrefix.java
@@ -22,7 +22,7 @@ public static void run() throws Exception {
         EditableDocument document = editor.edit(new WordProcessingEditOptions());
         String externalImagesPrefix = "http://www.mywebsite.com/images/id=";
         String externalCssPrefix = "http://www.mywebsite.com/css/id=";
-        String prefixedHtmlContent = document.getContent(externalImagesPrefix, externalCssPrefix);
+        String prefixedHtmlContent = document.getContentString(externalImagesPrefix, externalCssPrefix);
         System.out.println("HTML content of the input document with custom image and stylesheet prefixes: " + prefixedHtmlContent);
     }
 }
diff --git a/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/editabledocumentexamples/WorkingWithResources.java b/Examples/src/main/java/com/groupdocs/editor/examples/advancedusage/editabledocumentexamples/WorkingWithResources.java
@@ -34,7 +34,7 @@ public static void run() throws Exception {
         System.out.println("Investigating resources of DOCX document");
 
         //1. Lets create a EditableDocument instance in usual way, by loading and editing input document of some supportable format
-        String inputFilePath = Constants.SAMPLE_DOCX;
+        String inputFilePath = Constants.SAMPLE_DOCX2;
         Editor editor = new Editor(inputFilePath, new WordProcessingLoadOptions());
 
         WordProcessingEditOptions editOptions = new WordProcessingEditOptions();
