import java.util.List;
import org.apache.commons.lang.StringUtils;
+import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
}
});
+ Composite unitIdComposite = new Composite(composite, SWT.NULL);
+ GridLayout gridLayoutUnitId = new GridLayout();
+ gridLayoutUnitId.numColumns=2;
+ unitIdComposite.setLayout(gridLayoutUnitId);
+
GridData gridData = new GridData();
gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false);
gridData.horizontalIndent = 5;
gridData.minimumWidth = 100;
// classificationSelection.setLayoutData(gridData);
- Label unitIdLabel = new Label(composite, SWT.NONE);
+ Label unitIdLabel = new Label(unitIdComposite, SWT.NONE);
unitIdLabel.setText(Messages.AbcdImportPreference_map_unit_nr_catalog_number);
- checkBoxMapUnitId = new Combo(composite, SWT.BORDER| SWT.READ_ONLY);
+ checkBoxMapUnitId = new Combo(unitIdComposite, SWT.BORDER| SWT.READ_ONLY);
checkBoxMapUnitId.setLayoutData(gridData);
checkBoxMapUnitId.add(ACCESSION_NUMBER);
checkBoxMapUnitId.add(BARCODE);
checkBoxMapUnitId.select(2);
}
-
+ GridLayoutFactory.fillDefaults();
Button checkBoxRemoveCountry = new Button(composite, SWT.CHECK);
checkBoxRemoveCountry.setSelection(abcdImportConfigurator.isRemoveCountryFromLocalityText());
checkBoxRemoveCountry.setText("Remove country from locality text");
if (!isFileImport){
- Label labelRef = new Label(composite, SWT.NONE);
+ Composite dnaComposite = new Composite(composite, SWT.NULL);
+ GridLayout gridLayoutDna = new GridLayout();
+ gridLayoutDna.numColumns=2;
+ dnaComposite.setLayout(gridLayoutDna);
+ Label labelRef = new Label(dnaComposite, SWT.NONE);
labelRef.setText("Biocase provider for associated DNA");
- new Label(composite, SWT.NONE);
- textDNAProviderString = new Combo(composite, SWT.BORDER);
+ new Label(dnaComposite, SWT.NONE);
+ textDNAProviderString = new Combo(dnaComposite, SWT.BORDER);
textDNAProviderString.setLayoutData(gridData);
textDNAProviderString.add("Do not search for DNA");
// gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false);
// gridData.horizontalIndent = 5;
// classificationSelection.setLayoutData(gridData);
+ Composite codeComposite = new Composite(composite, SWT.NULL);
- nomenclaturalCodeSelectionCombo = new Combo(composite, SWT.BORDER| SWT.READ_ONLY);
+ codeComposite.setLayout(gridLayoutUnitId);
+ Label labelCode = new Label(codeComposite, SWT.NONE);
+ labelCode.setText("Nomenclatural Code");
+ nomenclaturalCodeSelectionCombo = new Combo(codeComposite, SWT.BORDER| SWT.READ_ONLY);
nomenclaturalCodeSelectionCombo.setLayoutData(gridData);
for(NomenclaturalCode code: NomenclaturalCode.values()){
nomenclaturalCodeSelectionCombo.add(code.getKey());