Project

General

Profile

« Previous | Next » 

Revision d85cfdf3

Added by Katja Luther over 7 years ago

fix #5759 remove all switches for remoting and standalone

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
141 141
                            specimenOrObservationBase.addDerivationEvent(DerivationEvent.NewSimpleInstance(specimenOrObservationBase, mediaSpecimen, derivationEventType));
142 142
                            mediaSpecimen.setCacheStrategy(new DerivedUnitFacadeCacheStrategy());
143 143
                            mediaSpecimen.getTitleCache(); //update title cache
144
                            if(CdmStore.getCurrentSessionManager().isRemoting()) {
145
                                CdmStore.getService(IOccurrenceService.class).merge(specimenOrObservationBase, true);
146
                            }
144
                            CdmStore.getService(IOccurrenceService.class).merge(specimenOrObservationBase, true);
145
                           
147 146
                        }
148 147

  
149 148
                        //refresh view
......
208 207
                    Sequence newInstance = Sequence.NewInstance(dnaSample, "", 0); //$NON-NLS-1$
209 208
                    createdElement = newInstance;
210 209
                }
211
                if(CdmStore.getCurrentSessionManager().isRemoting()) {
212
                    CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true);
213
                }
214
            }
215
            else if(selectedDerivate instanceof Sequence){
210
                CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true);
211
            } else if(selectedDerivate instanceof Sequence){
216 212
                SingleRead newInstance = SingleRead.NewInstance();
217 213
                ((Sequence) selectedDerivate).addSingleRead(newInstance);
218 214
                createdElement = newInstance;
219
                if(CdmStore.getCurrentSessionManager().isRemoting()) {
220
                    CdmApplicationState.getCurrentAppConfig().getSequenceService().merge((Sequence)selectedDerivate, true);
221
                }
215
                CdmApplicationState.getCurrentAppConfig().getSequenceService().merge((Sequence)selectedDerivate, true);
216
                
222 217
            }
223 218
            if(selectedDerivate instanceof SpecimenOrObservationBase && DerivedUnit.class.isAssignableFrom(childClass)){
224 219
                SpecimenOrObservationBase<?> specimenOrObservationBase = (SpecimenOrObservationBase<?>)selectedDerivate;
......
244 239
                derivedUnit.setCacheStrategy(new DerivedUnitFacadeCacheStrategy());
245 240
                derivedUnit.getTitleCache(); //update title cache
246 241
                createdElement = derivedUnit;
247
                if(CdmStore.getCurrentSessionManager().isRemoting()) {
248
                    CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true);
249
                }
242
                CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true);
243
                
250 244
            }
251 245

  
252 246
            //refresh view

Also available in: Unified diff