Project

General

Profile

« Previous | Next » 

Revision 19633083

Added by Katja Luther about 4 years ago

smaller issues in preferences part

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
104 104

  
105 105
        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.AreasSortedInDistributionEditor);
106 106
        if (pref != null){
107
            this.orderAreas = pref.getValue().toString();
107
            if (pref.getValue() != null){
108
                this.orderAreas = pref.getValue().toString();
109
            }else{
110
                this.orderAreas = EditorPreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();
111
            }
108 112
            this.allowOverrideOrderAreas = pref.isAllowOverride();
109 113
        }else{
110 114
            this.orderAreas = EditorPreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
605 605
                orderAreas = PreferencesUtil.getSortNamedAreasInDistributionEditor();
606 606
                overrideOrderAreas = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.AreasSortedInDistributionEditor.getKey()));
607 607
            }else{
608
                this.orderAreas = pref.getValue().toString();
608
                if (pref.getValue() != null){
609
                    orderAreas = pref.getValue().toString();
610
                }else{
611
                    orderAreas = EditorPreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();
612
                }
609 613
            }
610 614
        }else{
611 615
            orderAreas = PreferencesUtil.getSortNamedAreasInDistributionEditor();
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
1405 1405
            //the preference value is build like this:
1406 1406
            //<section1>:true;<section2>:false....
1407 1407
        }else{
1408
            value = getStringValue(EditorPreferencePredicate.NameDetailsView.getKey(), false);
1408
            value = getStringValue(EditorPreferencePredicate.NameDetailsView.getKey(), local);
1409 1409
        }
1410 1410
        String [] sections = value.split(";");
1411 1411
        Map<String, Boolean> sectionMap = new HashMap<String, Boolean>();
......
1419 1419

  
1420 1420
            config.setTaxonSectionActivated(getValue(sectionMap, "taxon"));
1421 1421

  
1422
        config.setSecDetailsActivated(getValue(sectionMap, "taxon.SecEnabled"));
1423
        config.setSecEnabled(getValue(sectionMap, "taxon.SecDetails"));
1422
        config.setSecDetailsActivated(getValue(sectionMap, "taxon.SecDetails"));
1423
        config.setSecEnabled(getValue(sectionMap, "taxon.SecEnabled"));
1424 1424

  
1425 1425
        config.setLSIDActivated(getValue(sectionMap, "lsid"));
1426 1426

  

Also available in: Unified diff