ref #9611: move use shared taxa to the general flags

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index 7f33dc8e4824b558bac5784b2023029487aa22ea..36c8972c089a1a6fe1d501d1a0db74b88a4d8592 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@ -231,6 +231,16 @@ public class EditorUtil extends AbstractUtility {
                if(part.getObject() instanceof TaxonNameEditorE4
                     && ((TaxonNameEditorE4) part.getObject()).getTaxon()!=null
                     && ((TaxonNameEditorE4) part.getObject()).getTaxon().getUuid().equals(input.getTaxon().getUuid())){
+                   if (input.getTaxon().getTaxonNodes().size() > 1){
+                       boolean doSave = forceUserSaveE4Editor(((TaxonNameEditorE4) part.getObject()), getShell());
+                    if (doSave){
+                        input = TaxonEditorInputE4.NewInstance(input.getTaxonNode().getUuid());
+                        break;
+                    }else {
+                        return;
+                    }
+                   }
+
                    partService.activate(part, true);
                    return;
 

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 74039ce217217d0c67cbd945363cfd849871a935..3eb2f2af050bd673dbd06eabc586041691bdf276 100644 (file)
--- 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
@@ -301,11 +301,9 @@ public class Messages extends NLS {
     public static String SetSecundumConfiguration_IncludeSynonyms;
     public static String SetSecundumConfiguration_IncludeMisapplications;
     public static String SetSecundumConfiguration_IncludeProParteSynonyms;
-    public static String SetSecundumConfiguration_OverwriteExistingRelations;
-    public static String SetSecundumConfiguration_OverwriteExistingAccepted;
-    public static String SetSecundumConfiguration_OverwriteExistingSynonyms;
     public static String SetSecundumConfiguration_EmptySecundumDetail;
     public static String SetSecundumConfiguration_IncludeSharedtaxa;
+    public static String SetSecundumConfiguration_OverwriteExisting;
     public static String SetSecundumConfiguration_NewSecundum_Label;
     public static String SetSecundumConfiguration_Description;
     public static String SetSecundumConfiguration_Description_Configurator;
@@ -755,6 +753,8 @@ public class Messages extends NLS {
     public static String CdmLightPreference_distributionString_tooltip;
 
     public static String SecundumPreference_description;
+
+
     public static String Tree;
 
 

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 b569a8a49a213947c298918eba020c0f189c3916..1cad9bdb6ce822edbbf01e6600905c6cbf7f583a 100644 (file)
--- 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
@@ -234,11 +234,9 @@ SetSecundumConfiguration_IncludeAcceptedTaxa=Include accepted taxa
 SetSecundumConfiguration_IncludeSynonyms=Include synonyms
 SetSecundumConfiguration_IncludeMisapplications=Include misapplications (err. sec)
 SetSecundumConfiguration_IncludeProParteSynonyms=Include pro parte synonyms (syn. sec.)
-SetSecundumConfiguration_OverwriteExistingAccepted=Overwrite existing references for accepted taxa
-SetSecundumConfiguration_OverwriteExistingSynonyms=Overwrite existing references for synonyms
-SetSecundumConfiguration_OverwriteExistingRelations=Overwrite existing references for selected relations
+SetSecundumConfiguration_OverwriteExisting=Overwrite existing references
 SetSecundumConfiguration_EmptySecundumDetail=Delete existing secundum reference details (recommended)
-SetSecundumConfiguration_IncludeSharedtaxa=Include shared taxa
+SetSecundumConfiguration_IncludeSharedtaxa=Include shared objects
 SetSecundumConfiguration_NewSecundum_Label=New secundum reference:
 SetSecundumConfiguration_Description=If no reference is chosen existing secundum references are deleted.
 SetSecundumConfiguration_Description_Configurator=Configure how to perform the set secundum reference operation.

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 dd43d4e6217386e9bf4f4802b060ad43f93de1d2..07b73997bbc1ff44ba5295157090fc306291d2d3 100644 (file)
--- 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
@@ -233,11 +233,9 @@ SetSecundumConfiguration_IncludeAcceptedTaxa=Anwenden auf akzeptierte Taxa
 SetSecundumConfiguration_IncludeSynonyms=Anwenden auf Synonyme
 SetSecundumConfiguration_IncludeMisapplications=Anwenden auf Fehlanwendungen (err. sec)
 SetSecundumConfiguration_IncludeProParteSynonyms=Anwenden auf Pro Parte Synonyme (syn. sec.)
-SetSecundumConfiguration_OverwriteExistingAccepted=Existierende Secundum Referenzen bei akzeptierten Taxa überschreiben
-SetSecundumConfiguration_OverwriteExistingSynonyms=Existierende Secundum Referenzen bei Synonymen überschreiben
-SetSecundumConfiguration_OverwriteExistingRelations=Existierende Secundum Referenzen bei ausgewählten Relationen überschreiben
+SetSecundumConfiguration_OverwriteExisting=Existierende Secundum Referenzen überschreiben
 SetSecundumConfiguration_EmptySecundumDetail=Existierende Secundum Referenz Details löschen (empfohlen)
-SetSecundumConfiguration_IncludeSharedtaxa=Auch mehrfach verwendete Taxa mit einbeziehen
+SetSecundumConfiguration_IncludeSharedtaxa=Auch mehrfach verwendete Objekte mit einbeziehen
 SetSecundumConfiguration_NewSecundum_Label=Neue Secundum Referenz:
 SetSecundumConfiguration_Description=Wenn keine Referenz ausgewählt wird, werden die bestehenden Secundum Referenzen gelöscht.
 SetSecundumConfiguration_Description_Configurator=Konfigurieren Sie, wie das Ersetzen der Secundum Referenz durchgeführt werden soll.

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/SetSecundumConfiguratorWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/SetSecundumConfiguratorWizardPage.java
index a340323f5a0fe8d00c00cb3c984e2d5288c00462..244ba56c2d8032cb993c7090682833edcf448cd4 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/SetSecundumConfiguratorWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/SetSecundumConfiguratorWizardPage.java
@@ -175,14 +175,13 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
                 Button b = (Button) e.widget;
                 GridData data = (GridData)  btnIncludeAcceptedTaxa.getLayoutData();
                 data.exclude = b.getSelection();
-
-                btnIncludeSharedTaxa.setVisible(data.exclude);
                 boolean isEnabled = true;
                 if (!btnIncludeSynonyms.getSelection() && !data.exclude){
                     isEnabled = false;
                 }
                 btnOverwriteExisting.setVisible(isEnabled);
                 btnEmptySecundumDetail.setVisible(isEnabled);
+                btnIncludeSharedTaxa.setVisible(isEnabled);
                 setPageComplete(isEnabled);
             }
         });
@@ -193,12 +192,7 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
 //                btnOverwriteExistingAccepted.setLayoutData(gd_btnOverwriteExistingAccepted);
 //                btnOverwriteExistingAccepted.setText(Messages.SetSecundumConfiguration_OverwriteExistingAccepted);
 
-                btnIncludeSharedTaxa = new Button(control, SWT.CHECK);
-                GridData gd_btnIncludeSharedTaxa = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
-                gd_btnIncludeSharedTaxa.horizontalIndent = 10;
-                btnIncludeSharedTaxa.setLayoutData(gd_btnIncludeSharedTaxa);
-                btnIncludeSharedTaxa.setText(Messages.SetSecundumConfiguration_IncludeSharedtaxa);
-                btnIncludeSharedTaxa.setSelection(configurator.isIncludeSharedTaxa());
+
 
         btnIncludeSynonyms = new Button(control, SWT.CHECK);
         btnIncludeSynonyms.setText(Messages.SetSecundumConfiguration_IncludeSynonyms);
@@ -215,6 +209,7 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
                 }
                 btnEmptySecundumDetail.setVisible(isEnabled);
                 btnOverwriteExisting.setVisible(isEnabled);
+                btnIncludeSharedTaxa.setVisible(isEnabled);
                 setPageComplete(isEnabled);
 
             }
@@ -242,6 +237,7 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
                 }
                 btnEmptySecundumDetail.setVisible(isEnabled);
                 btnOverwriteExisting.setVisible(isEnabled);
+                btnIncludeSharedTaxa.setVisible(isEnabled);
                 setPageComplete(isEnabled);
             }
         });
@@ -263,15 +259,21 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
                 }
                 btnEmptySecundumDetail.setVisible(isEnabled);
                 btnOverwriteExisting.setVisible(isEnabled);
+                btnIncludeSharedTaxa.setVisible(isEnabled);
                 setPageComplete(isEnabled);
             }
         });
 
-        btnOverwriteExisting = new Button(control, SWT.CHECK);
+        btnIncludeSharedTaxa = new Button(control, SWT.CHECK);
         GridData gd_btnOverwriteExistingRelations = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
         gd_btnOverwriteExistingRelations.verticalIndent = 5;
-        btnOverwriteExisting.setLayoutData(gd_btnOverwriteExistingRelations);
-        btnOverwriteExisting.setText(Messages.SetSecundumConfiguration_OverwriteExistingRelations);
+        btnIncludeSharedTaxa.setLayoutData(gd_btnOverwriteExistingRelations);
+        btnIncludeSharedTaxa.setText(Messages.SetSecundumConfiguration_IncludeSharedtaxa);
+        btnIncludeSharedTaxa.setSelection(configurator.isIncludeSharedTaxa());
+
+        btnOverwriteExisting = new Button(control, SWT.CHECK);
+
+        btnOverwriteExisting.setText(Messages.SetSecundumConfiguration_OverwriteExisting);
         btnOverwriteExisting.setSelection(configurator.isOverwriteExisting());