ref #7086 Fix merge issues

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/handler/OpenWorkingSetEditorHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/handler/OpenWorkingSetEditorHandler.java
index 0ae15cdf9e69f6a5d9afae1bf0a3ee1e9e38bd4c..c1393ede9ecba96ddd4ac45fae0875b4b18a9816 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/handler/OpenWorkingSetEditorHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/handler/OpenWorkingSetEditorHandler.java
@@ -19,7 +19,7 @@ public class OpenWorkingSetEditorHandler {
 
        @Execute
        public void execute(Shell shell, EPartService partService, MApplication application, EModelService modelService) {
-           WorkingSet workingSet = WorkingSetSelectionDialog.select(shell, null, null);
+           WorkingSet workingSet = WorkingSetSelectionDialog.select(shell, null);
            MPart part = partService.createPart("eu.etaxonomy.taxeditor.editor.view.workingSet.WorkingSetEditor");
 
         MPartStack editorAreaPartStack = WorkbenchUtility.getEditorAreaPartStack(application, modelService);

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
index 28e1d60db8b0fc4ea02d4fe365b868f2d82f21d2..784d06f917611d310f06a39d6cee140d429d7de6 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
@@ -26,6 +26,7 @@ public class Messages extends NLS {
     public static String ChangeAcceptedTaxonToSynonymOperation_CREATE_FAIL;
     public static String ChangeAcceptedTaxonToSynonymOperation_CREATE_SUCCESS;
     public static String ChangeAcceptedTaxonToSynonymOperation_OP_FAIL;
+    public static String ClassificationLabelProvider_UNNAMED_TREE;
     public static String CloneClassificationHandler_CLONE_CLASSIFICATION;
     public static String CreateClassificationHierarchyHandler_CREATE_HIERARCHY;
     public static String CreateClassificationHierarchyHandler_FAILED;

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
index 3075ac9c81ef9a691aefa4d01f33f4ef98639b71..9bf8986e84ddc7de5cca86883312247dcfc0ecdd 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
@@ -7,6 +7,7 @@ ChangeAcceptedTaxonToSynonymHandler_PREREQUISITE_MESSAGE=The accepted taxon must
 ChangeAcceptedTaxonToSynonymOperation_CREATE_FAIL=Synonym creation not possible
 ChangeAcceptedTaxonToSynonymOperation_CREATE_SUCCESS=Synonym created but taxon deletion not possible.
 ChangeAcceptedTaxonToSynonymOperation_OP_FAIL=Operation failed
+ClassificationLabelProvider_UNNAMED_TREE=Unnamed Taxonomic Tree
 CloneClassificationHandler_CLONE_CLASSIFICATION=Clone classification
 CreateClassificationHierarchyHandler_CREATE_HIERARCHY=Create Taxon Hierarchy
 CreateClassificationHierarchyHandler_FAILED=Failed to open Editor

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
index 8d95a38c4e05c8d6398b076d8ceb0d7588d62e87..9bfdefa46ac08135aa3c5dac12026ef4fe838da7 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
@@ -7,6 +7,7 @@ ChangeAcceptedTaxonToSynonymHandler_PREREQUISITE_MESSAGE=Das akzeptierte Taxon d
 ChangeAcceptedTaxonToSynonymOperation_CREATE_FAIL=Synonymerstellung nicht möglich
 ChangeAcceptedTaxonToSynonymOperation_CREATE_SUCCESS=Synonym erstellt, aber das Löschen des Taxons ist nicht möglich.
 ChangeAcceptedTaxonToSynonymOperation_OP_FAIL=Vorgang fehlgeschlagen
+ClassificationLabelProvider_UNNAMED_TREE=Unbenannter taxonomischer BaumTree
 CloneClassificationHandler_CLONE_CLASSIFICATION=Klassifikation duplizieren
 CreateClassificationHierarchyHandler_CREATE_HIERARCHY=Taxonhierarchie erstellen
 CreateClassificationHierarchyHandler_FAILED=Öffnen des Editors fehlgeschlagen

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java
index 5361d83443bb8de558641a32b65321ff3d33408e..002c57aeac1e5fc975024264b42f1bfac777d33f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/WorkingSetSelectionDialog.java
@@ -20,7 +20,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.IWorkingSetService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.description.WorkingSet;
@@ -36,8 +35,8 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class WorkingSetSelectionDialog extends
 AbstractFilteredCdmResourceSelectionDialog<WorkingSet> {
 
-    public static WorkingSet select(Shell shell, ConversationHolder conversation, WorkingSet workingSet){
-        WorkingSetSelectionDialog dialog = new WorkingSetSelectionDialog(shell, conversation,
+    public static WorkingSet select(Shell shell, WorkingSet workingSet){
+        WorkingSetSelectionDialog dialog = new WorkingSetSelectionDialog(shell,
                 "Choose working set", false, WorkingSetSelectionDialog.class.getCanonicalName(), workingSet);
         return getSelectionFromDialog(dialog);
     }
@@ -45,9 +44,9 @@ AbstractFilteredCdmResourceSelectionDialog<WorkingSet> {
     /**
      * <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>
      */
-    protected WorkingSetSelectionDialog(Shell shell, ConversationHolder conversation, String title,
+    protected WorkingSetSelectionDialog(Shell shell, String title,
             boolean multi, String settings, WorkingSet cdmObject) {
-        super(shell, conversation, title, multi, settings, cdmObject);
+        super(shell, title, multi, settings, cdmObject);
     }
 
     /** {@inheritDoc} */