ref #6913 Remove IEditorInput dependency from alignment editor input

diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorInput.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorInput.java
index 94095996f632606ceb5bda32e746897cafc44c57..b9835667e34be1ee62c55747810c6a942941fb70 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorInput.java
+++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorInput.java
@@ -13,14 +13,9 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
 import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
 import eu.etaxonomy.cdm.model.molecular.Sequence;
 import eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput;
-import eu.etaxonomy.taxeditor.molecular.l10n.Messages;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 
@@ -30,9 +25,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @author Ben Stöver
  * @date 04.08.2014
  */
-public class AlignmentEditorInput extends CdmEntitySessionInput implements IEditorInput {
-    private static final String name = Messages.AlignmentEditorInput_EDITOR_NAME;
-
+public class AlignmentEditorInput extends CdmEntitySessionInput {
 
     private final UUID sequenceNodeUuid;
     private Sequence sequenceNode;
@@ -44,63 +37,6 @@ public class AlignmentEditorInput extends CdmEntitySessionInput implements IEdit
        }
 
 
-       /* (non-Javadoc)
-     * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-     */
-    @Override
-    public Object getAdapter(Class adapter) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IEditorInput#exists()
-     */
-    @Override
-    public boolean exists() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-     */
-    @Override
-    public ImageDescriptor getImageDescriptor() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IEditorInput#getName()
-     */
-    @Override
-    public String getName() {
-        return name;
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IEditorInput#getPersistable()
-     */
-    @Override
-    public IPersistableElement getPersistable() {
-        return null;
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IEditorInput#getToolTipText()
-     */
-    @Override
-    public String getToolTipText() {
-        return name;
-    }
-
-
        /**
         * Returns the {@link UUID} of the sequence CDM node that should be edited by the {@link AlignmentEditor} this object
         * is used with.
@@ -164,6 +100,6 @@ public class AlignmentEditorInput extends CdmEntitySessionInput implements IEdit
     @Override
     public void merge() {
         CdmStore.getService(ISequenceService.class).merge(sequenceNode, true);
-        
+
     }
 }

diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/EditSequenceHandler.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/EditSequenceHandler.java
index 84b2ce6636c612833895bb1c8d1140b1bc88158d..c76354ad4a638ac230c14eff154d0546b07c27c0 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/EditSequenceHandler.java
+++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/EditSequenceHandler.java
@@ -9,13 +9,8 @@ import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.TreeNode;
-import org.eclipse.ui.PartInitException;
 
 import eu.etaxonomy.cdm.model.molecular.Sequence;
-import eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin;
-import eu.etaxonomy.taxeditor.molecular.editor.AlignmentEditor;
-import eu.etaxonomy.taxeditor.molecular.editor.AlignmentEditorInput;
-import eu.etaxonomy.taxeditor.molecular.l10n.Messages;
 
 
 
@@ -32,14 +27,14 @@ public class EditSequenceHandler {
     @Execute
     public void execute(@Optional@Named(IServiceConstants.ACTIVE_SELECTION)TreeNode treeNodeOfSelection) {
         if(treeNodeOfSelection != null && treeNodeOfSelection.getValue() instanceof Sequence){
-            AlignmentEditorInput input = new AlignmentEditorInput(((Sequence)treeNodeOfSelection.getValue()).getUuid());  //TODO Should there always be a new instance created here? What if the specified CDM node is already opened in an AlignmentEditor? => Possible create Singleton that keeps instances by sequence objects in a map.
-            try {
-                TaxeditorMolecularPlugin.getDefault().getWorkbench()
-                .getActiveWorkbenchWindow().getActivePage().openEditor(input, AlignmentEditor.ID);
-            }
-            catch (PartInitException e) {
-                logger.error(Messages.EditSequenceHandler_COULD_NOT_OPEN, e);
-            }
+//            AlignmentEditorInput input = new AlignmentEditorInput(((Sequence)treeNodeOfSelection.getValue()).getUuid());  //TODO Should there always be a new instance created here? What if the specified CDM node is already opened in an AlignmentEditor? => Possible create Singleton that keeps instances by sequence objects in a map.
+//            try {
+//                TaxeditorMolecularPlugin.getDefault().getWorkbench()
+//                .getActiveWorkbenchWindow().getActivePage().openEditor(input, AlignmentEditor.ID);
+//            }
+//            catch (PartInitException e) {
+//                logger.error(Messages.EditSequenceHandler_COULD_NOT_OPEN, e);
+//            }
         }
     }