diff --git a/Demos/Dropwizard/README.md b/Demos/Dropwizard/README.md index a78dcfb..341722c 100644 --- a/Demos/Dropwizard/README.md +++ b/Demos/Dropwizard/README.md @@ -1,6 +1,6 @@ ![Groupdocs document & pdf annotator](https://raw.githubusercontent.com/groupdocs-annotation/groupdocs-annotation.github.io/master/resources/image/banner.png "GroupDocs.Annotation") # GroupDocs.Annotation for Java Dropwizard Example -###### version 1.12.24 +###### version 1.12.25 [![GitHub license](https://img.shields.io/github/license/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard.svg)](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard/blob/master/LICENSE) @@ -123,10 +123,10 @@ Download [latest release](https://github.com/groupdocs-annotation/GroupDocs.Anno **Note**: This method is **recommended** for running this sample behind firewall. ```bash -curl -J -L -o release.tar.gz https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard/releases/download/1.12.24/release.tar.gz +curl -J -L -o release.tar.gz https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Dropwizard/releases/download/1.12.25/release.tar.gz tar -xvzf release.tar.gz cd release -java -jar annotation-1.12.24.jar configuration.yaml +java -jar annotation-1.12.25.jar configuration.yaml ## Open http://localhost:8080/annotation/ in your favorite browser. ``` diff --git a/Demos/Dropwizard/pom.xml b/Demos/Dropwizard/pom.xml index 3b89ea8..96c1329 100644 --- a/Demos/Dropwizard/pom.xml +++ b/Demos/Dropwizard/pom.xml @@ -6,7 +6,7 @@ com.groupdocs.ui annotation - 1.12.24 + 1.12.25 jar GroupDocs.Annotation Dropwizard @@ -81,7 +81,7 @@ com.groupdocs groupdocs-annotation - 21.7.2 + 23.2 javax.xml.bind diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/AreaAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/AreaAnnotator.java index 0e89848..6edbf8a 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/AreaAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/AreaAnnotator.java @@ -50,6 +50,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.Area; + return AnnotationType.AREA; } } diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/ArrowAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/ArrowAnnotator.java index 550f9e7..d5b10bc 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/ArrowAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/ArrowAnnotator.java @@ -67,7 +67,7 @@ protected Reply getAnnotationReplyInfo(CommentsEntity comment) { @Override protected int getType() { - return AnnotationType.Arrow; + return AnnotationType.ARROW; } @Override diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/DistanceAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/DistanceAnnotator.java index 0a0bcb7..1efc61b 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/DistanceAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/DistanceAnnotator.java @@ -72,7 +72,7 @@ protected final AnnotationBase initAnnotationBaseDistanceAnnotator(AnnotationBas @Override protected int getType() { - return AnnotationType.Distance; + return AnnotationType.DISTANCE; } @Override diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/PointAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/PointAnnotator.java index 2a4efe5..82c853f 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/PointAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/PointAnnotator.java @@ -51,6 +51,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.Point; + return AnnotationType.POINT; } } diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/PolylineAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/PolylineAnnotator.java index 96a5df6..a554cb1 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/PolylineAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/PolylineAnnotator.java @@ -74,6 +74,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.Polyline; + return AnnotationType.POLYLINE; } } diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/ResourceRedactionAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/ResourceRedactionAnnotator.java index a2b36e4..bef6255 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/ResourceRedactionAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/ResourceRedactionAnnotator.java @@ -52,6 +52,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.ResourcesRedaction; + return AnnotationType.RESOURCES_REDACTION; } } \ No newline at end of file diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextFieldAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextFieldAnnotator.java index 2e62d73..4df87dc 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextFieldAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextFieldAnnotator.java @@ -56,6 +56,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.TextField; + return AnnotationType.TEXT_FIELD; } } \ No newline at end of file diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextHighlightAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextHighlightAnnotator.java index c86eb95..cc4b08d 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextHighlightAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextHighlightAnnotator.java @@ -52,6 +52,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.TextHighlight; + return AnnotationType.TEXT_HIGHLIGHT; } } \ No newline at end of file diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextRedactionAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextRedactionAnnotator.java index c6efeff..f1b3a4b 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextRedactionAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextRedactionAnnotator.java @@ -51,6 +51,6 @@ public AnnotationBase annotateWord() { @Override protected int getType() { - return AnnotationType.TextRedaction; + return AnnotationType.TEXT_REDACTION; } } \ No newline at end of file diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextReplacementAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextReplacementAnnotator.java index e44b499..c6d92ca 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextReplacementAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextReplacementAnnotator.java @@ -53,6 +53,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.TextReplacement; + return AnnotationType.TEXT_REPLACEMENT; } } \ No newline at end of file diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextStrikeoutAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextStrikeoutAnnotator.java index 363b30a..3f36675 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextStrikeoutAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextStrikeoutAnnotator.java @@ -53,6 +53,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.TextStrikeout; + return AnnotationType.TEXT_STRIKEOUT; } } \ No newline at end of file diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextUnderlineAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextUnderlineAnnotator.java index 5249a4f..ef09636 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextUnderlineAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/TextUnderlineAnnotator.java @@ -55,6 +55,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.TextUnderline; + return AnnotationType.TEXT_UNDERLINE; } } \ No newline at end of file diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/WatermarkAnnotator.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/WatermarkAnnotator.java index cda6c22..b395e0a 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/WatermarkAnnotator.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/annotator/WatermarkAnnotator.java @@ -55,6 +55,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.Watermark; + return AnnotationType.WATERMARK; } } \ No newline at end of file diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/service/AnnotationServiceImpl.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/service/AnnotationServiceImpl.java index 900d629..ee15f59 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/service/AnnotationServiceImpl.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/service/AnnotationServiceImpl.java @@ -1,13 +1,13 @@ package com.groupdocs.ui.annotation.service; -import com.groupdocs.annotation.license.License; +import com.groupdocs.annotation.licenses.License; import com.groupdocs.annotation.models.annotationmodels.AnnotationBase; import com.groupdocs.annotation.Annotator; import com.groupdocs.annotation.IDocumentInfo; import com.groupdocs.annotation.exceptions.AnnotatorException; import com.groupdocs.annotation.models.PageInfo; import com.groupdocs.annotation.options.LoadOptions; -import com.groupdocs.annotation.options.PreviewFormats; +import com.groupdocs.annotation.options.pagepreview.PreviewFormats; import com.groupdocs.annotation.options.export.AnnotationType; import com.groupdocs.annotation.options.export.SaveOptions; import com.groupdocs.annotation.options.pagepreview.CreatePageStream; @@ -146,7 +146,12 @@ public final AnnotatedDocumentEntity loadDocument(LoadDocumentRequest loadDocume try { annotator = new Annotator(guid, loadOptions); - IDocumentInfo info = annotator.getDocument().getDocumentInfo(); + IDocumentInfo info = null; + try { + info = annotator.getDocument().getDocumentInfo(); + } catch (IOException e) { + e.printStackTrace(); + } List annotations = annotator.get(); description.setGuid(loadDocumentRequest.getGuid()); @@ -301,7 +306,7 @@ public InputStream annotateDocument(String documentGuid, String documentType, Li Annotator annotator = new Annotator(documentGuid); SaveOptions saveOptions = new SaveOptions(); - saveOptions.setAnnotationTypes(AnnotationType.None); + saveOptions.setAnnotationTypes(AnnotationType.NONE); annotator.save(documentGuid, saveOptions); @@ -448,7 +453,7 @@ public static void removeAnnotations(String documentGuid, String password) { final Annotator annotator = new Annotator(inputStream, getLoadOptions(password)); try { SaveOptions tmp0 = new SaveOptions(); - tmp0.setAnnotationTypes(AnnotationType.None); + tmp0.setAnnotationTypes(AnnotationType.NONE); annotator.save(tempPath, tmp0); } finally { if (annotator != null) { diff --git a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/util/DocumentTypesConverter.java b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/util/DocumentTypesConverter.java index 44f1770..bac184e 100644 --- a/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/util/DocumentTypesConverter.java +++ b/Demos/Dropwizard/src/main/java/com/groupdocs/ui/annotation/util/DocumentTypesConverter.java @@ -23,30 +23,30 @@ public class DocumentTypesConverter { * @return int * @param documentType string */ - public static int getDocumentType(String documentType) { - switch (documentType) { - case "Portable Document Format": - case "PDF": - return DocumentType.Pdf; - case "Microsoft Word": - case "WORDS": - case "Microsoft Word Open XML format (.docx)": - return DocumentType.Words; - case "Microsoft PowerPoint": - case "SLIDES": - return DocumentType.Slides; - case "image": - return DocumentType.Images; - case "Microsoft Excel": - case "CELLS": - return DocumentType.Cells; - case "AutoCAD Drawing File Format": - case "diagram": - return DocumentType.Diagram; - default: - return DocumentType.Undefined; - } - } +// public static int getDocumentType(String documentType) { +// switch (documentType) { +// case "Portable Document Format": +// case "PDF": +// return DocumentType.Pdf; +// case "Microsoft Word": +// case "WORDS": +// case "Microsoft Word Open XML format (.docx)": +// return DocumentType.Words; +// case "Microsoft PowerPoint": +// case "SLIDES": +// return DocumentType.Slides; +// case "image": +// return DocumentType.Images; +// case "Microsoft Excel": +// case "CELLS": +// return DocumentType.Cells; +// case "AutoCAD Drawing File Format": +// case "diagram": +// return DocumentType.Diagram; +// default: +// return DocumentType.Undefined; +// } +// } /** * Check image and diagram document types diff --git a/Demos/Spring/README.md b/Demos/Spring/README.md index 4556e02..b470452 100644 --- a/Demos/Spring/README.md +++ b/Demos/Spring/README.md @@ -1,6 +1,6 @@ ![Groupdocs document & pdf annotator](https://raw.githubusercontent.com/groupdocs-annotation/groupdocs-annotation.github.io/master/resources/image/banner.png "GroupDocs.Annotation") # GroupDocs.Annotation for Java Spring Example -###### version 1.12.27 +###### version 1.12.28 [![GitHub license](https://img.shields.io/github/license/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring.svg)](https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring/blob/master/LICENSE) @@ -131,10 +131,10 @@ Download [latest release](https://github.com/groupdocs-annotation/GroupDocs.Anno **Note**: This method is **recommended** for running this sample behind firewall. ```bash -curl -J -L -o release.tar.gz https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring/releases/download/1.12.27/release.tar.gz +curl -J -L -o release.tar.gz https://github.com/groupdocs-annotation/GroupDocs.Annotation-for-Java-Spring/releases/download/1.12.28/release.tar.gz tar -xvzf release.tar.gz cd release -java -jar annotation-spring-1.12.27.jar configuration.yml +java -jar annotation-spring-1.12.28.jar configuration.yml ## Open http://localhost:8080/annotation/ in your favorite browser. ``` diff --git a/Demos/Spring/pom.xml b/Demos/Spring/pom.xml index f878cde..19145d2 100644 --- a/Demos/Spring/pom.xml +++ b/Demos/Spring/pom.xml @@ -6,7 +6,7 @@ com.groupdocs.ui annotation-spring - 1.12.25 + 1.12.28 ${packaging.type} GroupDocs.Annotation for Java Spring Sample @@ -128,13 +128,24 @@ spring-boot-starter-thymeleaf 2.0.4.RELEASE - com.groupdocs groupdocs-annotation - 21.7.2 + 23.2 + + + org.tukaani + xz + 1.9 + + + com.aspose + aspose-note + 22.3 + jdk17 + com.google.guava guava @@ -153,6 +164,11 @@ GroupDocs Java API https://artifact.groupdocs.com/repo/ + + aspose-central + repository.aspose.com-releases + https://repository.aspose.com/repo + diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/AreaAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/AreaAnnotator.java index 0e89848..6edbf8a 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/AreaAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/AreaAnnotator.java @@ -50,6 +50,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.Area; + return AnnotationType.AREA; } } diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/ArrowAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/ArrowAnnotator.java index 550f9e7..d5b10bc 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/ArrowAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/ArrowAnnotator.java @@ -67,7 +67,7 @@ protected Reply getAnnotationReplyInfo(CommentsEntity comment) { @Override protected int getType() { - return AnnotationType.Arrow; + return AnnotationType.ARROW; } @Override diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/DistanceAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/DistanceAnnotator.java index 0a0bcb7..1efc61b 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/DistanceAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/DistanceAnnotator.java @@ -72,7 +72,7 @@ protected final AnnotationBase initAnnotationBaseDistanceAnnotator(AnnotationBas @Override protected int getType() { - return AnnotationType.Distance; + return AnnotationType.DISTANCE; } @Override diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/PointAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/PointAnnotator.java index 2a4efe5..82c853f 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/PointAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/PointAnnotator.java @@ -51,6 +51,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.Point; + return AnnotationType.POINT; } } diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/PolylineAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/PolylineAnnotator.java index 96a5df6..a554cb1 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/PolylineAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/PolylineAnnotator.java @@ -74,6 +74,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.Polyline; + return AnnotationType.POLYLINE; } } diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/ResourceRedactionAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/ResourceRedactionAnnotator.java index 1933748..4d66e9a 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/ResourceRedactionAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/ResourceRedactionAnnotator.java @@ -52,6 +52,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.ResourcesRedaction; + return AnnotationType.RESOURCES_REDACTION; } } \ No newline at end of file diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextFieldAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextFieldAnnotator.java index 2e62d73..4df87dc 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextFieldAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextFieldAnnotator.java @@ -56,6 +56,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.TextField; + return AnnotationType.TEXT_FIELD; } } \ No newline at end of file diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextHighlightAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextHighlightAnnotator.java index b701943..799716a 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextHighlightAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextHighlightAnnotator.java @@ -52,6 +52,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.TextHighlight; + return AnnotationType.TEXT_HIGHLIGHT; } } \ No newline at end of file diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextRedactionAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextRedactionAnnotator.java index b1e4394..2d21db5 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextRedactionAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextRedactionAnnotator.java @@ -51,6 +51,6 @@ public AnnotationBase annotateWord() { @Override protected int getType() { - return AnnotationType.TextRedaction; + return AnnotationType.TEXT_REDACTION; } } \ No newline at end of file diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextReplacementAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextReplacementAnnotator.java index 9291466..1b81cc5 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextReplacementAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextReplacementAnnotator.java @@ -53,6 +53,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.TextReplacement; + return AnnotationType.TEXT_REPLACEMENT; } } \ No newline at end of file diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextStrikeoutAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextStrikeoutAnnotator.java index f5a6a5c..c8ed96c 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextStrikeoutAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextStrikeoutAnnotator.java @@ -53,6 +53,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.TextStrikeout; + return AnnotationType.TEXT_STRIKEOUT; } } \ No newline at end of file diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextUnderlineAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextUnderlineAnnotator.java index 53956be..e3c2b31 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextUnderlineAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/TextUnderlineAnnotator.java @@ -55,6 +55,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.TextUnderline; + return AnnotationType.TEXT_UNDERLINE; } } \ No newline at end of file diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/WatermarkAnnotator.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/WatermarkAnnotator.java index 3e8c06a..927d18a 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/WatermarkAnnotator.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/annotator/WatermarkAnnotator.java @@ -55,6 +55,6 @@ public AnnotationBase annotateDiagram() { @Override protected int getType() { - return AnnotationType.Watermark; + return AnnotationType.WATERMARK; } } \ No newline at end of file diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/entity/Annotations.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/entity/Annotations.java index db2c999..0fe8b6e 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/entity/Annotations.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/entity/Annotations.java @@ -1,4 +1,4 @@ -package com.groupdocs.annotation.entity; +package com.groupdocs.ui.annotation.entity; public class Annotations { diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/AnnotationServiceImpl.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/AnnotationServiceImpl.java index fa943ef..5e91d98 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/AnnotationServiceImpl.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/AnnotationServiceImpl.java @@ -1,13 +1,13 @@ package com.groupdocs.ui.annotation.service; -import com.groupdocs.annotation.license.License; +import com.groupdocs.annotation.licenses.License; import com.groupdocs.annotation.models.annotationmodels.AnnotationBase; import com.groupdocs.annotation.Annotator; import com.groupdocs.annotation.IDocumentInfo; import com.groupdocs.annotation.exceptions.AnnotatorException; import com.groupdocs.annotation.models.PageInfo; import com.groupdocs.annotation.options.LoadOptions; -import com.groupdocs.annotation.options.PreviewFormats; +import com.groupdocs.annotation.options.pagepreview.PreviewFormats; import com.groupdocs.annotation.options.export.AnnotationType; import com.groupdocs.annotation.options.export.SaveOptions; import com.groupdocs.annotation.options.pagepreview.CreatePageStream; @@ -183,6 +183,8 @@ public final AnnotatedDocumentEntity loadDocument(LoadDocumentRequest loadDocume } description.getPages().add(page); } + } catch (IOException e) { + e.printStackTrace(); } finally { if (annotator != null) { annotator.dispose(); @@ -304,7 +306,7 @@ public InputStream annotateDocument(String documentGuid, String documentType, Li Annotator annotator = new Annotator(documentGuid); SaveOptions saveOptions = new SaveOptions(); - saveOptions.setAnnotationTypes(AnnotationType.None); + saveOptions.setAnnotationTypes(AnnotationType.NONE); annotator.save(documentGuid, saveOptions); @@ -450,7 +452,7 @@ public static void removeAnnotations(String documentGuid, String password) { final Annotator annotator = new Annotator(inputStream, getLoadOptions(password)); try { SaveOptions tmp0 = new SaveOptions(); - tmp0.setAnnotationTypes(AnnotationType.None); + tmp0.setAnnotationTypes(AnnotationType.NONE); annotator.save(tempPath, tmp0); } finally { if (annotator != null) { diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/IPageStreamFactory.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/IPageStreamFactory.java index f4a072c..4c5b8ae 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/IPageStreamFactory.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/IPageStreamFactory.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package com.groupdocs.ui.annotation.service; import java.io.InputStream; @@ -13,8 +8,6 @@ * @author AlexT */ public interface IPageStreamFactory { - - public OutputStream createPageStream(int pageNumber); - - public void closePageStream(int pageNumber, InputStream pageStream); + OutputStream createPageStream(int pageNumber); + void closePageStream(int pageNumber, InputStream pageStream); } diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/StreamFactoryClass.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/StreamFactoryClass.java index 4e02618..ab43242 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/StreamFactoryClass.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/service/StreamFactoryClass.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package com.groupdocs.ui.annotation.service; import com.groupdocs.ui.annotation.entity.web.PageDataDescriptionEntity; diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/AnnotationMapper.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/AnnotationMapper.java index 52b9318..3da9074 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/AnnotationMapper.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/AnnotationMapper.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; - public class AnnotationMapper { private AnnotationMapper() { diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/DocumentTypesConverter.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/DocumentTypesConverter.java index 0402ff7..7a1a906 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/DocumentTypesConverter.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/DocumentTypesConverter.java @@ -18,30 +18,30 @@ public class DocumentTypesConverter { * @return int * @param documentType string */ - public static int getDocumentType(String documentType) { - switch (documentType) { - case "Portable Document Format": - case "PDF": - return DocumentType.Pdf; - case "Microsoft Word": - case "WORDS": - case "Microsoft Word Open XML format (.docx)": - return DocumentType.Words; - case "Microsoft PowerPoint": - case "SLIDES": - return DocumentType.Slides; - case "image": - return DocumentType.Images; - case "Microsoft Excel": - case "CELLS": - return DocumentType.Cells; - case "AutoCAD Drawing File Format": - case "diagram": - return DocumentType.Diagram; - default: - return DocumentType.Undefined; - } - } +// public static int getDocumentType(String documentType) { +// switch (documentType) { +// case "Portable Document Format": +// case "PDF": +// return DocumentType.Pdf; +// case "Microsoft Word": +// case "WORDS": +// case "Microsoft Word Open XML format (.docx)": +// return DocumentType.Words; +// case "Microsoft PowerPoint": +// case "SLIDES": +// return DocumentType.Slides; +// case "image": +// return DocumentType.Images; +// case "Microsoft Excel": +// case "CELLS": +// return DocumentType.Cells; +// case "AutoCAD Drawing File Format": +// case "diagram": +// return DocumentType.Diagram; +// default: +// return DocumentType.Undefined; +// } +// } /** * Check image and diagram document types diff --git a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/SupportedAnnotations.java b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/SupportedAnnotations.java index d0af772..33e2eb5 100644 --- a/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/SupportedAnnotations.java +++ b/Demos/Spring/src/main/java/com/groupdocs/ui/annotation/util/SupportedAnnotations.java @@ -1,6 +1,6 @@ package com.groupdocs.ui.annotation.util; -import com.groupdocs.annotation.entity.Annotations; +import com.groupdocs.ui.annotation.entity.Annotations; public class SupportedAnnotations { diff --git a/Examples/pom.xml b/Examples/pom.xml index 85bccae..7d0c3ff 100644 --- a/Examples/pom.xml +++ b/Examples/pom.xml @@ -5,8 +5,8 @@ GroupDocs.Annotation-for-Java 0.0.1-SNAPSHOT - 7 - 7 + 8 + 8 @@ -23,7 +23,7 @@ com.groupdocs groupdocs-annotation - 21.7.2 + 23.2-20230213-0421 diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/Constants.java b/Examples/src/main/java/com/groupdocs/annotation/examples/Constants.java index 96ab6c6..1ce50b5 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/Constants.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/Constants.java @@ -4,7 +4,7 @@ public class Constants { public static String PROJECT_PATH = System.getProperty("user.dir"); - public static final String LicensePath = "C:\\GroupDocs.Total.Java.lic"; + public static final String LicensePath = "C:\\Conholdate.Total.Product.Family.lic";//GroupDocs.Total.Java.lic"; public static final String SamplesPath = "\\Resources\\SampleFiles\\"; public static final String OutputPath = "\\Resources\\Output\\"; @@ -20,6 +20,8 @@ public class Constants { public static String ANNOTATED = getSampleFilePath("annotated.pdf"); public static String ANNOTATED_IMPORT = getSampleFilePath("annotated_import.pdf"); + public static String INPUT_DOC = getSampleFilePath("sample.docx"); + private static String getSampleFilePath(String fileName) { return PROJECT_PATH + SamplesPath + fileName; } diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/RunExamples.java b/Examples/src/main/java/com/groupdocs/annotation/examples/RunExamples.java index e70a90e..ab7f377 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/RunExamples.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/RunExamples.java @@ -20,112 +20,114 @@ public static void main(String[] args) throws IOException { // Quick Start SetLicenseFromFile.run(); SetLicenseFromStream.run(); -// SetMeteredLicense.run(); +// SetMeteredLicense.run(); // Get supported file formats GetSupportedFileFormats.run(); - + // Get file info - GetFileInfo.run(); - + GetFileInfo.run(); + // Extract annotations from document - ExtractAnnotationsFromDocument.run(); - +// ExtractAnnotationsFromDocument.run(); + // Remove annotation from document - RemoveAnnotationFromDocument.run(); - +// RemoveAnnotationFromDocument.run(); + // Generate document pages preview GenerateDocumentPagesPreview.run(); - + // Saving specific page range SavingSpecificPageRange.run(); - + // Saving only pages with annotations SavingOnlyPagesWithAnnotations.run(); - + // Filtering annotation types - // FilteringAnnotationTypes.run(); - Unsupported exception - +// FilteringAnnotationTypes.run();// - Unsupported exception + // Add area annotation AddAreaAnnotation.run(); - + // Add arrow annotation AddArrowAnnotation.run(); - + // Add distance annotation AddDistanceAnnotation.run(); - + // Add ellipse annotation AddEllipseAnnotation.run(); - + // Add link annotation AddLinkAnnotation.run(); - + // Add point annotation AddPointAnnotation.run(); - + // Add resources redaction annotation AddResourcesRedactionAnnotation.run(); - + // Add text highlight annotation AddTextHighlightAnnotation.run(); - + // Add text field annotation AddTextFieldAnnotation.run(); - + // Add text redaction annotation AddTextRedactionAnnotation.run(); - + // Add text replacement annotation AddTextReplacementAnnotation.run(); - + // Add text strikeout annotation AddTextStrikeoutAnnotation.run(); - + // Add polyline annotation AddPolylineAnnotation.run(); - + // Add underline annotation AddTextUnderlineAnnotation.run(); - + // Add watermark annotation AddWatermarkAnnotation.run(); - + // Add replies annotation AddReplies.run(); - + // Remove replies RemoveReplies.run(); - + // Remove replies by Id - RemoveRepliesById.run(); - +// RemoveRepliesById.run(); + // Remove replies by user name - RemoveRepliesByUserName.run(); - +// RemoveRepliesByUserName.run(); + // Update annotation UpdateAnnotation.run(); - // Load document from local disk - LoadDocumentFromLocalDisk.run(); - + // Load document from local disk + LoadDocumentFromLocalDisk.run(); + // Load document from stream LoadDocumentFromStream.run(); - + // Load password-protected documents LoadPasswordProtectedDocuments.run(); - + // Load document from url LoadDocumentFromUrl.run(); - + // Load document from FTP LoadDocumentFromFtp.run(); - + // Load document from AmazonS3 - // LoadDocumentFromAmazonS3.run(); - +// LoadDocumentFromAmazonS3.run(); + // Load document from Azure - // LoadDocumentFromAzure.run(); +// LoadDocumentFromAzure.run(); + + MinimalAnnotation.run(); System.out.println(); System.out.println("All done."); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/GenerateDocumentPagesPreview.java b/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/GenerateDocumentPagesPreview.java index a4cfcfe..27cd456 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/GenerateDocumentPagesPreview.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/GenerateDocumentPagesPreview.java @@ -3,7 +3,7 @@ import com.groupdocs.annotation.Annotator; import com.groupdocs.annotation.examples.Constants; import com.groupdocs.annotation.exception.GroupDocsException; -import com.groupdocs.annotation.options.PreviewFormats; +import com.groupdocs.annotation.options.pagepreview.PreviewFormats; import com.groupdocs.annotation.options.pagepreview.CreatePageStream; import com.groupdocs.annotation.options.pagepreview.PreviewOptions; import com.groupdocs.annotation.options.pagepreview.PageStreamFactory; @@ -27,8 +27,8 @@ public static void run() { @Override public OutputStream invoke(int pageNumber) { try { - String OutputPath = "//Resources//Output/"; - String fileName = OutputPath + "GenerateDocumentPagesPreview_"+pageNumber+".png"; + //String OutputPath = "//Resources//Output/"; + String fileName = Constants.getOutputFilePath("GenerateDocumentPagesPreview_"+pageNumber, "png");//OutputPath + "GenerateDocumentPagesPreview_"+pageNumber+".png"; OutputStream result = new FileOutputStream(fileName); return result; } catch (Exception ex) { diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/loading/loading_documents_from_different_sources/LoadDocumentFromAmazonS3.java b/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/loading/loading_documents_from_different_sources/LoadDocumentFromAmazonS3.java index 17341c1..f6e943e 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/loading/loading_documents_from_different_sources/LoadDocumentFromAmazonS3.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/loading/loading_documents_from_different_sources/LoadDocumentFromAmazonS3.java @@ -1,4 +1,4 @@ -package com.groupdocs.annotation.examples.advanced_usage.loading.loadingdocumentsfromdifferentsources; +package com.groupdocs.annotation.examples.advanced_usage.loading.loading_documents_from_different_sources; import com.groupdocs.annotation.Annotator; import com.groupdocs.annotation.examples.Constants; diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/loading/loading_documents_from_different_sources/LoadDocumentFromAzure.java b/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/loading/loading_documents_from_different_sources/LoadDocumentFromAzure.java index aa13d9f..df4433c 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/loading/loading_documents_from_different_sources/LoadDocumentFromAzure.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/loading/loading_documents_from_different_sources/LoadDocumentFromAzure.java @@ -1,4 +1,4 @@ -package com.groupdocs.annotation.examples.advanced_usage.loading.loadingdocumentsfromdifferentsources; +package com.groupdocs.annotation.examples.advanced_usage.loading.loading_documents_from_different_sources; /** *

diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/saving/FilteringAnnotationTypes.java b/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/saving/FilteringAnnotationTypes.java index dcb0c04..5a599a9 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/saving/FilteringAnnotationTypes.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/advanced_usage/saving/FilteringAnnotationTypes.java @@ -37,7 +37,7 @@ public static void run() { annotations.add(ellipse); annotator.add(annotations); SaveOptions saveOptions = new SaveOptions(); - saveOptions.setAnnotationTypes(AnnotationType.Ellipse); + saveOptions.setAnnotationTypes(AnnotationType.ELLIPSE); annotator.save(outputPath, saveOptions); } finally { if (annotator != null) { diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/AddReplies.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/AddReplies.java index 233a8a6..f789564 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/AddReplies.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/AddReplies.java @@ -44,7 +44,7 @@ public static void run() { area.setOpacity(0.7); area.setPageNumber(0); area.setPenColor(65535); - area.setPenStyle(PenStyle.Dot); + area.setPenStyle(PenStyle.DOT); area.setPenWidth((byte) 3); Reply reply1 = new Reply(); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/ExtractAnnotationsFromDocument.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/ExtractAnnotationsFromDocument.java index 7717479..dfba9ed 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/ExtractAnnotationsFromDocument.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/ExtractAnnotationsFromDocument.java @@ -4,7 +4,11 @@ import com.groupdocs.annotation.examples.Constants; import com.groupdocs.annotation.models.annotationmodels.AnnotationBase; import com.groupdocs.annotation.options.LoadOptions; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.Iterator; import java.util.List; @@ -15,20 +19,29 @@ */ public class ExtractAnnotationsFromDocument { - public static void run() throws IOException { + public static void run() { + //LoadOptions loadOptions = new LoadOptions(); + + try (final InputStream inputStream = new FileInputStream(Constants.ANNOTATED_IMPORT); + final Annotator annotator = new Annotator(inputStream/*, loadOptions*/)){ + List annotations = annotator.get(); - LoadOptions loadOptions = new LoadOptions(); - final Annotator annotator = new Annotator(Constants.ANNOTATED_IMPORT, loadOptions); + Iterator items = (annotations).iterator(); + while (items.hasNext()) { + AnnotationBase annotation = (AnnotationBase) items.next(); + System.out.println(annotation.getMessage()); + } + System.out.println("Annotations extracted successfully."); - List annotations = annotator.get(); + annotator.dispose(); + }catch (IOException e) { + e.printStackTrace(); + } /*catch (NoSuchFieldException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + }*/ - Iterator items = (annotations).iterator(); - while (items.hasNext()) { - AnnotationBase annotation = (AnnotationBase) items.next(); - System.out.println(annotation.getMessage()); - } - System.out.println("Annotations extracted successfully."); - annotator.dispose(); } } diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/GetFileInfo.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/GetFileInfo.java index 0f63756..f208237 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/GetFileInfo.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/GetFileInfo.java @@ -4,6 +4,8 @@ import com.groupdocs.annotation.IDocumentInfo; import com.groupdocs.annotation.examples.Constants; +import java.io.IOException; + /** *

* This example demonstrates document info extraction @@ -14,7 +16,12 @@ public class GetFileInfo { public static void run() { final Annotator annotator = new Annotator(Constants.INPUT); - IDocumentInfo info = annotator.getDocument().getDocumentInfo(); + IDocumentInfo info = null; + try { + info = annotator.getDocument().getDocumentInfo(); + } catch (IOException e) { + e.printStackTrace(); + } System.out.println( "\nFile type: " + info.getFileType() + "\nNumber of pages: " + info.getPageCount() diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/MinimalAnnotation.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/MinimalAnnotation.java new file mode 100644 index 0000000..dd946db --- /dev/null +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/MinimalAnnotation.java @@ -0,0 +1,18 @@ +package com.groupdocs.annotation.examples.basic_usage; + +import com.groupdocs.annotation.Annotator; +import com.groupdocs.annotation.examples.Constants; +import com.groupdocs.annotation.models.Rectangle; +import com.groupdocs.annotation.models.annotationmodels.ArrowAnnotation; +import org.apache.commons.io.FilenameUtils; + +public class MinimalAnnotation { + public static void run() { + final Annotator annotator = new Annotator(Constants.INPUT_DOC); + String outputPath = Constants.getOutputFilePath("MinimalAnnotation", FilenameUtils.getExtension(Constants.INPUT_DOC)); + final ArrowAnnotation arrowAnnotation = new ArrowAnnotation(); + arrowAnnotation.setBox(new Rectangle(100, 100, 200, 200)); + annotator.add(arrowAnnotation); + annotator.save(outputPath); + } +} diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveAnnotationFromDocument.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveAnnotationFromDocument.java index 1855b73..aea9611 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveAnnotationFromDocument.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveAnnotationFromDocument.java @@ -19,7 +19,7 @@ public static void run() { final Annotator annotator = new Annotator(Constants.ANNOTATED_AREA_REPLIES_5); SaveOptions saveOptions = new SaveOptions(); - saveOptions.setAnnotationTypes(AnnotationType.None); + saveOptions.setAnnotationTypes(AnnotationType.NONE); annotator.save(outputPath, saveOptions); annotator.dispose(); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveReplies.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveReplies.java index 552a074..87a2b64 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveReplies.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveReplies.java @@ -24,7 +24,7 @@ public static void run() { // Obtain annotations collection from document List annotations = annotator.get(); // Remove first reply by index - annotations.get(0).getReplies().remove(0); + if(!annotations.isEmpty())annotations.get(0).getReplies().remove(0); // Save changes annotator.update(annotations); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveRepliesById.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveRepliesById.java index 42228a6..d7e2407 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveRepliesById.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/RemoveRepliesById.java @@ -26,7 +26,7 @@ public static void run() { List annotations = annotator.get(); // Remove reply with Id = 4 - annotations.get(0).getReplies().remove(4); + if(!annotations.isEmpty())annotations.get(0).getReplies().remove(4); // Save changes annotator.update(annotations); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddAreaAnnotation.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddAreaAnnotation.java index 220c66a..4156c97 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddAreaAnnotation.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddAreaAnnotation.java @@ -42,7 +42,7 @@ public static void run() { area.setOpacity(0.7); area.setPageNumber(0); area.setPenColor(65535); - area.setPenStyle(PenStyle.Dot); + area.setPenStyle(PenStyle.DOT); area.setPenWidth((byte) 3); area.setReplies(replies); annotator.add(area); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddArrowAnnotation.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddArrowAnnotation.java index e70a1b1..a8f30f0 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddArrowAnnotation.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddArrowAnnotation.java @@ -41,7 +41,7 @@ public static void run() { arrow.setOpacity(0.7); arrow.setPageNumber(0); arrow.setPenColor(65535); - arrow.setPenStyle(PenStyle.Dot); + arrow.setPenStyle(PenStyle.DOT); arrow.setPenWidth((byte) 3); arrow.setReplies(replies); annotator.add(arrow); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddDistanceAnnotation.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddDistanceAnnotation.java index be9cf24..498721d 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddDistanceAnnotation.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddDistanceAnnotation.java @@ -41,7 +41,7 @@ public static void run() { distance.setOpacity(0.7); distance.setPageNumber(0); distance.setPenColor(65535); - distance.setPenStyle(PenStyle.Dot); + distance.setPenStyle(PenStyle.DOT); distance.setPenWidth((byte) 3); distance.setReplies(replies); annotator.add(distance); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddEllipseAnnotation.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddEllipseAnnotation.java index cb391e3..2f346bd 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddEllipseAnnotation.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddEllipseAnnotation.java @@ -42,7 +42,7 @@ public static void run() { ellipse.setOpacity(0.7); ellipse.setPageNumber(0); ellipse.setPenColor(65535); - ellipse.setPenStyle(PenStyle.Dot); + ellipse.setPenStyle(PenStyle.DOT); ellipse.setPenWidth((byte) 3); ellipse.setReplies(replies); annotator.add(ellipse); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddPolylineAnnotation.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddPolylineAnnotation.java index 016624a..c29e518 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddPolylineAnnotation.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddPolylineAnnotation.java @@ -41,7 +41,7 @@ public static void run() { polyline.setOpacity(0.7); polyline.setPageNumber(0); polyline.setPenColor(65535); - polyline.setPenStyle(PenStyle.Dot); + polyline.setPenStyle(PenStyle.DOT); polyline.setPenWidth((byte) 3); polyline.setReplies(replies); polyline.setSvgPath("M250.8280751173709,48.209295774647885l0.6986854460093896,0l0.6986854460093896,-1.3973708920187793l0.6986854460093896,0l0.6986854460093896,-1.3973708920187793l1.3973708920187793,-0.6986854460093896l0.6986854460093896,-0.6986854460093896l0.6986854460093896,0l2.096056338028169,-1.3973708920187793l3.493427230046948,-1.3973708920187793l0.6986854460093896,-0.6986854460093896l1.3973708920187793,-1.3973708920187793l0.6986854460093896,0l1.3973708920187793,-0.6986854460093896l0.6986854460093896,0l0.6986854460093896,-0.6986854460093896l0.6986854460093896,0l0.6986854460093896,0l0,-0.6986854460093896l0.6986854460093896,0l0.6986854460093896,0l1.3973708920187793,0l0,-0.6986854460093896l0.6986854460093896,0l1.3973708920187793,0l0.6986854460093896,0l1.3973708920187793,0l0.6986854460093896,0l2.096056338028169,-0.6986854460093896l1.3973708920187793,0l0.6986854460093896,0l0.6986854460093896,0l1.3973708920187793,0l1.3973708920187793,0l1.3973708920187793,0l2.096056338028169,0l5.589483568075117,0l1.3973708920187793,0l2.096056338028169,0l0.6986854460093896,0l1.3973708920187793,0l0.6986854460093896,0l1.3973708920187793,0l1.3973708920187793,0l0.6986854460093896,0.6986854460093896l1.3973708920187793,0l2.096056338028169,1.3973708920187793l0.6986854460093896,0l0.6986854460093896,0l0,0.6986854460093896l1.3973708920187793,0l0.6986854460093896,0.6986854460093896l1.3973708920187793,0.6986854460093896l0,0.6986854460093896l0.6986854460093896,0l1.3973708920187793,0.6986854460093896l1.3973708920187793,0.6986854460093896l3.493427230046948,0.6986854460093896l1.3973708920187793,0.6986854460093896l2.096056338028169,0.6986854460093896l1.3973708920187793,0.6986854460093896l1.3973708920187793,0l1.3973708920187793,0.6986854460093896l0.6986854460093896,0l0.6986854460093896,0.6986854460093896l1.3973708920187793,0l0.6986854460093896,0l0.6986854460093896,0l2.7947417840375586,0l1.3973708920187793,0l0.6986854460093896,0l1.3973708920187793,0l0.6986854460093896,0l0.6986854460093896,0l1.3973708920187793,0l0.6986854460093896,0l2.7947417840375586,0l0.6986854460093896,0l2.7947417840375586,0l1.3973708920187793,0l0.6986854460093896,0l0.6986854460093896,0l0.6986854460093896,0l0.6986854460093896,0l0.6986854460093896,0l0.6986854460093896,0l0.6986854460093896,-0.6986854460093896l0.6986854460093896,0"); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddTextFieldAnnotation.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddTextFieldAnnotation.java index 455ac7d..2b791d3 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddTextFieldAnnotation.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddTextFieldAnnotation.java @@ -44,7 +44,7 @@ public static void run() { textField.setMessage("This is text field annotation"); textField.setOpacity(0.7); textField.setPageNumber(0); - textField.setPenStyle(PenStyle.Dot); + textField.setPenStyle(PenStyle.DOT); textField.setPenWidth((byte) 3); textField.setReplies(replies); annotator.add(textField); diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddTextUnderlineAnnotation.java b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddTextUnderlineAnnotation.java index e9be4f2..533292c 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddTextUnderlineAnnotation.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/basic_usage/add_annotation_to_the_document/AddTextUnderlineAnnotation.java @@ -5,9 +5,14 @@ import com.groupdocs.annotation.models.Point; import com.groupdocs.annotation.models.Reply; import com.groupdocs.annotation.models.annotationmodels.UnderlineAnnotation; + +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Calendar; import java.util.List; + +import com.groupdocs.annotation.options.export.AnnotationType; +import com.groupdocs.annotation.options.export.SaveOptions; import org.apache.commons.io.FilenameUtils; /** @@ -18,9 +23,10 @@ public class AddTextUnderlineAnnotation { public static void run() { + //String outputPath = Constants.getOutputFilePath("sample", "docx"); String outputPath = Constants.getOutputFilePath("AddTextUnderlineAnnotation", FilenameUtils.getExtension(Constants.INPUT)); - final Annotator annotator = new Annotator(Constants.INPUT); + Annotator annotator = new Annotator(/*Constants.PROJECT_PATH + Constants.SamplesPath + "sample.docx"*/Constants.INPUT); Reply reply1 = new Reply(); reply1.setComment("First comment"); @@ -59,5 +65,59 @@ public static void run() { annotator.dispose(); System.out.println("\nDocument saved successfully.\nCheck output in " + outputPath); + + annotator = new Annotator(outputPath); + + SaveOptions saveOptions = new SaveOptions(); + saveOptions.setAnnotationTypes(AnnotationType.NONE); + + String noneAnnotation = Paths.get(outputPath).resolveSibling("none-annotation.pdf").toString(); + + annotator.save(noneAnnotation, saveOptions); + + annotator.dispose(); + + System.out.println("\nDocument saved successfully.\nCheck output in " + noneAnnotation); +// String outputPath = Constants.getOutputFilePath("AddTextUnderlineAnnotation", FilenameUtils.getExtension(Constants.INPUT)); +// +// final Annotator annotator = new Annotator(Constants.INPUT); +// +// Reply reply1 = new Reply(); +// reply1.setComment("First comment"); +// reply1.setRepliedOn(Calendar.getInstance().getTime()); +// +// Reply reply2 = new Reply(); +// reply2.setComment("Second comment"); +// reply2.setRepliedOn(Calendar.getInstance().getTime()); +// +// java.util.List replies = new ArrayList(); +// replies.add(reply1); +// replies.add(reply2); +// +// Point point1 = new Point(80, 730); +// Point point2 = new Point(240, 730); +// Point point3 = new Point(80, 650); +// Point point4 = new Point(240, 650); +// +// List points = new ArrayList(); +// points.add(point1); +// points.add(point2); +// points.add(point3); +// points.add(point4); +// +// UnderlineAnnotation underline = new UnderlineAnnotation(); +// underline.setCreatedOn(Calendar.getInstance().getTime()); +// underline.setFontColor(65535); +// underline.setMessage("This is underline annotation"); +// underline.setOpacity(0.7); +// underline.setPageNumber(0); +// underline.setPoints(points); +// underline.setReplies(replies); +// annotator.add(underline); +// annotator.save(outputPath); +// +// annotator.dispose(); +// +// System.out.println("\nDocument saved successfully.\nCheck output in " + outputPath); } } \ No newline at end of file diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetLicenseFromFile.java b/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetLicenseFromFile.java index 6b4efcb..a4caea4 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetLicenseFromFile.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetLicenseFromFile.java @@ -1,7 +1,7 @@ package com.groupdocs.annotation.examples.quick_start; import com.groupdocs.annotation.examples.Constants; -import com.groupdocs.annotation.license.License; +import com.groupdocs.annotation.licenses.License; import java.io.File; /** diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetLicenseFromStream.java b/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetLicenseFromStream.java index 04af39c..2f2b1d7 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetLicenseFromStream.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetLicenseFromStream.java @@ -1,7 +1,7 @@ package com.groupdocs.annotation.examples.quick_start; import com.groupdocs.annotation.examples.Constants; -import com.groupdocs.annotation.license.License; +import com.groupdocs.annotation.licenses.License; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetMeteredLicense.java b/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetMeteredLicense.java index 035cd73..7745279 100644 --- a/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetMeteredLicense.java +++ b/Examples/src/main/java/com/groupdocs/annotation/examples/quick_start/SetMeteredLicense.java @@ -1,6 +1,6 @@ package com.groupdocs.annotation.examples.quick_start; -import com.groupdocs.annotation.license.Metered; +import com.groupdocs.annotation.licenses.Metered; /** *