- reset input fields of DerivateSearchView when context stops

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java
index 54b704380d7b272d8a97bd3b26e1644b06a85cde..ca758b17f6a7a5159def7bd6c8e17c4fd3c4d9ac 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java
@@ -85,13 +85,11 @@ public class DerivateSearchComposite extends Composite {
 
     @Override
     public void setEnabled(boolean enabled){
-        if(!isDisposed()){
-            super.setEnabled(enabled);
-            searchField.setEnabled(enabled);
-            table.setEnabled(enabled);
-            //        resultViewer.setEnabled(enabled);
-            comboDerivateType.setEnabled(enabled);
-            buttonSearch.setEnabled(enabled);
-        }
+        super.setEnabled(enabled);
+        searchField.setEnabled(enabled);
+        table.setEnabled(enabled);
+        //        resultViewer.setEnabled(enabled);
+        comboDerivateType.setEnabled(enabled);
+        buttonSearch.setEnabled(enabled);
     }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
index 41d6f02178d9c9e755e58eae846e94ab778791e0..877391038a6e8db6335d812d9f2b538ded29fa63 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
@@ -117,8 +117,23 @@ public class DerivateSearchCompositeController implements Listener{
         }
     }
 
+    /**
+     * Sets enable status of all input fields
+     * @param enabled
+     */
     public void setEnabled(boolean enabled) {
-        derivateSearchComposite.setEnabled(enabled);
+        if(!derivateSearchComposite.isDisposed()){
+            derivateSearchComposite.setEnabled(enabled);
+        }
+    }
+
+    /**
+     * Resets all input fields
+     */
+    public void reset(){
+        derivateSearchComposite.getResultViewer().setInput(null);
+        derivateSearchComposite.getSearchField().setText("");
+        derivateSearchComposite.getComboDerivateType().deselectAll();
     }
 
     public TableViewer getResultViewer() {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
index 270a0096029fda58da0b972162f12e7c03063fa1..a51ffb343e87eb129003d0ec501910f0a49e88cc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
@@ -67,6 +67,7 @@ public class DerivateSearchView extends ViewPart implements IContextListener {
     @Override
     public void contextStop(IMemento memento, IProgressMonitor monitor) {
         derivateSearchCompositeController.setEnabled(false);
+        derivateSearchCompositeController.reset();
     }
 
     /* (non-Javadoc)