Project

General

Profile

« Previous | Next » 

Revision bfe8226d

Added by Patrick Plitzner over 5 years ago

ref #7912 Centralize layout

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/AreasSelectionDialog.java
18 18
import org.eclipse.jface.dialogs.Dialog;
19 19
import org.eclipse.jface.layout.GridLayoutFactory;
20 20
import org.eclipse.swt.SWT;
21
import org.eclipse.swt.layout.GridLayout;
22 21
import org.eclipse.swt.widgets.Composite;
23 22
import org.eclipse.swt.widgets.Control;
24 23
import org.eclipse.swt.widgets.Shell;
......
55 54

  
56 55
    @Override
57 56
    protected Control createDialogArea(Composite parent) {
58
        parent.setLayout(new GridLayout());
59 57
        treeComposite = new CheckBoxTreeComposite(parent, new TermDtoContentProvider(), new TermDtoLabelProvider(), SWT.NONE);
60 58
        treeComposite.getViewer().setComparator(new DefinedTermSorter());
61 59
        treeComposite.getViewer().setInput(areaVocabularies);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
18 18
import org.eclipse.jface.layout.GridLayoutFactory;
19 19
import org.eclipse.jface.wizard.WizardPage;
20 20
import org.eclipse.swt.SWT;
21
import org.eclipse.swt.layout.GridLayout;
22 21
import org.eclipse.swt.widgets.Composite;
23 22

  
24 23
import eu.etaxonomy.cdm.api.service.ITermService;
......
52 51
	/** {@inheritDoc} */
53 52
	@Override
54 53
	public void createControl(Composite parent) {
55
	    parent.setLayout(new GridLayout());
56 54
        treeComposite = new CheckBoxTreeComposite(parent, new TermDtoContentProvider(), new TermDtoLabelProvider(), SWT.NONE);
57 55
        List<TermVocabularyDto> vocabularyDtos = CdmStore.getService(IVocabularyService.class).findVocabularyDtoByTermType(TermType.Feature);
58 56
        treeComposite.getViewer().setComparator(new DefinedTermSorter());
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
18 18
import org.eclipse.jface.viewers.CheckboxTreeViewer;
19 19
import org.eclipse.jface.wizard.WizardPage;
20 20
import org.eclipse.swt.SWT;
21
import org.eclipse.swt.layout.GridLayout;
22 21
import org.eclipse.swt.widgets.Composite;
23 22

  
24 23
import eu.etaxonomy.cdm.api.service.ITermService;
......
56 55

  
57 56
    @Override
58 57
    public void createControl(Composite parent){
59
        parent.setLayout(new GridLayout());
60 58
        treeComposite = new CheckBoxTreeComposite(parent, new TermDtoContentProvider(), new TermDtoLabelProvider(), SWT.NONE);
61 59
        treeComposite.getViewer().setComparator(new DefinedTermSorter());
62 60
        rememberCheckedValues(getCheckedValuesFromPreferences());
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
22 22
import org.eclipse.swt.layout.GridLayout;
23 23
import org.eclipse.swt.widgets.Button;
24 24
import org.eclipse.swt.widgets.Composite;
25
import org.eclipse.swt.widgets.Label;
25 26
import org.eclipse.swt.widgets.Tree;
26 27
import org.eclipse.swt.widgets.TreeItem;
27 28
import org.eclipse.swt.widgets.Widget;
......
46 47

  
47 48
    public CheckBoxTreeComposite(Composite parent, ITreeContentProvider contentProvider, IBaseLabelProvider labelProvider, int style) {
48 49
        super(parent, style);
50
        GridLayout layout = new GridLayout();
51
        parent.setLayout(layout);
49 52
        Composite composite = new Composite(parent, SWT.NULL);
50 53
        composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
51 54

  
52
        composite.setLayout(new GridLayout());
55
        GridLayout gl_composite = layout;
56
        gl_composite.marginHeight = 0;
57
        composite.setLayout(gl_composite);
53 58

  
54 59
        Composite toolbar = new Composite(composite, SWT.NONE);
55 60
        toolbar.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1));
56
        toolbar.setLayout(new GridLayout(4, false));
61
        GridLayout gl_toolbar = new GridLayout(4, false);
62
        gl_toolbar.marginHeight = 0;
63
        gl_toolbar.verticalSpacing = 0;
64
        toolbar.setLayout(gl_toolbar);
57 65

  
58 66
        btnCollapse = new Button(toolbar, SWT.NONE);
59 67
        btnCollapse.addSelectionListener(this);
......
69 77
        btnSelectAllChildren.addSelectionListener(this);
70 78
        btnSelectAllChildren.setImage(ImageResources.getImage(ImageResources.HIERARCHICAL));
71 79
        btnSelectAllChildren.setToolTipText(Messages.CheckBoxTreeComposite_TOGGLE_TREE_SELECTION);
80
        new Label(toolbar, SWT.NONE);
72 81

  
73 82
        Tree tree = new Tree(composite, SWT.BORDER | SWT.CHECK);
74 83
        tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

Also available in: Unified diff