ref #7849: add correct handling for restoreDefaults in DB preference pages

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 a73a5f046841fe05949eb08a65e64abb66721ef6..d1897a775cb568285c5d169b52c35ad39300d305 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
@@ -362,6 +362,14 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4AdminP
 
     }
 
+    @Override
+    protected void performDefaults() {
+        configurator = Abcd206ImportConfigurator.NewInstance(null,null);
+        preference = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AbcdImportConfig, configurator.toString());
+        preference.setAllowOverride(true);
+        super.performDefaults();
+    }
+
 //    private void createAbcdImportConfig() {
 //        this.configurator.setAddIndividualsAssociationsSuchAsSpecimenAndObservations(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_INDIVIDUALS_ASSOCIATIONS_SUCH_AS_SPECIMEN_AND_OBSERVATIONS));
 //        this.configurator.setAddMediaAsMediaSpecimen(doGetPreferenceStore().getBoolean(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_ADD_MEDIA_AS_MEDIASPECIMEN));

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
index 8b40ab21b956afa40578b5f273bbd02fc85c0fef..c08249d6f45f0d5535f934af2bb9da720f1d34aa 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
@@ -28,9 +28,13 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGeneralPreference implements IE4AdminPreferencePage {
 
+    Composite parent;
+    CdmPreference areaVocPref = null;
+    CdmPreference statusPref = null;
 
     @Override
     protected Control createContents(Composite parent) {
+        this.parent = parent;
         return super.createContents(parent);
 
     }
@@ -70,6 +74,12 @@ public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGenera
         pref.setAllowOverride(this.allowOverrideOwnDescriptionForDistributionEditor);
         service.set(pref);
 
+        if (statusPref != null){
+            service.set(statusPref);
+        }
+        if (areaVocPref != null){
+            service.set(areaVocPref);
+        }
         PreferencesUtil.updateDBPreferences();
 
         return true;
@@ -141,4 +151,97 @@ public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGenera
         setValid(false);
     }
 
+    @Override
+    protected void performDefaults() {
+        isEditorActivated = (Boolean)PreferencePredicate.DistributionEditorActivated.getDefaultValue();
+        activateCheckButton.setSelection(isEditorActivated);
+
+        displayArea = ((TermDisplayEnum)PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue()).getKey();
+        TermDisplayEnum areaDisplay;
+        try{
+            if (displayArea != null){
+                areaDisplay  = TermDisplayEnum.byKey(displayArea);
+            }else{
+                areaDisplay = TermDisplayEnum.Title;
+            }
+        }catch(IllegalArgumentException e){
+            areaDisplay = TermDisplayEnum.Title;
+        }
+        int index = 0;
+        for (String itemLabel : areaDisplaySelectionCombo.getItems()){
+            if (itemLabel.equalsIgnoreCase(areaDisplay.getLabel())){
+                areaDisplaySelectionCombo.select(index);
+                break;
+            }
+            index++;
+        }
+
+        displayStatus = ((TermDisplayEnum)PreferencePredicate.DisplayOfStatus.getDefaultValue()).getKey();
+        TermDisplayEnum statusDisplay;
+        try{
+            if (displayStatus != null){
+                statusDisplay  = TermDisplayEnum.byKey(displayStatus);
+            }else{
+                statusDisplay = TermDisplayEnum.Title;
+            }
+        }catch(IllegalArgumentException e){
+            statusDisplay = TermDisplayEnum.Title;
+        }
+        index = 0;
+        for (String itemLabel : statusDisplaySelectionCombo.getItems()){
+            if (itemLabel.equalsIgnoreCase(statusDisplay.getLabel())){
+                statusDisplaySelectionCombo.select(index);
+                break;
+            }
+            index++;
+        }
+
+
+
+        orderAreas = ((TermOrder)PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue()).getKey();
+        index = 0;
+        if (PreferencesUtil.getStringValue(PreferencePredicate.DistributionEditorActivated.getKey()) != null){
+            TermOrder areaOrder;
+            try{
+                if (orderAreas != null){
+                    areaOrder  = TermOrder.valueOf(orderAreas);
+                }else{
+                    areaOrder = TermOrder.IdInVoc;
+                }
+            }catch(IllegalArgumentException e){
+                areaOrder = TermOrder.IdInVoc;
+            }
+            for (String itemLabel : areaOrderSelectionCombo.getItems()){
+                if (itemLabel.equalsIgnoreCase(areaOrder.getLabel())){
+                    areaOrderSelectionCombo.select(index);
+                    break;
+                }
+                index++;
+            }
+        }
+
+
+        isShowRank = Boolean.valueOf(PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue().toString());
+        activateRankButton.setSelection(isShowRank);
+
+        ownDescriptionForDistributionEditor = Boolean.valueOf(PreferencePredicate.OwnDescriptionForDistributionEditor.getDefaultValue().toString());
+
+        allowOverrideActivated = true;
+        allowOverrideActivatedButton.setSelection(allowOverrideActivated);
+        allowOverrideAreaDisplay = true;
+        allowOverrideAreaDisplayButton.setSelection(allowOverrideAreaDisplay);
+        allowOverrideStatusDisplay = true;
+        allowOverrideStatusDisplayButton.setSelection(allowOverrideStatusDisplay);
+        allowOverrideOrderAreas = true;
+        allowOverrideOrderAreasButton.setSelection(allowOverrideOrderAreas);
+        allowOverrideRank = true;
+        allowOverrideRankButton.setSelection(allowOverrideRank);
+        allowOverrideOwnDescriptionForDistributionEditor = true;
+        createContents(parent);
+
+        this.statusPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, null);
+        this.areaVocPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionAreaVocabularies, null);
+        super.performDefaults();
+    }
+
 }

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 581d39160ba5dd0eb3f3651e968cf6a3f3db6155..292cca06eeffe223e186cab7cf838f5c105dd5db 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
@@ -107,4 +107,21 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
 
     }
 
+    @Override
+    protected void performDefaults() {
+        isShowIOMenu = Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString());
+        showIOMenuButton.setSelection(isShowIOMenu);
+        isShowCheckListPerspective = Boolean.valueOf(PreferencePredicate.ShowChecklistPerspective.getDefaultValue().toString());
+        showChecklistPerspectiveButton.setSelection(isShowCheckListPerspective);
+        isShowTaxonNodeWizard = Boolean.valueOf(PreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString());
+        showTaxonNodeWizardButton.setSelection(isShowTaxonNodeWizard);
+        isAllowOverrideShowIOMenu = true;
+        allowOverrideShowIOMenuButton.setSelection(isAllowOverrideShowIOMenu);
+        isAllowOverrideShowCheckListPerspective = true;
+        allowOverrideShowChecklistButton.setSelection(isAllowOverrideShowCheckListPerspective);
+        isAllowOverrideShowTaxonNodeWizard = true;
+        allowOverrideShowTaxonNodeWizardButton.setSelection(isAllowOverrideShowTaxonNodeWizard);
+        super.performDefaults();
+    }
+
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
index 8214201c38f04a7148080d859c090288c7a32ea2..6a397539ef324241feb2f007940dd3a2dea1b2d3 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
@@ -90,5 +90,29 @@ public class NameDetailsViewAdminConfiguration extends NameDetailsViewConfigurat
 
     }
 
+    @Override
+    protected void performDefaults() {
+        nameDetailsConfig = new NameDetailsConfigurator(false);
+        isShowAppendedPhrase = nameDetailsConfig.isAppendedPhraseActivated();
+        isShowEpithets = nameDetailsConfig.isAtomisedEpithetsActivated();
+        isShowAuthorship = nameDetailsConfig.isAuthorshipSectionActivated();
+        isShowAuthorCache = nameDetailsConfig.isAuthorCacheActivated();
+        isShowLSID = nameDetailsConfig.isLSIDActivated();
+        isShowNameApprobiation = nameDetailsConfig.isNameApprobiationActivated();
+        isShowNameCache = nameDetailsConfig.isNameCacheActivated();
+        isShowNameRelationship = nameDetailsConfig.isNameRelationsSectionActivated();
+        isShowNomenclaturalCode = nameDetailsConfig.isNomenclaturalCodeActived();
+        isShowNomenclaturalStatus = nameDetailsConfig.isNomenclaturalStatusSectionActivated();
+        isShowNomenclaturalRef = nameDetailsConfig.isNomenclaturalReferenceSectionActivated();
+        isShowProtologue = nameDetailsConfig.isProtologueActivated();
+        isShowRank = nameDetailsConfig.isRankActivated();
+        isShowTaxon = nameDetailsConfig.isTaxonSectionActivated();
+        isSecDetailsActivated = nameDetailsConfig.isSecDetailsActivated();
+        isSecEnabled = nameDetailsConfig.isSecEnabled();
+        isShowTypeDesignation = nameDetailsConfig.isTypeDesignationSectionActivated();
+        isShowHybrid = nameDetailsConfig.isHybridActivated();
+        super.performDefaults();
+    }
+
 
 }

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 dcb56dd84d0cb12fcd3a4d413a6b09a2f19a92bc..22c22bed60179d968b60e9807917e94391e7d53e 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
@@ -49,7 +49,7 @@ public class NomenclaturalCodePreferences extends CdmPreferencePage implements I
     Map<String, String>  labelAndValues;
     Map<String, Integer> keyAndIndex;
     Combo nomenclaturalCode;
-
+    Button allowOverrideButton;
     boolean allowOverride;
 
 
@@ -155,14 +155,24 @@ public class NomenclaturalCodePreferences extends CdmPreferencePage implements I
 
        @Override
         public boolean performOk() {
-
            if (actualCode != null){
                CdmPreference pref = CdmPreference.NewDatabaseInstance(PreferencePredicate.NomenclaturalCode, actualCode);
                pref.setAllowOverride(allowOverride);
                PreferencesUtil.setPreferredNomenclaturalCode(pref);
            }
-
         return true;
     }
 
+       @Override
+       protected void performDefaults() {
+           actualCode = PreferencePredicate.NomenclaturalCode.getDefaultValue().toString();
+           allowOverride = true;
+           Integer index = keyAndIndex.get(actualCode);
+        if(index!=null){
+            nomenclaturalCode.select(index);
+        }
+        allowOverrideButton.setSelection(allowOverride);
+           super.performDefaults();
+       }
+
 }

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 5c588456caa973350e4e37f62b80bf3dd065ceef..36abe1e90ba3fcc20efa5f4b7e97d909f27bb026 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
@@ -12,8 +12,8 @@ import eu.etaxonomy.cdm.api.application.ICdmRepository;
 import eu.etaxonomy.cdm.api.service.IPreferenceService;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
+import eu.etaxonomy.cdm.model.metadata.PublishEnum;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.preference.PublishEnum;
 import eu.etaxonomy.taxeditor.preference.PublishFlagLocalPreference;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -67,12 +67,27 @@ public class PublishFlagPreference extends PublishFlagLocalPreference implements
         isAdminPreference = true;
         pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
         if (pref == null){
-            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DefaultBehaviourForPublishFlag, PreferencePredicate.DefaultBehaviourForPublishFlag.getDefaultValue().toString());
+            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.DefaultBehaviourForPublishFlag, ((PublishEnum)PreferencePredicate.DefaultBehaviourForPublishFlag.getDefaultValue()).getKey());
         }
         allowOverride = pref.isAllowOverride();
-        publishBehaviour = PublishEnum.valueOf(pref.getValue().toString());
+        publishBehaviour = PublishEnum.valueOf(pref.getValue());
     }
 
+    @Override
+    protected void performDefaults() {
+        publishBehaviour = (PublishEnum)PreferencePredicate.DefaultBehaviourForPublishFlag.getDefaultValue();
+        allowOverride = true;
+        int index = 0;
+        for (String itemLabel : publishFlagBehaviour.getItems()){
+            if (itemLabel.equalsIgnoreCase(publishBehaviour.getLabel())){
+                publishFlagBehaviour.select(index);
+                break;
+            }
+            index++;
+        }
+
+        super.performDefaults();
+    }
 
 
 

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 4310b5c0b2a1648fa3e6c1e448cb54beac733c68..8bf2b3f4452c268401653aa3fe29bb0978b52df0 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
@@ -134,4 +134,39 @@ public class SpecimenAdminPreferences extends SpecimenOrObservationPreferences i
         return true;
     }
 
+    @Override
+    protected void performDefaults() {
+        isShowSpecimenRelatedIssues = (Boolean)PreferencePredicate.ShowSpecimen.getDefaultValue();
+        showSpecimenButton.setSelection(isShowSpecimenRelatedIssues);
+
+        allowOverrideShowSpecimenRelatedIssues = true;
+        allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
+
+        isShowCollectingAreaInGeneralSection = (Boolean)PreferencePredicate.ShowCollectingAreasInGeneralSection.getDefaultValue();
+        showCollectingAreaInGeneralSectionButton.setSelection(isShowCollectingAreaInGeneralSection);
+
+        allowOverrideShowCollectingAreaInGeneralSection = true;
+        allowOverrideShowCollectingAreaButton.setSelection(allowOverrideShowCollectingAreaInGeneralSection);
+
+        isDeterminationOnlyForFieldUnits = (Boolean) PreferencePredicate.DeterminationOnlyForFieldUnits.getDefaultValue();
+        determinationOnlyForFieldUnitsButton.setSelection(isDeterminationOnlyForFieldUnits);
+
+        allowOverrideDeterminationOnlyForFieldUnits = true;
+        allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(allowOverrideDeterminationOnlyForFieldUnits);
+
+        isShowTaxonAssociation = (Boolean) PreferencePredicate.ShowTaxonAssociations.getDefaultValue();
+        showTaxonAssociationButton.setSelection(isShowTaxonAssociation);
+
+        allowOverrideShowTaxonAssociation = true;
+        allowOverrideIsShowTaxonAssociationButton.setSelection(allowOverrideShowTaxonAssociation);
+
+        isShowLifeForm = (Boolean) PreferencePredicate.ShowLifeForm.getDefaultValue();
+        showLifeFormButton.setSelection(isShowLifeForm);
+
+        allowOverrideShowLifeForm = true;
+        allowOverrideShowLifeFormButton.setSelection(allowOverrideShowLifeForm);
+
+        super.performDefaults();
+    }
+
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VocabularyAdminPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VocabularyAdminPreferences.java
index b484ff1d5dab3994bdc52af281641afeffb990db..ce312895384caff0613e6a22908033efd566f512 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VocabularyAdminPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/VocabularyAdminPreferences.java
@@ -76,12 +76,18 @@ public class VocabularyAdminPreferences extends CdmPreferencePage implements IE4
         if (pref == null){
             return true;
         }
-
+        PreferencesUtil.setPreferenceToDB(pref);
         PreferencesUtil.updateDBPreferences();
 
         return true;
 
     }
 
+    @Override
+    protected void performDefaults() {
+        pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.CommonNameAreaVocabularies, null);
+        pref.setAllowOverride(true);
 
+        super.performDefaults();
+    }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
index a3a1011ed3dc2c9ba3efcaf46ce8d1740a08d321..8b2b918b9a907cd5956e301ae1bcf9cf39b90092 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
@@ -60,10 +60,12 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
     protected boolean overrideStatusDisplay;
 
     protected boolean allowOverrideStatus;
-    Combo areaOrderSelectionCombo;
-    Combo statusDisplaySelectionCombo;
-    Combo areaDisplaySelectionCombo;
-
+    protected Combo areaOrderSelectionCombo;
+    protected Button allowOverrideOrderAreasButton;
+    protected Combo statusDisplaySelectionCombo;
+    protected Button allowOverrideStatusDisplayButton;
+    protected Combo areaDisplaySelectionCombo;
+    protected Button allowOverrideAreaDisplayButton;
     protected String commandHandlerString;
     protected String commandHandlerStringStatus;
 
@@ -73,6 +75,12 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
     Composite child ;
     protected boolean isAllowOverride;
 
+    protected Button activateCheckButton;
+    protected Button allowOverrideActivatedButton;
+
+    protected Button activateRankButton;
+    protected Button allowOverrideRankButton;
+
     @Override
     protected Control createContents(Composite parent) {
         getValues();
@@ -88,7 +96,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             GridData sepGrid = createTextGridData();
             separator.setLayoutData(sepGrid);
             separator.setVisible(false);
-            final Button activateCheckButton = new Button(activateComp, SWT.CHECK);
+            activateCheckButton = new Button(activateComp, SWT.CHECK);
             activateCheckButton.setText(Messages.ChecklistEditorGeneralPreference_enable);
             activateCheckButton.setSelection(isEditorActivated);
             activateCheckButton.addSelectionListener(new SelectionAdapter(){
@@ -107,7 +115,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 
                 }
             });
-            Button allowOverrideActivatedButton = createAllowOverrideButton(activateComp);
+            allowOverrideActivatedButton = createAllowOverrideButton(activateComp);
             if (isAdminPreference){
                 allowOverrideActivatedButton.setSelection(allowOverrideActivated);
                 allowOverrideActivatedButton.addSelectionListener(new SelectionAdapter(){
@@ -142,7 +150,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             separator.setLayoutData(sepGrid);
 
 
-            final Button activateRankButton = new Button(child, SWT.CHECK);
+            activateRankButton = new Button(child, SWT.CHECK);
             activateRankButton.setText(Messages.ChecklistEditorGeneralPreference_show_rank);
             activateRankButton.setSelection(isShowRank);
             activateRankButton.addSelectionListener(new SelectionAdapter(){
@@ -152,7 +160,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     isShowRank = activateRankButton.getSelection();
                 }
             });
-            Button allowOverrideRankButton = createAllowOverrideButton(child);
+            allowOverrideRankButton = createAllowOverrideButton(child);
             if (isAdminPreference){
                 allowOverrideRankButton.setSelection(allowOverrideRank);
                 allowOverrideRankButton.addSelectionListener(new SelectionAdapter(){
@@ -221,7 +229,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 //                    isSortByVocabularyOrder = sortNamedAreaByVocabularyOrder.getSelection();
 //                 }
 //            });
-            Button allowOverrideOrderAreasButton = createAllowOverrideButton(child);
+            allowOverrideOrderAreasButton = createAllowOverrideButton(child);
             if (isAdminPreference){
                 allowOverrideOrderAreasButton.setSelection(allowOverrideOrderAreas);
                 allowOverrideOrderAreasButton.addSelectionListener(new SelectionAdapter(){
@@ -321,7 +329,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                 }
             }
             areaDisplaySelectionCombo.addSelectionListener(this);
-            Button allowOverrideAreaDisplayButton = createAllowOverrideButton(child);
+            allowOverrideAreaDisplayButton = createAllowOverrideButton(child);
             if (isAdminPreference){
                 allowOverrideAreaDisplayButton.setSelection(allowOverrideAreaDisplay);
                 allowOverrideAreaDisplayButton.addSelectionListener(new SelectionAdapter(){
@@ -371,7 +379,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             }
 
             statusDisplaySelectionCombo.addSelectionListener(this);
-            Button allowOverrideStatusDisplayButton = createAllowOverrideButton(child);
+            allowOverrideStatusDisplayButton = createAllowOverrideButton(child);
             if (isAdminPreference){
                 allowOverrideStatusDisplayButton.setSelection(allowOverrideStatusDisplay);
                 allowOverrideStatusDisplayButton.addSelectionListener(new SelectionAdapter(){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
index 46d1379b72146e62982cf46e32158238c92713d4..eb3c9b6d656982679cae54e604261cb9436df62b 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
@@ -43,6 +43,12 @@ public class GeneralPreferencePage extends CdmPreferencePage {
     protected boolean isOverrideShowCheckListPerspective;
     protected boolean isOverrideShowTaxonNodeWizard;
 
+    protected Button showIOMenuButton;
+    protected Button allowOverrideShowIOMenuButton;
+    protected Button showChecklistPerspectiveButton;
+    protected Button allowOverrideShowChecklistButton;
+    protected Button showTaxonNodeWizardButton;
+    protected Button allowOverrideShowTaxonNodeWizardButton;
     /**
      * {@inheritDoc}
      */
@@ -56,7 +62,7 @@ public class GeneralPreferencePage extends CdmPreferencePage {
         Label separator= new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
         separator.setLayoutData(gridData);
         separator.setVisible(false);
-        final Button showIOMenuButton = new Button(composite, SWT.CHECK);
+        showIOMenuButton = new Button(composite, SWT.CHECK);
         showIOMenuButton.setText(Messages.DatabasePreferncesPage_Show_IOMenu);
         showIOMenuButton.setSelection(isShowIOMenu);
         showIOMenuButton.addSelectionListener(new SelectionAdapter(){
@@ -66,7 +72,7 @@ public class GeneralPreferencePage extends CdmPreferencePage {
                  setApply(true);
               }
          });
-        Button allowOverrideShowIOMenuButton = createAllowOverrideButton(composite);
+        allowOverrideShowIOMenuButton = createAllowOverrideButton(composite);
         if (isAdminPreference){
             allowOverrideShowIOMenuButton.setSelection(isAllowOverrideShowIOMenu);
             allowOverrideShowIOMenuButton.addSelectionListener(new SelectionAdapter(){
@@ -124,7 +130,7 @@ public class GeneralPreferencePage extends CdmPreferencePage {
 //            }
 //        }
 
-        final Button showChecklistPerspectiveButton = new Button(composite, SWT.CHECK);
+        showChecklistPerspectiveButton = new Button(composite, SWT.CHECK);
         showChecklistPerspectiveButton.setText(Messages.DatabasePreferncesPage_Show_ChecklistPerspective);
         showChecklistPerspectiveButton.setSelection(isShowCheckListPerspective);
         showChecklistPerspectiveButton.addSelectionListener(new SelectionAdapter(){
@@ -135,7 +141,7 @@ public class GeneralPreferencePage extends CdmPreferencePage {
               }
          });
 
-        Button allowOverrideShowChecklistButton = createAllowOverrideButton(composite);
+        allowOverrideShowChecklistButton = createAllowOverrideButton(composite);
         if (isAdminPreference){
             allowOverrideShowChecklistButton.setSelection(isAllowOverrideShowCheckListPerspective);
             allowOverrideShowChecklistButton.addSelectionListener(new SelectionAdapter(){
@@ -160,7 +166,7 @@ public class GeneralPreferencePage extends CdmPreferencePage {
             }
         }
 
-        final Button showTaxonNodeWizardButton = new Button(composite, SWT.CHECK);
+        showTaxonNodeWizardButton = new Button(composite, SWT.CHECK);
         showTaxonNodeWizardButton.setText(Messages.DatabasePreferncesPage_Show_TaxonNodeWizard);
         showTaxonNodeWizardButton.setSelection(isShowTaxonNodeWizard);
         showTaxonNodeWizardButton.addSelectionListener(new SelectionAdapter(){
@@ -171,7 +177,7 @@ public class GeneralPreferencePage extends CdmPreferencePage {
               }
          });
 
-        Button allowOverrideShowTaxonNodeWizardButton = createAllowOverrideButton(composite);
+        allowOverrideShowTaxonNodeWizardButton = createAllowOverrideButton(composite);
         if (isAdminPreference){
             allowOverrideShowTaxonNodeWizardButton.setSelection(isAllowOverrideShowTaxonNodeWizard);
             allowOverrideShowTaxonNodeWizardButton.addSelectionListener(new SelectionAdapter(){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
index 8a623564e921fccb75df6ed43c267ed29ca8faa3..6cb80c4f981c40bed16fe4c0b7a867bebec488ab 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
@@ -151,7 +151,7 @@ public interface IPreferenceKeys {
 //     public static final String SHOW_NAME_DETAILS_SECTION_APPENDED_PHRASE = "eu.etaxonomy.taxeditor.name.showNameAppendedPhrase";
 //     public static final String SHOW_NAME_DETAILS_SECTION_CACHE = "eu.etaxonomy.taxeditor.name.showNameCache";
 //    public static final String SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE = "eu.etaxonomy.taxeditor.name.showAuthorCache";
-    public static final String ALLOW_OVERRIDE_NAME_DETAILS = "eu.etaxonomy.taxeditor.name.allowOverride";
+   // public static final String ALLOW_OVERRIDE_NAME_DETAILS = "eu.etaxonomy.taxeditor.name.allowOverride";
     public static final String OVERRIDE_NAME_DETAILS = "eu.etaxonomy.taxeditor.name.override";
 
     public static final String PROMPT_FOR_OPEN_SPECIMEN_IN_EDITOR = "eu.etaxonomy.taxeditor.specimen.promptForOpenSpecimenInEditor";

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
index 0e5ae603d98f033f80cf7d1c5264ad27164ec20f..cac401181e6d703f51852e00dc08fd5f4fca2991 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
@@ -389,15 +389,17 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage {
 
     @Override
     public void getValues(){
-        CdmPreference nameDetailsPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NameDetailsView);
-        isAdminPreference = false;
-        isAllowOverride = true;
-        if (nameDetailsPref != null){
-            isAllowOverride = nameDetailsPref.isAllowOverride();
+        if (nameDetailsConfig == null){
+            CdmPreference nameDetailsPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NameDetailsView);
+            isAdminPreference = false;
+            isAllowOverride = true;
+            if (nameDetailsPref != null){
+                isAllowOverride = nameDetailsPref.isAllowOverride();
 
+            }
+            isOverride = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.NameDetailsView.getKey()));
+            nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(true);
         }
-        isOverride = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.NameDetailsView.getKey()));
-        nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(true);
     }
 
 }

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 41750af91a5b612d4fb75bb20ca4d039e5e20981..a41c70a2e309c6b452c363a41bbe65626ddee1cc 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
@@ -857,6 +857,7 @@ public class PreferencesUtil implements IPreferenceKeys {
                getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowNamespaceInSource.getKey()), Boolean.valueOf(PreferencePredicate.ShowNamespaceInSource.getDefaultValue().toString()));
                getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowIdInSource.getKey()), Boolean.valueOf(PreferencePredicate.ShowIdInSource.getDefaultValue().toString()));
                getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisableMultiClassification.getKey()), Boolean.valueOf(PreferencePredicate.DisableMultiClassification.getDefaultValue().toString()));
+               getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowImportExportMenu.getKey()), Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString()));
 
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishEnum.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishEnumX.java
similarity index 91%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishEnum.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishEnumX.java
index 5e5fa0b47ce325eee03e8f5dd7596ed6c22d0fb9..ffd2b0857ba082bae1947c589b3a08ab21a419f3 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishEnum.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishEnumX.java
@@ -15,7 +15,7 @@ import eu.etaxonomy.taxeditor.l10n.Messages;
  * @since 19.11.2018
  *
  */
-public enum PublishEnum {
+public enum PublishEnumX {
 
     Publish("Publish", Messages.PublishEnum_publish),
     NotPublish("NotPublish", Messages.PublishFlagPreference_do_not_set),
@@ -25,7 +25,7 @@ public enum PublishEnum {
     String label;
     String key;
 
-    private PublishEnum(String key, String label){
+    private PublishEnumX(String key, String label){
         this.label = label;
         this.key = key;
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
index 063992ab1d37be8ca62652ee72b267a6e95d4567..3749cde622ce958916f76688e5d7c3aa6b162574 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
@@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Control;
 
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
+import eu.etaxonomy.cdm.model.metadata.PublishEnum;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
 

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 d620ffaca2382f5b2fe1ae98c3557744f9764169..d140767a887b20e4b75505e1767667f4027c8793 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,6 +50,17 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
     protected boolean overrideShowLifeForm;
     Composite composite;
 
+    protected Button showSpecimenButton;
+    protected Button allowOverrideIsShowSpecimenRelatedIssuesButton;
+    protected Button showCollectingAreaInGeneralSectionButton;
+    protected Button allowOverrideShowCollectingAreaButton;
+    protected Button determinationOnlyForFieldUnitsButton;
+    protected Button allowOverridesDeterminationOnlyForFieldUnitsButton;
+    protected Button showTaxonAssociationButton;
+    protected Button allowOverrideIsShowTaxonAssociationButton;
+    protected Button allowOverrideShowLifeFormButton;
+    protected Button showLifeFormButton;
+
 
     @Override
     public void init() {
@@ -91,7 +102,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
         Label separator= new Label(titleComp, SWT.HORIZONTAL | SWT.SEPARATOR);
         separator.setLayoutData(gridData);
         separator.setVisible(false);
-        final Button showSpecimenButton = new Button(titleComp, SWT.CHECK);
+        showSpecimenButton = new Button(titleComp, SWT.CHECK);
 
         showSpecimenButton.setText(Messages.DatabasePreferncesPage_Show_Specimen);
 
@@ -110,7 +121,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
 //                 }
               }
          });
-        Button allowOverrideIsShowSpecimenRelatedIssuesButton = createAllowOverrideButton(titleComp);
+        allowOverrideIsShowSpecimenRelatedIssuesButton = createAllowOverrideButton(titleComp);
 
 
         if (isAdminPreference){
@@ -143,7 +154,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
         separator= new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
         separator.setLayoutData(gridData);
 
-        final Button showCollectingAreaInGeneralSectionButton = new Button(composite, SWT.CHECK);
+        showCollectingAreaInGeneralSectionButton = new Button(composite, SWT.CHECK);
 
         showCollectingAreaInGeneralSectionButton.setText(Messages.DatabasePreferncesPage_Show_Collecting_Areas_in_general_section);
 
@@ -156,7 +167,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
 
               }
          });
-        Button allowOverrideShowCollectingAreaButton = createAllowOverrideButton(composite);
+        allowOverrideShowCollectingAreaButton = createAllowOverrideButton(composite);
         if (isAdminPreference){
             allowOverrideShowCollectingAreaButton.setSelection(allowOverrideShowCollectingAreaInGeneralSection);
             allowOverrideShowCollectingAreaButton.addSelectionListener(new SelectionAdapter(){
@@ -181,7 +192,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
             }
         }
 
-        final Button determinationOnlyForFieldUnitsButton = new Button(composite, SWT.CHECK);
+        determinationOnlyForFieldUnitsButton = new Button(composite, SWT.CHECK);
         determinationOnlyForFieldUnitsButton.setText(Messages.DatabasePreferncesPage_Determination_only_for_field_unnits);
         determinationOnlyForFieldUnitsButton.setSelection(isDeterminationOnlyForFieldUnits);
         determinationOnlyForFieldUnitsButton.addSelectionListener(new SelectionAdapter(){
@@ -192,7 +203,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
              }
          });
 
-        Button allowOverridesDeterminationOnlyForFieldUnitsButton = createAllowOverrideButton(composite);
+        allowOverridesDeterminationOnlyForFieldUnitsButton = createAllowOverrideButton(composite);
         if (isAdminPreference){
             allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(allowOverrideDeterminationOnlyForFieldUnits);
             allowOverridesDeterminationOnlyForFieldUnitsButton.addSelectionListener(new SelectionAdapter(){
@@ -217,7 +228,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
             }
         }
 
-        final Button showTaxonAssociationButton = new Button(composite, SWT.CHECK);
+        showTaxonAssociationButton = new Button(composite, SWT.CHECK);
 
         showTaxonAssociationButton.setText(Messages.DatabasePreferncesPage_Taxon_Associations);
 
@@ -230,7 +241,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
 
               }
          });
-        Button allowOverrideIsShowTaxonAssociationButton = createAllowOverrideButton(composite);
+        allowOverrideIsShowTaxonAssociationButton = createAllowOverrideButton(composite);
         if (isAdminPreference){
             allowOverrideIsShowTaxonAssociationButton.setSelection(allowOverrideShowTaxonAssociation);
             allowOverrideIsShowTaxonAssociationButton.addSelectionListener(new SelectionAdapter(){
@@ -255,7 +266,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
             }
         }
 
-        final Button showLifeFormButton = new Button(composite, SWT.CHECK);
+        showLifeFormButton = new Button(composite, SWT.CHECK);
         showLifeFormButton.setText(Messages.DatabasePreferncesPage_Life_Form);
         showLifeFormButton.setSelection(isShowLifeForm);
         showLifeFormButton.addSelectionListener(new SelectionAdapter(){
@@ -267,7 +278,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage {
               }
          });
 
-        Button allowOverrideShowLifeFormButton = createAllowOverrideButton(composite);
+        allowOverrideShowLifeFormButton = createAllowOverrideButton(composite);
         if (isAdminPreference){
             allowOverrideShowLifeFormButton.setSelection(allowOverrideShowLifeForm);
             allowOverrideShowLifeFormButton.addSelectionListener(new SelectionAdapter(){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
index 58f61703218adbcf85eeca5ece6585254ba731b0..5708255ef4c713cca9b1aacf3a5eba05223ee29d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
@@ -134,4 +134,6 @@ public abstract class CdmPreferencePage extends PreferencePage implements IE4Pre
 
 
 
+
+
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
index a60773859c326b7852e31f6b60f32d607ab5a794..e74143834201a01733ee3d393269175a3df3d7c5 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
@@ -101,15 +101,19 @@ public abstract class AbstractTermSelectionWizardPage extends WizardPage {
             List<AbstractTermDto> termsFromStringValues = getTermsFromStringValues(checked);
             treeComposite.setCheckedElements(termsFromStringValues.toArray());
 
+        }else{
+            List<AbstractTermDto> termsFromStringValues = getTermsFromStringValues(new ArrayList<String>());
+            treeComposite.setCheckedElements(termsFromStringValues.toArray());
         }
     }
 
     protected List<AbstractTermDto> getTermsFromStringValues(List<String> listValue) {
         List<AbstractTermDto> termlist = new ArrayList<>();
+        ITermService termService = CdmStore.getService(ITermService.class);
         for (String s : listValue) {
             if (!StringUtils.isBlank(s)){
                 UUID uuid = UUID.fromString(s);
-                ITermService termService = CdmStore.getService(ITermService.class);
+
                 DefinedTermBase definedTermBase = termService.load(uuid);
                 if(definedTermBase != null){
                     termlist.add(TermDto.fromTerm(definedTermBase, true));
@@ -122,6 +126,12 @@ public abstract class AbstractTermSelectionWizardPage extends WizardPage {
                 }
             }
         }
+        if (listValue.isEmpty()){
+            List<DefinedTermBase> terms = CdmStore.getTermManager().getPreferredTerms(type);
+            for (DefinedTermBase term: terms){
+                termlist.add(TermDto.fromTerm(term, true));
+            }
+        }
 
         return termlist;
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java
index 4ba4bf920c70d5eceef9e9315dbb7b26845b0e42..1f7ec5ae8448f4c776f07eafc724aa719982925f 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPage.java
@@ -24,6 +24,7 @@ import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
+import eu.etaxonomy.cdm.persistence.dto.AbstractTermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -58,6 +59,28 @@ public class AvailableDistributionPage extends AbstractTermSelectionWizardPage {
         return checkedValues;
     }
 
+    @Override
+    protected void rememberCheckedValues(String checkedValues) {
+        initialiseVocabularies();
+
+        treeComposite.getViewer().setInput(getVocabularies());
+
+        if (checkedValues != null && checkedValues != "") { //$NON-NLS-1$
+            String[] listChecked = checkedValues.split(";"); //$NON-NLS-1$
+            String[] listCheckedComma = checkedValues.split(","); //$NON-NLS-1$
+            List<String> checked = new ArrayList<>();
+            if (listChecked != null ){
+                checked = Arrays.asList(listChecked);
+            }
+            if (listCheckedComma != null && checkedValues.contains(",")){ //$NON-NLS-1$
+                checked = Arrays.asList(listCheckedComma);
+            }
+            List<AbstractTermDto> termsFromStringValues = getTermsFromStringValues(checked);
+            treeComposite.setCheckedElements(termsFromStringValues.toArray());
+        }
+
+    }
+
     @Override
     public void dispose() {
        // CdmStore.getCurrentSessionManager().dispose(this);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index e6d9d6b8bd191bbc95cdf8e79a175e32fafa5767..3ee7e6879da9217f04ab7f56dca346fa15ead7a7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@ -21,6 +21,7 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
+import eu.etaxonomy.cdm.model.metadata.PublishEnum;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
@@ -28,7 +29,6 @@ import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.preference.PublishEnum;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;