Revision: 19840
          http://sourceforge.net/p/gate/code/19840
Author:   markagreenwood
Date:     2016-12-01 23:02:14 +0000 (Thu, 01 Dec 2016)
Log Message:
-----------
merged changes to search dialog from trunk

Modified Paths:
--------------
    
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/DocumentEditor.java

Property Changed:
----------------
    gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/

Index: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview
===================================================================
--- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview     
2016-12-01 22:59:53 UTC (rev 19839)
+++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview     
2016-12-01 23:02:14 UTC (rev 19840)

Property changes on: 
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,7 ##
+/gate/branches/cl-experiment/src/main/gate/gui/docview:15466-15613
+/gate/branches/new-ontology-api/src/main/gate/gui/docview:10584-11598
+/gate/branches/release-7.0/src/main/gate/gui/docview:15335-15398
+/gate/branches/release-8.1/src/main/gate/gui/docview:18736-18747
+/gate/branches/sawdust/src/main/gate/gui/docview:17055-17079
+/gate/tags/release-7.0/src/main/gate/gui/docview:15399-15407
+/gate/trunk/src/main/gate/gui/docview:3-7,19180-19839
\ No newline at end of property
Modified: 
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/DocumentEditor.java
===================================================================
--- 
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/DocumentEditor.java
 2016-12-01 22:59:53 UTC (rev 19839)
+++ 
gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/DocumentEditor.java
 2016-12-01 23:02:14 UTC (rev 19840)
@@ -958,7 +958,6 @@
     protected void initLocalData() {
       pattern = null;
       nextMatchStartsFrom = 0;
-      content = document.getContent().toString();
       findFirstAction = new AbstractAction("Find first") {
         {
           putValue(SHORT_DESCRIPTION, "Finds first match");
@@ -967,6 +966,7 @@
 
         @Override
         public void actionPerformed(ActionEvent evt) {
+          String content = document.getContent().toString();
           refresh();
           if(!isValidRegularExpression()) return;
           boolean found = false;
@@ -1020,6 +1020,7 @@
 
         @Override
         public void actionPerformed(ActionEvent evt) {
+          String content = document.getContent().toString();
           refresh();
           if(!isValidRegularExpression()) return;
           boolean found = false;
@@ -1270,8 +1271,6 @@
 
     int nextMatchStartsFrom;
 
-    String content;
-
     Action findFirstAction;
 
     Action findNextAction;

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to