Refactor DerivativeEditor context menu

 - extracted "link with taxon selection" to plugin.xml

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 70e779d74ef3c91104fae1f6f30c5dcc408d5351..1795b73afead863711963eec6cdb9840b23b379b 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -787,6 +787,30 @@
                class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
                id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
          </dynamic>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.derivative.toggleLinkWithTaxonSelection"
+               label="Link with taxon selection"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <not>
+                  <reference
+                        definitionId="isDerivativeEditorLinkedToTaxonSelection">
+                  </reference>
+               </not>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.derivative.toggleLinkWithTaxonSelection"
+               label="Unlink from taxon selection"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isDerivativeEditorLinkedToTaxonSelection">
+               </reference>
+            </visibleWhen>
+         </command>
          <separator
                name="eu.etaxonomy.taxeditor.editor.separator3"
                visible="true">
@@ -1579,6 +1603,11 @@
             id="eu.etaxonomy.taxeditor.editor.derivative.removeSingleReadFromSequence"
             name="Remove SingleRead from sequence">
       </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.ToggleLinkWithTaxonSelectionHandler"
+            id="eu.etaxonomy.taxeditor.editor.derivative.toggleLinkWithTaxonSelection"
+            name="Toggle link with taxon selection">
+      </command>
         
    </extension>
    <extension
@@ -1787,6 +1816,15 @@
             </test>
          </with>
       </definition>
+      <definition
+            id="isDerivativeEditorLinkedToTaxonSelection">
+         <with
+               variable="activeEditor">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.view.derivate.DerivativeEditorPropertyTester.isLinkedWithTaxonSelection">
+            </test>
+         </with>
+      </definition>
    </extension>
    <extension
          point="org.eclipse.core.expressions.propertyTesters">
@@ -1818,6 +1856,13 @@
             properties="isSequence,isSingleRead,isSingleReadReusableHere,isSingleReadReused"
             type="org.eclipse.jface.viewers.IStructuredSelection">
       </propertyTester>
+      <propertyTester
+            class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivativeEditorPropertyTester"
+            id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivativeEditorPropertyTester"
+            namespace="eu.etaxonomy.taxeditor.editor.view.derivate.DerivativeEditorPropertyTester"
+            properties="isLinkedWithTaxonSelection"
+            type="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
+      </propertyTester>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">   

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivativeEditorPropertyTester.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivativeEditorPropertyTester.java
new file mode 100644 (file)
index 0000000..74229d4
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivativeEditorPropertyTester.java
@@ -0,0 +1,20 @@
+package eu.etaxonomy.taxeditor.editor.view.derivate;
+
+import org.eclipse.core.expressions.PropertyTester;
+
+public class DerivativeEditorPropertyTester extends PropertyTester {
+
+    public DerivativeEditorPropertyTester() {
+        // TODO Auto-generated constructor stub
+    }
+
+    @Override
+    public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+        DerivateView derivateView = (DerivateView)receiver;
+        if(property.equals("isLinkedWithTaxonSelection")){
+            return derivateView.isListenToSelectionChange();
+        }
+        return false;
+    }
+
+}

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/DerivateViewContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/DerivateViewContextMenu.java
index c89c7c85d0c38bee2fab44873041e6b5fb69fdab..ef1437956a3e9d4c4604a4e7819e078f8ef1df32 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/DerivateViewContextMenu.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/DerivateViewContextMenu.java
@@ -12,7 +12,7 @@ public class DerivateViewContextMenu extends CompoundContributionItem  {
                 new CreateDerivateContextMenu(),
                 new CreateFieldUnitContextMenu(),
                 new Separator(),
-                new ListenToSelectionChangeContextMenu(),
+//                new ListenToSelectionChangeContextMenu(),
         };
         return contributionItems;
     }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/ToggleLinkWithTaxonSelectionHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/ToggleLinkWithTaxonSelectionHandler.java
new file mode 100644 (file)
index 0000000..3af34dd
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/ToggleLinkWithTaxonSelectionHandler.java
@@ -0,0 +1,19 @@
+package eu.etaxonomy.taxeditor.editor.view.derivate.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
+
+public class ToggleLinkWithTaxonSelectionHandler extends AbstractHandler {
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        DerivateView derivateView = (DerivateView) HandlerUtil.getActiveEditor(event);
+        derivateView.toggleListenToSelectionChange();
+        return null;
+    }
+
+}