Project

General

Profile

« Previous | Next » 

Revision d36d2eb8

Added by Patrick Plitzner over 4 years ago

ref #8631 Fixed layout + merged constructors

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
14 14
import java.util.List;
15 15

  
16 16
import org.apache.commons.lang.StringUtils;
17
import org.eclipse.jface.layout.GridDataFactory;
17 18
import org.eclipse.jface.layout.GridLayoutFactory;
18 19
import org.eclipse.swt.SWT;
19 20
import org.eclipse.swt.events.SelectionAdapter;
......
61 62
    private Combo textDNAProviderString;
62 63

  
63 64
	protected AbcdImportConfiguratorWizardPage(String title, String description, Abcd206ImportConfigurator configurator) {
64
        super(PAGE_NAME);
65
        this.abcdImportConfigurator = configurator;
66
        setTitle(title);
67
        setDescription(description);
65
	    this(title, description, configurator, false, false);
68 66
    }
69 67

  
70 68
	protected AbcdImportConfiguratorWizardPage(String title, String description, Abcd206ImportConfigurator configurator, boolean isPreferencePage, boolean isFileImport) {
......
145 143
        gridLayoutUnitId.numColumns=2;
146 144
	    unitIdComposite.setLayout(gridLayoutUnitId);
147 145

  
148
		GridData gridData = new GridData();
149
        gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false);
150
        gridData.horizontalIndent = 5;
151
        gridData.minimumWidth = 100;
152
//	      classificationSelection.setLayoutData(gridData);
153 146
        Label unitIdLabel = new Label(unitIdComposite, SWT.NONE);
154 147
        unitIdLabel.setText(Messages.AbcdImportPreference_map_unit_nr_catalog_number);
155
        unitIdLabel.setLayoutData(gridData);
148
        GridDataFactory.fillDefaults().applyTo(unitIdLabel);
156 149
        checkBoxMapUnitId = new Combo(unitIdComposite, SWT.BORDER| SWT.READ_ONLY);
157
        checkBoxMapUnitId.setLayoutData(gridData);
150
        GridDataFactory.fillDefaults().applyTo(checkBoxMapUnitId);
158 151
        checkBoxMapUnitId.add(ACCESSION_NUMBER);
159 152
        checkBoxMapUnitId.add(BARCODE);
160 153
        checkBoxMapUnitId.add(CATALOGUE_NUMBER);
......
256 249
            labelRef.setText("Biocase provider for associated DNA");
257 250
            new Label(dnaComposite, SWT.NONE);
258 251
            textDNAProviderString = new Combo(dnaComposite, SWT.BORDER);
259
            textDNAProviderString.setLayoutData(gridData);
252
            GridDataFactory.fillDefaults().applyTo(textDNAProviderString);
260 253
            textDNAProviderString.add("Do not search for DNA");
261 254

  
262 255
            String allProviderString = PreferencesUtil.getStringValue(PreferencePredicate.BioCaseProvider.getKey(), false);
......
288 281
        codeComposite.setLayout(gridLayoutUnitId);
289 282
        Label labelCode = new Label(codeComposite, SWT.NONE);
290 283
        labelCode.setText("Nomenclatural Code");
291
        labelCode.setLayoutData(gridData);
284
        GridDataFactory.fillDefaults().applyTo(labelCode);
292 285
        nomenclaturalCodeSelectionCombo = new Combo(codeComposite, SWT.BORDER| SWT.READ_ONLY);
293
        nomenclaturalCodeSelectionCombo.setLayoutData(gridData);
286
        GridDataFactory.fillDefaults().applyTo(nomenclaturalCodeSelectionCombo);
294 287
        for(NomenclaturalCode code: NomenclaturalCode.values()){
295 288
            nomenclaturalCodeSelectionCombo.add(code.getKey());
296 289
        }

Also available in: Unified diff