fix #4101: getValue() was missing

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 ebebaf1e2882dac5c14f19eeedca2f858b8f821e..acb05b25673bf312bb95a3a68d3e96faea424332 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
@@ -37,24 +37,28 @@ public class PublishFlagPreference extends CdmPreferencePage implements IE4Admin
    boolean setNotPublish;
    boolean inheritFromParent;
 
+   String do_not_publish = "DO NOT PUBLISH";
+   String inherit_from_parent = "PARENT";
+   String publish = "PUBLISH";
+
    @Override
    public void init() {
        super.init();
        CdmPreference pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
        if (pref != null){
-           if (pref.getValue().equals(Messages.PublishFlagPreference_do_not_set)){
+           if (pref.getValue().equals(do_not_publish)){
                setNotPublish = true;
                setPublish = false;
                inheritFromParent = false;
            }
 
-           if (pref.getValue().equals(Messages.PublishFlagPreference_inherit)){
+           if (pref.getValue().equals(inherit_from_parent)){
                setNotPublish = false;
                setPublish = false;
                inheritFromParent = true;
            }
 
-           if (pref.getValue().equals(Messages.PublishFlagPreference_set)){
+           if (pref.getValue().equals(publish)){
                setNotPublish = false;
                setPublish = true;
                inheritFromParent = false;
@@ -119,11 +123,11 @@ public class PublishFlagPreference extends CdmPreferencePage implements IE4Admin
     public boolean performOk() {
         String preferenceValue = null;
         if (setPublish){
-            preferenceValue = Messages.PublishFlagPreference_set;
+            preferenceValue = publish;
         }else if (setNotPublish){
-            preferenceValue = Messages.PublishFlagPreference_do_not_set;
+            preferenceValue = do_not_publish;
         } else{
-            preferenceValue = Messages.PublishFlagPreference_inherit;
+            preferenceValue = inherit_from_parent;
         }
         CdmPreference pref = CdmPreference.NewDatabaseInstance( PreferencePredicate.DefaultBehaviourForPublishFlag, preferenceValue);
         pref.setAllowOverride(true);

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 d1d2ca6bdc3871d791b44df7453734dd42479d12..881724bd9a2a4a347b183e9e287dbe509b8f0134 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
@@ -227,6 +227,10 @@ public interface IPreferenceKeys {
 
     public static final String LAST_SELECTED_REFERENCES = "eu.etaxonomy.taxeditor.references.selection.lastSelected";
 
+    public static final String DO_NOT_PUBLISH = "DO NOT PUBLISH";
+    public static final String INHERIT_FROM_PARENT = "PARENT";
+    public static final String PUBLISH = "PUBLISH";
+
 
 
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
index 4e96aa24147e97b8187d8b3bad190e100f4c0e6f..7009a34d19ca97a35c7139a34542f3ed70e704ea 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
@@ -23,9 +23,9 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 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.l10n.Messages;
 import eu.etaxonomy.taxeditor.newWizard.IWizardPageListener;
 import eu.etaxonomy.taxeditor.parser.ParseHandler;
+import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -144,10 +144,9 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITaxonTreeN
                        INonViralName parseReferencedName = ParseHandler.parseReferencedName(taxonName, null);
                        Taxon taxon = Taxon.NewInstance(parseReferencedName, reference);
                        CdmPreference defaultPublish = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DefaultBehaviourForPublishFlag);
-
-                       if (defaultPublish != null && defaultPublish.getValue().equals(Messages.PublishFlagPreference_set)){
+                       if (defaultPublish != null && defaultPublish.getValue().equals(IPreferenceKeys.PUBLISH)){
                            taxon.setPublish(true);
-                       } else if (defaultPublish != null && defaultPublish.equals(Messages.PublishFlagPreference_do_not_set)){
+                       } else if (defaultPublish != null && defaultPublish.getValue().equals(IPreferenceKeys.DO_NOT_PUBLISH)){
                            taxon.setPublish(false);
                        }else{
                            if((this.getParentTreeNode()).isInstanceOf(TaxonNode.class)){