ref #7912 Centralize layout

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/AreasSelectionDialog.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/AreasSelectionDialog.java
index e7a61a24725c6d1f57f9c298473c3e755a4d87df..7db5431bfa0a463bbff8f6234358b73f810359b8 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/AreasSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/AreasSelectionDialog.java
@@ -18,7 +18,6 @@ import java.util.stream.Collectors;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
@@ -55,7 +54,6 @@ public class AreasSelectionDialog extends Dialog{
 
     @Override
     protected Control createDialogArea(Composite parent) {
-        parent.setLayout(new GridLayout());
         treeComposite = new CheckBoxTreeComposite(parent, new TermDtoContentProvider(), new TermDtoLabelProvider(), SWT.NONE);
         treeComposite.getViewer().setComparator(new DefinedTermSorter());
         treeComposite.getViewer().setInput(areaVocabularies);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
index aea6fc8671caabe77445f8abeeaf999d6d4c2e17..674a0f8674d52524fc937f431c22843b273af98f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
@@ -18,7 +18,6 @@ import java.util.stream.Collectors;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.api.service.ITermService;
@@ -52,7 +51,6 @@ public class AvailableFeaturesWizardPage extends WizardPage {
        /** {@inheritDoc} */
        @Override
        public void createControl(Composite parent) {
-           parent.setLayout(new GridLayout());
         treeComposite = new CheckBoxTreeComposite(parent, new TermDtoContentProvider(), new TermDtoLabelProvider(), SWT.NONE);
         List<TermVocabularyDto> vocabularyDtos = CdmStore.getService(IVocabularyService.class).findVocabularyDtoByTermType(TermType.Feature);
         treeComposite.getViewer().setComparator(new DefinedTermSorter());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
index 4169808bb46f37f3aa5873c1bd7ce68aa8a4ca38..1eaa8fa82fef659be5ba230c312f64594bb6ab16 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
@@ -18,7 +18,6 @@ import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.api.service.ITermService;
@@ -56,7 +55,6 @@ public abstract class AbstractTermSelectionWizardPage extends WizardPage {
 
     @Override
     public void createControl(Composite parent){
-        parent.setLayout(new GridLayout());
         treeComposite = new CheckBoxTreeComposite(parent, new TermDtoContentProvider(), new TermDtoLabelProvider(), SWT.NONE);
         treeComposite.getViewer().setComparator(new DefinedTermSorter());
         rememberCheckedValues(getCheckedValuesFromPreferences());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
index 04aa5ab3b647edd4ed5e870472b1afb0bd8f23f3..54895eeb9abb13bd52f49a1aa5ece694d3f2b4fb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
@@ -22,6 +22,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.swt.widgets.Widget;
@@ -46,14 +47,21 @@ public class CheckBoxTreeComposite extends Composite implements SelectionListene
 
     public CheckBoxTreeComposite(Composite parent, ITreeContentProvider contentProvider, IBaseLabelProvider labelProvider, int style) {
         super(parent, style);
+        GridLayout layout = new GridLayout();
+        parent.setLayout(layout);
         Composite composite = new Composite(parent, SWT.NULL);
         composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
-        composite.setLayout(new GridLayout());
+        GridLayout gl_composite = layout;
+        gl_composite.marginHeight = 0;
+        composite.setLayout(gl_composite);
 
         Composite toolbar = new Composite(composite, SWT.NONE);
         toolbar.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1));
-        toolbar.setLayout(new GridLayout(4, false));
+        GridLayout gl_toolbar = new GridLayout(4, false);
+        gl_toolbar.marginHeight = 0;
+        gl_toolbar.verticalSpacing = 0;
+        toolbar.setLayout(gl_toolbar);
 
         btnCollapse = new Button(toolbar, SWT.NONE);
         btnCollapse.addSelectionListener(this);
@@ -69,6 +77,7 @@ public class CheckBoxTreeComposite extends Composite implements SelectionListene
         btnSelectAllChildren.addSelectionListener(this);
         btnSelectAllChildren.setImage(ImageResources.getImage(ImageResources.HIERARCHICAL));
         btnSelectAllChildren.setToolTipText(Messages.CheckBoxTreeComposite_TOGGLE_TREE_SELECTION);
+        new Label(toolbar, SWT.NONE);
 
         Tree tree = new Tree(composite, SWT.BORDER | SWT.CHECK);
         tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));