Project

General

Profile

« Previous | Next » 

Revision 9c128421

Added by Katja Luther over 4 years ago

ref #8385: adapt local and db preference pages

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
41 41
    Button allowOverrideButton;
42 42

  
43 43
    protected boolean allowOverride;
44
    private boolean override = true;
44 45

  
45 46

  
46 47
   @Override
......
132 133

  
133 134
    @Override
134 135
    public boolean performOk() {
135
        if (publishFlagBehaviour != null){
136
        if (publishBehaviour != null){
136 137
            String text = publishFlagBehaviour.getText();
137 138
            for (PublishEnum display: PublishEnum.values()){
138 139
                if (text.startsWith(display.getLabel())){
......
143 144
            PreferencesUtil.setStringValue(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey(), text);
144 145
            if (pref == null || !pref.getValue().equals(text)){
145 146
                PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey()), true);
146
            }else{
147
                PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey()), false);
148 147
            }
148
        }else{
149
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey()), false);
149 150
        }
150 151
        return true;
151 152
    }
152 153

  
153 154
    @Override
154 155
    public void getValues(){
155

  
156
        publishBehaviour = null;
156 157
        try{
157
            publishBehaviour = PublishEnum.valueOf(PreferencesUtil.getStringValue(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey(), true));
158
            String publishString = PreferencesUtil.getStringValue(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey(), true);
159

  
160
            if (publishString != null){
161
                publishBehaviour = PublishEnum.valueOf(publishString);
162
            }
158 163
        }catch (IllegalArgumentException e){
159 164
            publishBehaviour = PublishEnum.InheritFromParent;
160 165
        }
166

  
167
        override = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey()));
168
        if (!override){
169
            publishBehaviour = null;
170
        }
161 171
    }
162 172

  
163 173
    @Override

Also available in: Unified diff