commit f5979052617ff666c888cd14cfda62d90389f171
Author: Katja Luther
Date: Thu Nov 23 15:37:19 2017 +0100
fix multiple representation by removing conversation of selection dialog
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java
index 02929957f..345fb072a 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java
@@ -87,7 +87,8 @@ public class ChangeSynonymToAcceptedTaxonHandlerE4 implements IPostOperationEnab
// Get taxon
Taxon taxon = input.getTaxon();
- TaxonNode newParentNode = TaxonNodeSelectionDialog.select(shell, editor.getConversationHolder(), Messages.ChangeSynonymToAcceptedTaxonHandler_SELECT_PARENT, null, null, input.getTaxonNode().getClassification());
+ TaxonNode newParentNode = TaxonNodeSelectionDialog.select(shell,// editor.getConversationHolder(),
+ Messages.ChangeSynonymToAcceptedTaxonHandler_SELECT_PARENT, null, null, input.getTaxonNode().getClassification());
if(newParentNode != null){
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandlerE4.java
index 2a83ec999..98be8b451 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandlerE4.java
@@ -83,7 +83,8 @@ public class MoveSynonymToAnotherAcceptedTaxonHandlerE4 implements IPostOperatio
excludeTaxa.add(oldParent.getUuid());
- newParentNode = TaxonNodeSelectionDialog.select(shell, editor.getConversationHolder(), Messages.MoveSynonymToAnotherAcceptedTaxonHandler_SELECT_ACC_TAXON, excludeTaxa, input.getTaxonNode(), input.getTaxonNode().getClassification());
+ newParentNode = TaxonNodeSelectionDialog.select(shell, //editor.getConversationHolder(),
+ Messages.MoveSynonymToAnotherAcceptedTaxonHandler_SELECT_ACC_TAXON, excludeTaxa, input.getTaxonNode(), input.getTaxonNode().getClassification());
if(newParentNode!=null){
MoveSynonymToAnotherAcceptedTaxonOperationE4 operation = new MoveSynonymToAnotherAcceptedTaxonOperationE4(Messages.MoveSynonymToAnotherAcceptedTaxonHandler_CHANGE_ACC_TAXON, EditorUtil.getUndoContext(),
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/operation/MoveSynonymToAnotherAcceptedTaxonOperationE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/operation/MoveSynonymToAnotherAcceptedTaxonOperationE4.java
index 309c7a6ad..d187a5605 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/operation/MoveSynonymToAnotherAcceptedTaxonOperationE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/operation/MoveSynonymToAnotherAcceptedTaxonOperationE4.java
@@ -12,6 +12,7 @@ import org.eclipse.core.runtime.IStatus;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.api.service.UpdateResult;
import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -56,7 +57,7 @@ public class MoveSynonymToAnotherAcceptedTaxonOperationE4 extends
conversationEnabled.getConversationHolder().commit();
try {
- CdmStore.getService(ITaxonService.class).moveSynonymToAnotherTaxon(synonym,
+ UpdateResult result = CdmStore.getService(ITaxonService.class).moveSynonymToAnotherTaxon(synonym,
this.element.getUuid(),
true,
synonym.getType(),
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/CreateConceptRelationHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/CreateConceptRelationHandlerE4.java
index 52040d7f3..2a7975924 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/CreateConceptRelationHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/CreateConceptRelationHandlerE4.java
@@ -80,7 +80,8 @@ public class CreateConceptRelationHandlerE4 {
// undoContext = bulkEditor.getUndoContext();
// }
- Taxon relatedConcept = TaxonBaseSelectionDialog.selectTaxon(shell, conversationHolder, taxon);
+ Taxon relatedConcept = TaxonBaseSelectionDialog.selectTaxon(shell, //conversationHolder,
+ taxon);
if(relatedConcept == null){
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/AddExistingMediaHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/AddExistingMediaHandler.java
index 04a2cc239..deecef605 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/AddExistingMediaHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/AddExistingMediaHandler.java
@@ -31,7 +31,8 @@ public class AddExistingMediaHandler extends AbstractAddDerivativeHandler{
protected DerivedUnit createDerivative() {
MediaSpecimen mediaSpecimen = null;
//select media
- Media media = MediaSelectionDialog.select(AbstractUtility.getShell(), null, null);
+ Media media = MediaSelectionDialog.select(AbstractUtility.getShell(), //null,
+ null);
if(media!=null){
//create MediaSpecimen
mediaSpecimen = MediaSpecimen.NewInstance(SpecimenOrObservationType.StillImage);
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
index cc173c77b..cb761f5e9 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
@@ -120,7 +120,8 @@ public class DerivateSearchCompositeController implements Listener{
searchDerivates();
}
else if(eventSource==derivateSearchComposite.getBtnBrowseTaxa()){
- selectedTaxon = SelectionDialogFactory.getSelectionFromDialog(Taxon.class, this.derivateSearchComposite.getShell(), derivativeEditor.getConversationHolder(), null);
+ selectedTaxon = SelectionDialogFactory.getSelectionFromDialog(Taxon.class, this.derivateSearchComposite.getShell(), //derivativeEditor.getConversationHolder(),
+ null);
if(selectedTaxon!=null){
derivateSearchComposite.getTextTaxonName().setText(selectedTaxon.getTitleCache());
}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
index bacb86cb9..05a509197 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
@@ -121,7 +121,7 @@ public class MoveDescriptionElementsHandlerE4 implements IPostOperationEnabled{
}
}
TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(shell,
- editor.getConversationHolder(),
+// editor.getConversationHolder(),
Messages.MoveDescriptionElementsHandler_CHOOSE_ACC_TAXON,
excludeTaxa,
null, classification
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
index a8f1ae0bf..7807c6fd9 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
@@ -109,7 +109,7 @@ public class MoveDescriptionToOtherTaxonHandlerE4 implements IPostOperationEnabl
classification = node.getClassification();
}
TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(shell,
- editor.getConversationHolder(),
+// editor.getConversationHolder(),
Messages.MoveDescriptionToOtherTaxonHandler_CHOOSE_ACC_TAXON,
excludeTaxa,
node,
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddExistingMediaHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddExistingMediaHandler.java
index 26ac3a8fd..f67aa4ad1 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddExistingMediaHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddExistingMediaHandler.java
@@ -31,7 +31,8 @@ public class AddExistingMediaHandler {
if(description != null){
AbstractPostOperation operation = null;
//select media
- Media media = MediaSelectionDialog.select(AbstractUtility.getShell(), null, null);
+ Media media = MediaSelectionDialog.select(AbstractUtility.getShell(),// null,
+ null);
if(media!=null){
// TODO use undo context specific to editor
operation = new AddExistingMediaToImageGalleryOperation(media, menuItem.getLocalizedLabel(),
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/CharacterEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/CharacterEditor.java
index a03c87666..e0c094f7c 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/CharacterEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/CharacterEditor.java
@@ -337,7 +337,8 @@ public class CharacterEditor
@Override
public void widgetSelected(SelectionEvent e) {
- FeatureTree tree = FeatureTreeSelectionDialog.select(featureTreeEditorComposite.getDisplay().getActiveShell(), conversation, null);
+ FeatureTree tree = FeatureTreeSelectionDialog.select(featureTreeEditorComposite.getDisplay().getActiveShell(), //conversation,
+ null);
if(tree!=null){
featureTreeEditorComposite.setSelectedTree(tree, CharacterEditor.this);
featureTreeEditorComposite.getText_title().setEnabled(false);
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/ChangeAcceptedTaxonToSynonymHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/ChangeAcceptedTaxonToSynonymHandlerE4.java
index 8a985899b..6cba7e7b6 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/ChangeAcceptedTaxonToSynonymHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/ChangeAcceptedTaxonToSynonymHandlerE4.java
@@ -87,7 +87,7 @@ public class ChangeAcceptedTaxonToSynonymHandlerE4 extends DeleteHandlerE4 imple
List excludeTaxa = new ArrayList();
excludeTaxa.add(((TaxonNode)oldAcceptedTaxonNode).getTaxon().getUuid());
TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(shell,
- taxonNavigator.getConversationHolder(),
+// taxonNavigator.getConversationHolder(),
Messages.ChangeAcceptedTaxonToSynonymHandler_CHOOSE_TAXON,
excludeTaxa,
null,
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveFactualDataHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveFactualDataHandlerE4.java
index a95e721e4..99ff6712f 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveFactualDataHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveFactualDataHandlerE4.java
@@ -54,7 +54,7 @@ public class MoveFactualDataHandlerE4 {
List excludeTaxa = new ArrayList();
excludeTaxa.add(taxon.getUuid());
TaxonNode dialogTaxonNode = TaxonNodeSelectionDialog.select(shell,
- taxonNavigator.getConversationHolder(),
+// taxonNavigator.getConversationHolder(),
Messages.MoveFactualDataHandler_CHOOSE_TAXON,
excludeTaxa,
sourceTaxonNode,
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveTaxonHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveTaxonHandlerE4.java
index ac02c7643..28ebd359a 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveTaxonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveTaxonHandlerE4.java
@@ -87,9 +87,11 @@ public class MoveTaxonHandlerE4 implements IPostOperationEnabled {
if(!MessageDialog.openQuestion(null, Messages.MoveTaxonHandler_TARGET_NODE, Messages.MoveTaxonHandler_TARGET_NODE_MESSAGE)){
moveToNewParent = MovingType.BEHIND;
}
- parentTaxonNode = TaxonNodeSelectionDialog.select(shell, taxonNavigator.getConversationHolder(), Messages.MoveTaxonHandler_CHOOSE_ABOVE, excludeTaxa, null, classification);
+ parentTaxonNode = TaxonNodeSelectionDialog.select(shell, //taxonNavigator.getConversationHolder(),
+ Messages.MoveTaxonHandler_CHOOSE_ABOVE, excludeTaxa, null, classification);
}else{
- parentTaxonNode = TaxonNodeSelectionDialog.select(shell, taxonNavigator.getConversationHolder(), Messages.MoveTaxonHandler_CHOOSE_PARENT, excludeTaxa, null, classification);
+ parentTaxonNode = TaxonNodeSelectionDialog.select(shell, //taxonNavigator.getConversationHolder(),
+ Messages.MoveTaxonHandler_CHOOSE_PARENT, excludeTaxa, null, classification);
}
if(parentTaxonNode != null){
if(NavigationUtil.isDirty(parentTaxonNode, partService)){
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingChangeAcceptedTaxonToSynonymHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingChangeAcceptedTaxonToSynonymHandlerE4.java
index 9831b0b37..a6ecb3dc0 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingChangeAcceptedTaxonToSynonymHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingChangeAcceptedTaxonToSynonymHandlerE4.java
@@ -20,7 +20,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.navigation.l10n.Messages;
@@ -99,7 +98,7 @@ public class RemotingChangeAcceptedTaxonToSynonymHandlerE4 extends RemotingCdmHa
List excludeTaxa = new ArrayList();
excludeTaxa.add(oldTaxonNode.getTaxon().getUuid());
TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(shell,
- new ConversationHolderMock(),
+// new ConversationHolderMock(),
Messages.RemotingChangeAcceptedTaxonToSynonymHandler_CHOOSE_TAXON,
excludeTaxa,
oldTaxonNode,
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveFactualDataHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveFactualDataHandlerE4.java
index c04b7a079..897da4799 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveFactualDataHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveFactualDataHandlerE4.java
@@ -26,7 +26,6 @@ import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
@@ -89,7 +88,7 @@ public class RemotingMoveFactualDataHandlerE4 extends RemotingCdmHandlerE4 {
excludeTaxa.add(sourceTaxonNode.getTaxon().getUuid());
targetTaxonNode = TaxonNodeSelectionDialog.select(shell,
- new ConversationHolderMock(),
+// new ConversationHolderMock(),
Messages.RemotingMoveFactualDataHandler_CHOOSE_TAXA,
excludeTaxa,
sourceTaxonNode,
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveTaxonNodeHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveTaxonNodeHandlerE4.java
index a20ce56ee..bd5b81aa6 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveTaxonNodeHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveTaxonNodeHandlerE4.java
@@ -26,7 +26,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
import eu.etaxonomy.taxeditor.navigation.l10n.Messages;
@@ -96,7 +95,7 @@ public class RemotingMoveTaxonNodeHandlerE4 extends RemotingCdmHandlerE4 {
parentTaxonNode = TaxonNodeSelectionDialog.select(shell,
- new ConversationHolderMock(),
+// new ConversationHolderMock(),
Messages.RemotingMoveTaxonNodeHandler_CHOOSE_TAXON,
excludeTaxa,
null,
@@ -112,7 +111,7 @@ public class RemotingMoveTaxonNodeHandlerE4 extends RemotingCdmHandlerE4 {
}
} else {
parentTaxonNode = TaxonNodeSelectionDialog.select(shell,
- new ConversationHolderMock(),
+// new ConversationHolderMock(),
Messages.RemotingMoveTaxonNodeHandler_CHOOSE_PARENT,
excludeTaxa,
oldTaxonNode,
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java
index 3a3875357..d5fe1104e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java
@@ -115,7 +115,8 @@ public class FeatureTreeEditor implements ICdmEntitySessionEnabled, ModifyListen
}
}
- FeatureTree tree = FeatureTreeSelectionDialog.select(composite.getDisplay().getActiveShell(), conversation, null);
+ FeatureTree tree = FeatureTreeSelectionDialog.select(composite.getDisplay().getActiveShell(), //conversation,
+ null);
if (tree != null) {
composite.setSelectedTree(tree, FeatureTreeEditor.this);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileAndChooseVocIdWizardPageE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileAndChooseVocIdWizardPageE4.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/distribution/ExcelDistributionUpdateWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/distribution/ExcelDistributionUpdateWizardE4.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ris/RISImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ris/RISImportWizardE4.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/cdmlight/CdmLightExportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/cdmlight/CdmLightExportWizardE4.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/CdmLightExportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/CdmLightExportWizard.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelDistributionUpdateWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelDistributionUpdateWizard.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileAndChooseVocIdWizardOage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileAndChooseVocIdWizardOage.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/RISImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/RISImportWizard.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index 888606235..12cc9f9dd 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -315,6 +315,12 @@ public class Messages extends NLS {
public static String SearchDialog_patternLabel;
// public static String SearchDialog_listLabel;
+
+ public static String SelectionViewMenu_SET_FLAG;
+ public static String SelectionViewMenu_selectVocabulary;
+ public static String SelectionViewMenu_4_YES;
+ public static String SelectionViewMenu_NO;
+
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index ef41c89e1..1037441e7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -248,3 +248,8 @@ SetPublishConfiguration_dont_publish=don't publish
SearchDialog_patternLabel=Use * for wildcard, or ? to see all entries
SearchDialog_listLabel=&Matching items:
+
+SelectionViewMenu_selectVocabulary=choose vocabulary
+SelectionViewMenu_SET_FLAG='%s' set flag
+SelectionViewMenu_4_YES=Yes
+SelectionViewMenu_NO=No
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
index 317d4b33a..b0c54c611 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
@@ -250,3 +250,8 @@ SetPublishConfiguration_dont_publish=nicht ver
SearchDialog_patternLabel=Nutze * als für eine beliebige Zeichenkette, oder ? um alle Einträge zu sehen
SearchDialog_listLabel=&Passende Objekte:
+
+SelectionViewMenu_selectVocabulary=Vokabular wählen
+SelectionViewMenu_SET_FLAG='%s' flag setzen
+SelectionViewMenu_4_YES=Ja
+SelectionViewMenu_NO=Nein
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
index b39a7f7ab..abb9bf1ad 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
@@ -58,6 +58,7 @@ import org.eclipse.ui.progress.IProgressConstants;
import eu.etaxonomy.cdm.api.application.CdmApplicationState;
import eu.etaxonomy.cdm.api.service.IProgressMonitorService;
+import eu.etaxonomy.cdm.api.service.UpdateResult;
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
import eu.etaxonomy.cdm.io.common.ExportDataWrapper;
import eu.etaxonomy.cdm.io.common.ExportResult;
@@ -713,7 +714,11 @@ public abstract class AbstractUtility {
final StringBuilder reportSb = new StringBuilder();
// collect reports
// for(String report : remotingMonitor.getResult()) {
+ if (remotingMonitor.getResult() instanceof ExportResult) {
reportSb.append(((ExportResult)remotingMonitor.getResult()).createReport());
+ }else if (remotingMonitor.getResult() instanceof UpdateResult){
+ reportSb.append(((UpdateResult)remotingMonitor.getResult()).getExceptions().toString());
+ }
// }
if(!StringUtils.isBlank(reportSb.toString())) {
Display.getDefault().asyncExec(new Runnable() {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/CloneClassificationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/CloneClassificationDetailElement.java
index 66048af5e..1ee4b5baf 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/CloneClassificationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/CloneClassificationDetailElement.java
@@ -39,7 +39,8 @@ AbstractCdmDetailElement{
protected void createControls(ICdmFormElement formElement, Classification entity, int style) {
txtClassificationName = formFactory.createTextWithLabelElement(formElement, "Classification name", null, style);
comboRelationType = formFactory.createDefinedTermComboElement(TermType.TaxonRelationshipType, formElement, "Taxon relation", null, style);
- selectReference = formFactory.createSelectionElement(Reference.class, getConversationHolder(), formElement, "Reference", null, EntitySelectionElement.SELECTABLE, style);
+ selectReference = formFactory.createSelectionElement(Reference.class, //getConversationHolder(),
+ formElement, "Reference", null, EntitySelectionElement.SELECTABLE, style);
}
@Override
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
index e25e4713c..9fb0f13f4 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
@@ -38,7 +38,6 @@ import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
@@ -83,7 +82,8 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog a T object.
*/
- protected AbstractFilteredCdmResourceSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, String settings, T cdmObject) {
+ protected AbstractFilteredCdmResourceSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title, boolean multi, String settings, T cdmObject) {
super(shell, multi);
setShellStyle(SWT.DIALOG_TRIM);
setTitle(title);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredIdentifierSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredIdentifierSelectionDialog.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AgentSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AgentSelectionDialog.java
index 142c82ed6..691e909f0 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AgentSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AgentSelectionDialog.java
@@ -18,7 +18,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IAgentService;
import eu.etaxonomy.cdm.model.agent.AgentBase;
import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
@@ -57,8 +56,9 @@ public class AgentSelectionDialog extends
* @param entity a {@link eu.etaxonomy.cdm.model.agent.AgentBase} object.
* @return a {@link eu.etaxonomy.cdm.model.agent.AgentBase} object.
*/
- public static AgentBase select(Shell shell, ConversationHolder conversation, AgentBase entity, boolean selectTeamMember) {
- AgentSelectionDialog dialog = new AgentSelectionDialog(shell, conversation,
+ public static AgentBase select(Shell shell, //ConversationHolder conversation,
+ AgentBase entity, boolean selectTeamMember) {
+ AgentSelectionDialog dialog = new AgentSelectionDialog(shell, //conversation,
"Choose Agent", false, AgentSelectionDialog.class.getCanonicalName(), entity, selectTeamMember);
return getSelectionFromDialog(dialog);
}
@@ -73,8 +73,10 @@ public class AgentSelectionDialog extends
* @param multi a boolean.
* @param settings a {@link java.lang.String} object.
*/
- protected AgentSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, String settings, AgentBase agent, boolean selectTeamMember) {
- super(shell, conversation, title, multi, settings, agent);
+ protected AgentSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title, boolean multi, String settings, AgentBase agent, boolean selectTeamMember) {
+ super(shell, //conversation,
+ title, multi, settings, agent);
this.selectTeamMember = selectTeamMember;
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
index d43fbe1a9..15ffd1fe8 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
@@ -12,7 +12,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.molecular.IAmplificationService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.molecular.Amplification;
@@ -29,8 +28,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
public class AmplificationSelectionDialog extends
AbstractFilteredCdmResourceSelectionDialog {
- public static Amplification select(Shell shell, ConversationHolder conversation, Amplification amplification){
- AmplificationSelectionDialog dialog = new AmplificationSelectionDialog(shell, conversation,
+ public static Amplification select(Shell shell, //ConversationHolder conversation,
+ Amplification amplification){
+ AmplificationSelectionDialog dialog = new AmplificationSelectionDialog(shell, //conversation,
"Choose Amplification", false, AmplificationSelectionDialog.class.getCanonicalName(), amplification);
return getSelectionFromDialog(dialog);
}
@@ -38,9 +38,11 @@ AbstractFilteredCdmResourceSelectionDialog {
/**
* Constructor for FilteredDerivedUnitSelectionDialog.
*/
- protected AmplificationSelectionDialog(Shell shell, ConversationHolder conversation, String title,
+ protected AmplificationSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title,
boolean multi, String settings, Amplification cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ClassificationSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ClassificationSelectionDialog.java
index 86f9b1d63..99a7a2a83 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ClassificationSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ClassificationSelectionDialog.java
@@ -15,7 +15,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
@@ -46,10 +45,10 @@ public class ClassificationSelectionDialog extends
* @param curentSelection
* @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonomicTree} object.
*/
- public static Classification select(Shell shell,
- ConversationHolder conversation, Classification curentSelection) {
- ClassificationSelectionDialog dialog = new ClassificationSelectionDialog(
- shell, conversation, "Choose a Classification", false, "", null);
+ public static Classification select(Shell shell,//ConversationHolder conversation,
+ Classification curentSelection) {
+ ClassificationSelectionDialog dialog = new ClassificationSelectionDialog(shell, //conversation,
+ "Choose a Classification", false, "", null);
return getSelectionFromDialog(dialog);
}
@@ -72,10 +71,11 @@ public class ClassificationSelectionDialog extends
* @param classification
* a {@link eu.etaxonomy.cdm.model.taxon.TaxonomicTree} object.
*/
- protected ClassificationSelectionDialog(Shell shell,
- ConversationHolder conversation, String title, boolean multi,
+ protected ClassificationSelectionDialog(Shell shell,//ConversationHolder conversation,
+ String title, boolean multi,
String settings, Classification classification) {
- super(shell, conversation, title, multi, settings, classification);
+ super(shell, //conversation,
+ title, multi, settings, classification);
}
// /*
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectionSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectionSelectionDialog.java
index 8d0a345b5..2ed9b3bee 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectionSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectionSelectionDialog.java
@@ -11,9 +11,11 @@ package eu.etaxonomy.taxeditor.ui.dialog.selection;
import java.util.UUID;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.ICollectionService;
import eu.etaxonomy.cdm.model.occurrence.Collection;
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
@@ -38,8 +40,9 @@ public class CollectionSelectionDialog extends
* @param collection a {@link eu.etaxonomy.cdm.model.occurrence.Collection} object.
* @return a {@link eu.etaxonomy.cdm.model.occurrence.Collection} object.
*/
- public static Collection select(Shell shell, ConversationHolder conversation, Collection collection){
- CollectionSelectionDialog dialog = new CollectionSelectionDialog(shell, conversation,
+ public static Collection select(Shell shell, //ConversationHolder conversation,
+ Collection collection){
+ CollectionSelectionDialog dialog = new CollectionSelectionDialog(shell, //conversation,
"Choose Collection", false, CollectionSelectionDialog.class.getCanonicalName(), collection);
return getSelectionFromDialog(dialog);
}
@@ -54,10 +57,11 @@ public class CollectionSelectionDialog extends
* @param settings a {@link java.lang.String} object.
* @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.Collection} object.
*/
- protected CollectionSelectionDialog(Shell shell,
- ConversationHolder conversation, String title, boolean multi,
+ protected CollectionSelectionDialog(Shell shell,//ConversationHolder conversation,
+ String title, boolean multi,
String settings, Collection cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/* (non-Javadoc)
@@ -75,7 +79,24 @@ public class CollectionSelectionDialog extends
/** {@inheritDoc} */
@Override
protected void search() {
- model = CdmStore.getService(ICollectionService.class).getUuidAndTitleCache(null, null);
+ Control control =getSearchField();
+ String pattern = null;
+ if (control != null){
+ pattern = ((Text)control).getText();
+ }
+
+ if (pattern == null || pattern.equals("?")){
+ model = CdmStore.getService(ICollectionService.class).getUuidAndTitleCache(null, null);
+ }else{
+ model = CdmStore.getService(ICollectionService.class).getUuidAndTitleCache(limitOfInitialElements,pattern);
+ }
+ try {
+ fillContentProvider(null);
+ } catch (CoreException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
}
/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
index 50c358072..4ddd17c94 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
@@ -16,7 +16,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
@@ -44,8 +43,9 @@ public class DerivedUnitSelectionDialog extends
* @param unit a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
* @return a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
*/
- public static DerivedUnit select(Shell shell, ConversationHolder conversation, DerivedUnit unit){
- DerivedUnitSelectionDialog dialog = new DerivedUnitSelectionDialog(shell, conversation,
+ public static DerivedUnit select(Shell shell, //ConversationHolder conversation,
+ DerivedUnit unit){
+ DerivedUnitSelectionDialog dialog = new DerivedUnitSelectionDialog(shell, //conversation,
"Choose Unit", false, DerivedUnitSelectionDialog.class.getCanonicalName(), unit);
return getSelectionFromDialog(dialog);
}
@@ -60,9 +60,11 @@ public class DerivedUnitSelectionDialog extends
* @param settings a {@link java.lang.String} object.
* @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
*/
- protected DerivedUnitSelectionDialog(Shell shell, ConversationHolder conversation, String title,
+ protected DerivedUnitSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title,
boolean multi, String settings, DerivedUnit cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ExtReferenceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ExtReferenceSelectionDialog.java
old mode 100755
new mode 100644
index 0175b320e..ef6aa3a66
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ExtReferenceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ExtReferenceSelectionDialog.java
@@ -18,7 +18,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IReferenceService;
import eu.etaxonomy.cdm.model.agent.Person;
import eu.etaxonomy.cdm.model.agent.Team;
@@ -58,8 +57,9 @@ public class ExtReferenceSelectionDialog extends
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @return a {@link eu.etaxonomy.cdm.model.reference.ReferenceBase} object.
*/
- public static Reference select(Shell shell, ConversationHolder conversation, Reference reference, boolean isInReference) {
- ExtReferenceSelectionDialog dialog = new ExtReferenceSelectionDialog(shell, conversation,
+ public static Reference select(Shell shell, //ConversationHolder conversation,
+ Reference reference, boolean isInReference) {
+ ExtReferenceSelectionDialog dialog = new ExtReferenceSelectionDialog(shell, //conversation,
"Choose a reference", false, reference, isInReference);
return getSelectionFromDialog(dialog);
}
@@ -72,8 +72,9 @@ public class ExtReferenceSelectionDialog extends
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @return a {@link eu.etaxonomy.cdm.model.reference.ReferenceBase} object.
*/
- public static Reference select(Shell shell, ConversationHolder conversation, Reference reference) {
- ExtReferenceSelectionDialog dialog = new ExtReferenceSelectionDialog(shell, conversation,
+ public static Reference select(Shell shell, //ConversationHolder conversation,
+ Reference reference) {
+ ExtReferenceSelectionDialog dialog = new ExtReferenceSelectionDialog(shell, //conversation,
"Choose a reference", false, reference);
return getSelectionFromDialog(dialog);
}
@@ -92,8 +93,10 @@ public class ExtReferenceSelectionDialog extends
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @param multi a boolean.
*/
- protected ExtReferenceSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, Reference reference) {
- super(shell, conversation, title, multi, ExtReferenceSelectionDialog.class.getCanonicalName(), null);
+ protected ExtReferenceSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title, boolean multi, Reference reference) {
+ super(shell, //conversation,
+ title, multi, ExtReferenceSelectionDialog.class.getCanonicalName(), null);
this.currentReference = reference;
// controller = CdmStore.getCurrentApplicationConfiguration();
@@ -117,8 +120,10 @@ public class ExtReferenceSelectionDialog extends
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @param multi a boolean.
*/
- protected ExtReferenceSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, Reference reference, boolean isInReference) {
- super(shell, conversation, title, multi, ExtReferenceSelectionDialog.class.getCanonicalName(), null);
+ protected ExtReferenceSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title, boolean multi, Reference reference, boolean isInReference) {
+ super(shell, //conversation,
+ title, multi, ExtReferenceSelectionDialog.class.getCanonicalName(), null);
this.isInReference = isInReference;
this.currentReference = reference;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java
index d3ff2dca8..5fd62ec44 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java
@@ -15,7 +15,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.ITermService;
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
import eu.etaxonomy.cdm.model.description.Feature;
@@ -31,8 +30,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
public class FeatureSelectionDialog extends
AbstractFilteredCdmResourceSelectionDialog {
- public static Feature select(Shell shell, ConversationHolder conversation, Feature feature){
- FeatureSelectionDialog dialog = new FeatureSelectionDialog(shell, conversation,
+ public static Feature select(Shell shell, //ConversationHolder conversation,
+ Feature feature){
+ FeatureSelectionDialog dialog = new FeatureSelectionDialog(shell, //conversation,
"Choose Feature", false, FeatureSelectionDialog.class.getCanonicalName(), feature);
return getSelectionFromDialog(dialog);
}
@@ -45,10 +45,11 @@ public class FeatureSelectionDialog extends
* @param settings
* @param cdmObject
*/
- protected FeatureSelectionDialog(Shell shell,
- ConversationHolder conversation, String title, boolean multi,
+ protected FeatureSelectionDialog(Shell shell,//ConversationHolder conversation,
+ String title, boolean multi,
String settings, Feature cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell,//conversation,
+ title, multi, settings, cdmObject);
}
@Override
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java
index 643b67792..f032e0e4a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java
@@ -15,7 +15,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
import eu.etaxonomy.cdm.model.description.FeatureTree;
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
@@ -30,16 +29,18 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
public class FeatureTreeSelectionDialog extends
AbstractFilteredCdmResourceSelectionDialog {
- public static FeatureTree select(Shell shell, ConversationHolder conversation, FeatureTree featureTree) {
- FeatureTreeSelectionDialog dialog = new FeatureTreeSelectionDialog(shell, conversation,
+ public static FeatureTree select(Shell shell, //ConversationHolder conversation,
+ FeatureTree featureTree) {
+ FeatureTreeSelectionDialog dialog = new FeatureTreeSelectionDialog(shell, //conversation,
"Choose a feature tree", false, featureTree);
return getSelectionFromDialog(dialog);
}
- protected FeatureTreeSelectionDialog(Shell shell,
- ConversationHolder conversation, String title, boolean multi,
+ protected FeatureTreeSelectionDialog(Shell shell,//ConversationHolder conversation,
+ String title, boolean multi,
FeatureTree cdmObject) {
- super(shell, conversation, title, multi, FeatureTreeSelectionDialog.class.getCanonicalName(), cdmObject);
+ super(shell, //conversation,
+ title, multi, FeatureTreeSelectionDialog.class.getCanonicalName(), cdmObject);
}
/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java
index b0ba469c5..4b4d10a69 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java
@@ -13,7 +13,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
@@ -41,8 +40,9 @@ public class FieldUnitSelectionDialog extends
* @param observation a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object.
* @return a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object.
*/
- public static FieldUnit select(Shell shell, ConversationHolder conversation, FieldUnit observation){
- FieldUnitSelectionDialog dialog = new FieldUnitSelectionDialog(shell, conversation,
+ public static FieldUnit select(Shell shell, //ConversationHolder conversation,
+ FieldUnit observation){
+ FieldUnitSelectionDialog dialog = new FieldUnitSelectionDialog(shell, //conversation,
"Choose Derived Unit", false, FieldUnitSelectionDialog.class.getCanonicalName(), observation);
return getSelectionFromDialog(dialog);
}
@@ -57,10 +57,11 @@ public class FieldUnitSelectionDialog extends
* @param settings a {@link java.lang.String} object.
* @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object.
*/
- protected FieldUnitSelectionDialog(Shell shell, ConversationHolder conversation,
+ protected FieldUnitSelectionDialog(Shell shell, //ConversationHolder conversation,
String title, boolean multi, String settings,
FieldUnit cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FilterDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FilterDialog.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
index 418d9d37c..816a15832 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
@@ -16,7 +16,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
import org.springframework.security.core.GrantedAuthority;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService;
import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
@@ -32,9 +31,10 @@ import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityLabelT
*/
public class GrantedAuthoritySelectionDialog extends AbstractFilteredCdmResourceSelectionDialog {
- public static GrantedAuthority select(Shell shell, ConversationHolder conversation, GrantedAuthorityImpl authority){
+ public static GrantedAuthority select(Shell shell, //ConversationHolder conversation,
+ GrantedAuthorityImpl authority){
- GrantedAuthoritySelectionDialog dialog = new GrantedAuthoritySelectionDialog(shell, conversation,
+ GrantedAuthoritySelectionDialog dialog = new GrantedAuthoritySelectionDialog(shell,//conversation,
"Choose Granted Authority", false, GrantedAuthoritySelectionDialog.class.getCanonicalName(), authority);
return getSelectionFromDialog(dialog);
@@ -48,10 +48,11 @@ public class GrantedAuthoritySelectionDialog extends AbstractFilteredCdmResource
* @param settings
* @param cdmObject
*/
- protected GrantedAuthoritySelectionDialog(Shell shell,
- ConversationHolder conversation, String title, boolean multi,
+ protected GrantedAuthoritySelectionDialog(Shell shell,//ConversationHolder conversation,
+ String title, boolean multi,
String settings, GrantedAuthorityImpl cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java
index 9ad65a941..029aff32c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java
@@ -15,7 +15,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IGroupService;
import eu.etaxonomy.cdm.model.common.Group;
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
@@ -31,8 +30,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
public class GroupSelectionDialog extends
AbstractFilteredCdmResourceSelectionDialog {
- public static Group select(Shell shell, ConversationHolder conversation, Group group){
- GroupSelectionDialog dialog = new GroupSelectionDialog(shell, conversation,
+ public static Group select(Shell shell, //ConversationHolder conversation,
+ Group group){
+ GroupSelectionDialog dialog = new GroupSelectionDialog(shell, //conversation,
"Choose Group", false, GroupSelectionDialog.class.getCanonicalName(), group);
return getSelectionFromDialog(dialog);
}
@@ -45,10 +45,11 @@ public class GroupSelectionDialog extends
* @param settings
* @param cdmObject
*/
- protected GroupSelectionDialog(Shell shell,
- ConversationHolder conversation, String title, boolean multi,
+ protected GroupSelectionDialog(Shell shell,//ConversationHolder conversation,
+ String title, boolean multi,
String settings, Group cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java
index b3ab56ff9..255b37164 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java
@@ -13,7 +13,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IAgentService;
import eu.etaxonomy.cdm.model.agent.AgentBase;
import eu.etaxonomy.cdm.model.agent.Institution;
@@ -29,8 +28,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
public class InstitutionSelectionDialog extends
AbstractFilteredCdmResourceSelectionDialog {
- public static Institution select(Shell shell, ConversationHolder conversation, Institution institution){
- InstitutionSelectionDialog dialog = new InstitutionSelectionDialog(shell, conversation,
+ public static Institution select(Shell shell,// ConversationHolder conversation,
+ Institution institution){
+ InstitutionSelectionDialog dialog = new InstitutionSelectionDialog(shell, //conversation,
"Choose Institution", false, TeamSelectionDialog.class.getCanonicalName(), institution);
return getSelectionFromDialog(dialog);
}
@@ -43,10 +43,11 @@ public class InstitutionSelectionDialog extends
* @param settings
* @param cdmObject
*/
- protected InstitutionSelectionDialog(Shell shell,
- ConversationHolder conversation, String title, boolean multi,
+ protected InstitutionSelectionDialog(Shell shell,//ConversationHolder conversation,
+ String title, boolean multi,
String settings, Institution cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/MediaSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/MediaSelectionDialog.java
index bde77b2ed..5f964b584 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/MediaSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/MediaSelectionDialog.java
@@ -12,7 +12,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IMediaService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.media.Media;
@@ -28,8 +27,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
public class MediaSelectionDialog extends
AbstractFilteredCdmResourceSelectionDialog {
- public static Media select(Shell shell, ConversationHolder conversation, Media media){
- MediaSelectionDialog dialog = new MediaSelectionDialog(shell, conversation,
+ public static Media select(Shell shell, //ConversationHolder conversation,
+ Media media){
+ MediaSelectionDialog dialog = new MediaSelectionDialog(shell, //conversation,
"Choose Media", false, MediaSelectionDialog.class.getCanonicalName(), media);
return getSelectionFromDialog(dialog);
}
@@ -37,9 +37,11 @@ AbstractFilteredCdmResourceSelectionDialog {
/**
* Constructor for FilteredDerivedUnitSelectionDialog.
*/
- protected MediaSelectionDialog(Shell shell, ConversationHolder conversation, String title,
+ protected MediaSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title,
boolean multi, String settings, Media cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NameSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NameSelectionDialog.java
index 92b827885..0463837e7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NameSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NameSelectionDialog.java
@@ -15,7 +15,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.INameService;
import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
@@ -28,14 +27,17 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
*/
public class NameSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog {
- public static TaxonName select(Shell shell, ConversationHolder conversation, TaxonName name) {
- NameSelectionDialog dialog = new NameSelectionDialog(shell, conversation,
+ public static TaxonName select(Shell shell, //ConversationHolder conversation,
+ TaxonName name) {
+ NameSelectionDialog dialog = new NameSelectionDialog(shell, //conversation,
"Choose a name", false, name);
return getSelectionFromDialog(dialog);
}
- protected NameSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonName name) {
- super(shell, conversation, title, multi, NameSelectionDialog.class.getCanonicalName(), name);
+ protected NameSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title, boolean multi, TaxonName name) {
+ super(shell, //conversation,
+ title, multi, NameSelectionDialog.class.getCanonicalName(), name);
}
/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
index d4801afb2..1034781f6 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
@@ -27,7 +27,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.wb.swt.ResourceManager;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.ITermService;
import eu.etaxonomy.cdm.api.service.IVocabularyService;
import eu.etaxonomy.cdm.model.common.CdmBase;
@@ -88,14 +87,17 @@ public class NamedAreaSelectionDialog extends
* @param preselectedVocabularyUuids the {@link UUID}s of the pre-selected vocabularies
* @return a {@link eu.etaxonomy.cdm.model.location.NamedArea} object.
*/
- public static NamedArea select(Shell shell, ConversationHolder conversation, NamedArea namedArea, String preferenceId, UUID... preselectedVocabularyUuids) {
- NamedAreaSelectionDialog dialog = new NamedAreaSelectionDialog(shell, conversation,
+ public static NamedArea select(Shell shell, //ConversationHolder conversation,
+ NamedArea namedArea, String preferenceId, UUID... preselectedVocabularyUuids) {
+ NamedAreaSelectionDialog dialog = new NamedAreaSelectionDialog(shell, //conversation,
"Choose an area", false, namedArea, preferenceId, preselectedVocabularyUuids);
return getSelectionFromDialog(dialog);
}
- protected NamedAreaSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, NamedArea namedArea, Object preferenceId, UUID... preselectedVocabularyUuids) {
- super(shell, conversation, title, multi, NamedAreaSelectionDialog.class.getCanonicalName(), namedArea);
+ protected NamedAreaSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title, boolean multi, NamedArea namedArea, Object preferenceId, UUID... preselectedVocabularyUuids) {
+ super(shell, //conversation,
+ title, multi, NamedAreaSelectionDialog.class.getCanonicalName(), namedArea);
this.preferenceID = preferenceId;
preselectedVocabularies = new ArrayList();
for(int i=0;i {
- public static PolytomousKey select(Shell shell, ConversationHolder conversation, PolytomousKey key){
- PolytomousKeySelectionDialog dialog = new PolytomousKeySelectionDialog(shell, conversation,
+ public static PolytomousKey select(Shell shell, //ConversationHolder conversation,
+ PolytomousKey key){
+ PolytomousKeySelectionDialog dialog = new PolytomousKeySelectionDialog(shell, //conversation,
"Choose Polytomous Key", false, PolytomousKeySelectionDialog.class.getCanonicalName(), key);
return getSelectionFromDialog(dialog);
}
@@ -41,10 +41,11 @@ public class PolytomousKeySelectionDialog extends
* @param settings
* @param cdmObject
*/
- protected PolytomousKeySelectionDialog(Shell shell,
- ConversationHolder conversation, String title, boolean multi,
+ protected PolytomousKeySelectionDialog(Shell shell,//ConversationHolder conversation,
+ String title, boolean multi,
String settings, PolytomousKey cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java
index 3a45434ce..f7d510b38 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java
@@ -12,7 +12,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.molecular.IPrimerService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.molecular.Primer;
@@ -29,8 +28,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
public class PrimerSelectionDialog extends
AbstractFilteredCdmResourceSelectionDialog {
- public static Primer select(Shell shell, ConversationHolder conversation, Primer primer){
- PrimerSelectionDialog dialog = new PrimerSelectionDialog(shell, conversation,
+ public static Primer select(Shell shell, //ConversationHolder conversation,
+ Primer primer){
+ PrimerSelectionDialog dialog = new PrimerSelectionDialog(shell, //conversation,
"Choose Primer", false, PrimerSelectionDialog.class.getCanonicalName(), primer);
return getSelectionFromDialog(dialog);
}
@@ -38,9 +38,11 @@ AbstractFilteredCdmResourceSelectionDialog {
/**
* Constructor for FilteredDerivedUnitSelectionDialog.
*/
- protected PrimerSelectionDialog(Shell shell, ConversationHolder conversation, String title,
+ protected PrimerSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title,
boolean multi, String settings, Primer cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
index 6a592342f..efc56a69d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
@@ -15,7 +15,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IReferenceService;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
@@ -42,8 +41,9 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @return a {@link eu.etaxonomy.cdm.model.reference.ReferenceBase} object.
*/
- public static Reference select(Shell shell, ConversationHolder conversation, Reference reference, boolean isInReference) {
- ReferenceSelectionDialog dialog = new ReferenceSelectionDialog(shell, conversation,
+ public static Reference select(Shell shell, //ConversationHolder conversation,
+ Reference reference, boolean isInReference) {
+ ReferenceSelectionDialog dialog = new ReferenceSelectionDialog(shell, //conversation,
"Choose a reference", false, reference, isInReference);
return getSelectionFromDialog(dialog);
}
@@ -56,8 +56,9 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @return a {@link eu.etaxonomy.cdm.model.reference.ReferenceBase} object.
*/
- public static Reference select(Shell shell, ConversationHolder conversation, Reference reference) {
- ReferenceSelectionDialog dialog = new ReferenceSelectionDialog(shell, conversation,
+ public static Reference select(Shell shell, //ConversationHolder conversation,
+ Reference reference) {
+ ReferenceSelectionDialog dialog = new ReferenceSelectionDialog(shell, //conversation,
"Choose a reference", false, reference);
return getSelectionFromDialog(dialog);
}
@@ -73,8 +74,10 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @param multi a boolean.
*/
- protected ReferenceSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, Reference reference) {
- super(shell, conversation, title, multi, ReferenceSelectionDialog.class.getCanonicalName(), null);
+ protected ReferenceSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title, boolean multi, Reference reference) {
+ super(shell, //conversation,
+ title, multi, ReferenceSelectionDialog.class.getCanonicalName(), null);
this.currentReference = reference;
@@ -92,8 +95,10 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @param multi a boolean.
*/
- protected ReferenceSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, Reference reference, boolean isInReference) {
- super(shell, conversation, title, multi, ReferenceSelectionDialog.class.getCanonicalName(), null);
+ protected ReferenceSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title, boolean multi, Reference reference, boolean isInReference) {
+ super(shell, //conversation,
+ title, multi, ReferenceSelectionDialog.class.getCanonicalName(), null);
this.isInReference = isInReference;
this.currentReference = reference;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/RightsSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/RightsSelectionDialog.java
old mode 100755
new mode 100644
index 65572cabe..0599c5bc8
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/RightsSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/RightsSelectionDialog.java
@@ -14,7 +14,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IRightsService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.media.Rights;
@@ -30,8 +29,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
public class RightsSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog {
- public static Rights select(Shell shell, ConversationHolder conversation, Rights rights){
- RightsSelectionDialog dialog = new RightsSelectionDialog(shell, conversation,
+ public static Rights select(Shell shell, //ConversationHolder conversation,
+ Rights rights){
+ RightsSelectionDialog dialog = new RightsSelectionDialog(shell, //conversation,
"Choose Rights", false, RightsSelectionDialog.class.getCanonicalName(), rights);
return getSelectionFromDialog(dialog);
}
@@ -39,9 +39,11 @@ public class RightsSelectionDialog extends AbstractFilteredCdmResourceSelectionD
/**
* Constructor for FilteredDerivedUnitSelectionDialog.
*/
- protected RightsSelectionDialog(Shell shell, ConversationHolder conversation, String title,
+ protected RightsSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title,
boolean multi, String settings, Rights rights) {
- super(shell, conversation, title, multi, settings, rights);
+ super(shell, //conversation,
+ title, multi, settings, rights);
}
/**
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SearchDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SearchDialog.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
index 93fc8e292..23dfb3d67 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
@@ -10,7 +10,6 @@ package eu.etaxonomy.taxeditor.ui.dialog.selection;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
import eu.etaxonomy.cdm.model.agent.AgentBase;
import eu.etaxonomy.cdm.model.agent.Institution;
@@ -57,63 +56,81 @@ import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceDetailElement;
*/
public class SelectionDialogFactory {
- public static T getSelectionFromDialog(Class clazz, Shell shell, ConversationHolder conversation, T currentSelection){
- return getSelectionFromDialog(clazz, shell, conversation, currentSelection, null);
+ public static T getSelectionFromDialog(Class clazz, Shell shell, //ConversationHolder conversation,
+ T currentSelection){
+ return getSelectionFromDialog(clazz, shell, //conversation,
+ currentSelection, null);
}
- public static T getSelectionFromDialog(Class clazz, Shell shell, ConversationHolder conversation, T currentSelection, ICdmFormElement parentElement){
+ public static T getSelectionFromDialog(Class clazz, Shell shell, //ConversationHolder conversation,
+ T currentSelection, ICdmFormElement parentElement){
if(clazz.equals(Taxon.class)){
- return (T) TaxonBaseSelectionDialog.selectTaxon(shell, conversation, (Taxon) currentSelection);
+ return (T) TaxonBaseSelectionDialog.selectTaxon(shell, //conversation,
+ (Taxon) currentSelection);
}
if(clazz.equals(Synonym.class)){
- return (T) TaxonBaseSelectionDialog.selectSynonym(shell, conversation);
+ return (T) TaxonBaseSelectionDialog.selectSynonym(shell );//,conversation);
}
if(clazz.equals(TaxonBase.class)){
- return (T) TaxonBaseSelectionDialog.selectTaxonBase(shell, conversation);
+ return (T) TaxonBaseSelectionDialog.selectTaxonBase(shell);//, conversation);
}
if(clazz.equals(Classification.class)){
- return (T) ClassificationSelectionDialog.select(shell, conversation, (Classification) currentSelection);
+ return (T) ClassificationSelectionDialog.select(shell, //conversation,
+ (Classification) currentSelection);
}
if(clazz.equals(TaxonNode.class)){
- return (T) TaxonNodeSelectionDialog.select(shell, conversation, null, null, (TaxonNode) currentSelection, ((TaxonNode) currentSelection).getClassification());
+ return (T) TaxonNodeSelectionDialog.select(shell, //conversation,
+ null, null, (TaxonNode) currentSelection, ((TaxonNode) currentSelection).getClassification());
}
if(clazz.equals(Reference.class) && parentElement instanceof NomenclaturalReferenceDetailElement){
- return (T) NomenclaturalReferenceSelectionDialog.select(shell, conversation, (Reference) currentSelection, ((NomenclaturalReferenceDetailElement)parentElement).getEntity().getCombinationAuthorship());
+ return (T) NomenclaturalReferenceSelectionDialog.select(shell, //conversation,
+ (Reference) currentSelection, ((NomenclaturalReferenceDetailElement)parentElement).getEntity().getCombinationAuthorship());
}
if(clazz.equals(Reference.class)){
if (parentElement instanceof ReferenceDetailElement){
- return (T) ReferenceSelectionDialog.select(shell, conversation, ((ReferenceDetailElement) parentElement).getEntity(), true);
+ return (T) ReferenceSelectionDialog.select(shell, //conversation,
+ ((ReferenceDetailElement) parentElement).getEntity(), true);
}
- return (T) ReferenceSelectionDialog.select(shell, conversation, (Reference) currentSelection);
+ return (T) ReferenceSelectionDialog.select(shell, //conversation,
+ (Reference) currentSelection);
}
if(clazz.equals(TaxonName.class)){
- return (T) NameSelectionDialog.select(shell, conversation, (TaxonName) currentSelection);
+ return (T) NameSelectionDialog.select(shell, //conversation,
+ (TaxonName) currentSelection);
}
if(clazz.equals(Team.class)){
- return (T) TeamSelectionDialog.select(shell, conversation, (Team) currentSelection);
+ return (T) TeamSelectionDialog.select(shell, //conversation,
+ (Team) currentSelection);
}
if(clazz.equals(TeamOrPersonBase.class) && parentElement instanceof AuthorshipDetailElement){
- return (T) NomenclaturalAuthorSelectionDialog.select(shell, conversation, (AgentBase) currentSelection, false);
+ return (T) NomenclaturalAuthorSelectionDialog.select(shell, //conversation,
+ (AgentBase) currentSelection, false);
}else if(clazz.equals(TeamOrPersonBase.class)){
//TODO: add TeamOrPersonBaseSelectionDialog (see ticket #4545)
- return (T) AgentSelectionDialog.select(shell, conversation, (AgentBase) currentSelection, false);
+ return (T) AgentSelectionDialog.select(shell, //conversation,
+ (AgentBase) currentSelection, false);
}
if(clazz.equals(Person.class) && parentElement instanceof TeamMemberElement){
- return (T) NomenclaturalPersonAuthorSelectionDialog.select(shell, conversation, (AgentBase) currentSelection, true);
+ return (T) NomenclaturalPersonAuthorSelectionDialog.select(shell, //conversation,
+ (AgentBase) currentSelection, true);
}
if(clazz.equals(AgentBase.class)){
- return (T) AgentSelectionDialog.select(shell, conversation, (AgentBase) currentSelection, false);
+ return (T) AgentSelectionDialog.select(shell, //conversation,
+ (AgentBase) currentSelection, false);
}
if(clazz.equals(Feature.class)){
- return (T) FeatureSelectionDialog.select(shell, conversation, (Feature) currentSelection);
+ return (T) FeatureSelectionDialog.select(shell, //conversation,
+ (Feature) currentSelection);
}
if(clazz.equals(FeatureTree.class)){
- return (T) FeatureTreeSelectionDialog.select(shell, conversation, (FeatureTree) currentSelection);
+ return (T) FeatureTreeSelectionDialog.select(shell, //conversation,
+ (FeatureTree) currentSelection);
}
if(clazz.equals(PolytomousKey.class)){
- return (T) PolytomousKeySelectionDialog.select(shell, conversation, (PolytomousKey) currentSelection);
+ return (T) PolytomousKeySelectionDialog.select(shell, //conversation,
+ (PolytomousKey) currentSelection);
}
if(clazz.equals(PolytomousKeyNode.class)){
MessagingUtils.warningDialog("Not implemented yet", SelectionDialogFactory.class,
@@ -121,58 +138,75 @@ public class SelectionDialogFactory {
return null;
}
if(clazz.equals(DerivedUnit.class)){
- return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnit) currentSelection);
+ return (T) DerivedUnitSelectionDialog.select(shell, //conversation,
+ (DerivedUnit) currentSelection);
}
if(clazz.equals(FieldUnit.class)){
- return (T) FieldUnitSelectionDialog.select(shell, conversation, (FieldUnit) currentSelection);
+ return (T) FieldUnitSelectionDialog.select(shell, //conversation,
+ (FieldUnit) currentSelection);
}
if(clazz.equals(SpecimenOrObservationBase.class)){
- return (T) SpecimenOrObservationBaseSelectionDialog.select(shell, conversation, (SpecimenOrObservationBase) currentSelection);
+ return (T) SpecimenOrObservationBaseSelectionDialog.select(shell, //conversation,
+ (SpecimenOrObservationBase) currentSelection);
}
if(clazz.equals(NamedArea.class)){
if(parentElement instanceof IEntityElement && ((IEntityElement) parentElement).getEntity() instanceof DerivedUnitFacade){
- return (T) NamedAreaSelectionDialog.select(shell, conversation, (NamedArea) currentSelection, DerivedUnit.class.getCanonicalName(), Country.uuidCountryVocabulary);
+ return (T) NamedAreaSelectionDialog.select(shell, //conversation,
+ (NamedArea) currentSelection, DerivedUnit.class.getCanonicalName(), Country.uuidCountryVocabulary);
}
else{
- return (T) NamedAreaSelectionDialog.select(shell, conversation, (NamedArea) currentSelection, parentElement.getClass().getCanonicalName());
+ return (T) NamedAreaSelectionDialog.select(shell, //conversation,
+ (NamedArea) currentSelection, parentElement.getClass().getCanonicalName());
}
}
if(clazz.equals(Collection.class)){
- return (T) CollectionSelectionDialog.select(shell, conversation, (Collection) currentSelection);
+ return (T) CollectionSelectionDialog.select(shell, //conversation,
+ (Collection) currentSelection);
}
if(clazz.equals(User.class)){
- return (T) UserSelectionDialog.select(shell, conversation, (User) currentSelection);
+ return (T) UserSelectionDialog.select(shell, //conversation,
+ (User) currentSelection);
}
if(clazz.equals(GrantedAuthorityImpl.class)){
- return (T) GrantedAuthoritySelectionDialog.select(shell, conversation, (GrantedAuthorityImpl) currentSelection);
+ return (T) GrantedAuthoritySelectionDialog.select(shell, //conversation,
+ (GrantedAuthorityImpl) currentSelection);
}
if (clazz.equals(Person.class)){
- return (T) PersonSelectionDialog.select(shell, conversation, (Person) currentSelection);
+ return (T) PersonSelectionDialog.select(shell, //conversation,
+ (Person) currentSelection);
}
if(clazz.equals(Group.class)){
- return (T) GroupSelectionDialog.select(shell, conversation, (Group) currentSelection);
+ return (T) GroupSelectionDialog.select(shell, //conversation,
+ (Group) currentSelection);
}
if(clazz.equals(Institution.class)){
- return (T) InstitutionSelectionDialog.select(shell, conversation, (Institution) currentSelection);
+ return (T) InstitutionSelectionDialog.select(shell, //conversation,
+ (Institution) currentSelection);
}
if(clazz.equals(Primer.class)){
- return (T) PrimerSelectionDialog.select(shell, conversation, (Primer) currentSelection);
+ return (T) PrimerSelectionDialog.select(shell, //conversation,
+ (Primer) currentSelection);
}
if(clazz.equals(Amplification.class)){
- return (T) AmplificationSelectionDialog.select(shell, conversation, (Amplification) currentSelection);
+ return (T) AmplificationSelectionDialog.select(shell, //conversation,
+ (Amplification) currentSelection);
}
if(clazz.equals(Media.class)){
- return (T) MediaSelectionDialog.select(shell, conversation, (Media) currentSelection);
+ return (T) MediaSelectionDialog.select(shell, //conversation,
+ (Media) currentSelection);
}
if(clazz.equals(Rights.class)){
- return (T) RightsSelectionDialog.select(shell, conversation, (Rights) currentSelection);
+ return (T) RightsSelectionDialog.select(shell, //conversation,
+ (Rights) currentSelection);
}
return null;
}
- public static T getSelectionFromExtDialog(Class clazz, Shell shell, ConversationHolder conversation, ICdmFormElement parentElement){
- return (T) ExtReferenceSelectionDialog.select(shell, conversation, null);
+ public static T getSelectionFromExtDialog(Class clazz, Shell shell, //ConversationHolder conversation,
+ ICdmFormElement parentElement){
+ return (T) ExtReferenceSelectionDialog.select(shell, //conversation,
+ null);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationBaseSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationBaseSelectionDialog.java
index 304d0f638..e4b4d8064 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationBaseSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationBaseSelectionDialog.java
@@ -16,7 +16,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
@@ -30,16 +29,18 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
public class SpecimenOrObservationBaseSelectionDialog extends
AbstractFilteredCdmResourceSelectionDialog {
- public static SpecimenOrObservationBase select(Shell shell, ConversationHolder conversation, SpecimenOrObservationBase observation){
- SpecimenOrObservationBaseSelectionDialog dialog = new SpecimenOrObservationBaseSelectionDialog(shell, conversation,
+ public static SpecimenOrObservationBase select(Shell shell, //ConversationHolder conversation,
+ SpecimenOrObservationBase observation){
+ SpecimenOrObservationBaseSelectionDialog dialog = new SpecimenOrObservationBaseSelectionDialog(shell, //conversation,
"Choose field unit or derived unit", false, SpecimenOrObservationBaseSelectionDialog.class.getCanonicalName(), observation);
return getSelectionFromDialog(dialog);
}
- protected SpecimenOrObservationBaseSelectionDialog(Shell shell, ConversationHolder conversation,
+ protected SpecimenOrObservationBaseSelectionDialog(Shell shell, //ConversationHolder conversation,
String title, boolean multi, String settings,
SpecimenOrObservationBase cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
index 2a3fa60e7..07b09ea04 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
@@ -16,7 +16,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -33,30 +32,33 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
public class TaxonBaseSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog {
- public static TaxonBase selectTaxonBase(Shell shell, ConversationHolder conversation) {
- AbstractFilteredCdmResourceSelectionDialog dialog = new TaxonBaseSelectionDialog(TaxonBase.class, shell, conversation,
+ public static TaxonBase selectTaxonBase(Shell shell){//, ConversationHolder conversation) {
+ AbstractFilteredCdmResourceSelectionDialog dialog = new TaxonBaseSelectionDialog(TaxonBase.class, shell, //conversation,
"Choose a taxon/synonym", false, null, null);
return getSelectionFromDialog(dialog);
}
- public static Taxon selectTaxon(Shell shell, ConversationHolder conversation, Taxon taxonToBeFiltered) {
+ public static Taxon selectTaxon(Shell shell, //ConversationHolder conversation,
+ Taxon taxonToBeFiltered) {
- AbstractFilteredCdmResourceSelectionDialog dialog = new TaxonBaseSelectionDialog(Taxon.class, shell, conversation,
+ AbstractFilteredCdmResourceSelectionDialog dialog = new TaxonBaseSelectionDialog(Taxon.class, shell, //conversation,
"Choose a taxon", false, null, taxonToBeFiltered);
return (Taxon) getSelectionFromDialog(dialog);
}
- public static Synonym selectSynonym(Shell shell, ConversationHolder conversation) {
- AbstractFilteredCdmResourceSelectionDialog dialog = new TaxonBaseSelectionDialog(Synonym.class, shell, conversation,
+ public static Synonym selectSynonym(Shell shell){//, ConversationHolder conversation) {
+ AbstractFilteredCdmResourceSelectionDialog dialog = new TaxonBaseSelectionDialog(Synonym.class, shell, //conversation,
"Choose a synonym", false, null, null);
return (Synonym) getSelectionFromDialog(dialog);
}
private final Class extends TaxonBase> clazz;
- protected TaxonBaseSelectionDialog(Class extends TaxonBase> clazz, Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonBase taxon, TaxonBase taxonToBeFiltered) {
- super(shell, conversation, title, multi, TaxonBaseSelectionDialog.class.getCanonicalName(), taxon);
+ protected TaxonBaseSelectionDialog(Class extends TaxonBase> clazz, Shell shell, //ConversationHolder conversation,
+ String title, boolean multi, TaxonBase taxon, TaxonBase taxonToBeFiltered) {
+ super(shell, //conversation,
+ title, multi, TaxonBaseSelectionDialog.class.getCanonicalName(), taxon);
this.cdmBaseToBeFiltered = taxonToBeFiltered;
this.clazz = clazz;
search();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java
index 73e8689d1..db0ac3cd3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java
@@ -22,7 +22,6 @@ import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -35,9 +34,10 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
*/
public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog implements SelectionListener{
- public static TaxonNode select(Shell shell, ConversationHolder conversation, String title, List excludeTaxa, TaxonNode node, Classification classification) {
+ public static TaxonNode select(Shell shell, //ConversationHolder conversation,
+ String title, List excludeTaxa, TaxonNode node, Classification classification) {
TaxonNodeSelectionDialog dialog = new TaxonNodeSelectionDialog(shell,
- conversation,
+ //conversation,
title,
excludeTaxa,
false,
@@ -53,8 +53,10 @@ public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelecti
private Classification selectedClassification;
private final List excludeTaxa;
- protected TaxonNodeSelectionDialog(Shell shell, ConversationHolder conversation, String title, List excludeTaxa, boolean multi, TaxonNode node, Classification classification) {
- super(shell, conversation, title, multi, TaxonNodeSelectionDialog.class.getCanonicalName(), node);
+ protected TaxonNodeSelectionDialog(Shell shell, //ConversationHolder conversation,
+ String title, List excludeTaxa, boolean multi, TaxonNode node, Classification classification) {
+ super(shell, //conversation,
+ title, multi, TaxonNodeSelectionDialog.class.getCanonicalName(), node);
ILabelProvider labelProvider = new FilteredCdmResourceLabelProvider();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionNaturalOrderDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionNaturalOrderDialog.java
index 275a5d56d..b3b872f37 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionNaturalOrderDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionNaturalOrderDialog.java
@@ -5,21 +5,21 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
public class TaxonNodeSelectionNaturalOrderDialog extends
TaxonNodeSelectionDialog {
- protected TaxonNodeSelectionNaturalOrderDialog(Shell shell,
- ConversationHolder conversation, String title,
+ protected TaxonNodeSelectionNaturalOrderDialog(Shell shell,//ConversationHolder conversation,
+ String title,
List excludeTaxa, boolean multi, TaxonNode node,
Classification classification) {
- super(shell, conversation, title, excludeTaxa, multi, node, classification);
+ super(shell, //conversation,
+ title, excludeTaxa, multi, node, classification);
// TODO Auto-generated constructor stub
}
-
-
+
+
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java
index a338b9528..183bc9e07 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java
@@ -13,7 +13,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IAgentService;
import eu.etaxonomy.cdm.model.agent.Team;
import eu.etaxonomy.cdm.model.common.CdmBase;
@@ -39,8 +38,9 @@ public class TeamSelectionDialog extends
* @param team a {@link eu.etaxonomy.cdm.model.agent.Team} object.
* @return a {@link eu.etaxonomy.cdm.model.agent.Team} object.
*/
- public static Team select(Shell shell, ConversationHolder conversation, Team team){
- TeamSelectionDialog dialog = new TeamSelectionDialog(shell, conversation,
+ public static Team select(Shell shell, //ConversationHolder conversation,
+ Team team){
+ TeamSelectionDialog dialog = new TeamSelectionDialog(shell, //conversation,
"Choose Team", false, TeamSelectionDialog.class.getCanonicalName(), team);
return getSelectionFromDialog(dialog);
}
@@ -55,10 +55,11 @@ public class TeamSelectionDialog extends
* @param cdmObject a {@link eu.etaxonomy.cdm.model.agent.Team} object.
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
*/
- protected TeamSelectionDialog(Shell shell, ConversationHolder conversation,
+ protected TeamSelectionDialog(Shell shell, //ConversationHolder conversation,
String title, boolean multi, String settings,
Team cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java
index e19be41f9..159ee61d6 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java
@@ -15,7 +15,6 @@ import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IUserService;
import eu.etaxonomy.cdm.model.common.User;
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
@@ -38,8 +37,9 @@ public class UserSelectionDialog extends
* @param user
* @return
*/
- public static User select(Shell shell, ConversationHolder conversation, User user){
- UserSelectionDialog dialog = new UserSelectionDialog(shell, conversation,
+ public static User select(Shell shell, //ConversationHolder conversation,
+ User user){
+ UserSelectionDialog dialog = new UserSelectionDialog(shell, //conversation,
"Choose User", false, UserSelectionDialog.class.getCanonicalName(), user);
return getSelectionFromDialog(dialog);
}
@@ -52,9 +52,10 @@ public class UserSelectionDialog extends
* @param settings
* @param cdmObject
*/
- protected UserSelectionDialog(Shell shell, ConversationHolder conversation,
+ protected UserSelectionDialog(Shell shell, //ConversationHolder conversation,
String title, boolean multi, String settings, User cdmObject) {
- super(shell, conversation, title, multi, settings, cdmObject);
+ super(shell, //conversation,
+ title, multi, settings, cdmObject);
}
/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 55668cb9a..061415706 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -2799,7 +2799,8 @@ public class CdmFormFactory extends FormToolkit {
public EntitySelectionElement createSelectionElement(Class clazz,
ConversationHolder conversation, ICdmFormElement parentElement, String labelString, T selection, int mode,
int style, boolean filterElement) {
- EntitySelectionElement element = new EntitySelectionElement(this, conversation, parentElement, clazz,
+ EntitySelectionElement element = new EntitySelectionElement(this, //conversation,
+ parentElement, clazz,
labelString, selection, mode, style, filterElement);
adapt(element);
parentElement.addElement(element);
@@ -2807,9 +2808,11 @@ public class CdmFormFactory extends FormToolkit {
}
public EntitySelectionElement createSelectionElement(Class clazz,
- ConversationHolder conversation, ICdmFormElement parentElement, String labelString, T selection, int mode,
+// ConversationHolder conversation,
+ ICdmFormElement parentElement, String labelString, T selection, int mode,
int style) {
- EntitySelectionElement element = new EntitySelectionElement(this, conversation, parentElement, clazz,
+ EntitySelectionElement element = new EntitySelectionElement(this, //conversation,
+ parentElement, clazz,
labelString, selection, mode, style);
adapt(element);
parentElement.addElement(element);
@@ -2851,7 +2854,8 @@ public class CdmFormFactory extends FormToolkit {
public EntitySelectionElementWithAbbreviatedTitle createSelectionElementWithAbbreviatedTitle(
Class clazz, ConversationHolder conversation, ICdmFormElement parentElement, String labelString,
T selection, int mode, int style) {
- EntitySelectionElementWithAbbreviatedTitle element = new EntitySelectionElementWithAbbreviatedTitle(this, conversation, parentElement, clazz,
+ EntitySelectionElementWithAbbreviatedTitle element = new EntitySelectionElementWithAbbreviatedTitle(this, //conversation,
+ parentElement, clazz,
labelString, selection, mode, style);
adapt(element);
parentElement.addElement(element);
@@ -2860,7 +2864,8 @@ public class CdmFormFactory extends FormToolkit {
public TaxonNodeSelectionElement createTaxonNodeSelectionElement(ConversationHolder conversation,
ICdmFormElement parentElement, String labelString, TaxonNode selection, int mode, int style) {
- TaxonNodeSelectionElement element = new TaxonNodeSelectionElement(this, conversation, parentElement,
+ TaxonNodeSelectionElement element = new TaxonNodeSelectionElement(this, //conversation,
+ parentElement,
labelString, selection, mode, style);
adapt(element);
parentElement.addElement(element);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailElement.java
index a9ffb6378..0fb16db17 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailElement.java
@@ -1,8 +1,8 @@
/**
* Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy
+ * European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
- *
+ *
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
@@ -43,7 +43,7 @@ public class InstitutionDetailElement extends
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls
* (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
@@ -52,7 +52,7 @@ public class InstitutionDetailElement extends
protected void createControls(ICdmFormElement formElement,
Institution entity, int style) {
this.setWarnForReferencingObjects(formElement);
-
+
text_name = formFactory.createTextWithLabelElement(formElement, "Name",
entity.getName(), style);
text_code = formFactory.createTextWithLabelElement(formElement, "Code",
@@ -60,15 +60,16 @@ public class InstitutionDetailElement extends
// section_institutionTypes
selection_partOfInstitution = formFactory
.createSelectionElement(Institution.class,
- getConversationHolder(), formElement, "Is Part Of",
+ //getConversationHolder(),
+ formElement, "Is Part Of",
entity.getIsPartOf(),
- EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE | EntitySelectionElement.DELETABLE,
+ EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE | EntitySelectionElement.DELETABLE,
style);
}
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
* .lang.Object)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java
index 0bcaed53a..3d2073e8e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java
@@ -43,7 +43,8 @@ public class TeamMemberElement extends AbstractEntityCollectionElement {
public void createControls(ICdmFormElement element, int style) {
selection_person = formFactory
.createSelectionElement(Person.class,
- getConversationHolder(), this, "Person", null,
+ //getConversationHolder(),
+ this, "Person", null,
EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE,
style);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java
index 96ecc71de..af7e05f28 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java
@@ -79,7 +79,8 @@ public class ClassificationDetailElement extends
protected void createControls(ICdmFormElement formElement,
Classification entity, int style) {
text_treeLabel = formFactory.createTextWithLabelElement(formElement, "Label", entity != null ? entity.getName().getText() : null, SWT.NULL);
- selection_reference = formFactory.createSelectionElement(Reference.class, getConversationHolder(), formElement, "Reference",
+ selection_reference = formFactory.createSelectionElement(Reference.class, //getConversationHolder(),
+ formElement, "Reference",
entity != null ? entity.getReference() : null, EntitySelectionElement.ALL, SWT.NULL);
text_microReference = formFactory.createTextWithLabelElement(formElement, "Reference Detail",
entity != null ? entity.getMicroReference() : null, SWT.NULL);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeAgentRelationCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeAgentRelationCollectionElement.java
index a82f21223..d0d9db187 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeAgentRelationCollectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeAgentRelationCollectionElement.java
@@ -80,12 +80,14 @@ public class TaxonNodeAgentRelationCollectionElement extends AbstractEntityColle
if (entity != null){
selection_toPerson = formFactory
.createSelectionElement(TeamOrPersonBase.class,
- getConversationHolder(), element, "Agent", entity.getAgent(),
+ //getConversationHolder(),
+ element, "Agent", entity.getAgent(),
EntitySelectionElement.ALL, style);
} else{
selection_toPerson = formFactory
.createSelectionElement(TeamOrPersonBase.class,
- getConversationHolder(), element, "Agent", null,
+ //getConversationHolder(),
+ element, "Agent", null,
EntitySelectionElement.ALL, style);
}
label = formFactory.createLabel(element, null);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index bbb79f819..8908fbf4f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@ -15,7 +15,6 @@ import org.eclipse.swt.widgets.Text;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.Classification;
@@ -84,26 +83,27 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement
* DerivedUnitElement class.
*
- *
+ *
* @author n.hoffmann
* @created Sep 16, 2010
* @version 1.0
@@ -37,7 +37,7 @@ public class DerivedUnitElement extends
*
* Constructor for DerivedUnitElement.
*
- *
+ *
* @param formFactory
* a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
* object.
@@ -61,7 +61,7 @@ public class DerivedUnitElement extends
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#createControls
* (eu.etaxonomy.taxeditor.forms.ICdmFormElement, int)
@@ -70,14 +70,15 @@ public class DerivedUnitElement extends
@Override
public void createControls(ICdmFormElement element, int style) {
selection_derivedUnit = formFactory.createSelectionElement(
- DerivedUnit.class, getConversationHolder(), element,
- "Specimen", null, EntitySelectionElement.SELECTABLE | EntitySelectionElement.EDITABLE,
+ DerivedUnit.class, //getConversationHolder(),
+ element, "Specimen", null,
+ EntitySelectionElement.SELECTABLE | EntitySelectionElement.EDITABLE,
style);
}
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent
* (java.lang.Object)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
index a2651e253..53e561771 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
@@ -61,7 +61,8 @@ public class DescribedSpecimenSection extends AbstractEntityCollectionSection
* DescriptionSourceElement class.
*
- *
+ *
* @author n.hoffmann
* @created Mar 18, 2010
* @version 1.0
@@ -36,7 +36,7 @@ public class DescriptionSourceElement extends
*
* Constructor for DescriptionSourceElement.
*
- *
+ *
* @param cdmFormFactory
* a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
* object.
@@ -61,8 +61,8 @@ public class DescriptionSourceElement extends
@Override
public void createControls(ICdmFormElement element, int style) {
selection_descriptionSource = formFactory
- .createSelectionElement(Reference.class,
- getConversationHolder(), element, "Description Source",
+ .createSelectionElement(Reference.class,//getConversationHolder(),
+ element, "Description Source",
null, EntitySelectionElement.ALL, style);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
index 5b65a7261..922a8e28a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
@@ -56,7 +56,7 @@ public class CommonNameDetailElement extends AbstractDetailedDescriptionDetailEl
combo_language = formFactory.createDefinedTermComboElement(TermType.Language, this, "Language", entity.getLanguage(), style);
- selection_namedArea = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(),
+ selection_namedArea = formFactory.createSelectionElement(NamedArea.class, //getConversationHolder(),
formElement, "Area",
entity.getArea(), EntitySelectionElement.NOTHING, style);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
index b19959a32..1c08cbf7a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
@@ -50,7 +50,7 @@ public class DistributionDetailElement extends
@Override
protected void createControls(ICdmFormElement formElement,
Distribution entity, int style) {
- selection_namedArea = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(),
+ selection_namedArea = formFactory.createSelectionElement(NamedArea.class, //getConversationHolder(),
formElement, "Area",
entity.getArea(), EntitySelectionElement.NOTHING, style);
ICdmFormElement parent = this.getParentElement();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
index 536dbafc2..f655b9be1 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
@@ -45,7 +45,8 @@ public class IndividualsAssociationDetailElement extends
IndividualsAssociation entity, int style) {
selection_derivedUnit = formFactory
.createSelectionElement(SpecimenOrObservationBase.class,
- getConversationHolder(), formElement, "Occurrence/Unit",
+ //getConversationHolder(),
+ formElement, "Occurrence/Unit",
CdmBase.deproxy(entity.getAssociatedSpecimenOrObservation(),SpecimenOrObservationBase.class),
EntitySelectionElement.ALL, style);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
old mode 100755
new mode 100644
index 1522e4bc0..bb260e7e5
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
@@ -65,8 +65,8 @@ public class TaxonInteractionDetailElement extends
TaxonInteraction entity, int style) {
taxonSelection = formFactory
- .createSelectionElement(Taxon.class,
- getConversationHolder(), formElement, "Taxon",
+ .createSelectionElement(Taxon.class,//getConversationHolder(),
+ formElement, "Taxon",
CdmBase.deproxy(entity.getTaxon2(),Taxon.class),
EntitySelectionElement.ALL, style);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityCollectionElement.java
index f40a6403d..a5af0d171 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityCollectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityCollectionElement.java
@@ -53,7 +53,8 @@ public class GrantedAuthorityCollectionElement extends AbstractEntityCollectionE
@Override
public void createControls(ICdmFormElement element, int style) {
selection_authority = formFactory.createSelectionElement(
- GrantedAuthorityImpl.class, getConversationHolder(), element, "", getEntity(), EntitySelectionElement.SELECTABLE, style);
+ GrantedAuthorityImpl.class, //getConversationHolder(),
+ element, "", getEntity(), EntitySelectionElement.SELECTABLE, style);
}
/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
index de07e5e74..c55c51602 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
@@ -65,7 +65,8 @@ public class GrantedAuthorityDetailSection extends
// .warningDialog("Not implemented yet", getClass(),
// "This functionality needs to be implemented in CDM Library first.");
- GrantedAuthority selection = GrantedAuthoritySelectionDialog.select(getLayoutComposite().getShell(), getConversationHolder(), null);
+ GrantedAuthority selection = GrantedAuthoritySelectionDialog.select(getLayoutComposite().getShell(), //getConversationHolder(),
+ null);
return selection;
}
@@ -119,7 +120,7 @@ public class GrantedAuthorityDetailSection extends
*/
@Override
public GrantedAuthority addExisting() {
-
+
return null;
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupSelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupSelectionElement.java
index 3c0cd7574..cd091b7c3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupSelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupSelectionElement.java
@@ -1,14 +1,13 @@
/**
* Copyright (C) 2012 EDIT
-* European Distributed Institute of Taxonomy
+* European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
-*
+*
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
package eu.etaxonomy.taxeditor.ui.section.group;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.model.common.Group;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -19,12 +18,13 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
*
*/
public class GroupSelectionElement extends EntitySelectionElement {
-
- public GroupSelectionElement(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement,
+
+ public GroupSelectionElement(CdmFormFactory formFactory,//ConversationHolder conversation,
+ ICdmFormElement parentElement,
String labelString, Group entity, int mode,
int style) {
- super(formFactory, conversation, parentElement, Group.class, labelString, entity,
+ super(formFactory, //conversation,
+ parentElement, Group.class, labelString, entity,
mode, style);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java
index 5e169537b..a635f341f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java
@@ -1,8 +1,8 @@
/**
* Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy
+ * European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
- *
+ *
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
@@ -43,7 +43,7 @@ public class MemberDetailElement extends AbstractEntityCollectionElement {
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#setEntity
* (java.lang.Object)
@@ -55,21 +55,21 @@ public class MemberDetailElement extends AbstractEntityCollectionElement {
/*
* (non-Javadoc)
- *
+ *
* @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#
* createControls(eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement, int)
*/
@Override
public void createControls(ICdmFormElement element, int style) {
selection_user = formFactory
- .createSelectionElement(User.class,
- getConversationHolder(), element, "", entity,
+ .createSelectionElement(User.class,//getConversationHolder(),
+ element, "", entity,
EntitySelectionElement.EDITABLE, style);
}
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#handleEvent
* (java.lang.Object)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailSection.java
index 02018f474..184530c0d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailSection.java
@@ -1,8 +1,8 @@
/**
* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
+* European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
-*
+*
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
@@ -52,7 +52,8 @@ public class MemberDetailSection extends AbstractEntityCollectionSection imp
}
});
text_title = formFactory.createLanguageStringWithLabelElement(element, "Title", null, style);
- selection_artist = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), element, "Artist", null, EntitySelectionElement.ALL, style);
+ selection_artist = formFactory.createSelectionElement(AgentBase.class, //getConversationHolder(),
+ element, "Artist", null, EntitySelectionElement.ALL, style);
addElement(selection_artist);
-
+
mediaCreated = formFactory.createDateElement(element, "Media Created", getEntity().getMediaCreated(), style, false);
addElement(mediaCreated.getController());
text_description = formFactory.createLanguageStringWithLabelElement(element, "Description", null, 100, true, style);
-
-
-
-
+
+
+
+
mediaDetailElement = formFactory.createMediaDetailElement(element);
addElement(mediaDetailElement);
}
@@ -116,14 +113,15 @@ public class MediaMetaElement extends AbstractEntityCollectionElement imp
}
text_title.setLanguageString(title);
-
+
}
@Override
protected Media selectFromDialog() {
- setEntity(MediaSelectionDialog.select(AbstractUtility.getShell(), null, null));
+ setEntity(MediaSelectionDialog.select(AbstractUtility.getShell(), //null,
+ null));
return entity;
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaSection.java
index e85971ef7..cb3c4deb7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaSection.java
@@ -74,7 +74,8 @@ public class MediaSection extends AbstractEntityCollectionSection
* Abstract AbstractEventDetailElement class.
*
- *
+ *
* @author n.hoffmann
* @created Oct 14, 2010
* @version 1.0
@@ -41,7 +41,7 @@ public abstract class AbstractEventDetailElement extends
*
* Constructor for AbstractEventDetailElement.
*
- *
+ *
* @param formFactory
* a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
* object.
@@ -65,7 +65,7 @@ public abstract class AbstractEventDetailElement extends
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#setEntity
* (java.lang.Object)
@@ -80,7 +80,7 @@ public abstract class AbstractEventDetailElement extends
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#createControls
* (eu.etaxonomy.taxeditor.forms.ICdmFormElement, int)
@@ -89,8 +89,8 @@ public abstract class AbstractEventDetailElement extends
@Override
public void createControls(ICdmFormElement element, int style) {
selection_agent = formFactory
- .createSelectionElement(AgentBase.class,
- getConversationHolder(), element, "Actor", null,
+ .createSelectionElement(AgentBase.class,//getConversationHolder(),
+ element, "Actor", null,
EntitySelectionElement.ALL, style);
element_timePeriod = formFactory.createTimePeriodElement(element,
"Time Period", null, style);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/AbstractSpecimenOrObservationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/AbstractSpecimenOrObservationDetailElement.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java
index a47e134fb..3d10026d7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java
@@ -59,7 +59,8 @@ public class CollectingAreasDetailSection extends AbstractEntityCollectionSectio
/** {@inheritDoc} */
@Override
public NamedArea createNewElement() {
- NamedArea selection = NamedAreaSelectionDialog.select(getLayoutComposite().getShell(), getConversationHolder(), null, FieldUnit.class.getCanonicalName());
+ NamedArea selection = NamedAreaSelectionDialog.select(getLayoutComposite().getShell(), //getConversationHolder(),
+ null, FieldUnit.class.getCanonicalName());
return selection;
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionDetailElement.java
index cc7f2d934..656b7d550 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionDetailElement.java
@@ -1,8 +1,8 @@
/**
* Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy
+ * European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
- *
+ *
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
@@ -22,7 +22,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
*
* CollectionDetailElement class.
*
- *
+ *
* @author n.hoffmann
* @created Oct 13, 2010
* @version 1.0
@@ -48,7 +48,7 @@ public class CollectionDetailElement extends
*
* Constructor for CollectionDetailElement.
*
- *
+ *
* @param formFactory
* a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
* object.
@@ -63,7 +63,7 @@ public class CollectionDetailElement extends
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls
* (eu.etaxonomy.taxeditor.forms.ICdmFormElement,
@@ -87,20 +87,20 @@ public class CollectionDetailElement extends
formElement, "Town Or Location", entity.getTownOrLocation(),
style);
selection_institute = formFactory
- .createSelectionElement(Institution.class,
- getConversationHolder(), formElement, "Institute",
+ .createSelectionElement(Institution.class,//getConversationHolder(),
+ formElement, "Institute",
entity.getInstitute(),
EntitySelectionElement.ALL, style);
selection_superCollection = formFactory
- .createSelectionElement(Collection.class,
- getConversationHolder(), formElement,
+ .createSelectionElement(Collection.class,//getConversationHolder(),
+ formElement,
"Super Collection", entity.getSuperCollection(),
EntitySelectionElement.ALL, style);
}
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
* .lang.Object)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
index e0f929ab8..5cfda2aed 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -96,7 +96,8 @@ public class DerivedUnitBaseDetailElement extends
// we ignore this
MessagingUtils.info(e.getMessage());
}
- selection_storedUnder = formFactory.createSelectionElement(TaxonName.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
+ selection_storedUnder = formFactory.createSelectionElement(TaxonName.class, //getConversationHolder(),
+ formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
try {
text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java
index 5834ea5f1..2b29013cf 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java
@@ -83,7 +83,7 @@ public class DerivedUnitGeneralDetailElement extends
combo_specorobstype = formFactory.createEnumComboElement(SpecimenOrObservationType.class, formElement, style);
combo_specorobstype.setSelection(entity.getType());
combo_specorobstype.setEnabled(showSpecimenType);
- selection_country = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(),
+ selection_country = formFactory.createSelectionElement(NamedArea.class, //getConversationHolder(),
formElement, "Country",
entity.getCountry(), EntitySelectionElement.NOTHING, style);
@@ -103,16 +103,16 @@ public class DerivedUnitGeneralDetailElement extends
element_date = formFactory.createTimePeriodElement(formElement, "Date",
entity.getGatheringPeriod(), style);
selection_collector = formFactory
- .createSelectionElement(AgentBase.class,
- getConversationHolder(), formElement, "Collector",
+ .createSelectionElement(AgentBase.class,//getConversationHolder(),
+ formElement, "Collector",
entity.getCollector(), EntitySelectionElement.ALL,
style);
text_collectingNumber = formFactory.createTextWithLabelElement(formElement,
"Collecting number", entity.getFieldNumber(), style);
}
selection_collection = formFactory
- .createSelectionElement(Collection.class,
- getConversationHolder(), formElement, "Collection",
+ .createSelectionElement(Collection.class,//getConversationHolder(),
+ formElement, "Collection",
entity.getCollection(),
EntitySelectionElement.ALL, style);
text_accessionNumber = formFactory.createTextWithLabelElement(
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
index c083c039a..4aabff99e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
@@ -80,12 +80,12 @@ public class DeterminationEventDetailElement extends
@Override
public void createControls(ICdmFormElement element, int style) {
selectionTaxonNameBase = formFactory
- .createSelectionElement(TaxonName.class,
- getConversationHolder(), element, "Taxon Name", null,
+ .createSelectionElement(TaxonName.class,//getConversationHolder(),
+ element, "Taxon Name", null,
EntitySelectionElement.NOTHING, style);
selection_taxonBase = formFactory
- .createSelectionElement(TaxonBase.class,
- getConversationHolder(), element, "Taxon", null,
+ .createSelectionElement(TaxonBase.class,//getConversationHolder(),
+ element, "Taxon", null,
EntitySelectionElement.NOTHING, style);
@@ -112,7 +112,7 @@ public class DeterminationEventDetailElement extends
getEntity().setTaxonName(selectionTaxonNameBase.getSelection());
//empty taxon field if name does not belong the taxon
TaxonBase taxonBase = selection_taxonBase.getEntity();
- if(taxonBase!=null && taxonBase.getName()!=null
+ if(taxonBase!=null && taxonBase.getName()!=null
&& !taxonBase.getName().equals(selectionTaxonNameBase.getSelection())){
selection_taxonBase.setEntity(null);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitGeneralDetailElement.java
index 7b4c0ab49..90c373523 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitGeneralDetailElement.java
@@ -74,8 +74,8 @@ public class FieldUnitGeneralDetailElement extends AbstractCdmDetailElement
* CollectingAreasDetailElement class.
*
- *
+ *
* @author n.hoffmann
* @created Oct 14, 2010
* @version 1.0
@@ -36,7 +36,7 @@ public class NamedAreaDetailElement extends
*
* Constructor for CollectingAreasDetailElement.
*
- *
+ *
* @param formFactory
* a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
* object.
@@ -58,7 +58,7 @@ public class NamedAreaDetailElement extends
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#setEntity
* (java.lang.Object)
@@ -71,7 +71,7 @@ public class NamedAreaDetailElement extends
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#createControls
* (eu.etaxonomy.taxeditor.forms.ICdmFormElement, int)
@@ -79,14 +79,14 @@ public class NamedAreaDetailElement extends
/** {@inheritDoc} */
@Override
public void createControls(ICdmFormElement formElement, int style) {
- selection_namedArea = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(),
+ selection_namedArea = formFactory.createSelectionElement(NamedArea.class, //getConversationHolder(),
formElement, "Area",
null, EntitySelectionElement.NOTHING, style);
}
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent
* (java.lang.Object)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java
index 4176c4a81..4eae4d1e4 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java
@@ -1,8 +1,8 @@
/**
* Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy
+ * European Distributed Institute of Taxonomy
* http://www.e-taxonomy.eu
- *
+ *
* The contents of this file are subject to the Mozilla Public License Version 1.1
* See LICENSE.TXT at the top of this package for the full license terms.
*/
@@ -22,7 +22,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
*
* SpecimenCollectionDetailElement class.
*
- *
+ *
* @author n.hoffmann
* @created Oct 14, 2010
* @version 1.0
@@ -36,7 +36,7 @@ public class SpecimenCollectionDetailElement extends
*
* Constructor for SpecimenCollectionDetailElement.
*
- *
+ *
* @param formFactory
* a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
* object.
@@ -58,7 +58,7 @@ public class SpecimenCollectionDetailElement extends
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#setEntity
* (java.lang.Object)
@@ -72,7 +72,7 @@ public class SpecimenCollectionDetailElement extends
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#createControls
* (eu.etaxonomy.taxeditor.forms.ICdmFormElement, int)
@@ -81,14 +81,14 @@ public class SpecimenCollectionDetailElement extends
@Override
public void createControls(ICdmFormElement element, int style) {
selection_derivedUnit = formFactory
- .createSelectionElement(DerivedUnit.class,
- getConversationHolder(), element, "Derived Unit", null,
+ .createSelectionElement(DerivedUnit.class,//getConversationHolder(),
+ element, "Derived Unit", null,
EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE, style);
}
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent
* (java.lang.Object)
@@ -97,7 +97,7 @@ public class SpecimenCollectionDetailElement extends
@Override
public void handleEvent(Object eventSource) {
if (eventSource == selection_derivedUnit) {
- this.setEntity((DerivedUnit) selection_derivedUnit.getSelection());
+ this.setEntity(selection_derivedUnit.getSelection());
}
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/DerivedUnitTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/DerivedUnitTypeDesignationElement.java
index 35ed856b4..0155a4cfd 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/DerivedUnitTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/DerivedUnitTypeDesignationElement.java
@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
* @author n.hoffmann
* @created May 17, 2010
*/
-public class DerivedUnitTypeDesignationElement
+public class DerivedUnitTypeDesignationElement
extends AbstractTypeDesignationElement {
private TermComboElement combo_typeStatus;
@@ -79,7 +79,8 @@ public class DerivedUnitTypeDesignationElement
this.style = style;
selectionTaxonName = formFactory.createSelectionElement(
- TaxonName.class, getConversationHolder(), parentFormElement, "Scientific Name", null,
+ TaxonName.class, //getConversationHolder(),
+ parentFormElement, "Scientific Name", null,
EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE, style);
combo_typeStatus = formFactory.createDefinedTermComboElement(TermType.SpecimenTypeDesignationStatus,
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java
index e16d44aa5..f8d2fa288 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java
@@ -87,7 +87,8 @@ public class PreservedSpecimenDetailElement extends
PreservationMethod preservationMethod = entity.getPreservation();
combo_preservationMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Preservation Method", preservationMethod==null?null:preservationMethod.getDefinedMaterialOrMethod(), style);
- selection_storedUnder = formFactory.createSelectionElement(TaxonName.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
+ selection_storedUnder = formFactory.createSelectionElement(TaxonName.class, //getConversationHolder(),
+ formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenGeneralDetailElement.java
index f5348c74a..b4a51ecf7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenGeneralDetailElement.java
@@ -52,8 +52,8 @@ public class PreservedSpecimenGeneralDetailElement extends AbstractCdmDetailElem
formElement, "Title Cache", entity.getTitleCache(),
entity.isProtectedTitleCache(), style);
selection_collection = formFactory
- .createSelectionElement(Collection.class,
- getConversationHolder(), formElement, "Collection",
+ .createSelectionElement(Collection.class,//getConversationHolder(),
+ formElement, "Collection",
entity.getCollection(),
EntitySelectionElement.ALL, style);
text_accessionNumber = formFactory.createTextWithLabelElement(
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
index 24e9fc8f9..43b7b9bdb 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
@@ -53,7 +53,8 @@ public class AmplificationCloningDetailElement extends AbstractCdmDetailElement<
Cloning cloning = entity.getCloning();
textCloningStrain = formFactory.createTextWithLabelElement(formElement, "Cloning Strain", cloning==null?"":cloning.getStrain(), style);
date = formFactory.createTimePeriodElement(formElement, "Cloning Date", cloning==null?null:cloning.getTimeperiod(), style);
- selectionCloningStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Cloning Staff", cloning==null?null:cloning.getActor(), EntitySelectionElement.ALL, style);
+ selectionCloningStaff = formFactory.createSelectionElement(AgentBase.class, //getConversationHolder(),
+ formElement, "Cloning Staff", cloning==null?null:cloning.getActor(), EntitySelectionElement.ALL, style);
comboCloningMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Cloning Mat. & Meth.", cloning==null?null:cloning.getDefinedMaterialOrMethod(), style);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
index a86cea392..0ac54b6b4 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
@@ -60,12 +60,16 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
textDesignation = formFactory.createTextWithLabelElement(formElement, "Designation", entity.getLabelCache(), style);
textDesignation.setEnabled(false);
textDesignation.setBackground(getPersistentBackground());
- selectionInstitution = formFactory.createSelectionElement(Institution.class, getConversationHolder(), formElement, "Institution", entity.getInstitution(), EntitySelectionElement.ALL, style);
- selectionAmplificationStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Amplification staff", entity.getActor(), EntitySelectionElement.ALL, style);
+ selectionInstitution = formFactory.createSelectionElement(Institution.class, //getConversationHolder(),
+ formElement, "Institution", entity.getInstitution(), EntitySelectionElement.ALL, style);
+ selectionAmplificationStaff = formFactory.createSelectionElement(AgentBase.class, //getConversationHolder(),
+ formElement, "Amplification staff", entity.getActor(), EntitySelectionElement.ALL, style);
dateAmplification = formFactory.createTimePeriodElement(formElement, "Date", entity.getTimeperiod(), style);
comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
- selectionPrimerFW = formFactory.createSelectionElement(Primer.class, getConversationHolder(), formElement, "Primer FW", entity.getForwardPrimer(), EntitySelectionElement.ALL, style);
- selectionPrimerRW = formFactory.createSelectionElement(Primer.class, getConversationHolder(), formElement, "Primer RW", entity.getReversePrimer(), EntitySelectionElement.ALL, style);
+ selectionPrimerFW = formFactory.createSelectionElement(Primer.class,// getConversationHolder(),
+ formElement, "Primer FW", entity.getForwardPrimer(), EntitySelectionElement.ALL, style);
+ selectionPrimerRW = formFactory.createSelectionElement(Primer.class, //getConversationHolder(),
+ formElement, "Primer RW", entity.getReversePrimer(), EntitySelectionElement.ALL, style);
AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), formElement, style);
annotationSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationPrimerDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationPrimerDetailElement.java
index 8a30fa006..2dc44b58f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationPrimerDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationPrimerDetailElement.java
@@ -45,8 +45,10 @@ public class AmplificationPrimerDetailElement extends AbstractCdmDetailElement
comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
selectionReference = formFactory
- .createSelectionElement(Reference.class,
- getConversationHolder(), formElement, "Reference",
+ .createSelectionElement(Reference.class,//getConversationHolder(),
+ formElement, "Reference",
entity.getPublishedIn(),
EntitySelectionElement.ALL, style);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceReferenceCollectionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceReferenceCollectionDetailElement.java
index 71c7108b9..b648cc311 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceReferenceCollectionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceReferenceCollectionDetailElement.java
@@ -40,8 +40,8 @@ public class SequenceReferenceCollectionDetailElement extends AbstractEntityColl
@Override
public void createControls(ICdmFormElement formElement, int style) {
selection_reference = formFactory
- .createSelectionElement(Reference.class,
- getConversationHolder(), formElement, "Reference",
+ .createSelectionElement(Reference.class,//getConversationHolder(),
+ formElement, "Reference",
null, EntitySelectionElement.SELECTABLE|EntitySelectionElement.EDITABLE, style);
text_referenceDetail = formFactory.createTextWithLabelElement(
formElement, "Reference Detail", null, SWT.NULL);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java
index a331dc64e..4f817fb94 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java
@@ -46,13 +46,15 @@ public class SingleReadGeneralDetailElement extends AbstractCdmDetailElement
* CreditElement class.
*
- *
+ *
* @author n.hoffmann
* @created Nov 16, 2009
* @version 1.0
@@ -32,7 +32,7 @@ public class CreditElement extends AbstractEntityCollectionElement {
*
* Constructor for CreditElement.
*
- *
+ *
* @param formElement
* a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection}
* object.
@@ -54,7 +54,7 @@ public class CreditElement extends AbstractEntityCollectionElement {
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.forms.entitysections.AbstractEntitySetElementComposite
* #createControls(org.eclipse.swt.widgets.Composite, int)
@@ -63,8 +63,8 @@ public class CreditElement extends AbstractEntityCollectionElement {
@Override
public void createControls(ICdmFormElement element, int style) {
agentSelection = formFactory
- .createSelectionElement(AgentBase.class,
- getConversationHolder(), this, "Agent", null,
+ .createSelectionElement(AgentBase.class,//getConversationHolder(),
+ this, "Agent", null,
EntitySelectionElement.ALL, style);
text = formFactory.createMultiLineTextWithLabel(this, "Text", 100,
style);
@@ -72,7 +72,7 @@ public class CreditElement extends AbstractEntityCollectionElement {
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.forms.entitysections.AbstractEntitySetElementComposite
* #setElement(eu.etaxonomy.cdm.model.common.AnnotatableEntity)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
index ecaf130ff..ba93b9e6b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
@@ -69,7 +69,8 @@ public class RightsElement extends AbstractEntityCollectionElement {
public void createControls(ICdmFormElement element, int style) {
combo_rightsType = formFactory.createDefinedTermComboElement(TermType.RightsType, this, "Rights Type", null, style);
selection_agent = formFactory.createSelectionElement(
- AgentBase.class, getConversationHolder(), this, "Agent",
+ AgentBase.class, //getConversationHolder(),
+ this, "Agent",
null, EntitySelectionElement.ALL, style);
text = formFactory.createMultiLineTextWithLabel(this, "Text", 100,
style);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java
index 5fc674c8e..7216436dd 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java
@@ -75,7 +75,8 @@ public class RightsSection extends AbstractEntityCollectionSection {
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#setEntity
* (java.lang.Object)
@@ -55,7 +55,7 @@ public class TaxonDetailElement extends AbstractEntityCollectionElement {
/*
* (non-Javadoc)
- *
+ *
* @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#
* createControls(eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement, int)
*/
@@ -63,13 +63,14 @@ public class TaxonDetailElement extends AbstractEntityCollectionElement {
public void createControls(ICdmFormElement element, int style) {
selection_taxon = formFactory
.createSelectionElement(Taxon.class,
- getConversationHolder(), element, "Taxon", null,
+// getConversationHolder(),
+ element, "Taxon", null,
EntitySelectionElement.NOTHING, style);
}
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#handleEvent
* (java.lang.Object)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonDetailSection.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonOfRelationshipElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonOfRelationshipElement.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
index 625b431c5..d4763904c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
@@ -68,7 +68,7 @@ public class TaxonRelationshipDetailElement extends AbstractCdmDetailElement {
@@ -34,7 +34,7 @@ public class UserDetailElement extends AbstractCdmDetailElement {
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls
* (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
@@ -58,10 +58,10 @@ public class UserDetailElement extends AbstractCdmDetailElement {
selection_person = formFactory
.createSelectionElement(Person.class,
- getConversationHolder(),
- formElement,
+ //getConversationHolder(),
+ formElement,
"Person",
- entity.getPerson(),
+ entity.getPerson(),
EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE,
style);
@@ -77,7 +77,7 @@ public class UserDetailElement extends AbstractCdmDetailElement {
}
/**
- *
+ *
* @return
*/
private boolean userIsAuthenticated() {
@@ -87,7 +87,7 @@ public class UserDetailElement extends AbstractCdmDetailElement {
/*
* (non-Javadoc)
- *
+ *
* @see
* eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
* .lang.Object)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java
index 6650b838a..872846bef 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java
@@ -1,19 +1,19 @@
package eu.etaxonomy.taxeditor.ui.selection;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
public class ClassificationSelectionElement extends EntitySelectionElement {
- public ClassificationSelectionElement(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement,
+ public ClassificationSelectionElement(CdmFormFactory formFactory,//ConversationHolder conversation, #
+ ICdmFormElement parentElement,
Class clazz, String labelString,
Classification entity, int mode, int style) {
- super(formFactory, conversation, parentElement, clazz, labelString, entity,
+ super(formFactory, //conversation,
+ parentElement, clazz, labelString, entity,
mode, style);
-
+
}
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
index 0f6aecbbd..30ebf0542 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
@@ -31,7 +31,7 @@ import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
import eu.etaxonomy.cdm.model.common.User;
import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.Primer;
-import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
+import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
import eu.etaxonomy.taxeditor.model.ImageResources;
import eu.etaxonomy.taxeditor.preference.Resources;
@@ -58,7 +58,8 @@ import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityLabelT
* @param
*/
public class EntitySelectionElement extends
- AbstractCdmFormElement implements SelectionListener, IEnableableFormElement, ISelectableElement, IEntityElement, ILabeledElement, IConversationEnabled, Observer {
+ AbstractCdmFormElement implements SelectionListener, IEnableableFormElement, ISelectableElement, IEntityElement, ILabeledElement, //IConversationEnabled,
+ Observer {
private static final EnumSet UPDATE = EnumSet.of(CRUD.UPDATE);
private static final EnumSet DELETE = EnumSet.of(CRUD.DELETE);
@@ -67,12 +68,13 @@ public class EntitySelectionElement extends
/**
* Bitmask for configuring functionality of selection element
*/
- public static final int NOTHING = 0; // 000
- public static final int EDITABLE = 1 << 0; // 001
- public static final int DELETABLE = 1 << 1; // 010
- public static final int SELECTABLE = 1 << 2; // 100
- public static final int ALL = EDITABLE | DELETABLE | SELECTABLE; // 111
-
+ public static final int NOTHING = 0; // 0000
+ public static final int EDITABLE = 1 << 0; // 0001
+ public static final int DELETABLE = 1 << 1; // 0010
+ public static final int SELECTABLE = 1 << 2; // 0100
+ public static final int EXTERNAL = 1 << 3; // 1000
+ public static final int ALL = EDITABLE | DELETABLE | SELECTABLE ; // 0111
+ public static final int ALL_WITH_EXT = EDITABLE | DELETABLE | SELECTABLE | EXTERNAL ; // 1111
protected T entity;
protected T filteredEntity;
@@ -80,6 +82,8 @@ public class EntitySelectionElement extends
protected Text text;
protected Button button_selection;
+ protected Button button_selectionExt;
+
private SelectionArbitrator selectionArbitrator;
protected Button button_edit;
@@ -93,23 +97,26 @@ public class EntitySelectionElement extends
private final boolean isEditable;
private final boolean isDeletable;
+ private final boolean isExternal;
- private final ConversationHolder conversation;
+// private final ConversationHolder conversation;
private Class clazz;
public EntitySelectionElement(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement, Class clazz,
+// ConversationHolder conversation,
+ ICdmFormElement parentElement, Class clazz,
String labelString, T entity, int mode, int style, boolean filterElement) {
super(formFactory, parentElement);
this.clazz = clazz;
this.isEditable = (mode & EDITABLE) == EDITABLE;
this.isDeletable = (mode & DELETABLE) == DELETABLE;
+ this.isExternal= (mode & EXTERNAL) == EXTERNAL;
boolean isSelectable = (mode & SELECTABLE) == SELECTABLE;
this.labelString = (labelString == null || labelString.equals("")) ? "" : labelString;
- this.conversation = conversation;
+// this.conversation = conversation;
if (isSelectable && formFactory.getSelectionProvider() != null) {
selectionArbitrator = formFactory.createSelectionArbitrator(this);
@@ -128,10 +135,11 @@ public class EntitySelectionElement extends
}
- public EntitySelectionElement(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement, Class clazz,
+ public EntitySelectionElement(CdmFormFactory formFactory,//ConversationHolder conversation,
+ ICdmFormElement parentElement, Class clazz,
String labelString, T entity, int mode, int style){
- this(formFactory, conversation, parentElement, clazz, labelString, entity, mode, style, false);
+ this(formFactory, //conversation,
+ parentElement, clazz, labelString, entity, mode, style, false);
}
private void createControls(Composite parent, int style) {
@@ -150,6 +158,9 @@ public class EntitySelectionElement extends
if (isDeletable) {
columns += 1;
}
+ if (isExternal) {
+ columns += 1;
+ }
selectableComposite.setLayout(LayoutConstants.LAYOUT(columns, false));
selectableComposite.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
@@ -172,7 +183,16 @@ public class EntitySelectionElement extends
addControl(button_selection);
button_selection.addSelectionListener(this);
-
+ if (isExternal){
+ button_selectionExt = formFactory.createButton(selectableComposite, null,
+ SWT.PUSH);
+ button_selectionExt.setImage(ImageResources
+ .getImage(ImageResources.BROWSE_ICON));
+ button_selectionExt.setToolTipText("Browse existing from external cdm store");
+ button_selectionExt.setText("Ext");
+ addControl(button_selectionExt);
+ button_selectionExt.addSelectionListener(this);
+ }
if (isEditable) {
button_edit = formFactory.createButton(selectableComposite, null,
SWT.PUSH);
@@ -196,8 +216,16 @@ public class EntitySelectionElement extends
@Override
public void widgetSelected(SelectionEvent e) {
- T selection = SelectionDialogFactory.getSelectionFromDialog(clazz, getShell(), getConversationHolder(), getFilteredEntity(), getParentElement());
- setSelectionInternal(selection);
+ if (e.getSource().equals(button_selection) ){
+ T selection = SelectionDialogFactory.getSelectionFromDialog(clazz, getShell(), //getConversationHolder(),
+ getFilteredEntity(), getParentElement());
+ setSelectionInternal(selection);
+ }else{
+ Reference selection = SelectionDialogFactory.getSelectionFromExtDialog(Reference.class, getShell(),//null,
+ getParentElement());
+ setSelectionInternal((T)selection);
+ }
+
}
/**
@@ -437,9 +465,12 @@ public class EntitySelectionElement extends
* @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}
* object.
*/
- @Override
+// @Override
public ConversationHolder getConversationHolder() {
- return conversation;
+ if(getParentElement() instanceof IConversationEnabled) {
+ return ((IConversationEnabled)getParentElement()).getConversationHolder();
+ }
+ return null;
}
/** {@inheritDoc} */
@@ -474,9 +505,9 @@ public class EntitySelectionElement extends
}
/** {@inheritDoc} */
- @Override
- public void update(CdmDataChangeMap changeEvents) {
- }
+// @Override
+// public void update(CdmDataChangeMap changeEvents) {
+// }
/* (non-Javadoc)
* @see eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement#removeElements()
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElementWithAbbreviatedTitle.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElementWithAbbreviatedTitle.java
index ac926a725..96a521c6e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElementWithAbbreviatedTitle.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElementWithAbbreviatedTitle.java
@@ -3,7 +3,6 @@
*/
package eu.etaxonomy.taxeditor.ui.selection;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.reference.Reference;
@@ -22,9 +21,10 @@ public class EntitySelectionElementWithAbbreviatedTitle exten
* @param mode
* @param style
*/
- public EntitySelectionElementWithAbbreviatedTitle(CdmFormFactory formFactory, ConversationHolder conversation,
+ public EntitySelectionElementWithAbbreviatedTitle(CdmFormFactory formFactory,// ConversationHolder conversation,
ICdmFormElement parentElement, Class clazz, String labelString, T entity, int mode, int style) {
- super(formFactory, conversation, parentElement, clazz, labelString, entity, mode, style);
+ super(formFactory, //conversation,
+ parentElement, clazz, labelString, entity, mode, style);
}
@Override
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NomenclaturalAuthorTeamSelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NomenclaturalAuthorTeamSelectionElement.java
index 94b0beaf0..e661c7aae 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NomenclaturalAuthorTeamSelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NomenclaturalAuthorTeamSelectionElement.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.ui.selection;
import org.eclipse.swt.events.SelectionEvent;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.model.agent.Team;
import eu.etaxonomy.taxeditor.ui.dialog.selection.NomenclaturalAuthorTeamSelectionDialog;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -52,10 +51,11 @@ public class NomenclaturalAuthorTeamSelectionElement extends
* @param style
* a int.
*/
- public NomenclaturalAuthorTeamSelectionElement(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement,
+ public NomenclaturalAuthorTeamSelectionElement(CdmFormFactory formFactory,//ConversationHolder conversation,
+ ICdmFormElement parentElement,
String labelString, Team entity, int mode, int style) {
- super(formFactory, conversation, parentElement, Team.class, labelString, entity,
+ super(formFactory,// conversation,
+ parentElement, Team.class, labelString, entity,
mode, style);
}
@@ -69,7 +69,8 @@ public class NomenclaturalAuthorTeamSelectionElement extends
@Override
public void widgetSelected(SelectionEvent e) {
Team newSelection = NomenclaturalAuthorTeamSelectionDialog.select(
- getShell(), getConversationHolder(), entity);
+ getShell(), //getConversationHolder(),
+ entity);
setSelectionInternal(newSelection);
}
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElement.java
index 0a753619a..febb2126c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElement.java
@@ -10,7 +10,6 @@ package eu.etaxonomy.taxeditor.ui.selection;
import org.eclipse.swt.events.SelectionEvent;
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -27,10 +26,11 @@ public class TaxonNodeSelectionElement extends EntitySelectionElement
private Classification classification;
- public TaxonNodeSelectionElement(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement,
+ public TaxonNodeSelectionElement(CdmFormFactory formFactory,//ConversationHolder conversation,
+ ICdmFormElement parentElement,
String labelString, TaxonNode entity, int mode, int style) {
- super(formFactory, conversation, parentElement, TaxonNode.class, labelString, entity, mode,
+ super(formFactory, //conversation,
+ parentElement, TaxonNode.class, labelString, entity, mode,
style);
}
@@ -55,8 +55,8 @@ public class TaxonNodeSelectionElement extends EntitySelectionElement
/** {@inheritDoc} */
@Override
public void widgetSelected(SelectionEvent e) {
- TaxonNode newSelection = TaxonNodeSelectionDialog.select(getShell(),
- getConversationHolder(), "Select parent taxon", null, null, getClassification());
+ TaxonNode newSelection = TaxonNodeSelectionDialog.select(getShell(),//getConversationHolder(),
+ "Select parent taxon", null, null, getClassification());
setSelectionInternal(newSelection);
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditor.java
index 3805858b0..833b38bb1 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditor.java
@@ -84,7 +84,9 @@ IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, I
*/
@Override
public void setFocus() {
- tableViewer.getControl().setFocus();
+ if (!tableViewer.getControl().isDisposed()) {
+ tableViewer.getControl().setFocus();
+ }
//make sure to bind again if maybe in another view the conversation was unbound
if(!conversation.isBound()){
conversation.bind();
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
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/TestSpecimenImportView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/TestSpecimenImportView.java
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenImportViewE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenImportViewE4.java
old mode 100755
new mode 100644