From: Katja Luther Date: Tue, 6 Sep 2016 10:29:19 +0000 (+0200) Subject: fix #5759 remove all switches for remoting and standalone X-Git-Tag: 4.3.0^2~53 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d85cfdf33f40211cd3e6148c4c43b8a2c37d2c64?ds=sidebyside fix #5759 remove all switches for remoting and standalone --- diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java index 26e12964f..31b7498ca 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java @@ -150,12 +150,8 @@ public class AgentEditorInput extends AbstractBulkEditorInput @Override public TeamOrPersonBase save(TeamOrPersonBase entity) { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - return (TeamOrPersonBase) CdmStore.getService(IAgentService.class).merge(entity, true).getMergedEntity(); - } else { - CdmStore.getService(IAgentService.class).saveOrUpdate(entity) ; - return entity; - } + return (TeamOrPersonBase) CdmStore.getService(IAgentService.class).merge(entity, true).getMergedEntity(); + } @Override diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java index b86856244..440af4567 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java @@ -66,12 +66,8 @@ public class GroupEditorInput extends AbstractBulkEditorInput { */ @Override public Group save(Group entity) { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(IGroupService.class).merge(entity, true).getMergedEntity(); - } else { - CdmStore.getService(IGroupService.class).saveOrUpdate(entity); - return entity; - } + return CdmStore.getService(IGroupService.class).merge(entity, true).getMergedEntity(); + } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/MediaEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/MediaEditorInput.java index 2af42543a..697118e46 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/MediaEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/MediaEditorInput.java @@ -56,12 +56,8 @@ public class MediaEditorInput extends AbstractBulkEditorInput { @Override public Media save(Media entity) { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(IMediaService.class).merge(entity, true).getMergedEntity(); - } else { - CdmStore.getService(IMediaService.class).saveOrUpdate(entity) ; - return entity; - } + return CdmStore.getService(IMediaService.class).merge(entity, true).getMergedEntity(); + } @Override diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java index 1cc24918e..9017638d0 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java @@ -123,12 +123,8 @@ public class NameEditorInput extends AbstractBulkEditorInput { @Override public TaxonNameBase save(TaxonNameBase entity) { TaxonNameBase mergedName = null; - - if(CdmStore.getCurrentSessionManager().isRemoting()) { - mergedName = CdmStore.getService(INameService.class).merge(entity, true).getMergedEntity(); - } - - return mergedName; + mergedName = CdmStore.getService(INameService.class).merge(entity, true).getMergedEntity(); + return mergedName; } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java index 5f2077240..b247659c2 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java @@ -139,12 +139,8 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput save(SpecimenOrObservationBase entity) { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(IOccurrenceService.class).merge(entity, true).getMergedEntity(); - } else { - CdmStore.getService(IOccurrenceService.class).save(entity); - return entity; - } + return CdmStore.getService(IOccurrenceService.class).merge(entity, true).getMergedEntity(); + } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java index 8b8c11360..a269df46a 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java @@ -139,12 +139,7 @@ public class ReferenceEditorInput extends AbstractBulkEditorInput { /** {@inheritDoc} */ @Override public Reference save(Reference entity) { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(IReferenceService.class).merge(entity, true).getMergedEntity(); - } else { - CdmStore.getService(IReferenceService.class).saveOrUpdate(entity); - return entity; - } + return CdmStore.getService(IReferenceService.class).merge(entity, true).getMergedEntity(); } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java index aa6dd1537..5ea635f3b 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java @@ -71,12 +71,7 @@ public class TaxonEditorInput extends AbstractBulkEditorInput{ } @Override public TaxonBase save(TaxonBase entity) { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(ITaxonService.class).merge(entity, true).getMergedEntity(); - } else { - CdmStore.getService(ITaxonService.class).saveOrUpdate(entity); - return entity; - } + return CdmStore.getService(ITaxonService.class).merge(entity, true).getMergedEntity(); } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java index 46ce65fbe..f78e19d0d 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java @@ -64,13 +64,7 @@ public class UserEditorInput extends AbstractBulkEditorInput { */ @Override public User save(User entity) { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - return CdmStore.getService(IUserService.class).merge(entity, true).getMergedEntity(); - } else { - CdmStore.getService(IUserService.class).saveOrUpdate(entity); - return entity; - } - + return CdmStore.getService(IUserService.class).merge(entity, true).getMergedEntity(); } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java index 81ebab53c..c9f014554 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java @@ -43,12 +43,8 @@ public class UserCreator implements IEntityCreator{ public User createEntity(Object key, String text) { try{ User user = User.NewInstance(text, text); - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IUserService.class).createUser(user); - user = CdmStore.getService(IUserService.class).loadWithUpdate(user.getUuid()); - } else { - CdmStore.getService(IUserService.class).createUser(user); - } + CdmStore.getService(IUserService.class).createUser(user); + user = CdmStore.getService(IUserService.class).loadWithUpdate(user.getUuid()); return user; } catch (AccessDeniedException e){ MessagingUtils.messageDialog("Access denied", getClass(), e.getMessage(), e); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java index d127c3f31..0c223154b 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java @@ -454,9 +454,8 @@ public class TaxonEditorInput extends CdmEntitySessionInput implements IEditorI */ @Override public void merge() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true); - } + CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true); + } @Override 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 fa78b41d8..f49793677 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 @@ -157,8 +157,7 @@ public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IE */ @Override public void merge() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - group = CdmStore.getService(IGroupService.class).merge(group, true).getMergedEntity(); - } + group = CdmStore.getService(IGroupService.class).merge(group, true).getMergedEntity(); + } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java index 7a190f432..e75a12622 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java @@ -91,9 +91,8 @@ public class PolytomousKeyEditorInput extends AbstractIdentificationEditorInput< */ @Override public void merge() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - key = CdmStore.getService(IPolytomousKeyService.class).merge(key,true).getMergedEntity(); - } + key = CdmStore.getService(IPolytomousKeyService.class).merge(key,true).getMergedEntity(); + } @Override diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java index e4df386b1..c5bcfb75a 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java @@ -356,9 +356,8 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa // commit the conversation and start a new transaction immediately conversation.commit(true); - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IOccurrenceService.class).merge(new ArrayList(rootElements), true); - } + CdmStore.getService(IOccurrenceService.class).merge(new ArrayList(rootElements), true); + monitor.worked(1); this.setDirty(false); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java index daf96f431..cbdd50c78 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java @@ -141,9 +141,8 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { specimenOrObservationBase.addDerivationEvent(DerivationEvent.NewSimpleInstance(specimenOrObservationBase, mediaSpecimen, derivationEventType)); mediaSpecimen.setCacheStrategy(new DerivedUnitFacadeCacheStrategy()); mediaSpecimen.getTitleCache(); //update title cache - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IOccurrenceService.class).merge(specimenOrObservationBase, true); - } + CdmStore.getService(IOccurrenceService.class).merge(specimenOrObservationBase, true); + } //refresh view @@ -208,17 +207,13 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { Sequence newInstance = Sequence.NewInstance(dnaSample, "", 0); //$NON-NLS-1$ createdElement = newInstance; } - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true); - } - } - else if(selectedDerivate instanceof Sequence){ + CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true); + } else if(selectedDerivate instanceof Sequence){ SingleRead newInstance = SingleRead.NewInstance(); ((Sequence) selectedDerivate).addSingleRead(newInstance); createdElement = newInstance; - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmApplicationState.getCurrentAppConfig().getSequenceService().merge((Sequence)selectedDerivate, true); - } + CdmApplicationState.getCurrentAppConfig().getSequenceService().merge((Sequence)selectedDerivate, true); + } if(selectedDerivate instanceof SpecimenOrObservationBase && DerivedUnit.class.isAssignableFrom(childClass)){ SpecimenOrObservationBase specimenOrObservationBase = (SpecimenOrObservationBase)selectedDerivate; @@ -244,9 +239,8 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { derivedUnit.setCacheStrategy(new DerivedUnitFacadeCacheStrategy()); derivedUnit.getTitleCache(); //update title cache createdElement = derivedUnit; - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true); - } + CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true); + } //refresh view diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java index 7a7c749b9..09a52a288 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateFieldUnitContextMenu.java @@ -70,12 +70,8 @@ public class CreateFieldUnitContextMenu extends CompoundContributionItem { description = TaxonDescription.NewInstance(taxon); } description.addElement(association); - if(CdmStore.getCurrentSessionManager().isRemoting()){ - CdmStore.getService(ITaxonService.class).merge(taxon); - } - else{ - CdmStore.getService(ITaxonService.class).saveOrUpdate(taxon); - } + CdmStore.getService(ITaxonService.class).merge(taxon); + derivateView.getConversationHolder().commit(); derivateView.addFieldUnit(fieldUnit); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/SingleReadHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/SingleReadHandler.java index ba5f2b953..3a02146cc 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/SingleReadHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/SingleReadHandler.java @@ -41,12 +41,8 @@ public class SingleReadHandler extends AbstractHandler { SingleRead singleRead = (SingleRead)clipBoardTreeNode.getValue(); Sequence sequence = (Sequence)selectedTreeNode.getValue(); sequence.addSingleRead(singleRead); - if(CdmStore.getCurrentSessionManager().isRemoting()){ - CdmStore.getService(ISequenceService.class).merge(sequence); - } - else{ - CdmStore.getService(ISequenceService.class).saveOrUpdate(sequence); - } + CdmStore.getService(ISequenceService.class).merge(sequence); + if(activeEditor instanceof DerivateView) { derivateView.getConversationHolder().commit(); derivateView.refreshTree(); @@ -63,12 +59,8 @@ public class SingleReadHandler extends AbstractHandler { selectedTreeNode.getValue() instanceof SingleRead && selectedTreeNode.getParent().getValue() instanceof Sequence) { Sequence sequence = (Sequence) selectedTreeNode.getParent().getValue(); sequence.removeSingleRead((SingleRead) selectedTreeNode.getValue()); - if(CdmStore.getCurrentSessionManager().isRemoting()){ - CdmStore.getService(ISequenceService.class).merge(sequence); - } - else{ - CdmStore.getService(ISequenceService.class).saveOrUpdate(sequence); - } + CdmStore.getService(ISequenceService.class).merge(sequence); + if(activeEditor instanceof DerivateView) { derivateView.getConversationHolder().commit(); derivateView.refreshTree(); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java index 53d3b558b..b61efaa48 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java @@ -279,10 +279,9 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP } if(part instanceof BulkEditor && !(object instanceof SpecimenOrObservationBase)){ ((BulkEditor) part).forceDirty(); - if(CdmStore.getCurrentSessionManager().isRemoting()) { - IStructuredSelection selection = (IStructuredSelection) ((BulkEditor) part).getSelectionProvider().getSelection(); - ((BulkEditor) part).changed(selection.getFirstElement()); - } + IStructuredSelection selection = (IStructuredSelection) ((BulkEditor) part).getSelectionProvider().getSelection(); + ((BulkEditor) part).changed(selection.getFirstElement()); + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java index 331526d40..28beab559 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java @@ -135,10 +135,9 @@ public class MediaViewPart extends AbstractCdmEditorViewPart implements IPartCon // take a look at ISaveblePart if(part instanceof BulkEditor && !(object instanceof SpecimenOrObservationBase)){ ((BulkEditor) part).forceDirty(); - if(CdmStore.getCurrentSessionManager().isRemoting()) { - IStructuredSelection selection = (IStructuredSelection) ((BulkEditor) part).getSelectionProvider().getSelection(); - ((BulkEditor) part).changed(selection.getFirstElement()); - } + IStructuredSelection selection = (IStructuredSelection) ((BulkEditor) part).getSelectionProvider().getSelection(); + ((BulkEditor) part).changed(selection.getFirstElement()); + } super.changed(object); } diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorInput.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorInput.java index 4bc956e3c..89bc3cba9 100644 --- a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorInput.java +++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorInput.java @@ -163,8 +163,7 @@ public class AlignmentEditorInput extends CdmEntitySessionInput implements IEdit */ @Override public void merge() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(ISequenceService.class).merge(sequenceNode, true); - } + CdmStore.getService(ISequenceService.class).merge(sequenceNode, true); + } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/RecentNamesContributionItem.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/RecentNamesContributionItem.java index 984d7cf0a..3d190f9a1 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/RecentNamesContributionItem.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/RecentNamesContributionItem.java @@ -73,7 +73,7 @@ public class RecentNamesContributionItem extends ContributionItem { /** {@inheritDoc} */ @Override public void fill(Menu parent, int index) { - getRecentWindows().fill(parent, index); + // getRecentWindows().fill(parent, index); } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java index 33c0be754..035397f3c 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java @@ -198,14 +198,9 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp return Status.CANCEL_STATUS; } - if(CdmStore.getCurrentSessionManager().isRemoting()) { - AbstractOperation operation = new RemotingMoveTaxonOperation(taxonNavigator, false, uuids, (TaxonNode)targetITaxonTreeNode, MovingType.CHILD); - NavigationUtil.executeOperation(operation, null); - } else { - AbstractPostOperation operation = new MoveTaxonOperation - ("Move Taxon", workspaceUndoContext, uuids, targetITaxonTreeNode, this, taxonNavigator, MovingType.CHILD); - NavigationUtil.executeOperation(operation); - } + AbstractOperation operation = new RemotingMoveTaxonOperation(taxonNavigator, false, uuids, (TaxonNode)targetITaxonTreeNode, MovingType.CHILD); + NavigationUtil.executeOperation(operation, null); + logger.info("Moved taxa to new parent " + targetITaxonTreeNode); return Status.OK_STATUS; @@ -221,14 +216,9 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp return Status.CANCEL_STATUS; } - if(CdmStore.getCurrentSessionManager().isRemoting()) { - AbstractOperation operation = new RemotingMoveTaxonOperation(taxonNavigator, false, uuids, (TaxonNode)targetITaxonTreeNode, MovingType.CHILD); - NavigationUtil.executeOperation(operation, null); - } else { - AbstractPostOperation operation = new MoveTaxonOperation - ("Move Taxon", workspaceUndoContext, uuids, targetITaxonTreeNode, this, taxonNavigator, MovingType.CHILD); - NavigationUtil.executeOperation(operation); - } + AbstractOperation operation = new RemotingMoveTaxonOperation(taxonNavigator, false, uuids, (TaxonNode)targetITaxonTreeNode, MovingType.CHILD); + NavigationUtil.executeOperation(operation, null); + logger.info("Moved taxa to new parent " + targetITaxonTreeNode); return Status.OK_STATUS; @@ -240,14 +230,9 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp } TaxonNode targetNode = (TaxonNode) targetITaxonTreeNode; - if(CdmStore.getCurrentSessionManager().isRemoting()) { - AbstractOperation operation = new RemotingMoveTaxonOperation(taxonNavigator, false, uuids, targetNode, MovingType.BEHIND); - NavigationUtil.executeOperation(operation, null); - } else { - AbstractPostOperation operation = new MoveTaxonOperation - ("Move Taxon", workspaceUndoContext, uuids, targetNode, this, taxonNavigator, MovingType.BEHIND); - NavigationUtil.executeOperation(operation); - } + AbstractOperation operation = new RemotingMoveTaxonOperation(taxonNavigator, false, uuids, targetNode, MovingType.BEHIND); + NavigationUtil.executeOperation(operation, null); + logger.info("Moved taxa to new parent " + targetITaxonTreeNode); return Status.OK_STATUS; // }else if (returnCode == 2){ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java index 518382f1f..a02e9a732 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java @@ -101,10 +101,8 @@ public class TermEditorInput extends AbstractDefinedTermEditorInput */ @Override public void merge() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IVocabularyService.class).merge(new ArrayList(getRootEntities()), true); - updateDefaultFeatureTree(); - } + CdmStore.getService(IVocabularyService.class).merge(new ArrayList(getRootEntities()), true); + updateDefaultFeatureTree(); } public static FeatureTree getDefaultFeatureTree() { diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java index 78cd5bd5a..36a919603 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java @@ -206,11 +206,8 @@ public class EditFeatureTreeWizardPage extends WizardPage implements .getAdditionalFeatures(); for (Feature feature : additionalFeatures) { FeatureNode child = FeatureNode.NewInstance(feature); - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IFeatureNodeService.class).merge(child, true); - } else { - CdmStore.getService(IFeatureNodeService.class).saveOrUpdate(child); - } + CdmStore.getService(IFeatureNodeService.class).merge(child, true); + parent.addChild(child); } viewer.refresh(); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeEditorWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeEditorWizard.java index d65ad420e..c8c58d3e0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeEditorWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeEditorWizard.java @@ -70,11 +70,7 @@ public class FeatureTreeEditorWizard extends Wizard implements ICdmEntitySession public boolean performFinish() { try{ if (selectedFeatureTree != null){ - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IFeatureTreeService.class).merge(selectedFeatureTree, true); - } else { - CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(selectedFeatureTree); - } + CdmStore.getService(IFeatureTreeService.class).merge(selectedFeatureTree, true); } conversation.commit(); }finally{ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java index 409dae7e6..a7abcb38b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java @@ -151,11 +151,8 @@ public class SelectFeatureTreeWizardPage extends WizardPage implements ISelectio featureTree.setTitleCache(text_title.getText(), true); viewer.add(featureTree); - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IFeatureTreeService.class).merge(featureTree, true); - } else { - CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(featureTree); - } + CdmStore.getService(IFeatureTreeService.class).merge(featureTree, true); + text_title.setText(""); viewer.setSelection(new StructuredSelection(featureTree)); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java index d6f3236ea..d75d589bf 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java @@ -56,20 +56,8 @@ public class AbcdImportWizard extends AbstractImportWizard @Override public boolean performFinish() { File file = new File(page.getFolderText() + File.separator + page.getExportFileName()); - - if(CdmStore.getCurrentSessionManager().isRemoting()) { - // create job - Job job = CdmStore.getExportManager().createIOServiceJob(configurator, file); - // configure the job - job.setProperty(IProgressConstants.KEEP_PROPERTY, true); - job.setUser(true); - // schedule job - job.schedule(); - } else { - configurator.setDestination(file); - CdmStore.getExportManager().run(configurator); - } + // create job + Job job = CdmStore.getExportManager().createIOServiceJob(configurator, file); + // configure the job + job.setProperty(IProgressConstants.KEEP_PROPERTY, true); + job.setUser(true); + // schedule job + job.schedule(); + return true; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SddImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SddImportWizard.java index 8f4d382fe..d701f6f4a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SddImportWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SddImportWizard.java @@ -67,14 +67,9 @@ public class SddImportWizard extends AbstractImportWizard URI source = dataSourcePage.getUri(); configurator.setSource(source); configurator.setDbSchemaValidation(DbSchemaValidation.CREATE); - - if(CdmStore.getCurrentSessionManager().isRemoting()) { - Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.URI); - CdmStore.getImportManager().run(job); - } else { - CdmStore.getImportManager().run(configurator); - } - + Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.URI); + CdmStore.getImportManager().run(job); + return true; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/TcsImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/TcsImportWizard.java index 13113c2e4..bc4173652 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/TcsImportWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/TcsImportWizard.java @@ -45,13 +45,9 @@ public class TcsImportWizard extends AbstractImportWizard { /** {@inheritDoc} */ @Override protected void saveEntity() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(ICollectionService.class).merge(getEntity(), true); - } else { - CdmStore.getService(ICollectionService.class).save(getEntity()); - } + CdmStore.getService(ICollectionService.class).merge(getEntity(), true); + } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java index a09a1a8e8..664a54c33 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java @@ -93,11 +93,8 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard { /** {@inheritDoc} */ @Override protected void saveEntity() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IOccurrenceService.class).merge(getEntity(), true); - } else { - CdmStore.getService(IOccurrenceService.class).save(getEntity()); - } + CdmStore.getService(IOccurrenceService.class).merge(getEntity(), true); + } @Override diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java index c33427954..1a51c72c7 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java @@ -38,11 +38,8 @@ public class NewGrantedAuthorityWizard extends AbstractNewEntityWizard { */ @Override protected void saveEntity() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IGroupService.class).merge(getEntity(), true); - } else { - CdmStore.getService(IGroupService.class).save(getEntity()); - } + CdmStore.getService(IGroupService.class).merge(getEntity(), true); + } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java index 6ac2d4440..a03cafa04 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java @@ -35,11 +35,7 @@ public class NewInstitutionWizard extends AbstractNewEntityWizard { */ @Override protected void saveEntity() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IAgentService.class).merge(getEntity(), true); - } else { - CdmStore.getService(IAgentService.class).save(getEntity()); - } + CdmStore.getService(IAgentService.class).merge(getEntity(), true); } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java index cfdd27d18..8427ac1d0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java @@ -49,11 +49,7 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard /** {@inheritDoc} */ @Override protected void saveEntity() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(INameService.class).merge(getEntity(), true); - } else { - CdmStore.getService(INameService.class).save(getEntity()); - } + CdmStore.getService(INameService.class).merge(getEntity(), true); } @Override diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java index ab5f7038d..ad7156859 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java @@ -39,11 +39,7 @@ public class NewPersonWizard extends AbstractNewEntityWizard { /** {@inheritDoc} */ @Override protected void saveEntity() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IAgentService.class).merge(getEntity(), true); - } else { - CdmStore.getService(IAgentService.class).save(getEntity()); - } + CdmStore.getService(IAgentService.class).merge(getEntity(), true); } @Override diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java index daade6801..aaa3fe3ab 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java @@ -31,11 +31,7 @@ public class NewPolytomousKeyWizard extends AbstractNewEntityWizard { /** {@inheritDoc} */ @Override protected void saveEntity() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IPrimerService.class).merge(getEntity(),true); - } else { - CdmStore.getService(IPrimerService.class).save(getEntity()); - } + CdmStore.getService(IPrimerService.class).merge(getEntity(),true); + } /** {@inheritDoc} */ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java index 63ce08f21..51980556f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java @@ -89,10 +89,9 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard{ } affectedObjects.add(parentNode); } - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmApplicationState.getCurrentDataChangeService() + CdmApplicationState.getCurrentDataChangeService() .fireChangeEvent(new CdmChangeEvent(Action.Create, affectedObjects, NewTaxonNodeWizard.class), true); - } + }else{ if (!result.isOk()){ if (!result.getExceptions().isEmpty()){ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java index 1d6e0ae74..a6b3afa6b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java @@ -50,11 +50,8 @@ public class NewTeamWizard extends AbstractNewEntityWizard { /** {@inheritDoc} */ @Override protected void saveEntity() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IAgentService.class).merge(getEntity(), true); - } else { - CdmStore.getService(IAgentService.class).save(getEntity()); - } + CdmStore.getService(IAgentService.class).merge(getEntity(), true); + } @Override diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java index d14363c33..631872794 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java @@ -24,11 +24,8 @@ public class NewUserWizard extends AbstractNewEntityWizard { @Override protected void saveEntity() { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IUserService.class).merge(getEntity(), true); - } else { - CdmStore.getService(IUserService.class).save(getEntity()); - } + CdmStore.getService(IUserService.class).merge(getEntity(), true); + } @Override diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java index e5cad6866..2ed42b85b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java @@ -265,9 +265,8 @@ public class CdmStore { static void setInstance(ICdmApplicationConfiguration applicationController, ICdmSource cdmSource) { instance = new CdmStore(applicationController, cdmSource); - if(getCurrentSessionManager().isRemoting()) { - CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher()); - } + CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher()); + } private CdmStore(ICdmApplicationConfiguration applicationController, diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java index 38ae7193b..c0486d07d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java @@ -69,11 +69,10 @@ public class AuthenticatedUserBar extends WorkbenchWindowControlContribution imp if(authenticatedUser == null) { text = "Not logged in " ; } else { - if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmRemoteSource source = (CdmRemoteSource) CdmStore.getActiveCdmSource(); - String loginInfo = authenticatedUser.getUsername() + "@" + source.getName() + ":" + source.getContextPath(); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().setText(ApplicationUtil.getTitle() + " " + loginInfo); - } + CdmRemoteSource source = (CdmRemoteSource) CdmStore.getActiveCdmSource(); + String loginInfo = authenticatedUser.getUsername() + "@" + source.getName() + ":" + source.getContextPath(); + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell().setText(ApplicationUtil.getTitle() + " " + loginInfo); + text = "Logged in as: " + authenticatedUser.getUsername() + " "; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java index 07a3d89d9..e70f4a8f5 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java @@ -116,13 +116,8 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement languages = Arrays.asList(new Language[]{CdmStore.getDefaultLanguage()}); - if(CdmStore.getCurrentSessionManager().isRemoting()) { - editGeoService = ((CdmApplicationRemoteController)CdmStore.getCurrentApplicationConfiguration()).getEditGeoService(); - }else{ - editGeoService =(IEditGeoService) CdmStore.getCurrentApplicationConfiguration().getBean( - "editGeoService"); - } - + editGeoService = ((CdmApplicationRemoteController)CdmStore.getCurrentApplicationConfiguration()).getEditGeoService(); + String parameter = editGeoService.getDistributionServiceRequestParameterString( getTaxonDescriptions(), false, diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizard.java index 0bea2ae1e..19bd9898a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizard.java @@ -49,7 +49,7 @@ public class NameRelationshipWizard extends Wizard implements IConversationEnabl public NameRelationshipWizard(NameRelationshipDetailSection callingSection) { NameRelationshipWizard.callingSection = callingSection; rootElement = callingSection.getEntity(); - if (CdmStore.isActive() && CdmStore.getCurrentSessionManager().isRemoting()) { + if (CdmStore.isActive()) { previousCdmEntitySession = CdmStore.getCurrentSessionManager().getActiveSession(); cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true); cdmEntitySession.bind(); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java index 5e10262a7..279f2faaf 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java @@ -75,7 +75,7 @@ public class EditFromSelectionWizard extends Wizard implements private CdmBase rootElement; public EditFromSelectionWizard(EntitySelectionElement selectionElement) { - if (CdmStore.isActive() && CdmStore.getCurrentSessionManager().isRemoting()) { + if (CdmStore.isActive()) { previousCdmEntitySession = CdmStore.getCurrentSessionManager().getActiveSession(); cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true); cdmEntitySession.bind(); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SaveImportedSpecimenAction.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SaveImportedSpecimenAction.java index a22231177..b3ca3f460 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SaveImportedSpecimenAction.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SaveImportedSpecimenAction.java @@ -86,6 +86,7 @@ public class SaveImportedSpecimenAction extends Action { Collections.sort(biocaseResponses, getComparator()); URI dataSetUri = null; Abcd206ImportConfigurator configuratorAbcd; + List abcdConfigurators = new ArrayList(); DataSetResponse dataSetResponse; OccurenceQuery bioCaseOccurrenceQuery = null; @@ -102,6 +103,7 @@ public class SaveImportedSpecimenAction extends Action { } if (!response.getDataSetUri().equals(dataSetUri)){ configuratorAbcd = Abcd206ImportConfigurator.NewInstance(dataSetUri, null, false); + configuratorAbcd.addMediaAsMediaSpecimen(true); if (configuratorAbcd != null){ abcdConfigurators.add(configuratorAbcd); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java index 1c16a6fc5..eb01cbb79 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java @@ -71,15 +71,9 @@ public class SpecimenImportView extends DataImportView importer = new CdmDefaultImport(); - importer.invoke(configurator); - } - // results = repo.getUnits(); + Job job = CdmStore.getImportManager().createIOServiceJob(configurator, resultStream, SOURCE_TYPE.INPUTSTREAM); + CdmStore.getImportManager().run(job); + setResults(results); } catch (ClientProtocolException e) { logger.error(errorMessage, e); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java index 9ba538987..a33c03d9a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java @@ -78,62 +78,63 @@ public class SpecimenSearchWizard extends Wizard implements IImportWizard { Abcd206ImportConfigurator configurator = CdmStore.getImportManager().AbcdConfigurator(); configurator.setOccurenceQuery(query); configurator.setSourceUri(providerSelectionPage.getEndPoint()); + configurator.setAddMediaAsMediaSpecimen(true); configurator.setDbSchemaValidation(DbSchemaValidation.CREATE); - if(CdmStore.getCurrentSessionManager().isRemoting() ) { - //Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM); - //CdmStore.getImportManager().run(job); - try { - serviceWrapper = providerSelectionPage.getQueryServiceWrapper(); - InputStream stream = null; - - final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - IWorkbenchPage activePart = window.getActivePage(); - if (providerSelectionPage.getQueryType().equals(QueryType.BIOCASE)){ - stream =((BioCaseQueryServiceWrapper) serviceWrapper).query(query, configurator.getSourceUri()); - SpecimenImportReport report = new SpecimenImportReport(); - UnitAssociationWrapper unitNodesList = AbcdParseUtility.parseUnitsNodeList(stream, report); - NodeList nodeList = unitNodesList.getAssociatedUnits(); - String prefix = unitNodesList.getPrefix(); - String associationType = unitNodesList.getAssociationType(); - URI uri =AbcdParseUtility.parseFirstUri(nodeList, report); - String content = AbcdParseUtility.parseFirstTextContent(nodeList); - System.out.println(content); - - - SpecimenImportView specimenImportView = new SpecimenImportView(); - try { - specimenImportView = (SpecimenImportView) activePart.showView(SpecimenImportView.ID); - specimenImportView.setEndpoint(providerSelectionPage.getEndPoint()); - specimenImportView.setQuery(query); - dataImportView = specimenImportView; - } catch (PartInitException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - - } - - } else{ - try { - - dataImportView = (GbifResponseImportView) activePart.showView(GbifResponseImportView.ID, "query_"+query.toString().replaceAll(",", ""), IWorkbenchPage.VIEW_ACTIVATE); - dataImportView.setQuery(query); - // (GbifResponseImportView) activePart.showView(GbifResponseImportView.ID);getWorkbench().getActiveWorkbenchWindow().getActivePage() - // .showView(GbifResponseImportView.ID, "query_"+query.toString().replaceAll(",", ""),IWorkbenchPage.VIEW_ACTIVATE); - - } catch (PartInitException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + + //Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM); + //CdmStore.getImportManager().run(job); + try { + serviceWrapper = providerSelectionPage.getQueryServiceWrapper(); + InputStream stream = null; + + final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage activePart = window.getActivePage(); + if (providerSelectionPage.getQueryType().equals(QueryType.BIOCASE)){ + stream =((BioCaseQueryServiceWrapper) serviceWrapper).query(query, configurator.getSourceUri()); + SpecimenImportReport report = new SpecimenImportReport(); + UnitAssociationWrapper unitNodesList = AbcdParseUtility.parseUnitsNodeList(stream, report); + NodeList nodeList = unitNodesList.getAssociatedUnits(); + String prefix = unitNodesList.getPrefix(); + String associationType = unitNodesList.getAssociationType(); + URI uri =AbcdParseUtility.parseFirstUri(nodeList, report); + String content = AbcdParseUtility.parseFirstTextContent(nodeList); + System.out.println(content); + + + SpecimenImportView specimenImportView = new SpecimenImportView(); + try { + specimenImportView = (SpecimenImportView) activePart.showView(SpecimenImportView.ID); + specimenImportView.setEndpoint(providerSelectionPage.getEndPoint()); + specimenImportView.setQuery(query); + dataImportView = specimenImportView; + } catch (PartInitException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } + } else{ + try { + + dataImportView = (GbifResponseImportView) activePart.showView(GbifResponseImportView.ID, "query_"+query.toString().replaceAll(",", ""), IWorkbenchPage.VIEW_ACTIVATE); + dataImportView.setQuery(query); + // (GbifResponseImportView) activePart.showView(GbifResponseImportView.ID);getWorkbench().getActiveWorkbenchWindow().getActivePage() + // .showView(GbifResponseImportView.ID, "query_"+query.toString().replaceAll(",", ""),IWorkbenchPage.VIEW_ACTIVATE); + + } catch (PartInitException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); } - // CdmStore.getImportManager().run(configurator); + + + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } + // CdmStore.getImportManager().run(configurator); + // try { // switch (providerSelectionPage.getQueryType()) { // case BIOCASE: