Project

General

Profile

« Previous | Next » 

Revision 14f76d1e

Added by Katja Luther over 4 years ago

ref #8489: taxon node order preferences

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/TaxonNodeOrderAdminPreference.java
27 27
    @Override
28 28
    public boolean performOk() {
29 29
        if (isApply()){
30
            PreferencesUtil.setPreferenceToDB(CdmPreference.NewTaxEditorInstance(PreferencePredicate.TaxonNodeOrder, this.orderActivated.getKey()));
30
            PreferencesUtil.setPreferenceToDB(CdmPreference.NewTaxEditorInstance(PreferencePredicate.TaxonNodeOrder, this.orderActivated!=null?this.orderActivated.getKey():null));
31 31
            MessageDialog.openInformation(getShell(), null, Messages.OrderPreferencePage_PleaseReopenNavigator);
32 32
            setApply(false);
33 33
        }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java
110 110
		public boolean performOk() {
111 111
		    if (isApply()){
112 112
    		    PreferencesUtil.setSortNodes(this.orderActivated);
113
    		    //PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonNodeOrder), value);
113
    		    if (orderActivated != null){
114
    		        PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonNodeOrder.getKey()), true);
115
    		    }else{
116
    		        PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonNodeOrder.getKey()), false);
117
    		    }
114 118
    		    PreferencesUtil.setStoreNavigatorState(isRestoreTaxonNavigator);
115 119
    	    	MessageDialog.openInformation(getShell(), null, Messages.OrderPreferencePage_PleaseReopenNavigator);
116 120
		    }
......
153 157
            }
154 158

  
155 159
            isRestoreTaxonNavigator = false;
156
            orderActivated = NavigatorOrderEnum.RankAndNameOrder;
157
            int index = 0;
158
            for (String itemLabel : orderSelectionCombo.getItems()){
159
                if (itemLabel.equalsIgnoreCase(orderActivated.getLabel())){
160
                    orderSelectionCombo.select(index);
161
                    break;
162
                }
163
                index++;
164
            }
160
            orderActivated = null;
161

  
162
            orderSelectionCombo.select(0);
163

  
165 164
            super.performDefaults();
166 165
        }
167 166

  

Also available in: Unified diff