ref #8494: abcd config nom. code is set to default nom. code

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportAdminPreference.java
index 94f34c9483fa4e4257bf492df33a9fadd8ba41cb..03ef5ae7e20192037c37ac7e4c20646d67fb3fd1 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportAdminPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportAdminPreference.java
@@ -275,6 +275,7 @@ public class AbcdImportAdminPreference extends AbcdImportPreference implements I
         if (configurator != null){
             String configString = configurator.toString();
             Abcd206ImportConfigurator defaultConfig = Abcd206ImportConfigurator.NewInstance(null,null);
+            defaultConfig.setNomenclaturalCode(PreferencesUtil.getPreferredNomenclaturalCode());
             if (configString.equals(defaultConfig.toString())){
                 configString = null;
             }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
index 59f7575c9eaae840fe8e618ec5c3959ec1d45dcc..d8152c95319a87f0d5ce22c10849b218e889c12f 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
@@ -256,7 +256,7 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
         nomenclaturalCodeLabel.setText("Nomenclatural Code");
         nomenclaturalCodeSelectionCombo = new Combo(composite, SWT.BORDER| SWT.READ_ONLY);
         nomenclaturalCodeSelectionCombo.setLayoutData(gridData);
-        nomenclaturalCodeSelectionCombo.add(" - ");
+
         for(NomenclaturalCode code: NomenclaturalCode.values()){
             nomenclaturalCodeSelectionCombo.add(code.getKey());
         }
@@ -399,6 +399,7 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
     @Override
     protected void performDefaults() {
         configurator = Abcd206ImportConfigurator.NewInstance(null,null);
+        configurator.setNomenclaturalCode(PreferencesUtil.getPreferredNomenclaturalCode());
         override = false;
         setSelections();
         setApply(true);
@@ -458,7 +459,15 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
                 index++;
             }
         }else{
-            nomenclaturalCodeSelectionCombo.select(index);
+            for (String label : nomenclaturalCodeSelectionCombo.getItems()){
+                NomenclaturalCode code = PreferencesUtil.getPreferredNomenclaturalCode();
+                if (label.equals(code.getKey())){
+                    nomenclaturalCodeSelectionCombo.select(index);
+                    configurator.setNomenclaturalCode(code);
+                }
+                index++;
+            }
+
         }
 
     }