From: Cherian Mathew <c.mathew@bgbm.org>
Date: Mon, 14 Sep 2015 16:00:32 +0000 (+0200)
Subject: re-initialise group object in input constructor
X-Git-Tag: remoting-3.9.0
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/242020c01eb422424e4004430c558b659630b1a0

re-initialise group object in input constructor
---

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
index 03f8f0b7c..cfaedf067 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
@@ -232,7 +232,7 @@ public class CdmServerInfo {
         if(cdmServerInfoList == null) {
             cdmServerInfoList = new ArrayList<CdmServerInfo>();
             cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80));
-            cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80));
+            //cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80));
             cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80));
             cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080));
             cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST,8080));
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 5dad6bd57..b3b8d6437 100644
--- 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
@@ -16,6 +16,7 @@ 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;
 import eu.etaxonomy.cdm.api.service.IGroupService;
@@ -39,7 +40,7 @@ public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IE
 	protected CdmAuthorityEditorInput(ConversationHolder conversation, Group group) {
 	    super(true);
 		this.conversation = conversation;
-		this.group = group;
+		this.group = CdmApplicationState.getCurrentAppConfig().getGroupService().load(group.getUuid());
 
 	}
 
@@ -156,6 +157,6 @@ public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IE
      */
     @Override
     public void merge() {
-        CdmStore.getService(IGroupService.class).merge(group);
+        group = CdmStore.getService(IGroupService.class).merge(group);
     }
 }