use NewTaxEditorInstance for CdmPreferences in TaxEditor and fix representation handl...

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralPreference.java
index 33e7c60edb90264642a317e7f2b707a849d5ff16..50a8413a75143c0db28aeb98542f38d32d51a7ba 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralPreference.java
@@ -242,36 +242,36 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
         }
         IPreferenceService service = controller.getPreferenceService();
 
-        CdmPreference pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.DistributionEditorActivated, Boolean.toString(isEditorActivated));
+        CdmPreference pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DistributionEditorActivated, Boolean.toString(isEditorActivated));
         //ToDo
         pref.setAllowOverride(allowOverride);
         service.set(pref);
 
-        pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.ShowIdInVocabulary, Boolean.toString(isShowIdInVocabulary));
+        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.ShowIdInVocabulary, Boolean.toString(isShowIdInVocabulary));
         //ToDo
         pref.setAllowOverride(true);
         service.set(pref);
 
-        pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.ShowSymbol1, Boolean.toString(isShowSymbol1));
+        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.ShowSymbol1, Boolean.toString(isShowSymbol1));
         //ToDo
         pref.setAllowOverride(true);
         service.set(pref);
-        pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.ShowSymbol2, Boolean.toString(isShowSymbol2));
+        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.ShowSymbol2, Boolean.toString(isShowSymbol2));
         //ToDo
         pref.setAllowOverride(true);
         service.set(pref);
 
 
-        pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.ShowSymbolForStatus, Boolean.toString(isShowSymbol));
+        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.ShowSymbolForStatus, Boolean.toString(isShowSymbol));
         //ToDo
         pref.setAllowOverride(true);
         service.set(pref);
 
-        pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.ShowRankInDistributionEditor, Boolean.toString(isShowRank));
+        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.ShowRankInDistributionEditor, Boolean.toString(isShowRank));
         //ToDo
         pref.setAllowOverride(true);
         service.set(pref);
-        pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.AreasSortedByIdInVocabulary, Boolean.toString(isSortByVocabularyOrder));
+        pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.AreasSortedByIdInVocabulary, Boolean.toString(isSortByVocabularyOrder));
         //ToDo
         pref.setAllowOverride(true);
         service.set(pref);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
index 62bfae8f2001c521227475afb8e4c6bebd686ccd..6430a922d4fa121e7dda1bfe44e3671963f05538 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
@@ -51,25 +51,25 @@ public class GeneralAdminPreferencePage extends CdmPreferencePage implements IE4
         ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
         if (controller != null){
             IPreferenceService service = controller.getPreferenceService();
-            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.ShowImportExportMenu);
+            PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu);
             CdmPreference isShowSpecimenPref = service.find(key);
             if (isShowSpecimenPref != null){
                 this.isShowIOMenu = Boolean.valueOf(isShowSpecimenPref.getValue());
             }
 
-            key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.ShowMediaView);
+            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowMediaView);
             CdmPreference isShowMediaViewPref = service.find(key);
             if (isShowMediaViewPref != null){
                 this.isShowMediaView = Boolean.valueOf(isShowMediaViewPref.getValue());
             }
 
-            key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.ShowChecklistPerspective);
+            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective);
             CdmPreference isShowChecklistPref = service.find(key);
             if (isShowChecklistPref != null){
                 this.isShowCheckListPerspective = Boolean.valueOf(isShowChecklistPref.getValue());
             }
 
-            key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.ShowTaxonNodeWizard);
+            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard);
             CdmPreference isShowTaxonNodeWizardPref = service.find(key);
             if (isShowTaxonNodeWizardPref != null){
                 this.isShowTaxonNodeWizard = Boolean.valueOf(isShowTaxonNodeWizardPref.getValue());
@@ -141,16 +141,16 @@ public class GeneralAdminPreferencePage extends CdmPreferencePage implements IE4
        if (controller != null){
            IPreferenceService service = controller.getPreferenceService();
 
-           CdmPreference pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
+           CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
            pref.setAllowOverride(false);
            service.set(pref);
-           pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowMediaView, Boolean.toString(this.isShowMediaView));
+           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowMediaView, Boolean.toString(this.isShowMediaView));
            pref.setAllowOverride(false);
            service.set(pref);
-           pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
+           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
            pref.setAllowOverride(false);
            service.set(pref);
-           pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
+           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
            pref.setAllowOverride(false);
            service.set(pref);
            PreferencesUtil.updateDBPreferences();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java
index 56e4dd9c783378db2f27af226db9b94d4b4bbf9c..e41818102b609429e5f028a29a6b77240a4e868f 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java
@@ -130,7 +130,7 @@ public class PublishFlagPreference extends CdmPreferencePage implements IE4Admin
         } else{
             preferenceValue = inherit_from_parent;
         }
-        CdmPreference pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.DefaultBehaviourForPublishFlag, preferenceValue);
+        CdmPreference pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DefaultBehaviourForPublishFlag, preferenceValue);
         pref.setAllowOverride(true);
 
         ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
index c92ac4dc8df707bb1f890c0f74fcd1103161a523..420b2f1e500ac65334e6026d0a685153aa7dd833 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SpecimenAdminPreferences.java
@@ -208,22 +208,22 @@ public class SpecimenAdminPreferences extends CdmPreferencePage implements IE4Ad
         if (controller != null){
             IPreferenceService service = controller.getPreferenceService();
 
-            CdmPreference pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowCollectingAreasInGeneralSection, Boolean.toString(this.isShowCollectingAreaInGeneralSection));
+            CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowCollectingAreasInGeneralSection, Boolean.toString(this.isShowCollectingAreaInGeneralSection));
             pref.setAllowOverride(isUseLocalPreference);
             service.set(pref);
-            pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowSpecimen, Boolean.toString(this.isShowSpecimenRelatedIssues));
+            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowSpecimen, Boolean.toString(this.isShowSpecimenRelatedIssues));
             pref.setAllowOverride(isUseLocalPreference);
             service.set(pref);
 
-            pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.DeterminationOnlyForFieldUnits, Boolean.toString(this.isDeterminationOnlyForFieldUnits));
+            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DeterminationOnlyForFieldUnits, Boolean.toString(this.isDeterminationOnlyForFieldUnits));
             pref.setAllowOverride(isUseLocalPreference);
             service.set(pref);
 
-            pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowTaxonAssociations, Boolean.toString(this.isShowTaxonAssociation));
+            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonAssociations, Boolean.toString(this.isShowTaxonAssociation));
             pref.setAllowOverride(isUseLocalPreference);
             service.set(pref);
 
-            pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowLifeForm, Boolean.toString(this.isShowLifeForm));
+            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowLifeForm, Boolean.toString(this.isShowLifeForm));
             pref.setAllowOverride(isUseLocalPreference);
             service.set(pref);
             PreferencesUtil.updateDBPreferences();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenCommonNameAreaWizardAdminHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenCommonNameAreaWizardAdminHandler.java
index 5e7993df5835b62b05b2b3b1936776f601ed8388..52bda5cf32a0418aa666dc50c4693aee34a17dfc 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenCommonNameAreaWizardAdminHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenCommonNameAreaWizardAdminHandler.java
@@ -32,7 +32,7 @@ public class OpenCommonNameAreaWizardAdminHandler {
     public void execute(@Named(IServiceConstants.ACTIVE_SHELL)Shell shell) {
         CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.CommonNameAreaVocabularies);
         if (pref == null){
-            pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.CommonNameAreaVocabularies, null);
+            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameAreaVocabularies, null);
         }
         AvailableVocabularyWizard wizard = new AvailableVocabularyWizard(false, pref, "Common Names");
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenDistributionEditorWizardHandlerAdminE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenDistributionEditorWizardHandlerAdminE4.java
index d0fc9267e63740955c73a98f9652c59a130b078d..f355e57210848140d2e1bb217eb2ca4b4c93a6e6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenDistributionEditorWizardHandlerAdminE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenDistributionEditorWizardHandlerAdminE4.java
@@ -34,7 +34,7 @@ public class OpenDistributionEditorWizardHandlerAdminE4 {
         public void execute(@Named(IServiceConstants.ACTIVE_SHELL)Shell shell) {
             CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
             if (pref == null){
-                pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.AvailableDistributionAreaVocabularies, null);
+                pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionAreaVocabularies, null);
             }
             AvailableVocabularyWizard wizard = new AvailableVocabularyWizard(false, pref, "Distribution");
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenDistributionEditorWizardHandlerE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenDistributionEditorWizardHandlerE4.java
index 7a1d941189a0f677e134646e537bd1c5b11a3009..9d5f9f2b4597682ea8e0bec14d29bcb1ffc8b24f 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenDistributionEditorWizardHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/e4/OpenDistributionEditorWizardHandlerE4.java
@@ -31,7 +31,7 @@ public class OpenDistributionEditorWizardHandlerE4 {
 
         @Execute
         public void execute(@Named(IServiceConstants.ACTIVE_SHELL)Shell shell) {
-            CdmPreference pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.AvailableDistributionAreaVocabularies, null);
+            CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionAreaVocabularies, null);
             AvailableVocabularyWizard wizard = new AvailableVocabularyWizard(true, pref, "Distribution");
 
             WizardDialog dialog = new WizardDialog(shell,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 4cdda9cd403f3de2108e9f783b420f90e1bf6701..9c46e6ae04e8ac9d4e7a875513c40ac9f77e7dd7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -1260,7 +1260,7 @@ public class PreferencesUtil implements IPreferenceKeys {
         Abcd206ImportConfigurator config = Abcd206ImportConfigurator.NewInstance(null,null);
         ICdmRepository controller;
         controller = CdmStore.getCurrentApplicationConfiguration();
-        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.AbcdImportConfig);
+        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AbcdImportConfig);
         CdmPreference preference = null;
         if (controller == null){
             return null;
@@ -1353,7 +1353,7 @@ public class PreferencesUtil implements IPreferenceKeys {
         Abcd206ImportConfigurator config = Abcd206ImportConfigurator.NewInstance(null,null);
         ICdmRepository controller;
         controller = CdmStore.getCurrentApplicationConfiguration();
-        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.AbcdImportConfig);
+        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AbcdImportConfig);
         CdmPreference preference = null;
         if (controller == null){
             return ;
@@ -1536,12 +1536,12 @@ public static void setPreferredNamedAreasForDistributionEditor(
             } else{
                 getPreferenceStore().setValue(DISTRIBUTION_AREA_OCCURENCE_STATUS,
                         saveCheckedElements);
-                preference = CdmPreference.NewInstance(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);
+                preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);
                 setPreferenceToDB(preference);
 
             }
         } else{
-           preference = CdmPreference.NewInstance(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);
+           preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);
            setPreferenceToDB(preference);
            getPreferenceStore().setValue(DISTRIBUTION_AREA_OCCURENCE_STATUS,
                     saveCheckedElements);
@@ -1574,11 +1574,11 @@ public static void setPreferredVocabulariesForDistributionEditor(String saveChec
             } else{
                 getPreferenceStore().setValue(DISTRIBUTION_VOCABULARIES,
                         saveCheckedElements);
-                preference = CdmPreference.NewInstance(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.AvailableDistributionAreaVocabularies, saveCheckedElements);
+                preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaVocabularies, saveCheckedElements);
                 setPreferenceToDB(preference);
             }
         } else{
-            preference = CdmPreference.NewInstance(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.AvailableDistributionAreaVocabularies, saveCheckedElements);
+            preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaVocabularies, saveCheckedElements);
             setPreferenceToDB(preference);
             getPreferenceStore().setValue(DISTRIBUTION_VOCABULARIES,
                     saveCheckedElements);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
index bee6a427cf4ebd75c6523fbaaa52229214e61ebb..3728df7e954349a1d49080d07d7c6a27dc7da6b9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
@@ -50,11 +50,11 @@ public class SpecimenOrObservationPreferences extends FieldEditorPreferencePageE
         ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
         if (controller != null){
             IPreferenceService service = controller.getPreferenceService();
-            PrefKey keyTaxonAssociation = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.ShowTaxonAssociations);
+            PrefKey keyTaxonAssociation = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonAssociations);
             CdmPreference prefTaxonAssociation = service.find(keyTaxonAssociation);
-            PrefKey keyDeterminationFieldUnit = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.DeterminationOnlyForFieldUnits);
+            PrefKey keyDeterminationFieldUnit = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DeterminationOnlyForFieldUnits);
             CdmPreference prefDeterminationFieldUnit = service.find(keyDeterminationFieldUnit);
-            PrefKey keyCollectingAreas = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.ShowCollectingAreasInGeneralSection);
+            PrefKey keyCollectingAreas = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowCollectingAreasInGeneralSection);
             CdmPreference prefCollectingAreas = service.find(keyCollectingAreas);
 
             getPreferenceStore().setValue(IPreferenceKeys.SHOW_TAXON_ASSOCIATIONS_ALLOW_OVERRIDE, prefTaxonAssociation == null? true : prefTaxonAssociation.isAllowOverride());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusWizard.java
index 527a32f113fb704480da93e61ff888c322ddb171..f71c5910455b1efb8f2848165b71a8d407adf43d 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusWizard.java
@@ -125,7 +125,7 @@ public class AvailableDistributionStatusWizard extends Wizard implements IConver
                 }
             }
            String saveCheckedElements = StringUtils.join(listUIIDChecked, ";");
-           pref = CdmPreference.NewInstance(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.AvailableDistributionStatus, saveCheckedElements);
+           pref = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus, saveCheckedElements);
 
            PreferencesUtil.setPreferenceToDB(pref);
            CdmStore.getTermManager().setPreferredTerms(preferredTerms, aPage.getVocabularies().get(0).getTerms());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java
index 9583c11f519ac608cfdbccc57ebbf3ed23bf78e1..988ba7f2650946aa606724930745035c5b511c74 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java
@@ -128,7 +128,7 @@ public class AvailableVocabularyWizard extends Wizard implements IConversationEn
            if (pref != null){
                predicate = pref.getPredicate();
            }
-           CdmPreference savePref = CdmPreference.NewInstance(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.getByKey(pref.getPredicate()), saveCheckedElements);
+           CdmPreference savePref = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(pref.getPredicate()), saveCheckedElements);
            PreferencesUtil.setPreferenceToDB(savePref);
 
            PreferencesUtil.updateDBPreferences();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/InverseTermWrapper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/InverseTermWrapper.java
index 176deedee4e9cfb7432afa650108803ce2edfdb0..5e196d601811b78055ece76db70ae44b7f16ef99 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/InverseTermWrapper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/InverseTermWrapper.java
@@ -8,6 +8,11 @@
 */
 package eu.etaxonomy.taxeditor.ui.combo;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.Representation;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -75,10 +80,18 @@ public class InverseTermWrapper {
             return "";
         }else{
             String termLabel = null;
+            List<Language> languages = new ArrayList();
+
+            languages.add(CdmStore.getDefaultLanguage());
+            Representation rep = term.getPreferredInverseRepresentation(languages);
             if (useAbbrevLabel){
-                termLabel = term.getInverseSymbol();
+                termLabel = rep.getAbbreviatedLabel();
+                if (termLabel == null){
+                    termLabel = rep.getLabel();
+                }
+
             }else{
-                termLabel = term.getInverseLabel(CdmStore.getDefaultLanguage());
+                termLabel = rep.getLabel();
             }
             if (termLabel == null){
                 termLabel = term.getInverseLabel();
@@ -102,10 +115,14 @@ public class InverseTermWrapper {
             return "";
         }else{
             String termLabel = null;
+            Representation rep = term.getPreferredRepresentation(CdmStore.getDefaultLanguage());
             if (useAbbrevLabel){
-                termLabel = term.getIdInVocabulary();
+                termLabel = rep.getAbbreviatedLabel();
+                if (termLabel == null){
+                    termLabel = rep.getLabel();
+                }
             }else{
-                termLabel = term.getLabel(CdmStore.getDefaultLanguage());
+                termLabel = rep.getLabel();
             }
             if (termLabel == null){
                 termLabel = term.getLabel();