- updated SpecimenImportWizard

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / view / specimenSearch / SpecimenSearchComposite.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java
index 2b8911c8fe46ba82cfefbff3ddf4e91eaabfd496..0fbaebd2124d014f679b63885298fba4a172ee16 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenSearchComposite.java
@@ -25,82 +25,75 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout;
  */
 public class SpecimenSearchComposite extends Composite {
     private final FormToolkit formToolkit = new FormToolkit(Display.getDefault());
-    private Text textTaxonName;
-    private Text textCollector;
-    private Text textCollectorNumber;
-    private Text textAccessionNumber;
-    private Text textLocality;
-    private Text textHerbarium;
-    private Text textCountry;
+    private final Text textTaxonName;
+    private final Text textCollector;
+    private final Text textCollectorNumber;
+    private final Text textAccessionNumber;
+    private final Text textLocality;
+    private final Text textHerbarium;
+    private final Text textCountry;
 
     /**
      * Create the composite.
      * @param parent
-     * @param style
+     * @setBackgroundMode(SWT.INHERIT_DEFAULT);
+        param style
      */
     public SpecimenSearchComposite(Composite parent, int style) {
         super(parent, style);
-        setBackgroundMode(SWT.INHERIT_DEFAULT);
         {
             TableWrapLayout tableWrapLayout = new TableWrapLayout();
             tableWrapLayout.numColumns = 2;
             setLayout(tableWrapLayout);
         }
 
-        Label lblTaxonName = formToolkit.createLabel(this, "Taxon Name", SWT.NONE);
+        Label lblTaxonName = new Label(this, SWT.NONE);
+        lblTaxonName.setText("Taxon Name");
 
-        textTaxonName = new Text(this, SWT.BORDER);
+        textTaxonName = new Text(this, SWT.NONE);
         textTaxonName.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
-        formToolkit.adapt(textTaxonName, true, true);
 
         Label lblCollectors = new Label(this, SWT.NONE);
-        formToolkit.adapt(lblCollectors, true, true);
         lblCollectors.setText("Collector(s)");
 
-        textCollector = new Text(this, SWT.BORDER);
+        textCollector = new Text(this, SWT.NONE);
         textCollector.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
         formToolkit.adapt(textCollector, true, true);
 
         Label lblCollectorsNumber = new Label(this, SWT.NONE);
-        formToolkit.adapt(lblCollectorsNumber, true, true);
         lblCollectorsNumber.setText("Collector(s) Number");
 
-        textCollectorNumber = new Text(this, SWT.BORDER);
+        textCollectorNumber = new Text(this, SWT.NONE);
         textCollectorNumber.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
         formToolkit.adapt(textCollectorNumber, true, true);
 
         Label lblAccessionNumber = new Label(this, SWT.NONE);
-        formToolkit.adapt(lblAccessionNumber, true, true);
         lblAccessionNumber.setText("Accession Number");
 
-        textAccessionNumber = new Text(this, SWT.BORDER);
+        textAccessionNumber = new Text(this, SWT.NONE);
         textAccessionNumber.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
         formToolkit.adapt(textAccessionNumber, true, true);
 
         Label lblHerbarium = new Label(this, SWT.NONE);
-        formToolkit.adapt(lblHerbarium, true, true);
         lblHerbarium.setText("Herbarium");
 
         textHerbarium = new Text(this, SWT.NONE);
         textHerbarium.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
 
         Label lblCountry = new Label(this, SWT.NONE);
-        formToolkit.adapt(lblCountry, true, true);
         lblCountry.setText("Country");
 
         textCountry = new Text(this, SWT.NONE);
         textCountry.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
 
         Label lblLocality = new Label(this, SWT.NONE);
-        formToolkit.adapt(lblLocality, true, true);
         lblLocality.setText("Locality");
 
-        textLocality = new Text(this, SWT.BORDER);
+        textLocality = new Text(this, SWT.NONE);
         textLocality.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
         formToolkit.adapt(textLocality, true, true);
 
         Label lblCollectionDate = new Label(this, SWT.NONE);
-        formToolkit.adapt(lblCollectionDate, true, true);
         lblCollectionDate.setText("Collection Date");
         new Label(this, SWT.NONE);