Project

General

Profile

« Previous | Next » 

Revision 1da6f4ff

Added by Cherian Mathew over 8 years ago

#5256 Add missing recursive load for MergeResult lists, Add setting of dirty flag for factual data in Buld Editor

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CacheLoader.java
91 91
            return (T) load((Map<T,T>)obj, alreadyVisitedEntities, update);
92 92
        } else if (obj instanceof Collection) {
93 93
            return (T) load((Collection<T>)obj, alreadyVisitedEntities, update);
94
        } else if (obj instanceof MergeResult) {
95
            return (T) loadRecursive((MergeResult)obj, alreadyVisitedEntities, update);
94 96
        }
95 97

  
96 98

  
......
208 210
        return new MergeResult(cdmBase, mergeResult.getNewEntities());
209 211
    }
210 212

  
213
    public MergeResult<CdmBase> loadRecursive(MergeResult<CdmBase> mergeResult,List<Object> alreadyVisitedEntities, boolean update) {
214
        CdmBase cdmBase = loadRecursive(mergeResult.getMergedEntity(), alreadyVisitedEntities, update);
215
        loadRecursive(mergeResult.getNewEntities(), alreadyVisitedEntities, update);
216
        return new MergeResult(cdmBase, mergeResult.getNewEntities());
217
    }
211 218

  
212 219
    /**
213 220
     * Puts the (Key,Value) pair of ({@link java.util.UUID}, {@link eu.etaxonomy.cdm.model.common.CdmBase}),
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
66 66
import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
67 67
import eu.etaxonomy.taxeditor.model.ImageResources;
68 68
import eu.etaxonomy.taxeditor.model.MessagingUtils;
69
import eu.etaxonomy.taxeditor.store.CdmStore;
69 70
import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
70 71
import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart;
71 72
import eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart;
......
339 340
		}
340 341
		if(part instanceof BulkEditor && !(object instanceof SpecimenOrObservationBase<?>)){
341 342
		    ((BulkEditor) part).forceDirty();
343
		    if(CdmStore.getCurrentSessionManager().isRemoting()) {
344
		        IStructuredSelection selection = (IStructuredSelection) ((BulkEditor) part).getSelectionProvider().getSelection();
345
		        ((BulkEditor) part).changed(selection.getFirstElement());
346
		    }
342 347
		}
343 348

  
349

  
344 350
		super.changed(object);
345 351
	}
346 352

  

Also available in: Unified diff