Some small changes (#52)

* GH-51 Changes MarkupAnnotation toString, adds getControllers, sync annotationComponents on refresh * GH-51 Synchronizes after nullcheck * GH-51 Fixes AnnotationComparator page sorting * GH-51 Use Integer.compare for comparator
pcorless · Mar 4, 2020 · f99be67 · f99be67
1 parent 25234f1
commit f99be67
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/annotations/MarkupAnnotation.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/annotations/MarkupAnnotation.java
@@ -348,6 +348,6 @@ public void setSubject(String subject) {
     }
 
     public String toString() {
-        return getTitleText();
+        return getPObjectReference() + " - " + getTitleText() + " - " + getContents();
     }
 }
diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/WindowManagementCallback.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/WindowManagementCallback.java
@@ -20,6 +20,7 @@
 
 import javax.swing.*;
 import java.net.URL;
+import java.util.Collection;
 import java.util.List;
 import java.util.prefs.Preferences;
 
@@ -51,4 +52,6 @@ void quit(Controller controller, JFrame viewer,
               Preferences preferences);
 
     ViewerPropertiesManager getProperties();
+
+    Collection<Controller> getControllers();
 }
diff --git a/...rc/main/java/org/icepdf/ri/common/utility/annotation/markup/FindMarkupAnnotationTask.java b/...rc/main/java/org/icepdf/ri/common/utility/annotation/markup/FindMarkupAnnotationTask.java
@@ -325,13 +325,7 @@ class AnnotationComparator implements Comparator<MarkupAnnotation> {
         @Override
         public int compare(MarkupAnnotation o1, MarkupAnnotation o2) {
             if (MarkupAnnotationPanel.SortColumn.PAGE.equals(sortColumn)) {
-                if (o1.getPageIndex() > o2.getPageIndex()) {
-                    return 1;
-                } else if (o1.getPageIndex() > o2.getPageIndex()) {
-                    return -1;
-                } else {
-                    return 0;
-                }
+                return Integer.compare(o1.getPageIndex(), o2.getPageIndex());
             } else if (MarkupAnnotationPanel.SortColumn.AUTHOR.equals(sortColumn)) {
                 String author1 = o1.getTitleText();
                 String author2 = o2.getTitleText();

diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/PageViewComponentImpl.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/PageViewComponentImpl.java
@@ -369,13 +369,17 @@ public void updateView(String propertyConstant, Object oldValue, Object newValue
         if (PropertyConstants.DOCUMENT_VIEW_ROTATION_CHANGE.equals(propertyConstant) ||
                 PropertyConstants.DOCUMENT_VIEW_ZOOM_CHANGE.equals(propertyConstant)) {
             if (annotationComponents != null) {
-                for (AbstractAnnotationComponent comp : annotationComponents) {
-                    comp.validate();
+                synchronized (annotationComponents) {
+                    for (AbstractAnnotationComponent comp : annotationComponents) {
+                        comp.validate();
+                    }
                 }
             }
             if (destinationComponents != null) {
-                for (DestinationComponent comp : destinationComponents) {
-                    comp.validate();
+                synchronized (destinationComponents) {
+                    for (DestinationComponent comp : destinationComponents) {
+                        comp.validate();
+                    }
                 }
             }
         }

diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/viewer/WindowManager.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/viewer/WindowManager.java
@@ -27,6 +27,7 @@
 import java.awt.*;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.ResourceBundle;
 import java.util.prefs.Preferences;
@@ -95,6 +96,9 @@ public long getNumberOfWindows() {
         return newWindowInvocationCounter;
     }
 
+    public Collection<Controller> getControllers() {
+        return controllers;
+    }
 
     public void newWindow(final String location) {
         Controller controller = commonWindowCreation();