svn commit: r1297874 - /opennlp/sandbox/caseditor-corpus-server-plugin/src/main/java/org/apache/opennlp/corpus_server/caseditor/CorpusExplorerView.java

[jo...@apache.org]

Author: joern
Date: Wed Mar  7 08:20:56 2012
New Revision: 1297874

URL: http://svn.apache.org/viewvc?rev=1297874&view=rev
Log:
OPENNLP-461 Fixed a bug in query remembering code.

Modified:
    opennlp/sandbox/caseditor-corpus-server-plugin/src/main/java/org/apache/opennlp/corpus_server/caseditor/CorpusExplorerView.java

Modified: opennlp/sandbox/caseditor-corpus-server-plugin/src/main/java/org/apache/opennlp/corpus_server/caseditor/CorpusExplorerView.java
URL: http://svn.apache.org/viewvc/opennlp/sandbox/caseditor-corpus-server-plugin/src/main/java/org/apache/opennlp/corpus_server/caseditor/CorpusExplorerView.java?rev=1297874&r1=1297873&r2=1297874&view=diff
==============================================================================
--- opennlp/sandbox/caseditor-corpus-server-plugin/src/main/java/org/apache/opennlp/corpus_server/caseditor/CorpusExplorerView.java (original)
+++ opennlp/sandbox/caseditor-corpus-server-plugin/src/main/java/org/apache/opennlp/corpus_server/caseditor/CorpusExplorerView.java Wed Mar  7 08:20:56 2012
@@ -36,8 +36,6 @@ import org.eclipse.swt.events.ModifyEven
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -67,19 +65,24 @@ public class CorpusExplorerView extends 
   private TableViewer searchResultViewer;
   
   private void doSearch() {
+    
+    String queryString = queryText.getText();
+    
     // Remember query and save last queries to the preference store
-    int queryIndex = queryText.indexOf(queryText.getText());
+    int queryIndex = queryText.indexOf(queryString);
     
     if (queryIndex != -1) {
       queryText.remove(queryIndex);
     }
     
-    queryText.add(queryText.getText(), 0);
+    queryText.add(queryString, 0);
     
     if (queryText.getItemCount() > 10) {
       queryText.remove(queryText.getItemCount() - 1);
     }
     
+    queryText.setText(queryString);
+    
     // TODO: Serialize history to lastUsedQueries settings ...
     StringBuilder lastUsedQueriesString = new StringBuilder();
     
@@ -96,13 +99,10 @@ public class CorpusExplorerView extends 
     // get server url
     String serverPath = serverUrl.getText();
     
-    // get query
-    String query = queryText.getText();
-    
     final SearchCorpusServerJob searchJob = new SearchCorpusServerJob();
     
     searchJob.setServerAddress(serverPath);
-    searchJob.setQuery(query);
+    searchJob.setQuery(queryString);
     
     searchJob.schedule();