ref #8488: adapt all term related preferences, abcd preference page
authorKatja Luther <k.luther@bgbm.org>
Fri, 13 Sep 2019 12:10:17 +0000 (14:10 +0200)
committerKatja Luther <k.luther@bgbm.org>
Fri, 13 Sep 2019 12:10:17 +0000 (14:10 +0200)
15 files changed:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportAdminPreference.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/ImportPreferencesWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportConfiguratorWizardPageE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CommonNameLanguagePreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/LanguageMenuPreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MarkerTypeMenuPreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NameRelationshipTypeMenuPreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NamedAreaTypeMenuPreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java

index 06bc5a8b95ae1afaae8b9a9ffa8a449e1f6097e4..94f34c9483fa4e4257bf492df33a9fadd8ba41cb 100755 (executable)
@@ -17,7 +17,6 @@ import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
-import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.taxeditor.preference.AbcdImportPreference;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -261,11 +260,7 @@ public class AbcdImportAdminPreference extends AbcdImportPreference implements I
 //        return composite;
 //    }
 
-    @Override
-    public void widgetSelected(SelectionEvent e) {
-        this.configurator.setNomenclaturalCode(NomenclaturalCode.getByKey(nomenclaturalCodeSelectionCombo.getText()));
-        setApply(true);
-    }
+
 
     @Override
     public boolean performOk() {
index b33628574b9c5689f78f0fd35947cadaf9edf8e3..e03aedd8af4045cbee3b64885732fdb14f0aab86 100755 (executable)
@@ -37,11 +37,7 @@ public class ImportPreferencesWizard extends Wizard {
      */
     @Override
     public boolean performFinish() {
-        String configString = "";
-        this.configPage.saveConfigToPrefernceStore();
-
-
-
+       this.configPage.saveConfigToPrefernceStore();
        return true;
     }
 
index a4dcbc711b72a1ae0db919c5868ce3ffa4f06147..ad7b9ca82306a040a4543484d86df377ad9e00f9 100644 (file)
@@ -45,21 +45,6 @@ public class AbcdImportConfiguratorWizardPageE4 extends WizardPage {
         setDescription("Tooltips will explain parameters in more detail");
     }
 
-//     protected AbcdImportConfiguratorWizardPageE4(String title, String description, Abcd206ImportConfigurator configurator, boolean isPreferencePage) {
-//             super(PAGE_NAME);
-//             this.configurator = configurator;
-//             setTitle(title);
-//             setDescription(description);
-//             this.isPreferencePage = isPreferencePage;
-//     }
-//
-//     public static AbcdImportConfiguratorWizardPageE4 createPreferencePage(Abcd206ImportConfigurator configurator){
-//        return new AbcdImportConfiguratorWizardPageE4("Configure import parameters",
-//                "Tooltips will explain parameters in more detail", configurator, true);
-//    }
-
-
-
        /** {@inheritDoc} */
        @Override
     public void createControl(Composite parent) {
index 6e8287d76eb2a1e78f825610ff8cf3b0dd9c4521..d30eb62157b0199905e1c94ed786ad9ceb1ea656 100644 (file)
@@ -29,6 +29,7 @@ import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.taxeditor.databaseAdmin.wizard.AbstractPreferenceWizard;
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 /**
@@ -40,6 +41,12 @@ public class AbcdImportConfiguratorWizardPage extends AbstractPreferenceWizard i
 
        public static final String PAGE_NAME = "AbcdImportConfiguratorWizardPage";
 
+    private static final String ACCESSION_NUMBER = "Accession number";
+
+    private static final String BARCODE = "Barcode";
+
+    private static final String CATALOGUE_NUMBER = "Catalogue number";
+
        private Abcd206ImportConfigurator abcdImportConfigurator;
 
        private List<URI> biocaseProvider = new ArrayList<>();
@@ -47,6 +54,7 @@ public class AbcdImportConfiguratorWizardPage extends AbstractPreferenceWizard i
        private boolean isPreferencePage = false;
 
     private Combo nomenclaturalCodeSelectionCombo;
+    private Combo checkBoxMapUnitId;
     private Text textDNAProviderString;
 
        protected AbcdImportConfiguratorWizardPage(String title, String description, Abcd206ImportConfigurator configurator) {
@@ -124,44 +132,30 @@ public class AbcdImportConfiguratorWizardPage extends AbstractPreferenceWizard i
                        }
                });
 
-               Button checkBoxMapUnitIdToCatalogNumber = new Button(composite, SWT.CHECK);
-               checkBoxMapUnitIdToCatalogNumber.setSelection(abcdImportConfigurator.isMapUnitIdToCatalogNumber());
-               checkBoxMapUnitIdToCatalogNumber.setText("Map UnitID to catalog number");
-               checkBoxMapUnitIdToCatalogNumber
-               .setToolTipText("The UnitID of every ABCD unit will be mapped the catalog number "
-                               + "of the specimen");
-               checkBoxMapUnitIdToCatalogNumber.addSelectionListener(new SelectionAdapter() {
-                       @Override
-                       public void widgetSelected(SelectionEvent e) {
-                               abcdImportConfigurator.setMapUnitIdToCatalogNumber(!abcdImportConfigurator.isMapUnitIdToCatalogNumber());
-                       }
-               });
-//TODO: only one of the mappings can be checked!
-               Button checkBoxMapUnitIdToAccessionNumber = new Button(composite, SWT.CHECK);
-               checkBoxMapUnitIdToAccessionNumber.setSelection(abcdImportConfigurator.isMapUnitIdToAccessionNumber());
-               checkBoxMapUnitIdToAccessionNumber.setText("Map UnitID to accession number");
-               checkBoxMapUnitIdToAccessionNumber
-               .setToolTipText("The UnitID of every ABCD unit will be mapped the accession number "
-                               + "of the specimen");
-               checkBoxMapUnitIdToAccessionNumber.addSelectionListener(new SelectionAdapter() {
-                       @Override
-                       public void widgetSelected(SelectionEvent e) {
-                               abcdImportConfigurator.setMapUnitIdToAccessionNumber(!abcdImportConfigurator.isMapUnitIdToAccessionNumber());
-                       }
-               });
+               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);
+        unitIdLabel.setText(Messages.AbcdImportPreference_map_unit_nr_catalog_number);
+        checkBoxMapUnitId = new Combo(composite, SWT.BORDER| SWT.READ_ONLY);
+        checkBoxMapUnitId.setLayoutData(gridData);
+        checkBoxMapUnitId.add(ACCESSION_NUMBER);
+        checkBoxMapUnitId.add(BARCODE);
+        checkBoxMapUnitId.add(CATALOGUE_NUMBER);
+        checkBoxMapUnitId
+        .setToolTipText(Messages.AbcdImportPreference_map_unit_number_catalog_number_tooltip);
+        checkBoxMapUnitId.addSelectionListener(this);
+
+        if (abcdImportConfigurator.isMapUnitIdToAccessionNumber()){
+            checkBoxMapUnitId.select(0);
+        }else if (abcdImportConfigurator.isMapUnitIdToBarcode()){
+            checkBoxMapUnitId.select(1);
+        }else {
+            checkBoxMapUnitId.select(2);
+        }
 
-               Button checkBoxMapUnitIdToBarcode = new Button(composite, SWT.CHECK);
-               checkBoxMapUnitIdToBarcode.setSelection(abcdImportConfigurator.isMapUnitIdToBarcode());
-               checkBoxMapUnitIdToBarcode.setText("Map UnitID to barcode");
-               checkBoxMapUnitIdToBarcode
-               .setToolTipText("The UnitID of every ABCD unit will be mapped the barcode "
-                               + "of the specimen");
-               checkBoxMapUnitIdToBarcode.addSelectionListener(new SelectionAdapter() {
-                       @Override
-                       public void widgetSelected(SelectionEvent e) {
-                               abcdImportConfigurator.setMapUnitIdToBarcode(!abcdImportConfigurator.isMapUnitIdToBarcode());
-                       }
-               });
 
                Button checkBoxRemoveCountry = new Button(composite, SWT.CHECK);
                checkBoxRemoveCountry.setSelection(abcdImportConfigurator.isRemoveCountryFromLocalityText());
@@ -248,9 +242,9 @@ public class AbcdImportConfiguratorWizardPage extends AbstractPreferenceWizard i
                textDNAProviderString.setText(abcdImportConfigurator.getDnaSoure().toString());
         }
 
-        GridData gridData = new GridData();
-        gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false);
-        gridData.horizontalIndent = 5;
+//        GridData gridData = new GridData();
+//        gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false);
+//        gridData.horizontalIndent = 5;
 //      classificationSelection.setLayoutData(gridData);
 
         nomenclaturalCodeSelectionCombo = new Combo(composite, SWT.BORDER| SWT.READ_ONLY);
@@ -278,11 +272,35 @@ public class AbcdImportConfiguratorWizardPage extends AbstractPreferenceWizard i
 
        @Override
     public void widgetSelected(SelectionEvent e) {
-        this.abcdImportConfigurator.setNomenclaturalCode(NomenclaturalCode.getByKey(nomenclaturalCodeSelectionCombo.getText()));
+        if (e.getSource().equals(nomenclaturalCodeSelectionCombo)){
+            this.abcdImportConfigurator.setNomenclaturalCode(NomenclaturalCode.getByKey(nomenclaturalCodeSelectionCombo.getText()));
+        }
+        if (e.getSource().equals(checkBoxMapUnitId)){
+            String text = checkBoxMapUnitId.getText();
+            if (text.equals(ACCESSION_NUMBER)){
+                abcdImportConfigurator.setMapUnitIdToAccessionNumber(true);
+                abcdImportConfigurator.setMapUnitIdToBarcode(false);
+                abcdImportConfigurator.setMapUnitIdToCatalogNumber(false);
+            }else if (text.equals(BARCODE)){
+                abcdImportConfigurator.setMapUnitIdToAccessionNumber(false);
+                abcdImportConfigurator.setMapUnitIdToBarcode(true);
+                abcdImportConfigurator.setMapUnitIdToCatalogNumber(false);
+            }else{
+                abcdImportConfigurator.setMapUnitIdToAccessionNumber(false);
+                abcdImportConfigurator.setMapUnitIdToBarcode(false);
+                abcdImportConfigurator.setMapUnitIdToCatalogNumber(true);
+            }
+        }
+
 
     }
 
         public void saveConfigToPrefernceStore() {
+            try{
+                abcdImportConfigurator.setDnaSoure(URI.create(textDNAProviderString.getText()));
+            }catch(IllegalArgumentException e){
+//TODO: check prior or message
+            }
             PreferencesUtil.setStringValue(PreferencePredicate.AbcdImportConfig.getKey(), abcdImportConfigurator.toString());
 
 
index c130c20667ae3194d80d9053160ba188ca5104b7..e7b89408e3b77b45f24c8595d9679b014c22045c 100644 (file)
@@ -352,8 +352,8 @@ AbcdImportPreference_ignore_author=Ignore authorship for name matching
 AbcdImportPreference_ignore_author_tooltip=Name matching with existing names will be done without the authorship part of the name
 AbcdImportPreference_import_all_children_for_cultures_or_tissues=Import all children of cultures or tissue samples
 AbcdImportPreference_import_all_children_for_cultures_or_tissues_tooltip=For a tissue sample or culture all children will be searched and imported
-AbcdImportPreference_map_unit_nr_catalog_number=Map UnitID to catalog number
-AbcdImportPreference_map_unit_number_accession_number_tooltip=The UnitID of every ABCD unit will be mapped the accession number of the specimen
+AbcdImportPreference_map_unit_nr_catalog_number=UnitID mapping
+AbcdImportPreference_map_unit_number_catalog_number_tooltip=The UnitID of every ABCD unit will be imported as accession number, barcode or catalogue number according to the selection
 AbcdImportPreference_map_unit_number_barcode=Map UnitID to barcode
 AbcdImportPreference_map_unit_number_barcode_tooltip=The UnitID of every ABCD unit will be mapped the barcode of the specimen
 AbcdImportPreference_map_unit_number_catalog_number_tooltip=The UnitID of every ABCD unit will be mapped the catalog number of the specimen
index 027fecd188e6cc3ed54fea21ad52b71ab2984d28..42fc4e51b788d69ace0a1fe9ff4c485075ae1317 100644 (file)
@@ -352,8 +352,8 @@ AbcdImportPreference_ignore_author=Namensvergleich ohne Autor
 AbcdImportPreference_ignore_author_tooltip=Der Namensvergleich mit den bereits existierenden wissenschaftlichen Namen wird ohne den Autor durchgeführt.
 AbcdImportPreference_import_all_children_for_cultures_or_tissues=Kinder von Kulturen oder Gewebeproben importieren
 AbcdImportPreference_import_all_children_for_cultures_or_tissues_tooltip=Für Kulturen oder Gewebeproben werden auch die Kinder gesucht und importiert
-AbcdImportPreference_map_unit_nr_catalog_number=UnitID als Katalog Nummer 
-AbcdImportPreference_map_unit_number_accession_number_tooltip=Die UnitIds aller ABCD Units werden als Accession Nummern importiert.
+AbcdImportPreference_map_unit_nr_catalog_number=UnitID Mapping 
+AbcdImportPreference_map_unit_number_accession_number_tooltip=Die UnitIds aller ABCD Units werden entsprechend der Auswahl als Accession Nummer, Barcode oder Katalog Nummer importiert.
 AbcdImportPreference_map_unit_number_barcode=UnitID als Barcode
 AbcdImportPreference_map_unit_number_barcode_tooltip=Die UnitIds aller ABCD Units werden als Barcode importiert
 AbcdImportPreference_map_unit_number_catalog_number_tooltip=Die UnitID aller ABCD Units werden als Katalog Nummer importiert
index 291bdb822c827eb0696cc49d3d077db12b95630f..a42ea375fb477ae0ee09951e0be5a21a0894724c 100755 (executable)
@@ -8,8 +8,12 @@
 */
 package eu.etaxonomy.taxeditor.preference;
 
+import java.net.URI;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -40,6 +44,21 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class AbcdImportPreference extends CdmPreferencePage implements IE4PreferencePage, SelectionListener {
 
+    /**
+     *
+     */
+    private static final String CATALOGUE_NUMBER = "Catalogue number";
+
+    /**
+     *
+     */
+    private static final String BARCODE = "Barcode";
+
+    /**
+     *
+     */
+    private static final String ACCESSION_NUMBER = "Accession number";
+
     protected Abcd206ImportConfigurator configurator;
 
     protected Combo nomenclaturalCodeSelectionCombo;
@@ -49,21 +68,23 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
     protected CdmPreference preference = null;
     Text textDNAProviderString;
     private Composite composite;
-    Combo overrideCombo;
+
 
     Button checkBoxMediaSpecimen;
     Button checkBoxIgnoreExisting;
     Button checkBoxIgnoreAuthorship;
-    Button checkBoxMapUnitIdToCatalogNumber;
-    Button checkBoxMapUnitIdToAccessionNumber;
-    Button checkBoxMapUnitIdToBarcode;
+    Combo checkBoxMapUnitId;
+//    Button checkBoxMapUnitIdToAccessionNumber;
+//    Button checkBoxMapUnitIdToBarcode;
     Button checkBoxRemoveCountry;
     Button checkBoxMoveToDefaultClassification;
     Button checkBoxImportSiblings;
     Button checkBoxAddIndividualsAssociations;
     Button checkBoxReuseDescriptiveGroups;
     Button checkBoxReuseExistingTaxa;
-    Button checkAllowOverride;
+
+
+    Combo useLocalOrAdmin;
 
     @Override
     protected Control createContents(Composite parent) {
@@ -75,7 +96,7 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
             this.noDefaultAndApplyButton();
             return parent;
         }
-        final Composite composite = new Composite(parent, SWT.NULL);
+        composite = new Composite(parent, SWT.NULL);
         GridLayout gridLayout = new GridLayout();
         composite.setLayout(gridLayout);
 
@@ -119,44 +140,22 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
             }
         });
 
-        checkBoxMapUnitIdToCatalogNumber = new Button(composite, SWT.RADIO);
 
-        checkBoxMapUnitIdToCatalogNumber.setText(Messages.AbcdImportPreference_map_unit_nr_catalog_number);
-        checkBoxMapUnitIdToCatalogNumber
+        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);
+        unitIdLabel.setText(Messages.AbcdImportPreference_map_unit_nr_catalog_number);
+        checkBoxMapUnitId = new Combo(composite, SWT.BORDER| SWT.READ_ONLY);
+        checkBoxMapUnitId.setLayoutData(gridData);
+        checkBoxMapUnitId.add(ACCESSION_NUMBER);
+        checkBoxMapUnitId.add(BARCODE);
+        checkBoxMapUnitId.add(CATALOGUE_NUMBER);
+        checkBoxMapUnitId
         .setToolTipText(Messages.AbcdImportPreference_map_unit_number_catalog_number_tooltip);
-        checkBoxMapUnitIdToCatalogNumber.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                configurator.setMapUnitIdToCatalogNumber(!configurator.isMapUnitIdToCatalogNumber());
-                setApply(true);
-            }
-        });
-//TODO: only one of the mappings can be checked!
-        checkBoxMapUnitIdToAccessionNumber = new Button(composite, SWT.RADIO);
-
-        checkBoxMapUnitIdToAccessionNumber.setText(Messages.AbcdImportPreference_map_unit_number_to_accession_number);
-        checkBoxMapUnitIdToAccessionNumber
-        .setToolTipText(Messages.AbcdImportPreference_map_unit_number_accession_number_tooltip);
-        checkBoxMapUnitIdToAccessionNumber.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                configurator.setMapUnitIdToAccessionNumber(!configurator.isMapUnitIdToAccessionNumber());
-                setApply(true);
-            }
-        });
-
-        checkBoxMapUnitIdToBarcode = new Button(composite, SWT.RADIO);
-
-        checkBoxMapUnitIdToBarcode.setText(Messages.AbcdImportPreference_map_unit_number_barcode);
-        checkBoxMapUnitIdToBarcode
-        .setToolTipText(Messages.AbcdImportPreference_map_unit_number_barcode_tooltip);
-        checkBoxMapUnitIdToBarcode.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                configurator.setMapUnitIdToBarcode(!configurator.isMapUnitIdToBarcode());
-                setApply(true);
-            }
-        });
+        checkBoxMapUnitId.addSelectionListener(this);
 
         checkBoxRemoveCountry = new Button(composite, SWT.CHECK);
 
@@ -242,10 +241,21 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
         textDNAProviderString = new Text(composite, SWT.NONE);
         textDNAProviderString.setEnabled(true);
         textDNAProviderString.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true, 1, 1));
+        textDNAProviderString.addKeyListener(new KeyListener() {
+
+            @Override
+            public void keyReleased(KeyEvent e) {
+                setApply(true);
+            }
+
+            @Override
+            public void keyPressed(KeyEvent e) {
+                setApply(true);
+
+            }
+        }) ;
+
 
-        GridData gridData = new GridData();
-        gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false);
-        gridData.horizontalIndent = 5;
 //      classificationSelection.setLayoutData(gridData);
         Label nomenclaturalCodeLabel = new Label(composite, SWT.NONE);
         nomenclaturalCodeLabel.setText("Nomenclatural Code");
@@ -264,30 +274,34 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
             allowOverride = preference.isAllowOverride();
         }
 
-        checkAllowOverride = new Button(composite, SWT.CHECK);
-        if (isAdminPreference){
-            checkAllowOverride.setSelection(allowOverride);
-            checkAllowOverride.setText(Messages.Preference_allow_override);
-            checkAllowOverride
-                .setToolTipText(Messages.AbcdImportPreference_allow_override_tooltip);
+        useLocalOrAdmin = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
+        if (!isAdminPreference){
+            useLocalOrAdmin.add(LocalOrDefaultEnum.Default.getLabel(), 0);
+            useLocalOrAdmin.add(LocalOrDefaultEnum.Local.getLabel(), 1);
+
         }else{
-            checkAllowOverride.setSelection(override);
-            checkAllowOverride.setText(Messages.AbcdImportPreference_override);
-            checkAllowOverride
-                .setToolTipText(Messages.AbcdImportPreference_override_tooltip);
+            useLocalOrAdmin.add(LocalOrDefaultEnum.AllowOverride.getLabel(), 0);
+            useLocalOrAdmin.add(LocalOrDefaultEnum.Database.getLabel(), 1);
         }
-        checkAllowOverride.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                if (isAdminPreference){
-                    allowOverride = !allowOverride;
-                }else{
-                    override = !override;
-                }
-                setApply(true);
-            }
 
-        });
+        if (!isAdminPreference){
+            if (override && allowOverride){
+                useLocalOrAdmin.select(1);
+            }else{
+                useLocalOrAdmin.select(0);
+                composite.setEnabled(false);
+            }
+        }else{
+            if (allowOverride){
+                useLocalOrAdmin.select(0);
+            }else{
+                useLocalOrAdmin.select(1);
+            }
+        }
+        useLocalOrAdmin.addSelectionListener(this);
+        if (!allowOverride){
+            useLocalOrAdmin.setEnabled(false);
+        }
         setSelections();
 
         return composite;
@@ -298,9 +312,45 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
         if (e.getSource().equals(nomenclaturalCodeSelectionCombo)){
             this.configurator.setNomenclaturalCode(NomenclaturalCode.getByKey(nomenclaturalCodeSelectionCombo.getText()));
         }
-        if (e.getSource().equals(overrideCombo)) {
-            override = overrideCombo.getText().equals(LocalOrDefaultEnum.Local.getLabel())?true:false;
+        if (e.getSource().equals(checkBoxMapUnitId)){
+            String text = checkBoxMapUnitId.getText();
+            if (text.equals(ACCESSION_NUMBER)){
+                this.configurator.setMapUnitIdToAccessionNumber(true);
+                this.configurator.setMapUnitIdToBarcode(false);
+                this.configurator.setMapUnitIdToCatalogNumber(false);
+            }else if (text.equals(BARCODE)){
+                this.configurator.setMapUnitIdToAccessionNumber(false);
+                this.configurator.setMapUnitIdToBarcode(true);
+                this.configurator.setMapUnitIdToCatalogNumber(false);
+            }else{
+                this.configurator.setMapUnitIdToAccessionNumber(false);
+                this.configurator.setMapUnitIdToBarcode(false);
+                this.configurator.setMapUnitIdToCatalogNumber(true);
+            }
+        }
+        if (e.getSource().equals(useLocalOrAdmin)){
+            if (useLocalOrAdmin.getText().equals(LocalOrDefaultEnum.Default.getLabel()) || useLocalOrAdmin.getText().equals(LocalOrDefaultEnum.Database.getLabel())){
+               composite.setEnabled(false);
+               PreferencesUtil.extractAbcdConfiguratorFromPreferenceString(configurator, preference.getValue());
+               setSelections();
+
+               if (isAdminPreference){
+                   allowOverride = false;
+               }else{
+                   override = false;
+               }
+            }else{
+               composite.setEnabled(true);
+               if (isAdminPreference){
+                   allowOverride = true;
+               }else{
+                   override = true;
+               }
+            }
         }
+        this.setApply(true);
+
+
        // PreferencesUtil.recursiveSetEnabled(composite, override);
         setApply(true);
 
@@ -312,6 +362,11 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
             return true;
         }
         if (configurator != null){
+            try{
+                configurator.setDnaSoure(URI.create(textDNAProviderString.getText()));
+            }catch(IllegalArgumentException e){
+                //dna provider is not an uri
+            }
             String configString = configurator.toString();
 
 
@@ -363,23 +418,33 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
         override = PreferencesUtil.getBooleanValue(
                 PreferencesUtil.prefOverrideKey(PreferencePredicate.AbcdImportConfig.getKey()), true) != null? PreferencesUtil.getBooleanValue(
                         PreferencesUtil.prefOverrideKey(PreferencePredicate.AbcdImportConfig.getKey()), true):false;
-
-       configurator = PreferencesUtil.getLocalAbcdImportConfigurator();
+       if (allowOverride && override){
+           configurator = PreferencesUtil.getLocalAbcdImportConfigurator();
+       }else{
+           PreferencesUtil.extractAbcdConfiguratorFromPreferenceString(configurator, preference.getValue());
+       }
     }
 
     protected void setSelections(){
         checkBoxMediaSpecimen.setSelection(configurator.isAddMediaAsMediaSpecimen());
         checkBoxIgnoreExisting.setSelection(configurator.isIgnoreImportOfExistingSpecimen());
         checkBoxIgnoreAuthorship.setSelection(configurator.isIgnoreAuthorship());
-        checkBoxMapUnitIdToCatalogNumber.setSelection(configurator.isMapUnitIdToCatalogNumber());
-        checkBoxMapUnitIdToAccessionNumber.setSelection(configurator.isMapUnitIdToAccessionNumber());
-        checkBoxMapUnitIdToBarcode.setSelection(configurator.isMapUnitIdToBarcode());
+        if (configurator.isMapUnitIdToAccessionNumber()){
+            checkBoxMapUnitId.select(0);
+        }else if (configurator.isMapUnitIdToBarcode()){
+            checkBoxMapUnitId.select(1);
+        }else{
+            checkBoxMapUnitId.select(2);
+        }
+
+
         checkBoxRemoveCountry.setSelection(configurator.isRemoveCountryFromLocalityText());
         checkBoxImportSiblings.setSelection(configurator.isGetSiblings());
         checkBoxAddIndividualsAssociations.setSelection(configurator.isAddIndividualsAssociationsSuchAsSpecimenAndObservations());
         checkBoxReuseDescriptiveGroups.setSelection(configurator.isReuseExistingDescriptiveGroups());
         checkBoxReuseExistingTaxa.setSelection(configurator.isReuseExistingTaxaWhenPossible());
-        textDNAProviderString.setText(configurator.getDnaSoure().toString());
+
+        textDNAProviderString.setText(configurator.getDnaSoure()!= null? configurator.getDnaSoure().toString():"");
         int index = 0;
         if (configurator.getNomenclaturalCode() != null){
             for (String label : nomenclaturalCodeSelectionCombo.getItems()){
@@ -391,16 +456,7 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
         }else{
             nomenclaturalCodeSelectionCombo.select(index);
         }
-        if (isAdminPreference){
-            checkAllowOverride.setSelection(allowOverride || preference == null);
-//            if (preference == null){
-//                checkAllowOverride.setEnabled(false);
-//            }else{
-//                checkAllowOverride.setEnabled(true);
-//            }
-        }else{
-            checkAllowOverride.setSelection(override);
-        }
+
     }
 
 }
index 28e9969fa973a4a4b912f76da57791ce6a746330..7321816ad3ab5a7a7e9a2b69b4422ad993f52cb2 100755 (executable)
@@ -9,24 +9,9 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.commons.lang.StringUtils;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.taxeditor.l10n.Messages;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.preference.GeneralTermPreference;
 
 /**
  * <p>LanguageMenuPreferences class.</p>
@@ -35,7 +20,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created 24.08.2009
  * @version 1.0
  */
-public class CommonNameLanguagePreferences extends AbstractMenuPreferences<Language> {
+public class CommonNameLanguagePreferences extends GeneralTermPreference {
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.preferences.lang"{trunked}</code> */
        public final static String ID = "eu.etaxonomy.taxeditor.preferences.languages"; //$NON-NLS-1$
@@ -44,97 +29,11 @@ public class CommonNameLanguagePreferences extends AbstractMenuPreferences<Langu
         * <p>Constructor for LanguageMenuPreferences.</p>
         */
        public CommonNameLanguagePreferences() {
-               super("Language Preferences", //$NON-NLS-1$
-                               Messages.CommonNameLanguageMenuPreferences_configure,
-                               false);
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.AbstractMenuPreferences#createContents(org.eclipse.swt.widgets.Composite)
-        */
-       /** {@inheritDoc} */
-       @Override
-       public Control createContents(Composite parent) {
-               Control control = super.createContents(parent);
-
-               tableViewer.setLabelProvider(new LanguagePreferenceLabelProvider());
-               tableViewer.setComparator(new ViewerComparator());
-
-               return control;
+           super();
+        setLocalPref(true);
+        setPredicate(PreferencePredicate.CommonNameLanguages);
+        type = TermType.Language;
        }
 
-       class LanguagePreferenceLabelProvider extends LabelProvider implements ITableLabelProvider{
-
-               /* (non-Javadoc)
-                * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-                */
-               @Override
-        public Image getColumnImage(Object element, int columnIndex) {
-                       return null;
-               }
-
-               /* (non-Javadoc)
-                * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-                */
-               @Override
-        public String getColumnText(Object element, int columnIndex) {
-                       String description = ((Language)element).getDescription();
-                       if (description == null) {
-                               description = ((Language)element).getLabel() + Messages.LanguageMenuPreferences_warning;
-                       }
-                       return description;
-               }
-
-               }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTermClass()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected TermType getTermType() {
-               return TermType.Language;
-       }
-
-
-       @Override
-       protected void refresh(List<Language> definedTerms) {
-        tableViewer.setInput(definedTerms);
-        List<UUID> uuids = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.CommonNameLanguages.getKey(), true);
-        List<Language> preferedTerms = CdmStore.getTermManager().getTerms(uuids, Language.class);
-
-        tableViewer.setCheckedElements(preferedTerms.toArray());
-    }
-
-
-
-       @Override
-    public boolean performOk() {
-        if(!CdmStore.isActive()) {
-            return true;
-        }
-
-        if(super.checkNoneChecked()){
-            return false;
-        }
-
-        if(tableViewer!=null){
-            List<UUID> preferredTermUuids = new ArrayList<UUID>();
-            if (tableViewer.getCheckedElements().length == tableViewer.getTable().getItemCount()){
-                PreferencesUtil.setStringValue(PreferencePredicate.CommonNameLanguages.getKey(), "");
-            }else{
-                for (Object element : tableViewer.getCheckedElements()){
-                    preferredTermUuids.add(((Language)element).getUuid());
-                }
-
-                String preferredLanguagesString = StringUtils.join(preferredTermUuids, ";");
-                PreferencesUtil.setStringValue(PreferencePredicate.CommonNameLanguages.getKey(), preferredLanguagesString);
-                PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.CommonNameLanguages.getKey()), true);
-            }
-
-            PreferencesUtil.firePreferencesChanged(this.getClass());
-        }
 
-        return super.performOk();
-    }
 }
index 732694e4965028a35e586e34ded1c5ef29a3e03e..5d978122446b03e1f6af9c03bef6ffeb861eee5c 100644 (file)
@@ -9,16 +9,9 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.taxeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.preference.GeneralTermPreference;
 
 /**
  * <p>LanguageMenuPreferences class.</p>
@@ -27,7 +20,7 @@ import eu.etaxonomy.taxeditor.l10n.Messages;
  * @created 24.08.2009
  * @version 1.0
  */
-public class LanguageMenuPreferences extends AbstractMenuPreferences<Language> {
+public class LanguageMenuPreferences extends GeneralTermPreference {
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.preferences.lang"{trunked}</code> */
        public final static String ID = "eu.etaxonomy.taxeditor.preferences.languages"; //$NON-NLS-1$
@@ -36,55 +29,11 @@ public class LanguageMenuPreferences extends AbstractMenuPreferences<Language> {
         * <p>Constructor for LanguageMenuPreferences.</p>
         */
        public LanguageMenuPreferences() {
-               super("Language Preferences", //$NON-NLS-1$
-                               Messages.LanguageMenuPreferences_configure,
-                               false);
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.AbstractMenuPreferences#createContents(org.eclipse.swt.widgets.Composite)
-        */
-       /** {@inheritDoc} */
-       @Override
-       public Control createContents(Composite parent) {
-               Control control = super.createContents(parent);
-
-               tableViewer.setLabelProvider(new LanguagePreferenceLabelProvider());
-               tableViewer.setComparator(new ViewerComparator());
-
-               return control;
+           super();
+        setLocalPref(true);
+        setPredicate(PreferencePredicate.AvailableLanguages);
+        type = TermType.Language;
        }
 
-       class LanguagePreferenceLabelProvider extends LabelProvider implements ITableLabelProvider{
 
-               /* (non-Javadoc)
-                * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-                */
-               @Override
-        public Image getColumnImage(Object element, int columnIndex) {
-                       return null;
-               }
-
-               /* (non-Javadoc)
-                * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-                */
-               @Override
-        public String getColumnText(Object element, int columnIndex) {
-                       String description = ((Language)element).getDescription();
-                       if (description == null) {
-                               description = ((Language)element).getLabel() + Messages.LanguageMenuPreferences_warning;
-                       }
-                       return description;
-               }
-
-               }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTermClass()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected TermType getTermType() {
-               return TermType.Language;
-       }
 }
index eaacd8181c9baaad06e3efc971e541ee148bd083..35964c06942c2cd95561ff9b0bccd10dbf5a96b6 100644 (file)
@@ -9,9 +9,9 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.taxeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.preference.GeneralTermPreference;
 
 /**
  * <p>MarkerTypeMenuPreferences class.</p>
@@ -20,23 +20,17 @@ import eu.etaxonomy.taxeditor.l10n.Messages;
  * @created Aug 28, 2009
  * @version 1.0
  */
-public class MarkerTypeMenuPreferences extends AbstractMenuPreferences<MarkerType>{
+public class MarkerTypeMenuPreferences extends GeneralTermPreference{
 
        /**
         * <p>Constructor for MarkerTypeMenuPreferences.</p>
         */
        public MarkerTypeMenuPreferences() {
-               super("Marker Type Preferences" , //$NON-NLS-1$
-                               Messages.MarkerTypeMenuPreferences_display,
-                               true);
+           super();
+        setLocalPref(true);
+        setPredicate(PreferencePredicate.MarkerTypes);
+        type = TermType.MarkerType;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTermClass()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected TermType getTermType() {
-               return TermType.MarkerType;
-       }
+
 }
index 999a79e9072150cf0b8e957604cbac8fcf04f383..f9e3f8642d46dc3c8df5131f83cba75436e04beb 100644 (file)
@@ -3,9 +3,9 @@
  */
 package eu.etaxonomy.taxeditor.preference.menu;
 
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.cdm.model.description.MeasurementUnit;
-import eu.etaxonomy.taxeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.preference.GeneralTermPreference;
 
 /**
  * <p>MeasurementUnitMenuPreferences class.</p>
@@ -13,24 +13,18 @@ import eu.etaxonomy.taxeditor.l10n.Messages;
  * @author n.hoffmann
  * @version $Id: $
  */
-public class MeasurementUnitMenuPreferences extends AbstractMenuPreferences<MeasurementUnit> {
+public class MeasurementUnitMenuPreferences extends GeneralTermPreference {
 
        /**
         * <p>Constructor for MeasurementUnitMenuPreferences.</p>
         */
        public MeasurementUnitMenuPreferences() {
-               super("Measurement Units", //$NON-NLS-1$
-                               Messages.MeasurementUnitMenuPreferences_edit,
-                               true);
+           super();
+        setLocalPref(true);
+        setPredicate(PreferencePredicate.MeasurementUnit);
+        type = TermType.MeasurementUnit;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTermClass()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected TermType getTermType() {
-               return TermType.MeasurementUnit;
-       }
+
 
 }
index ca182fbbf2945180c3ef960aacebc2e6790c5cd3..022b14865ea1b6ff151fb61a7400e6f27ac401e9 100644 (file)
@@ -9,16 +9,9 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.cdm.model.name.NameRelationshipType;
-import eu.etaxonomy.taxeditor.l10n.Messages;
-import eu.etaxonomy.taxeditor.labels.ILabelImageStrategy;
-import eu.etaxonomy.taxeditor.labels.LabelImageProvider;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.preference.GeneralTermPreference;
 
 /**
  * <p>NameRelationshipTypeMenuPreferences class.</p>
@@ -28,71 +21,20 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  * @version 1.0
  */
 public class NameRelationshipTypeMenuPreferences extends
-               AbstractMenuPreferences<NameRelationshipType> {
+               GeneralTermPreference {
 
 
        /**
         * <p>Constructor for NameRelationshipTypeMenuPreferences.</p>
         */
        public NameRelationshipTypeMenuPreferences() {
-               super("Name relationship types", //$NON-NLS-1$
-                               Messages.NameRelationshipTypeMenuPreferences_relationshipTypes,
-                               false);
+           super();
+        setLocalPref(true);
+        setPredicate(PreferencePredicate.NameRelationshipType);
+        type = TermType.NameRelationshipType;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.AbstractMenuPreferences#createContents(org.eclipse.swt.widgets.Composite)
-        */
-       /** {@inheritDoc} */
-       @Override
-       public Control createContents(Composite parent) {
-               Control container = super.createContents(parent);
-               tableViewer.setLabelProvider(new NameRelationLabelProvider());
-               return container;
-       }
-
-       public class NameRelationLabelProvider extends DefinedTermBaseLabelProvider {
-
-               private LabelImageProvider labelProvider;
 
-               public NameRelationLabelProvider() {
-                       super();
 
-                       ILabelImageStrategy strategy = LabelImageProvider.getLabelStrategy(
-                                                       PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null));
-                       this.labelProvider = new LabelImageProvider(strategy);
-               }
 
-               /* (non-Javadoc)
-                * @see eu.etaxonomy.taxeditor.preference.AbstractMenuPreferences.MenuPreferenceLabelProvider#getColumnImage(java.lang.Object, int)
-                */
-               @Override
-               public Image getColumnImage(Object element, int columnIndex) {
-                       // The preference page looked lame with images
-//                     if (element instanceof NameRelationshipType) {
-//                             return labelProvider.getNameRelationImage((NameRelationshipType) element);
-//                     }
-                       return super.getColumnImage(element, columnIndex);
-               }
-
-               /* (non-Javadoc)
-                * @see eu.etaxonomy.taxeditor.preference.AbstractMenuPreferences.MenuPreferenceLabelProvider#getColumnText(java.lang.Object, int)
-                */
-               @Override
-               public String getColumnText(Object element, int columnIndex) {
-                       if (element instanceof NameRelationshipType) {
-                               return labelProvider.getNameRelationTypeLabel((NameRelationshipType) element);
-                       }
-                       return super.getColumnText(element, columnIndex);
-               }
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTermClass()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected TermType getTermType() {
-               return TermType.NameRelationshipType;
-       }
 }
index 32a947ed44f94d15f1d51f2e319d0e707f7f7ea8..73e5625dda7ef0cc3c47fbcb332c4136db7fd88a 100644 (file)
@@ -9,9 +9,9 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.cdm.model.location.NamedAreaType;
-import eu.etaxonomy.taxeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.preference.GeneralTermPreference;
 
 /**
  * <p>NamedAreaTypeMenuPreferences class.</p>
@@ -20,23 +20,16 @@ import eu.etaxonomy.taxeditor.l10n.Messages;
  * @created May 11, 2010
  * @version 1.0
  */
-public class NamedAreaTypeMenuPreferences extends AbstractMenuPreferences<NamedAreaType> {
+public class NamedAreaTypeMenuPreferences extends GeneralTermPreference{
 
        /**
         * <p>Constructor for NamedAreaTypeMenuPreferences.</p>
         */
        public NamedAreaTypeMenuPreferences() {
-               super("Named Area Types", //$NON-NLS-1$
-                               Messages.NamedAreaTypeMenuPreferences,
-                               false);
-       }
+               setLocalPref(true);
+               setPredicate(PreferencePredicate.NamedAreaTypes);
+               type = TermType.NamedAreaType;
+           }
+
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTermClass()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected TermType getTermType() {
-               return TermType.NamedAreaType;
-       }
 }
index d7ab33759c07ab1ed2eaef1d44e6665843a2cb14..813b42eb27c036c804763ff818acf4c4b5fa6bfb 100644 (file)
@@ -9,9 +9,9 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.taxeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.preference.GeneralTermPreference;
 
 
 /**
@@ -21,24 +21,18 @@ import eu.etaxonomy.taxeditor.l10n.Messages;
  * @created Jun 25, 2010
  * @version 1.0
  */
-public class StageMenuPreferences extends AbstractMenuPreferences<DefinedTerm> {
+public class StageMenuPreferences extends GeneralTermPreference {
 
        /**
         * <p>Constructor for StageMenuPreferences.</p>
         */
        public StageMenuPreferences() {
-               super("Stage Preferences", //$NON-NLS-1$
-                               Messages.StageMenuPreferences_choose,
-                               false);
+           super();
+        setLocalPref(true);
+        setPredicate(PreferencePredicate.Stage);
+        type = TermType.Stage;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTermClass()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected TermType getTermType() {
-               return TermType.Stage;
-       }
+
 
 }
index f303fba71c7831d75192babf41d4406e68d67aea..0bd2c73ce752e06bc41641fc10411854a2594873 100644 (file)
@@ -9,9 +9,9 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
-import eu.etaxonomy.taxeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.preference.GeneralTermPreference;
 
 /**
  * <p>TaxonRelationshipTypeMenuPreferences class.</p>
@@ -21,24 +21,17 @@ import eu.etaxonomy.taxeditor.l10n.Messages;
  * @version 1.0
  */
 public class TaxonRelationshipTypeMenuPreferences extends
-               AbstractMenuPreferences<TaxonRelationshipType> {
+               GeneralTermPreference {
 
        /**
         * <p>Constructor for TaxonRelationshipTypeMenuPreferences.</p>
         */
        public TaxonRelationshipTypeMenuPreferences() {
-               super("Taxon Relationship Type Preferences", //$NON-NLS-1$
-                               Messages.TaxonRelationshipTypeMenuPreferences_configure,
-                               false);
+           super();
+        setLocalPref(true);
+        setPredicate(PreferencePredicate.ConceptRelationshipType);
+        type = TermType.TaxonRelationshipType;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.preference.menu.AbstractMenuPreferences#getTermClass()
-        */
-       /** {@inheritDoc} */
-       @Override
-       protected TermType getTermType() {
-               return TermType.TaxonRelationshipType;
-       }
 
 }