ref #9262: adapt cdmlight preference handling to renamed predicate

diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
index 0d8c113a467ab1daac8b3c33deffae24f91c3c8a..e38132b99e0084afea176930562991bc3815581f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
@@ -188,6 +188,7 @@ extension.name.1 = Store Workbench Model
 page.name.21 = Verbreitungs-Editor
 page.name.140 = Import/Export
 page.name.40 = ABCD Import
+page.name.142 = CdmLight Export
 page.name.41 = Biocase Provider
 page.name.42 = Serverseitige Präferenzen
 page.name.50 = Allgemein

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index 909088c88903b7768fc40c2d4d0d7bf45ef2b251..034fc391196ce0b80c3006bb431cf74d47383163 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -443,6 +443,12 @@
          class="eu.etaxonomy.taxeditor.preference.AbcdImportPreference"
          id="eu.etaxonomy.taxeditor.store.abcdImportPreference"
          name="%page.name.40">
+    </page>
+     <page
+         category="eu.etaxonomy.taxeditor.store.IOPreferencesGeneral"
+         class="eu.etaxonomy.taxeditor.preference.CdmLightExportPreference"
+         id="eu.etaxonomy.taxeditor.store.cdmLightExportPreference"
+         name="%page.name.142">
     </page>
     <page
          category="eu.etaxonomy.taxeditor.store.abcdImportPreference"
@@ -881,6 +887,7 @@
             id="eu.etaxonomy.taxeditor.store.distributionNamedAreaVocabularies"
             name="%page.name.106">
       </page>
+      
       <page
             category="eu.etaxonomy.taxeditor.store.abcdImportPreference"
             class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.AbcdImportProviderAdminPreferencePage"
@@ -946,6 +953,12 @@
             id="eu.etaxonomy.taxeditor.store.abcdImportPreference"
             name="%page.name.40">
       </page>
+      <page
+            category="eu.etaxonomy.taxeditor.store.IOPreference"
+            class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.CdmLightExportAdminPreference"
+            id="eu.etaxonomy.taxeditor.store.cdmLightExportPreference"
+            name="%page.name.142">
+      </page>
       <page
             category="eu.etaxonomy.taxeditor.preferences.namePreferences"
             class="eu.etaxonomy.taxeditor.databaseAdmin.preferencePage.NameDetailsViewAdminConfiguration"

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/CdmLightExportAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/CdmLightExportAdminPreference.java
index 4abb243919e86c6587c94f73f24b98a4e2fd6d7c..5a7d90a886dbc801e4b1253b89ee253a713362f4 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/CdmLightExportAdminPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/CdmLightExportAdminPreference.java
@@ -60,9 +60,9 @@ public class CdmLightExportAdminPreference extends CdmLightExportPreference {
         }
 
         if (recipe == null && preferenceCondensedDistribtionRecipe.isAllowOverride()){
-            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.CdmLightExportCondensedDistributionRecipe));
+            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.CondensedDistributionRecipe));
         }else{
-            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.CdmLightExportCondensedDistributionRecipe, recipe != null? recipe.getKey(): null);
+            pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.CondensedDistributionRecipe, recipe != null? recipe.getKey(): null);
             pref.setAllowOverride(isAllowOverrideCondensedDistributionRecipe);
             service.set(pref);
         }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/cdmlight/CdmLightExportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/cdmlight/CdmLightExportWizardE4.java
index 43524ee4759ab540d234c37c6fc74294f5d58877..6293791d8c65720e2079c4c05883b3535b43aca2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/cdmlight/CdmLightExportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/cdmlight/CdmLightExportWizardE4.java
@@ -63,7 +63,7 @@ AbstractExportWizardE4<CdmLightExportConfigurator> {
         configurator = new CdmLightExportConfigurator(null);
         configurator.setCreateCondensedDistributionString(PreferencesUtil.getBooleanValue(PreferencePredicate.CdmLightExportCondensedDistributionString.getKey()));
         if (configurator.isCreateCondensedDistributionString()){
-            String recipeString = PreferencesUtil.getStringValue(PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getKey());
+            String recipeString = PreferencesUtil.getStringValue(PreferencePredicate.CondensedDistributionRecipe.getKey());
             if (StringUtils.isNotBlank(recipeString)){
                 configurator.setCondensedDistributionRecipe(CondensedDistributionRecipe.valueOf(recipeString));
             }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmLightExportPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmLightExportPreference.java
index 78ca9abfe17c79ad30d0cdd5333cbba337cddaf9..1d01730f1d70889412eeaa2122be4068057b552a 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmLightExportPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmLightExportPreference.java
@@ -100,7 +100,7 @@ public class CdmLightExportPreference extends CdmPreferencePage implements Selec
            });
         }
 
-        comboDistributionStringRecipe = createCombo(composite, CondensedDistributionRecipe.values(), PreferencePredicate.CdmLightExportCondensedDistributionRecipe, "Condensed Distribution String recipe", isAdminPreference);
+        comboDistributionStringRecipe = createCombo(composite, CondensedDistributionRecipe.values(), PreferencePredicate.CondensedDistributionRecipe, "Condensed Distribution String recipe", isAdminPreference);
 
 //        GridData gridData = new GridData(GridData.BEGINNING, GridData.CENTER, true, false);
 //        gridData.horizontalIndent = 9;
@@ -131,7 +131,7 @@ public class CdmLightExportPreference extends CdmPreferencePage implements Selec
                 public void widgetSelected(SelectionEvent e) {
                     setApply(true);
 //                    if (preferenceCondensedDistribtionRecipe == null){
-//                        preferenceCondensedDistribtionRecipe = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CdmLightExportCondensedDistributionRecipe, PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getDefaultValue() != null ?  PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getDefaultValue().toString(): null);
+//                        preferenceCondensedDistribtionRecipe = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CondensedDistributionRecipe, PreferencePredicate.CondensedDistributionRecipe.getDefaultValue() != null ?  PreferencePredicate.CondensedDistributionRecipe.getDefaultValue().toString(): null);
 //                    }
 //                    preferenceCondensedDistribtionRecipe.setAllowOverride(!preferenceCondensedDistribtionRecipe.isAllowOverride());
                     isAllowOverrideCondensedDistributionRecipe = !isAllowOverrideCondensedDistributionRecipe;
@@ -195,10 +195,10 @@ public class CdmLightExportPreference extends CdmPreferencePage implements Selec
            PreferencesUtil.setBooleanValue( PreferencesUtil.prefOverrideKey(PreferencePredicate.CdmLightExportCondensedDistributionString.getKey()), overrideExportCondensedDistribution);
         }
         if(overrideCondensedDistributionRecipe){
-            PreferencesUtil.setStringValue(PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getKey(), recipe.getKey());
-            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getKey()), overrideCondensedDistributionRecipe);
+            PreferencesUtil.setStringValue(PreferencePredicate.CondensedDistributionRecipe.getKey(), recipe.getKey());
+            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.CondensedDistributionRecipe.getKey()), overrideCondensedDistributionRecipe);
         }else{
-           PreferencesUtil.setBooleanValue( PreferencesUtil.prefOverrideKey(PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getKey()), overrideCondensedDistributionRecipe);
+           PreferencesUtil.setBooleanValue( PreferencesUtil.prefOverrideKey(PreferencePredicate.CondensedDistributionRecipe.getKey()), overrideCondensedDistributionRecipe);
         }
 
 
@@ -219,7 +219,7 @@ public class CdmLightExportPreference extends CdmPreferencePage implements Selec
     protected void performDefaults() {
         isExportCondensedDistribution = Boolean.valueOf(PreferencePredicate.CdmLightExportCondensedDistributionString.getDefaultValue().toString());
         createCondensedDistributionString.select(0);
-        recipe = PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getDefaultValue() != null? CondensedDistributionRecipe.valueOf(PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getDefaultValue().toString()): null;
+        recipe = PreferencePredicate.CondensedDistributionRecipe.getDefaultValue() != null? CondensedDistributionRecipe.valueOf(PreferencePredicate.CondensedDistributionRecipe.getDefaultValue().toString()): null;
         comboDistributionStringRecipe.select(0);
         setApply(true);
     }
@@ -259,23 +259,23 @@ public class CdmLightExportPreference extends CdmPreferencePage implements Selec
         }
         // recipe for creation of condensed string
 
-        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.CdmLightExportCondensedDistributionRecipe);
+        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.CondensedDistributionRecipe);
         preferenceCondensedDistribtionRecipe = controller.getPreferenceService().find(key);
 
         if (preferenceCondensedDistribtionRecipe != null ){
             isAllowOverrideCondensedDistributionRecipe = preferenceCondensedDistribtionRecipe.isAllowOverride();
         }else{
-            preferenceCondensedDistribtionRecipe = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CdmLightExportCondensedDistributionRecipe,
-                    PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getDefaultValue() != null? PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getDefaultValue().toString(): null);
+            preferenceCondensedDistribtionRecipe = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CondensedDistributionRecipe,
+                    PreferencePredicate.CondensedDistributionRecipe.getDefaultValue() != null? PreferencePredicate.CondensedDistributionRecipe.getDefaultValue().toString(): null);
             isAllowOverrideCondensedDistributionRecipe = true;
         }
 
         overrideCondensedDistributionRecipe = PreferencesUtil.getBooleanValue(
-                PreferencesUtil.prefOverrideKey(PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getKey()), true) != null? PreferencesUtil.getBooleanValue(
-                        PreferencesUtil.prefOverrideKey(PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getKey()), true):false;
+                PreferencesUtil.prefOverrideKey(PreferencePredicate.CondensedDistributionRecipe.getKey()), true) != null? PreferencesUtil.getBooleanValue(
+                        PreferencesUtil.prefOverrideKey(PreferencePredicate.CondensedDistributionRecipe.getKey()), true):false;
 
         if (isAllowOverrideCondensedDistributionRecipe && overrideCondensedDistributionRecipe){
-           String configString = PreferencesUtil.getStringValue(PreferencePredicate.CdmLightExportCondensedDistributionRecipe.getKey(), true);
+           String configString = PreferencesUtil.getStringValue(PreferencePredicate.CondensedDistributionRecipe.getKey(), true);
            if (StringUtils.isNotBlank(configString)){
                recipe = CondensedDistributionRecipe.valueOf(configString);
            }