Moving TextSelectionManager to the document instance, so it can be sh…

…ared by all active TextNavigator instances - otherwise one is changing and the other has a dirty cached next instance, which will never be found -> loop
tdf · Jul 11, 2023 · f93eff2 · f93eff2
1 parent ece836f
commit f93eff2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/odfdom/src/main/java/org/odftoolkit/odfdom/doc/OdfDocument.java b/odfdom/src/main/java/org/odftoolkit/odfdom/doc/OdfDocument.java
@@ -65,6 +65,7 @@
 import org.odftoolkit.odfdom.incubator.doc.office.OdfOfficeStyles;
 import org.odftoolkit.odfdom.incubator.doc.style.OdfDefaultStyle;
 import org.odftoolkit.odfdom.incubator.meta.OdfOfficeMeta;
+import org.odftoolkit.odfdom.incubator.search.SelectionManager;
 import org.odftoolkit.odfdom.pkg.MediaType;
 import org.odftoolkit.odfdom.pkg.OdfElement;
 import org.odftoolkit.odfdom.pkg.OdfName;
@@ -1249,4 +1250,14 @@ protected void removeCachedView() {
   public Boolean hasCollaboration() {
     return mHasCollaboration != null && mHasCollaboration;
   }
+
+  private SelectionManager mSelectionManager = null;
+  /** *  All text selections within this document are cached and have to be updated when the document is changed.The <code>SelectionManager</code> takes care of those updates across each <code>TextNavigator</code>
+     * @return the single selection manager for an OdfDocument instance */
+  public SelectionManager getSelectionManager(){
+      if(mSelectionManager == null){
+          mSelectionManager = new SelectionManager();
+      }
+      return mSelectionManager;
+  }
 }
diff --git a/odfdom/src/main/java/org/odftoolkit/odfdom/incubator/search/TextNavigation.java b/odfdom/src/main/java/org/odftoolkit/odfdom/incubator/search/TextNavigation.java
@@ -69,7 +69,7 @@ public TextNavigation(Pattern pattern, OdfTextDocument doc) {
     mCurrentSelectedItem = null;
     mbFinishFindInHeaderFooter = false;
 
-    mSelectionManager = new SelectionManager();
+    mSelectionManager = doc.getSelectionManager();
     // initialize the Iterator and find the first element...
     mNextSelectedItem = findNextSelection(null);
   }

diff --git a/odfdom/src/main/java/org/odftoolkit/odfdom/incubator/search/TextStyleNavigation.java b/odfdom/src/main/java/org/odftoolkit/odfdom/incubator/search/TextStyleNavigation.java
@@ -68,7 +68,7 @@ public TextStyleNavigation(Map<OdfStyleProperty, String> props, OdfTextDocument
     mCurrentSelectedItem = null;
     this.mProps = props;
 
-    mSelectionManager = new SelectionManager();
+    mSelectionManager = doc.getSelectionManager();
     // initialize the Iterator and find the first element...
     mNextSelectedItem = findNextSelection(null);
   }

diff --git a/odfdom/src/test/java/org/odftoolkit/odfdom/incubator/search/TextSelectionTest.java b/odfdom/src/test/java/org/odftoolkit/odfdom/incubator/search/TextSelectionTest.java
@@ -236,6 +236,7 @@ public void testPasteAtEndOf() {
       } catch (InvalidNavigationException e) {
         Logger.getLogger(TextSelectionTest.class.getName()).log(Level.SEVERE, e.getMessage(), e);
         Assert.fail("Failed with " + e.getClass().getName() + ": '" + e.getMessage() + "'");
+      }
     }
     int j = 0;
     TextNavigation search4deletechange = new TextNavigation("deletechange", doc);
@@ -252,7 +253,7 @@ public void testPasteAtEndOf() {
       Logger.getLogger(TextSelectionTest.class.getName()).log(Level.SEVERE, e.getMessage(), e);
       Assert.fail("Failed with " + e.getClass().getName() + ": '" + e.getMessage() + "'");
     }
-  }
+  }  
 
   /**
    * Test applyStyle method of org.odftoolkit.odfdom.incubator.search.TextSelection append "T4"