Project

General

Profile

« Previous | Next » 

Revision 242020c0

Added by Cherian Mathew over 8 years ago

re-initialise group object in input constructor

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
232 232 
        if(cdmServerInfoList == null) {
233 233 
            cdmServerInfoList = new ArrayList<CdmServerInfo>();
234 234 
            cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80));
235 
            cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80));
235 
            //cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80));
236 236 
            cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80));
237 237 
            cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080));
238 238 
            cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST,8080));
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java
16 16 
import org.eclipse.ui.IEditorInput;
17 17 
import org.eclipse.ui.IPersistableElement;
18 18 

  		




  
  19
  
    
import eu.etaxonomy.cdm.api.application.CdmApplicationState;


  		




  19
  20
  
    
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;


  		




  20
  21
  
    
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;


  		




  21
  22
  
    
import eu.etaxonomy.cdm.api.service.IGroupService;


  		




  ......




  39
  40
  
    
	protected CdmAuthorityEditorInput(ConversationHolder conversation, Group group) {


  		




  40
  41
  
    
	    super(true);


  		




  41
  42
  
    
		this.conversation = conversation;


  		




  42
  
  
    
		this.group = group;


  		




  
  43
  
    
		this.group = CdmApplicationState.getCurrentAppConfig().getGroupService().load(group.getUuid());


  		




  43
  44
  
    

  		




  44
  45
  
    
	}


  		




  45
  46
  
    

  		




  ......




  156
  157
  
    
     */


  		




  157
  158
  
    
    @Override


  		




  158
  159
  
    
    public void merge() {


  		




  159
  
  
    
        CdmStore.getService(IGroupService.class).merge(group);


  		




  
  160
  
    
        group = CdmStore.getService(IGroupService.class).merge(group);


  		




  160
  161
  
    
    }


  		




  161
  162
  
    
}


  		












Also available in:  Unified diff