add new class openDistributionPerAreaStatusAdminWizardHandler - continue

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / preference / PublishFlagLocalPreference.java

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 957949d0303c3c3575d1810af79ec54162d2ce19..a3fdf2d8986be946fea0631b9ed4f76ddbf78494 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
@@ -8,9 +8,6 @@
 */
 package eu.etaxonomy.taxeditor.preference;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -70,22 +67,7 @@ public class PublishFlagLocalPreference extends CdmPreferencePage {
             return composite;
         }
 
-
-//        description.setText(Messages.PublishFlagPreference_description);
-//        description.setLayoutData(createTextGridData());
-//        publishFlagBehaviour = new Combo(composite, SWT.READ_ONLY);
-        List<String> enumValues = new ArrayList();
-
         publishFlagBehaviour = createCombo(composite, PublishEnum.values(), PreferencePredicate.DefaultBehaviourForPublishFlag, Messages.PublishFlagPreference_description, isAdminPreference);
-
-//        publishFlagBehaviour.setFont(parent.getFont());
-//        for(PublishEnum display: PublishEnum.values()){
-//            if (pref.getValue().equals(display.getKey())){
-//                publishFlagBehaviour.add(display.getLabel() + " (Default)");
-//            }
-//            else
-//        }
-
         publishFlagBehaviour.addSelectionListener(new SelectionListener() {
 
             @Override
@@ -96,9 +78,7 @@ public class PublishFlagLocalPreference extends CdmPreferencePage {
                 }else{
                     publishBehaviour = null;
                 }
-                if (isAdminPreference){
-                    allowOverrideButton.setSelection(allowOverride);
-                }
+
             }
 
             @Override
@@ -109,7 +89,6 @@ public class PublishFlagLocalPreference extends CdmPreferencePage {
         });
         if (this.isAdminPreference){
             allowOverrideButton = createAllowOverrideButton(composite);
-            allowOverrideButton.setText(Messages.GeneralPreference_override);
             allowOverrideButton.setSelection(allowOverride);
             allowOverrideButton.addSelectionListener(new SelectionAdapter(){
                 @Override
@@ -141,20 +120,22 @@ public class PublishFlagLocalPreference extends CdmPreferencePage {
 
     @Override
     public boolean performOk() {
-        if (publishBehaviour != null){
-            String text = publishFlagBehaviour.getText();
-            for (PublishEnum display: PublishEnum.values()){
-                if (text.startsWith(display.getLabel())){
-                    text = display.getKey();
-                    break;
+        if (isApply()){
+            if (publishBehaviour != null){
+                String text = publishFlagBehaviour.getText();
+                for (PublishEnum display: PublishEnum.values()){
+                    if (text.startsWith(display.getLabel())){
+                        text = display.getKey();
+                        break;
+                    }
                 }
+                PreferencesUtil.setStringValue(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey(), text);
+                if (pref == null || !pref.getValue().equals(text)){
+                    PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey()), true);
+                }
+            }else{
+                PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey()), false);
             }
-            PreferencesUtil.setStringValue(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey(), text);
-            if (pref == null || !pref.getValue().equals(text)){
-                PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey()), true);
-            }
-        }else{
-            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey()), false);
         }
         return true;
     }
@@ -191,9 +172,13 @@ public class PublishFlagLocalPreference extends CdmPreferencePage {
             }
             index++;
         }
-        allowOverrideButton.setSelection(allowOverride);
+        if (isAdminPreference){
+            allowOverrideButton.setSelection(allowOverride);
+        }
+        setApply(true);
         super.performDefaults();
     }
 
 
+
 }