Project

General

Profile

« Previous | Next » 

Revision fce7d237

Added by Cherian Mathew over 8 years ago

Add remoting checks for merge, Move to merge call which returns updated transient object

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
161 161
	@Override
162 162
	public void doSave(IProgressMonitor monitor) {
163 163
		getConversationHolder().commit();
164
		CdmStore.getService(IVocabularyService.class).merge(new ArrayList<TermVocabulary>(getRootEntities()));
164
		if(CdmStore.getCurrentSessionManager().isRemoting()) {
165
		    CdmStore.getService(IVocabularyService.class).merge(new ArrayList<TermVocabulary>(getRootEntities()), true);
166
		}
165 167
		setDirty(false);
166 168
		getDefinedTermEditorInput().initialiseVocabularies();
167 169
		viewer.refresh();

Also available in: Unified diff