adapt Setsecundum handler and RefreshHandler to TaxonNodeDto

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RefreshTreeHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RefreshTreeHandlerE4.java
index 877aa7a3b691f047b61f4e6b1ca520cabdbd8697..2f443f5a4c531518dbe4891b44f1155512e60018 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RefreshTreeHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RefreshTreeHandlerE4.java
@@ -18,7 +18,7 @@ import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.TreeSelection;
 
-import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.navigation.navigator.e4.TaxonNavigatorE4;
 
 /**
@@ -40,7 +40,7 @@ public class RefreshTreeHandlerE4 {
     @CanExecute
     private boolean canExecute(@Named(IServiceConstants.ACTIVE_SELECTION)TreeSelection selection, MHandledMenuItem menuItem){
         boolean canExecute = false;
-        canExecute = selection.getFirstElement() instanceof ITaxonTreeNode;
+        canExecute = selection.getFirstElement() instanceof TaxonNodeDto;
         menuItem.setVisible(canExecute);
         return canExecute;
     }

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetSecReferenceForSubtreeHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetSecReferenceForSubtreeHandlerE4.java
index 91df45c37b4a4dd635df34e76000fa81c58ab75f..560dedcc32d3efb0a3cb5ac8825a69b37faac5c5 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetSecReferenceForSubtreeHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetSecReferenceForSubtreeHandlerE4.java
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.api.service.config.SecundumForSubtreeConfigurator;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigatorLabels;
 import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetSecundumForSubtreeOperation;
 import eu.etaxonomy.taxeditor.operation.e4.RemotingCdmHandlerE4;
@@ -39,7 +39,7 @@ import eu.etaxonomy.taxeditor.ui.dialog.configurator.SetSecundumForSubtreeConfig
  */
 public class SetSecReferenceForSubtreeHandlerE4 extends RemotingCdmHandlerE4 {
 
-    private ITaxonTreeNode taxonNode;
+    private TaxonNodeDto taxonNode;
     private SecundumForSubtreeConfigurator configurator;
 
     public SetSecReferenceForSubtreeHandlerE4() {
@@ -63,11 +63,11 @@ public class SetSecReferenceForSubtreeHandlerE4 extends RemotingCdmHandlerE4 {
 
         // check that selected object is a taxon node
         Object obj = selection.iterator().next();
-        if(obj instanceof ITaxonTreeNode) {
-            if (obj instanceof Classification){
-                taxonNode = ((Classification)obj).getRootNode();
+        if(obj instanceof TaxonNodeDto) {
+            if(obj instanceof Classification){
+                taxonNode = new TaxonNodeDto(((Classification)obj).getRootNode());
             }else{
-                taxonNode = (ITaxonTreeNode)obj;
+                taxonNode = (TaxonNodeDto)obj;
             }
         } else{
             return new Status(IStatus.ERROR,
@@ -90,7 +90,7 @@ public class SetSecReferenceForSubtreeHandlerE4 extends RemotingCdmHandlerE4 {
     @CanExecute
     private boolean canExecute(@Named(IServiceConstants.ACTIVE_SELECTION)TreeSelection selection, MHandledMenuItem menuItem){
         boolean canExecute = false;
-        canExecute = selection.getFirstElement() instanceof ITaxonTreeNode;
+        canExecute = selection.getFirstElement() instanceof TaxonNodeDto;
         menuItem.setVisible(canExecute);
         return canExecute;
     }