This revision cleans up the changes to FindReplace classes made in the

ponderosaTX · ponderosaTX · commit 86ebec4e1827 · 2017-09-14T08:06:09.000-05:00
previous commit.  We really need a better collection of unit tests for
find/replace operations.

The following files were modified, added, or removed:
	modified:   src/edu/rice/cs/drjava/model/FindReplaceMachine.java
	modified:   src/edu/rice/cs/drjava/ui/FindReplacePanel.java
diff --git a/drjava/src/edu/rice/cs/drjava/model/FindReplaceMachine.java b/drjava/src/edu/rice/cs/drjava/model/FindReplaceMachine.java
@@ -407,11 +407,11 @@ else if (_searchSelectionOnly) {
     * _selectionRegion and _isForward.  Ignores value of _searchAllDocuments.  Processes selected region (which may be 
     * the whole document) sequentially depending on find direction. This convention ensures that matches created by 
     * string replacement will not be replaced as in the following example:<p>
-    *   findString:    "hello"<br>
-    *   replaceString: "e"<br>
+    *   findString:    "e"<br>
+    *   replaceString: "hello"<br>
     *   document text: "hhellollo"<p>
     * Only executes in event thread.  Assumes (i) this has exclusive access to _doc (since it only runs in event thread) 
-    * and (ii) findAction does not modify _doc.
+    * and (ii) findAction does not modify _doc (What about replacement?)
     * @param findAction action to perform on the occurrences; input is the FindResult, output is ignored
     * @return the number of replacements
     */
@@ -488,24 +488,21 @@ private FindResult findNext(boolean searchAll) {
   }
   
   
-  /** Finds next match in specified doc only.  If searching forward, len must 
-   * be doc.getLength().  If searching backward, start must be 0.  If 
-   * searchAll, suppress executing in-document wrapped search, because it 
-   * must be deferred.  Only runs in the event thread.  Note than this method 
-   * does a wrapped search if specified search fails.
-   * @param doc the document to search in
-   * @param start the start offset for searching
-   * @param len the length to search
-   * @param searchAll flao
-   * @return the next match in the specified document
-   */
+  /** Finds next match in specified doc only.  If searching forward, len must  be doc.getLength().  If searching 
+    * backward, start must be 0.  If searchAll, suppress executing in-document wrapped search, because it must be 
+    * deferred.  Only runs in the event thread.  Note than this method does a wrapped search if specified search fails.
+    * @param doc the document to search in
+    * @param start the start offset for searching
+    * @param len the length to search
+    * @param searchAll flao
+    * @return the next match in the specified document
+    */
   private FindResult _findNextInDoc(OpenDefinitionsDocument doc, int start, int len, boolean searchAll) {
     
     assert EventQueue.isDispatchThread() || Utilities.TEST_MODE;
 
     // search from current position to "end" of document ("end" is start if searching backward)
-//    Utilities.show("_findNextInDoc([" + doc.getText() + "], " + start + ", " + len + ", " + searchAll + ")");
-//    _log.log("_findNextInDoc([" + doc.getText() + "], " + start + ", " + len + ", " + searchAll + ")");
+    _log.log("_findNextInDoc([" + doc.getText() + "], " + start + ", " + len + ", " + searchAll + ")");
     FindResult fr = _findNextInDocSegment(doc, start, len);
     if (fr.getFoundOffset() >= 0 || searchAll) return fr;
     
diff --git a/drjava/src/edu/rice/cs/drjava/ui/FindReplacePanel.java b/drjava/src/edu/rice/cs/drjava/ui/FindReplacePanel.java
@@ -586,7 +586,7 @@ private void _findAll() {
     _log.log("Refreshing active document after 'find all'");
     _model.refreshActiveDocument();  // Rationale: a giant findAll left the definitions pane is a strange state
     panel.requestFocusInWindow();
-    EventQueue.invokeLater(new Runnable() { public void run() { panel.getRegTree().scrollRowToVisible(0); } });
+//    EventQueue.invokeLater(new Runnable() { public void run() { panel.getRegTree().scrollRowToVisible(0); } });
   }
   
   /** Performs "find all" with the specified options. 
@@ -753,12 +753,12 @@ private void _replaceAll() {
     
     _frame.hourglassOn();
     int count = 0;
-    Runnable1<FindResult> doNothing =  new Runnable1<FindResult>() { 
-        public void run(FindResult fr) {  } 
-    };
+    Runnable1<FindResult> replaceMatchingString =   // replaces current (found) string 
+      new Runnable1<FindResult>() { 
+      public void run(FindResult fr) { _machine.replaceCurrent(); }};
     try {
       /* Replace all matching strings in region (which may be entire project). */
-      count = _machine.processAll(doNothing, region);
+      count = _machine.processAll(replaceMatchingString, region);
     }
     finally { 
       _frame.hourglassOff(); 
@@ -786,7 +786,7 @@ public void run(FindResult fr) {  }
     
     _log.log("Refreshing active document after 'replace all'");
     _model.refreshActiveDocument();  // Rationale: a giant findAll left the definitions pane is a strange state
-//    panel.requestFocusInWindow();
+    _findField.requestFocusInWindow();
 //    EventQueue.invokeLater(new Runnable() { public void run() { panel.getRegTree().scrollRowToVisible(0); } });
   }
   
