fix #6315: remaining issues of set secundum reference integration

diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index bd413e583ce3628feab7ccdbbcf6496507a91c6a..130c92b0eb7f82c23e7be82cca24b2fac6078435 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -196,9 +196,6 @@
                      <reference
                            definitionId="isCdmStoreConnected">
                      </reference>
-                     <reference
-                           definitionId="isTaxonNode">
-                     </reference>
                   </and>
             </visibleWhen>
          </command>

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 a1db9fe52e368f49b1741244d1bb6e525daec153..4b4f810eded0ced4e3a1dd53e3d0ecac8a8a879f 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
@@ -136,6 +136,7 @@ public class Messages extends NLS {
     public static String SearchResultView_STATUS;
     public static String SetSecundumForSubtreeOperation_CHANGE_SEC_OP;
     public static String SetSecundumForSubtreeOperation_SET_SEC_TASK;
+       public static String SetSecundumForSubtreeHandler_CONFIG_DIALOG_TITLE;
     public static String TaxonLinkHelper_CREATE_FAIL;
 
     public static String TaxonNavigator_LOAD_DATASOURCE;
@@ -175,6 +176,7 @@ public class Messages extends NLS {
     public static String TreeNodeDropAdapter_UNSAVED_PARENT;
     public static String TreeNodeDropAdapter_UNSAVED_PARENT_MESSAGE;
 
+
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);

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 348685a08dde6a112bedc12491dbae5801701b9a..37b1180bf891cd828546b3389bf50b80c5614029 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
@@ -117,6 +117,7 @@ SearchResultView_SEARCHING=Searching...
 SearchResultView_STATUS=Status:
 SetSecundumForSubtreeOperation_CHANGE_SEC_OP=Change secundum reference for all children
 SetSecundumForSubtreeOperation_SET_SEC_TASK=Set secundum reference for subtree
+SetSecundumForSubtreeHandler_CONFIG_DIALOG_TITLE=Set secundum reference for subtree
 TaxonLinkHelper_CREATE_FAIL=Could not create Taxon
 TaxonNavigator_LOAD_DATASOURCE=Loading datasources
 TaxonNavigator_RESTORE=Restoring Taxon Navigator

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 122d06dbdc2b9d3e67045c72a2d96ad0a51e5fc9..5bf8357bc77134a6a61814877cbe3d9bf1e589bb 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
@@ -117,6 +117,7 @@ SearchResultView_SEARCHING=Suche...
 SearchResultView_STATUS=Status:
 SetSecundumForSubtreeOperation_CHANGE_SEC_OP=Secundum Referenz für alle Kinder ändern
 SetSecundumForSubtreeOperation_SET_SEC_TASK=Secundum Referenz für Teilbaum setzen
+SetSecundumForSubtreeHandler_CONFIG_DIALOG_TITLE=Setze Secundum Referenz für Teilbaum
 TaxonLinkHelper_CREATE_FAIL=Konnte Taxon nicht erstellen
 TaxonNavigator_LOAD_DATASOURCE=Lade Datenquellen
 TaxonNavigator_RESTORE=Taxonnavigator wiederherstellen

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 000bf40a903f70618b5e8ba0e248543cc2909af2..27793e36f5c599492580816befc97def2512d46b 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
@@ -45,6 +45,7 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
     private final SetSecundumForSubtreeConfigurator configurator;
 
     private  Button btnBrowseReference = null;
+   
     private  Text textReference = null;
     private  Button btnClear = null;
     private EntitySelectionElement<Reference> selectReference;
@@ -64,7 +65,7 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
     public SetSecundumConfiguratorWizardPage(SetSecundumForSubtreeConfigurator configurator, Wizard parent, int style ) {
         super("Set Secundum Reference Configuration");
         this.configurator = configurator;
-        this.setDescription(Messages.SetSecundumConfiguration_Description);
+        this.setDescription(Messages.SetSecundumConfiguration_Description_Configurator);
 
 //        addDisposeListener(new DisposeListener() {
 //            @Override
@@ -131,7 +132,7 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
         compositeRef.setLayoutData(new GridData(SWT.FILL, SWT.LEFT, true, true));
         Label label = new Label(compositeRef, SWT.NONE);
         label.setText(Messages.SetSecundumConfiguration_NewSecundum_Label);
-       label.setLayoutData(new GridData(SWT.FILL, SWT.LEFT, true, false));
+        label.setLayoutData(new GridData(SWT.FILL, SWT.LEFT, true, false));
 
         textReference = new Text(compositeRef, SWT.BORDER);
         textReference.setEditable(false);
@@ -141,14 +142,22 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
         btnBrowseReference = new Button(compositeRef, SWT.NONE);
         btnBrowseReference.setImage(ResourceManager.getPluginImage("eu.etaxonomy.taxeditor.store", "icons/open.gif"));
         btnBrowseReference.addListener(SWT.Selection, this);
+       
         btnClear = new Button(compositeRef, SWT.NONE);
         btnClear.setImage(ResourceManager.getPluginImage("eu.etaxonomy.taxeditor.store", "icons/trash.gif"));
         btnClear.addListener(SWT.Selection, this);
-
+        Label labelDescription = new Label(compositeRef, SWT.NONE);
+        labelDescription.setText(Messages.SetSecundumConfiguration_Description);
+        GridData gd_labelDescription = new GridData(SWT.FILL, SWT.LEFT, true, false);
+        gd_labelDescription.horizontalSpan = 4;
+        labelDescription.setLayoutData(gd_labelDescription);
+        new Label(compositeRef, SWT.NONE);
+        new Label(compositeRef, SWT.NONE);
+        new Label(compositeRef, SWT.NONE);
+        
        // selectReference = toolkit.createSelectionElement(Rights.class, getConversationHolder(), composite, "Rights", null, EntitySelectionElement.SELECTABLE);
         final Composite control = new Composite(composite, SWT.NULL);
         GridLayout gridLayoutControl = new GridLayout();
-        gridLayoutControl.numColumns = 1;
 
         control.setLayout(gridLayoutControl);
         control.setLayoutData(new GridData(SWT.FILL, SWT.LEFT, true, true));
@@ -175,7 +184,17 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
         });
 
         btnOverwriteExistingAccepted = new Button(control, SWT.CHECK);
+        GridData gd_btnOverwriteExistingAccepted = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
+        gd_btnOverwriteExistingAccepted.horizontalIndent = 10;
+        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);
@@ -200,16 +219,15 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
 
         btnOverwriteExistingAccepted.setSelection(configurator.isOverwriteExistingAccepted());
         btnOverwriteExistingSynonyms = new Button(control, SWT.CHECK);
+        GridData gd_btnOverwriteExistingSynonyms = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
+        gd_btnOverwriteExistingSynonyms.horizontalIndent = 10;
+        btnOverwriteExistingSynonyms.setLayoutData(gd_btnOverwriteExistingSynonyms);
         btnOverwriteExistingSynonyms.setText(Messages.SetSecundumConfiguration_OverwriteExistingSynonyms);
         btnOverwriteExistingSynonyms.setSelection(configurator.isOverwriteExistingSynonyms());
         btnEmptySecundumDetail = new Button(control, SWT.CHECK);
         btnEmptySecundumDetail.setText(Messages.SetSecundumConfiguration_EmptySecundumDetail);
         btnEmptySecundumDetail.setSelection(configurator.isEmptySecundumDetail());
 
-        btnIncludeSharedTaxa = new Button(control, SWT.CHECK);
-        btnIncludeSharedTaxa.setText(Messages.SetSecundumConfiguration_IncludeSharedtaxa);
-        btnIncludeSharedTaxa.setSelection(configurator.isIncludeSharedTaxa());
-
         m_bindingContext = initDataBindings();
         setControl(composite);
     }