do not save cdm preference which are not changed

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportPreference.java
index 2d358a1e71cdab96262e18ec4c2a3df270d2ba31..b3504c0ed06dc226a5f7787a2092f51eb5d247b0 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/AbcdImportPreference.java
@@ -46,6 +46,7 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4AdminP
     private Combo nomenclaturalCodeSelectionCombo;
 
     private boolean allowOverride = true;
+    CdmPreference preference = null;
 
     /**
      * {@inheritDoc}
@@ -60,7 +61,7 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4AdminP
         ICdmRepository controller;
         controller = CdmStore.getCurrentApplicationConfiguration();
         PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.AbcdImportConfig);
-        CdmPreference preference = null;
+
         if (controller == null){
             return null;
         }
@@ -68,6 +69,8 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4AdminP
 
         if (preference != null ){
             allowOverride = preference.isAllowOverride();
+        }else{
+            preference = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AbcdImportConfig, configurator.toString());
         }
 
         if (preference != null){
@@ -312,6 +315,9 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4AdminP
 
     @Override
     public boolean performOk() {
+        if (preference == null){
+            return true;
+        }
         if (configurator != null){
             String configString = configurator.toString();
 

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 50a8413a75143c0db28aeb98542f38d32d51a7ba..4b8bbf549988dc13ee6e144aad7397a18e0b33cb 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
@@ -46,13 +46,14 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
     boolean isShowTitle;
     String displayString;
     Composite child ;
+    CdmPreference pref = null;
 
     @Override
     protected Control createContents(Composite parent) {
 
         Composite composite = new Composite(parent, SWT.NULL);
         composite.setLayout(new GridLayout());
-        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
+        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
         if (pref != null){
             isEditorActivated = Boolean.valueOf(pref.getValue());
             allowOverride = pref.isAllowOverride();
@@ -236,6 +237,9 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 
     @Override
     public boolean performOk() {
+        if (pref == null){
+            return true;
+        }
         ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
         if (controller == null){
             return false;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/DistributionAdminPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/DistributionAdminPreferences.java
index bcc07633454aa5dbfc543165ef50ec7b357eca6a..4f280235f6d2c878c822df0694abe2fc3d591251 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/DistributionAdminPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/DistributionAdminPreferences.java
@@ -32,6 +32,7 @@ import eu.etaxonomy.taxeditor.ui.element.CommandHandlerButton;
 public class DistributionAdminPreferences extends CdmPreferencePage implements IE4AdminPreferencePage {
 
     boolean allowOverride;
+    CdmPreference pref = null;
 
     @Override
     protected Control createContents(Composite parent) {
@@ -39,7 +40,7 @@ public class DistributionAdminPreferences extends CdmPreferencePage implements I
         composite.setLayout(new GridLayout());
 
 
-        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
+        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
         if (pref != null){
             allowOverride = pref.isAllowOverride();
         }

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 6430a922d4fa121e7dda1bfe44e3671963f05538..2f7a9cf69b0f8563b3d8d8cc0f4ac331dcd24f85 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
@@ -39,6 +39,7 @@ public class GeneralAdminPreferencePage extends CdmPreferencePage implements IE4
     boolean isShowMediaView = true;
     boolean isShowCheckListPerspective = false;
     boolean isShowTaxonNodeWizard = true;
+    ICdmRepository controller = null;
     /**
      * {@inheritDoc}
      */
@@ -48,7 +49,7 @@ public class GeneralAdminPreferencePage extends CdmPreferencePage implements IE4
 
         GridLayout gridLayout = new GridLayout();
         composite.setLayout(gridLayout);
-        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
+        controller = CdmStore.getCurrentApplicationConfiguration();
         if (controller != null){
             IPreferenceService service = controller.getPreferenceService();
             PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu);
@@ -137,7 +138,7 @@ public class GeneralAdminPreferencePage extends CdmPreferencePage implements IE4
 
     @Override
     public boolean performOk() {
-       ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
+       //ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
        if (controller != null){
            IPreferenceService service = controller.getPreferenceService();
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewConfiguration.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewConfiguration.java
index e1a2f57583b0938f0314753cecc168769c4041ec..7b0b1ea4602209b37cb675fd923a18f9a72c5f56 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewConfiguration.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewConfiguration.java
@@ -46,13 +46,13 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements I
     boolean isShowNameRelationship;
     boolean isShowHybrid;
     boolean isShowNameApprobiation;
-
+    NameDetailsConfigurator nameDetailsConfig = null;
 
     @Override
     protected Control createContents(Composite parent) {
         final CLabel description = new CLabel(parent, SWT.NULL);
         description.setText(Messages.NameDetailsViewConfiguration_description);
-        NameDetailsConfigurator nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(false);
+        nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(false);
         if (nameDetailsConfig == null){
             nameDetailsConfig = new NameDetailsConfigurator(false);
         }
@@ -328,6 +328,9 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements I
 
     @Override
     public boolean performOk() {
+        if (nameDetailsConfig == null){
+            return true;
+        }
         ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
         if (controller == null){
             return false;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalCodePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalCodePreferences.java
index 9c4e228cde2e43d1fbf8b98cdc82ebbbe87a276a..1b62e872706941bf216ce9a3d5a97fda687b36d7 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalCodePreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NomenclaturalCodePreferences.java
@@ -45,7 +45,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class NomenclaturalCodePreferences extends CdmPreferencePage implements IE4AdminPreferencePage{
 
-    String actualCode;
+    String actualCode = null;
     Map<String, String>  labelAndValues;
     Map<String, Integer> keyAndIndex;
     Combo nomenclaturalCode;
@@ -140,10 +140,11 @@ public class NomenclaturalCodePreferences extends CdmPreferencePage implements I
        @Override
         public boolean performOk() {
 
-               boolean result = super.performOk();
-               PreferencesUtil.setPreferredNomenclaturalCode(actualCode, false);
+           if (actualCode != null){
+               PreferencesUtil.setPreferredNomenclaturalCode(actualCode, false);
+           }
 
-        return result;
+        return true;
     }
 
 }

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 e41818102b609429e5f028a29a6b77240a4e868f..97e93b735dae57c813dbd9192bf4d558706733cf 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
@@ -41,11 +41,12 @@ public class PublishFlagPreference extends CdmPreferencePage implements IE4Admin
    String do_not_publish = "DO NOT PUBLISH";
    String inherit_from_parent = "PARENT";
    String publish = "PUBLISH";
+   CdmPreference pref = null;
 
    @Override
    public void init() {
        super.init();
-       CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
+       pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
        if (pref != null){
            if (pref.getValue().equals(IPreferenceKeys.DO_NOT_PUBLISH)){
                setNotPublish = true;
@@ -122,6 +123,9 @@ public class PublishFlagPreference extends CdmPreferencePage implements IE4Admin
 
     @Override
     public boolean performOk() {
+        if (pref == null){
+            return true;
+        }
         String preferenceValue = null;
         if (setPublish){
             preferenceValue = publish;

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 420b2f1e500ac65334e6026d0a685153aa7dd833..5111e1c170924fa435c023fdf2de833f125b1613 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
@@ -46,6 +46,7 @@ public class SpecimenAdminPreferences extends CdmPreferencePage implements IE4Ad
     boolean isShowLifeForm;
     boolean isUseLocalPreference;
     Composite composite;
+    CdmPreference isShowSpecimenPref = null;
 
     @Override
     protected Control createContents(Composite parent) {
@@ -164,7 +165,7 @@ public class SpecimenAdminPreferences extends CdmPreferencePage implements IE4Ad
         if (controller != null){
             IPreferenceService service = controller.getPreferenceService();
             PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowSpecimen);
-            CdmPreference isShowSpecimenPref = service.find(key);
+            isShowSpecimenPref = service.find(key);
             if (isShowSpecimenPref != null){
                 this.isShowSpecimenRelatedIssues = Boolean.valueOf(isShowSpecimenPref.getValue());
             }else{
@@ -187,7 +188,7 @@ public class SpecimenAdminPreferences extends CdmPreferencePage implements IE4Ad
             CdmPreference isShowTaxonAssociationPref = service.find(key);
             if (isShowTaxonAssociationPref != null){
                 this.isShowTaxonAssociation = Boolean.valueOf(isShowTaxonAssociationPref.getValue());
-                isUseLocalPreference = isShowTaxonAssociationPref.isAllowOverride();
+               // isUseLocalPreference = isShowTaxonAssociationPref.isAllowOverride();
             }
 
             key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowLifeForm);
@@ -204,6 +205,9 @@ public class SpecimenAdminPreferences extends CdmPreferencePage implements IE4Ad
 
     @Override
      public boolean performOk() {
+        if (isShowSpecimenPref == null){
+            return true;
+        }
         ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
         if (controller != null){
             IPreferenceService service = controller.getPreferenceService();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java
index 073e3540711723302c03f1d228f6b304149e0e21..5600ecd3ffebfc0fc6a918b117440e5b6c43d47f 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VokabularyAdminPreferences.java
@@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.ui.element.CommandHandlerButton;
 public class VokabularyAdminPreferences extends CdmPreferencePage implements IE4AdminPreferencePage {
 
     boolean allowOverride;
-
+    CdmPreference pref = null;
 
 
     @Override
@@ -41,7 +41,7 @@ public class VokabularyAdminPreferences extends CdmPreferencePage implements IE4
         Composite composite = new Composite(parent, SWT.NULL);
         composite.setLayout(new GridLayout());
 
-        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.CommonNameAreaVocabularies);
+        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.CommonNameAreaVocabularies);
 
         if (pref != null){
             allowOverride = pref.isAllowOverride();