Fixed annotation comments. Fixed SVG handling. Fixed deletion of comment replies. Fixed exception during exporting document. Fixed label for distance annotation.

saqibmasood · saqibmasood · commit e26fbc6b6450 · 2018-03-05T18:30:44.000+05:00
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.groupdocs</groupId>
             <artifactId>groupdocs-annotation</artifactId>
-            <version>17.10.2</version>
+            <version>17.10.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/src/main/java/com/groupdocs/ui/servlet/AddAnnotationServlet.java b/src/main/java/com/groupdocs/ui/servlet/AddAnnotationServlet.java
@@ -31,6 +31,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         AnnotationInfo annotation = new ObjectMapper().readValue(request.getInputStream(), AnnotationInfo.class);
         annotation.setDocumentGuid(documentId);
         CreateAnnotationResult result = imageHandler.createAnnotation(annotation);
+        imageHandler.createAnnotationReply(result.getId(), "");
         new ObjectMapper().writeValue(response.getOutputStream(), result);
     }
 }
diff --git a/src/main/java/com/groupdocs/ui/servlet/AnnotationServlet.java b/src/main/java/com/groupdocs/ui/servlet/AnnotationServlet.java
@@ -6,7 +6,6 @@
 import com.groupdocs.annotation.domain.Point;
 import com.groupdocs.annotation.domain.TextFieldInfo;
 import com.groupdocs.annotation.domain.results.DeleteAnnotationResult;
-import com.groupdocs.annotation.domain.results.MoveAnnotationResult;
 import com.groupdocs.annotation.domain.results.SaveAnnotationTextResult;
 import com.groupdocs.annotation.handler.AnnotationImageHandler;
 import com.groupdocs.ui.Utils;
@@ -36,6 +35,7 @@ protected void doDelete(HttpServletRequest request, HttpServletResponse response
         String guid = request.getParameter("guid");
         long annotationId = imageHandler.getAnnotation(guid).getId();
 
+        imageHandler.deleteAnnotationReplies(annotationId);
         DeleteAnnotationResult result = imageHandler.deleteAnnotation(annotationId);
         new ObjectMapper().writeValue(response.getOutputStream(), result);
 
diff --git a/src/main/java/com/groupdocs/ui/servlet/DeleteAnnotationServlet.java b/src/main/java/com/groupdocs/ui/servlet/DeleteAnnotationServlet.java
diff --git a/src/main/java/com/groupdocs/ui/servlet/DownloadAnnotatedServlet.java b/src/main/java/com/groupdocs/ui/servlet/DownloadAnnotatedServlet.java
@@ -29,7 +29,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
         InputStream exported;
         try (InputStream original = new FileInputStream(Utils.getStoragePath() + "/" + filename)) {
-            exported = imageHandler.exportAnnotationsToDocument(original, list, document.getDocumentType());
+            exported = imageHandler.exportAnnotationsToDocument(original, list);
         } catch (Exception x) {
             throw new RuntimeException(x);
         }
diff --git a/src/main/webapp/app.controller.thread.js b/src/main/webapp/app.controller.thread.js
@@ -27,6 +27,22 @@
                 });
         };
 
+        $scope.saveAnnotationComment = function (item) {
+            ReplyFactory
+                .updateMessage(
+                    {
+                        guid: item.replies[0].guid
+                    },
+                    {
+                        message: item.replies[0].message
+                    }
+                )
+                .$promise
+                .then(function (response) {
+                    item.unsaved = false;
+                });
+        };
+
         $scope.addReply = function (item) {
             RepliesFactory
                 .put(
diff --git a/src/main/webapp/app.directive.gdxAnnoPage.js b/src/main/webapp/app.directive.gdxAnnoPage.js
@@ -293,7 +293,7 @@
                     break;
                 case 'pencil':
                     ant.type = 4;
-                    ant.svgPath = currentObject.exportSVG().getAttribute('d');
+                    ant.svgPath = extractSvgPathData(currentObject);
                     break;
                 case 'point':
                     ant = angular.merge({}, ant, {
@@ -308,14 +308,13 @@
                     break;
                 case 'arrow':
                     ant.type = 8;
-                    ant.svgPath = currentObject.exportSVG().firstChild.getAttribute('d');
-                    ant.svgPath += " " + currentObject.exportSVG().lastChild.getAttribute('d');
+                    ant.svgPath = extractSvgPathData(currentObject);
                     break;
                 case 'distance':
                     ant = {
                         type: 12,
-                        svgPath: currentObject.exportSVG().children[0].getAttribute('d') + " " + currentObject.exportSVG().children[1].getAttribute('d') + " " + currentObject.exportSVG().children[2].getAttribute('d'),
-                        text: currentObject.children[3].content,
+                        svgPath: extractSvgPathData(currentObject),
+                        fieldText: currentObject.children[3].content,
                         box: {
                             x: currentObject.children[3].position.x,
                             y: currentObject.children[3].position.y,
@@ -327,7 +326,7 @@
                 case 'underline':
                     ant = {
                         type: 11,
-                        svgPath: currentObject.exportSVG().getAttribute('d'),
+                        svgPath: extractSvgPathData(currentObject),
                         box: {
                             x: currentObject.bounds.x,
                             y: currentObject.bounds.y,
@@ -339,7 +338,7 @@
                 case 'strikeout':
                     ant = {
                         type: 11,
-                        svgPath: currentObject.exportSVG().getAttribute('d'),
+                        svgPath: extractSvgPathData(currentObject),
                         box: {
                             x: currentObject.bounds.x,
                             y: currentObject.bounds.y,
@@ -528,6 +527,24 @@
         });
     }
 
+    function extractSvgPathData(object) {
+        var svg = object.exportSVG();
+        var data = '';
+
+        if (svg.nodeName === 'path') {
+            data = object.exportSVG().getAttribute('d')
+        } else if (svg.nodeName === 'g') {
+            angular.forEach(svg.children, function (value) {
+                if (value.nodeName === 'path') {
+                    data += value.getAttribute('d');
+                    data += ' ';
+                }
+            });
+        }
+
+        return data;
+    }
+
     angular.module('GroupDocsAnnotationApp').directive('gdxAnnoPage', main, ['cfpLoadingBar']);
 
 })();
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -128,8 +128,8 @@ <h1>GroupDocs.Annotation for Java</h1>
                             </md-card-header>
                             <md-card-content>
                                 <md-input-container>
-                                    <label ng-show="!selectedAnnotation.fieldText">Comments...</label>
-                                    <textarea ng-model="selectedAnnotation.fieldText" ng-change="selectedAnnotation.unsaved=true"
+                                    <label ng-show="!selectedAnnotation.replies[0].message">Comments...</label>
+                                    <textarea ng-model="selectedAnnotation.replies[0].message" ng-change="selectedAnnotation.unsaved=true"
                                               aria-label="Comments">
                                     </textarea>
                                 </md-input-container>
@@ -140,7 +140,7 @@ <h1>GroupDocs.Annotation for Java</h1>
                                     <md-icon>reply</md-icon>
                                 </md-button>
                                 <md-button class="md-icon-button" aria-label="Save" ng-show="selectedAnnotation.unsaved"
-                                           ng-click="saveAnnotationFieldText(selectedAnnotation)">
+                                           ng-click="saveAnnotationComment(selectedAnnotation)">
                                     <md-icon>save</md-icon>
                                 </md-button>
                                 <md-button class="md-icon-button" aria-label="Delete"
@@ -149,7 +149,7 @@ <h1>GroupDocs.Annotation for Java</h1>
                                 </md-button>
                             </md-card-actions>
                         </md-card>
-                        <md-card ng-repeat="reply in selectedAnnotation.replies">
+                        <md-card ng-repeat="reply in selectedAnnotation.replies" ng-hide="$first">
                             <md-card-header>
                                 <md-card-avatar>
                                     <md-icon>person</md-icon>

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)`
`31`	`31`	`AnnotationInfo annotation = new ObjectMapper().readValue(request.getInputStream(), AnnotationInfo.class);`
`32`	`32`	`annotation.setDocumentGuid(documentId);`
`33`	`33`	`CreateAnnotationResult result = imageHandler.createAnnotation(annotation);`
	`34`	`+ imageHandler.createAnnotationReply(result.getId(), "");`
`34`	`35`	`new ObjectMapper().writeValue(response.getOutputStream(), result);`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t`
`29`	`29`
`30`	`30`	`InputStream exported;`
`31`	`31`	`try (InputStream original = new FileInputStream(Utils.getStoragePath() + "/" + filename)) {`
`32`		`- exported = imageHandler.exportAnnotationsToDocument(original, list, document.getDocumentType());`
	`32`	`+ exported = imageHandler.exportAnnotationsToDocument(original, list);`
`33`	`33`	`} catch (Exception x) {`
`34`	`34`	`throw new RuntimeException(x);`
`35`	`35`	`}`