fix #7009 Replace part descriptor IDs in open handler with constants

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / group / authority / CdmAuthorityEditorInput.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java
index 77de015f12235de15deff65670b805486e22df27..1e52926c7127002969f92b9e723292750571c617 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java
@@ -12,10 +12,6 @@ import java.util.Arrays;
 import java.util.Collection;
 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.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
@@ -33,7 +29,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  */
 
-public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IEditorInput, IConversationEnabled {
+public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IConversationEnabled {
        private ConversationHolder conversation;
        private Group group;
 
@@ -57,10 +53,6 @@ public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IE
                return new CdmAuthorityEditorInput(conversation, group);
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-        */
-       @Override
        public Object getAdapter(Class adapter) {
                if (adapter == Group.class) {
                        return this.group;
@@ -83,43 +75,9 @@ public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IE
        public ConversationHolder getConversationHolder() {
                return this.conversation;
        }
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IEditorInput#exists()
-        */
-       @Override
-       public boolean exists() {
-               return group != null;
-       }
-       /* (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 group.getName();
        }
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IEditorInput#getPersistable()
-        */
-       @Override
-       public IPersistableElement getPersistable() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IEditorInput#getToolTipText()
-        */
-       @Override
-       public String getToolTipText() {
-               return getName();
-       }
 
        /* (non-Javadoc)
         * @see java.lang.Object#equals(java.lang.Object)
@@ -157,8 +115,7 @@ public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IE
      */
     @Override
     public void merge() {
-        if(CdmStore.getCurrentSessionManager().isRemoting()) {
-            group = CdmStore.getService(IGroupService.class).merge(group);
-        }
+        group = CdmStore.getService(IGroupService.class).merge(group, true).getMergedEntity();
+
     }
 }