Merge branch 'release/4.13.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / dialog / configurator / SetSecundumConfiguratorWizardPage.java

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..b1b77ef85d16b48eb56f71e44a38a8572df02df8 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
@@ -12,7 +12,6 @@ import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.PojoProperties;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -26,7 +25,7 @@ import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.wb.swt.ResourceManager;
 
-import eu.etaxonomy.cdm.io.common.SetSecundumForSubtreeConfigurator;
+import eu.etaxonomy.cdm.api.service.config.SecundumForSubtreeConfigurator;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory;
@@ -42,9 +41,10 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
     private DataBindingContext m_bindingContext;
 
     private final static CdmFormFactory toolkit = new CdmFormFactory(Display.getCurrent());
-    private final SetSecundumForSubtreeConfigurator configurator;
+    private final SecundumForSubtreeConfigurator configurator;
 
     private  Button btnBrowseReference = null;
+
     private  Text textReference = null;
     private  Button btnClear = null;
     private EntitySelectionElement<Reference> selectReference;
@@ -61,10 +61,11 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
      * @param parent
      * @param style
      */
-    public SetSecundumConfiguratorWizardPage(SetSecundumForSubtreeConfigurator configurator, Wizard parent, int style ) {
+    public SetSecundumConfiguratorWizardPage(SecundumForSubtreeConfigurator configurator) {
         super("Set Secundum Reference Configuration");
         this.configurator = configurator;
-        this.setDescription(Messages.SetSecundumConfiguration_Description);
+        this.setDescription(Messages.SetSecundumConfiguration_Description_Configurator);
+
 
 //        addDisposeListener(new DisposeListener() {
 //            @Override
@@ -129,9 +130,9 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
 
         compositeRef.setLayout(gridLayoutRef);
         compositeRef.setLayoutData(new GridData(SWT.FILL, SWT.LEFT, true, true));
-        Label label = new Label(compositeRef, SWT.NONE);
+        Label label = new Label(compositeRef, SWT.WRAP);
         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.WRAP);
+        labelDescription.setText(Messages.SetSecundumConfiguration_Description);
+        GridData gd_labelDescription = new GridData(SWT.FILL, SWT.BEGINNING, 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);
+        final Composite control = new Composite(composite, SWT.WRAP);
         GridLayout gridLayoutControl = new GridLayout();
-        gridLayoutControl.numColumns = 1;
 
         control.setLayout(gridLayoutControl);
         control.setLayoutData(new GridData(SWT.FILL, SWT.LEFT, true, true));
@@ -175,8 +184,18 @@ 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);
         btnIncludeSynonyms.setSelection(configurator.isIncludeSynonyms());
@@ -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);
     }