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 27793e36f5c599492580816befc97def2512d46b..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,10 +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;
@@ -62,11 +61,12 @@ 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_Configurator);
 
+
 //        addDisposeListener(new DisposeListener() {
 //            @Override
 //            public void widgetDisposed(DisposeEvent e) {
@@ -130,7 +130,7 @@ 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));
 
@@ -142,21 +142,21 @@ 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);
+        Label labelDescription = new Label(compositeRef, SWT.WRAP);
         labelDescription.setText(Messages.SetSecundumConfiguration_Description);
-        GridData gd_labelDescription = new GridData(SWT.FILL, SWT.LEFT, true, false);
+        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();
 
         control.setLayout(gridLayoutControl);
@@ -188,7 +188,7 @@ public class SetSecundumConfiguratorWizardPage extends WizardPage implements Lis
         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;