Merge branch 'release/5.8.0'
[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / preference / PreferencesUtil.java
index 32eb38bb865af00d2758b4887a94910d4c527f22..2e98c3ba489b56bd1b6247e2699c3796dfd20c54 100644 (file)
@@ -27,6 +27,8 @@ import java.util.UUID;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.preferences.ConfigurationScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.equinox.internal.p2.ui.model.MetadataRepositoryElement;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.window.Window;
@@ -34,6 +36,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
+import org.osgi.service.prefs.BackingStoreException;
+import org.osgi.service.prefs.Preferences;
 
 import eu.etaxonomy.cdm.api.application.ICdmRepository;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeConfigurator;
@@ -81,47 +85,102 @@ import eu.etaxonomy.taxeditor.ui.dialog.DefaultLanguageDialog;
  * @created 05.12.2008
  */
 public class PreferencesUtil implements IPreferenceKeys {
+    private final static String EDITOR_PREFERENCES_NODE = "eu.etaxonomy.taxeditor";
 
-       /**
-        *
-        */
-       public static final String PREFERRED_TERMS_CHANGE = "preferred_terms";
+    public static final String PREFERRED_TERMS_CHANGE = "preferred_terms";
 
-       public static final String P2_REPOSITORIES_DELIM = ",";
-       public static final String P2_REPOSITORY_FIELDS_DELIM = ";";
+    public static final String P2_REPOSITORIES_DELIM = ",";
+    public static final String P2_REPOSITORY_FIELDS_DELIM = ";";
+    public static final String SUBJECT_DELIM = "/";
+    private final static Logger logger = Logger.getLogger(PreferencesUtil.class);
 
-       private final static Logger logger = Logger.getLogger(PreferencesUtil.class);
+    public static IPreferenceStore getPreferenceStore() {
+       return TaxeditorStorePlugin.getDefault().getPreferenceStore();
+    }
+
+    public static String[] extractSubjectParts(String subject){
+       String[] result = subject.split("/");
+       return result;
+    }
+
+    public static IEclipsePreferences getEditorPreferences(){
+        return ConfigurationScope.INSTANCE.getNode(EDITOR_PREFERENCES_NODE);
+    }
+
+    public static String getPreferenceValue(PrefKey prefKey){
+        try {
+            if(getEditorPreferences().nodeExists(prefKey.getPredicate())){
+                Preferences predicateNode = getEditorPreferences().node(prefKey.getPredicate());
+                String[] splittedSubject = extractSubjectParts(prefKey.getSubject());
+                String value = predicateNode.get(splittedSubject[splittedSubject.length-1], PreferencePredicate.getByKey(prefKey.getPredicate()).getDefaultValue() != null? PreferencePredicate.getByKey(prefKey.getPredicate()).getDefaultValue().toString(): "");
+                int index = splittedSubject.length -2;
+                while (value != null && index >= 0){
+                   value = predicateNode.get(splittedSubject[index], prefKey.getPredicate());
+                   index--;
+                }
+                return value;
+            }
+
+        } catch (BackingStoreException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
 
+    public static List<CdmPreference> getPreference(PreferencePredicate prefPredicate){
+        try {
+            List<CdmPreference> prefs = new ArrayList();
+            CdmPreference pref;
+            PreferenceSubject subject;
+            if(getEditorPreferences().nodeExists(prefPredicate.getKey())){
+                Preferences predicateNode = getEditorPreferences().node(prefPredicate.getKey());
+                for (String childName: predicateNode.childrenNames()){
+                    Preferences child = predicateNode.node(childName);
+                    String subjectString = "";
+                    subjectString = createSubjectStringForChildNodes(childName, child);
+                    String value = child.get(subjectString, "");
+                    subject = PreferenceSubject.NewInstance(subjectString);
+                    pref = CdmPreference.NewInstance(subject, prefPredicate, value);
+                    prefs.add(pref);
+                }
 
+            }
 
+        } catch (BackingStoreException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return null;
+    }
 
+    /**
+     * @param childName
+     * @param child
+     */
+    private static String createSubjectStringForChildNodes(String subject, Preferences parent) {
+        try {
+            for (String childName: parent.childrenNames()){
+                subject = childName+SUBJECT_DELIM+subject;
+                Preferences child = parent.node(childName);
+                createSubjectStringForChildNodes(subject, child);
+            }
+        } catch (BackingStoreException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return subject;
 
-       /**
-        * <p>
-        * getPreferenceStore
-        * </p>
-        *
-        * @return a {@link org.eclipse.jface.preference.IPreferenceStore} object.
-        */
-       public static IPreferenceStore getPreferenceStore() {
-               return TaxeditorStorePlugin.getDefault().getPreferenceStore();
-       }
+    }
 
-       private static String prefKey(String name) {
-           return name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString();
-       }
+    private static String prefKey(String name) {
+        return name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString();
+    }
 
-       public static String prefOverrideKey(String name) {
+    public static String prefOverrideKey(String name) {
         return name + "_OVERRIDE_";
     }
 
-       /**
-     * <p>
-     * setStringValue
-     * </p>
-     *
-     *
-     **/
     public static void setStringValue(String name, String value) {
         if (value != null){
             getPreferenceStore().setValue(prefKey(name), value);
@@ -130,77 +189,33 @@ public class PreferencesUtil implements IPreferenceKeys {
         }
     }
 
-    /**
-     * <p>
-     * setIntValue
-     * </p>
-     *
-     *
-     **/
     public static void setIntValue(String name, int value) {
         getPreferenceStore().setValue(prefKey(name), value);
     }
 
-    /**
-     * <p>
-     * setBooleanValue
-     * </p>
-     *
-     *
-     **/
     public static void setBooleanValue(String name, boolean value) {
         getPreferenceStore().setValue(prefKey(name), value);
     }
 
-    /**
-     * <p>
-     * setBooleanValue
-     * </p>
-     *
-     *
-     **/
     public static void setDoubleValue(String name, double value) {
         getPreferenceStore().setValue(prefKey(name), value);
     }
 
-    /**
-     * <p>
-     * setFloatValue
-     * </p>
-     *
-     *
-     **/
     public static void setFloatValue(String name, float value) {
         getPreferenceStore().setValue(prefKey(name), value);
     }
 
-    /**
-     * <p>
-     * setFloatValue
-     * </p>
-     *
-     *
-     **/
     public static void setLongValue(String name, long value) {
         getPreferenceStore().setValue(prefKey(name), value);
     }
 
-    /**
-     * <p>
-     * getStringValue
-     * </p>
-     *
-     *
-     **/
     public static String getStringValue(String name, boolean local) {
 
         CdmPreference pref = getDBPreferenceValue(name);
         String prefValue = null;
         String overrideKey =  createPreferenceString(createOverridePreferenceString(name));
-        boolean override = true;
-        if (getPreferenceStore().contains(overrideKey)){
-            override = getPreferenceStore().getBoolean(overrideKey);
-        }
+        boolean override = getPreferenceStore().getBoolean(overrideKey);
+
         if (local || pref == null || (pref != null && pref.isAllowOverride() && override)){
             String dbSpecific = prefKey(name);
             if (getPreferenceStore().contains(dbSpecific)){
@@ -240,14 +255,7 @@ public class PreferencesUtil implements IPreferenceKeys {
         return pref;
     }
 
-    /**
-     * <p>
-     * setIntValue
-     * </p>
-     *
-     *
-     **/
-    public static int getIntValue(String name) {
+    public static int getIntValue(String name, boolean local) {
         CdmPreference pref= getDBPreferenceValue(name);
         String prefValue = null;
         if (pref != null){
@@ -259,7 +267,13 @@ public class PreferencesUtil implements IPreferenceKeys {
         }catch(NumberFormatException e){
             logger.debug("Preference value of " + name + " is not a number");
         }
-        if (result == null){
+
+        String overrideKey =  createPreferenceString(createOverridePreferenceString(name));
+        boolean override = true;
+        if (getPreferenceStore().contains(overrideKey)){
+            override = getPreferenceStore().getBoolean(overrideKey);
+        }
+        if (local || pref == null || (pref != null && pref.isAllowOverride() && override)){
             String dbSpecific = prefKey(name);
             if (getPreferenceStore().contains(dbSpecific)){
                 result = getPreferenceStore().getInt(dbSpecific);
@@ -270,33 +284,33 @@ public class PreferencesUtil implements IPreferenceKeys {
         }
         return result;
 
-
     }
 
     public static boolean getBooleanValue(String name) {
-        return getBooleanValue(name, false);
+        Boolean result = getBooleanValue(name, false);
+        if (result == null){
+            return false;
+        }else{
+            return result;
+        }
+
     }
 
-    /**
-     * <p>
-     * getBooleanValue
-     * </p>
-     *
-     *
-     **/
-    public static boolean getBooleanValue(String name, boolean local) {
+    public static Boolean getBooleanValue(String name, boolean local) {
         if (CdmStore.isActive()){
             CdmPreference pref = getDBPreferenceValue(name);
-            String prefValue = null;
-            if (pref == null || local){
+
+            String overrideKey =  createPreferenceString(createOverridePreferenceString(name));
+            boolean override = getPreferenceStore().getBoolean(overrideKey);
+
+            if (local || pref == null || (pref != null && pref.isAllowOverride() && override)){
                 String dbSpecific = prefKey(name);
                 if (getPreferenceStore().contains(dbSpecific)){
                     return getPreferenceStore().getBoolean(dbSpecific);
                 }else{
-                    return getPreferenceStore().
-                            getBoolean(name);
+                    return null;
                 }
-            }else{
+             }else{
                 return Boolean.valueOf(pref.getValue());
             }
 
@@ -306,13 +320,6 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     }
 
-    /**
-     * <p>
-     * setBooleanValue
-     * </p>
-     *
-     *
-     **/
     public static double getDoubleValue(String name) {
         CdmPreference pref = getDBPreferenceValue(name);
         String prefValue = null;
@@ -338,14 +345,7 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     }
 
-    /**
-     * <p>
-     * getFloatValue
-     * </p>
-     *
-     *
-     **/
-    public static float getFloatValue(String name) {
+    public static float getFloatValue(String name, boolean local) {
         CdmPreference pref = getDBPreferenceValue(name);
         String prefValue = null;
         if (pref != null){
@@ -357,7 +357,12 @@ public class PreferencesUtil implements IPreferenceKeys {
         }catch(NumberFormatException e){
             logger.debug("Preference value of " + name + " is not a number");
         }
-        if (result == null){
+        String overrideKey =  createPreferenceString(createOverridePreferenceString(name));
+        boolean override = true;
+        if (getPreferenceStore().contains(overrideKey)){
+            override = getPreferenceStore().getBoolean(overrideKey);
+        }
+        if (local || pref == null || (pref != null && pref.isAllowOverride() && override)){
             String dbSpecific = prefKey(name);
             if (getPreferenceStore().contains(dbSpecific)){
                 result = getPreferenceStore().getFloat(dbSpecific);
@@ -370,13 +375,6 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     }
 
-    /**
-     * <p>
-     * getLongValue
-     * </p>
-     *
-     *
-     **/
     public static long getLongValue(String name) {
         CdmPreference pref = getDBPreferenceValue(name);
         String prefValue = null;
@@ -401,67 +399,48 @@ public class PreferencesUtil implements IPreferenceKeys {
         return result;
     }
 
-
-       /**
-        * <p>
-        * setPreferredNomenclaturalCode
-        * </p>
-        *
-        * @param preferredCode
-        *            a {@link eu.etaxonomy.cdm.model.name.NomenclaturalCode}
-        *            object.
-        */
-       public static CdmPreference setPreferredNomenclaturalCode(
-                       String preferenceValue, boolean local) {
-           if (local){
-               setStringValue(PREFERRED_NOMENCLATURAL_CODE_KEY,
-                       preferenceValue);
-           }
-           else{
-               ICdmRepository controller;
-               controller = CdmStore.getCurrentApplicationConfiguration();
-               if (controller == null){
+    public static CdmPreference setPreferredNomenclaturalCode(
+            String preferenceValue, boolean local) {
+        if (local){
+            setStringValue(PREFERRED_NOMENCLATURAL_CODE_KEY,
+                    preferenceValue);
+        }
+        else{
+            ICdmRepository controller;
+            controller = CdmStore.getCurrentApplicationConfiguration();
+            if (controller == null){
                 return null;
             }
-               PrefKey key = null;
-               try{
-                   key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.NomenclaturalCode);
-               }catch (Exception e){
-                   System.out.println(e.getStackTrace());
-               }
-               CdmPreference preference = null;
-
-               if (preferenceValue == null){
-                       preference = controller.getPreferenceService().find(key);
-                       if (preference == null){
-                               return null;
-                       } else{
-                           setStringValue(PREFERRED_NOMENCLATURAL_CODE_KEY,
-                                       preference.getValue());
-
-                               return preference;
-                       }
-               } else{
-                       preference = CdmPreference.NewInstance(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.NomenclaturalCode, preferenceValue);
-                       controller.getPreferenceService().set(preference);
-
-               }
-           }
+            PrefKey key = null;
+            try{
+                key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.NomenclaturalCode);
+            }catch (Exception e){
+                System.out.println(e.getStackTrace());
+            }
+            CdmPreference preference = null;
+
+            if (preferenceValue == null){
+                preference = controller.getPreferenceService().find(key);
+                if (preference == null){
+                    return null;
+                } else{
+                    setStringValue(PREFERRED_NOMENCLATURAL_CODE_KEY,
+                            preference.getValue());
+
+                    return preference;
+                }
+            } else{
+                preference = CdmPreference.NewInstance(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.NomenclaturalCode, preferenceValue);
+                controller.getPreferenceService().set(preference);
+
+            }
+        }
         return null;
 
 
 
-       }
+    }
 
-       /**
-     * <p>
-     * setPreferredNomenclaturalCode
-     * </p>
-     *
-     * @param preferredCode
-     *            a {@link eu.etaxonomy.cdm.model.name.NomenclaturalCode}
-     *            object.
-     */
     public static void setPreferredNomenclaturalCode(
         CdmPreference preference) {
 
@@ -481,44 +460,27 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     }
 
+    public static NomenclaturalCode getPreferredNomenclaturalCode() {
 
+        CdmPreference pref = getPreferenceFromDB(PreferencePredicate.NomenclaturalCode);
 
 
-       /**
-        * <p>
-        * getPreferredNomenclaturalCode
-        * </p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.model.name.NomenclaturalCode} object.
-        */
-       public static NomenclaturalCode getPreferredNomenclaturalCode() {
+        String preferredCode;
+        if(pref == null || (pref.isAllowOverride() && getBooleanValue(prefOverrideKey(PreferencePredicate.NomenclaturalCode.getKey())))){
+            preferredCode = getStringValue(
+                    PreferencePredicate.NomenclaturalCode.getKey(), true);
 
-               CdmPreference pref = getPreferenceFromDB(PreferencePredicate.NomenclaturalCode);
-
-
-           String preferredCode;
-           if(pref == null || (pref.isAllowOverride() && getBooleanValue(prefOverrideKey(PreferencePredicate.NomenclaturalCode.getKey())))){
-               preferredCode = getStringValue(
-                       PreferencePredicate.NomenclaturalCode.getKey(), true);
-
-           }else{
-               preferredCode = pref.getValue();
-           }
-           if (StringUtils.isBlank(preferredCode)){
-               preferredCode = getPreferenceKey((NomenclaturalCode)PreferencePredicate.NomenclaturalCode.getDefaultValue());
-           }
+        }else{
+            preferredCode = pref.getValue();
+        }
+        if (StringUtils.isBlank(preferredCode)){
+            preferredCode = getPreferenceKey((NomenclaturalCode)PreferencePredicate.NomenclaturalCode.getDefaultValue());
+        }
 
-           return getPreferredNomenclaturalCode(preferredCode);
+        return getPreferredNomenclaturalCode(preferredCode);
 
-       }
+    }
 
-       /**
-     * <p>
-     * getPreferredNomenclaturalCode
-     * </p>
-     *
-     * @return a {@link eu.etaxonomy.cdm.model.name.NomenclaturalCode} object.
-     */
     public static NomenclaturalCode getPreferredNomenclaturalCode(String preferenceKeyNomenclaturalCode) {
 
         for (NomenclaturalCode code : NomenclaturalCodeHelper.getAllCodes()) {
@@ -529,27 +491,27 @@ public class PreferencesUtil implements IPreferenceKeys {
         return null;
     }
 
-       public static boolean isShowTaxonAssociations(){
+    public static boolean isShowTaxonAssociations(){
         boolean result = getBooleanValue(PreferencePredicate.ShowTaxonAssociations.getKey());
         return result;
     }
 
-       public static boolean isShowLifeForm(){
-           boolean result =  getBooleanValue(PreferencePredicate.ShowLifeForm.getKey());
-           return result;
+    public static boolean isShowLifeForm(){
+        boolean result =  getBooleanValue(PreferencePredicate.ShowLifeForm.getKey());
+        return result;
     }
 
-       public static boolean isDeterminationOnlyForFieldUnits(){
-           boolean result =  getBooleanValue(PreferencePredicate.DeterminationOnlyForFieldUnits.getKey());
+    public static boolean isDeterminationOnlyForFieldUnits(){
+        boolean result =  getBooleanValue(PreferencePredicate.DeterminationOnlyForFieldUnits.getKey());
         return result;
     }
 
-       public static boolean isCollectingAreaInGeneralSection(){
-           boolean result =  getBooleanValue(PreferencePredicate.ShowCollectingAreasInGeneralSection.getKey());
+    public static boolean isCollectingAreaInGeneralSection(){
+        boolean result =  getBooleanValue(PreferencePredicate.ShowCollectingAreasInGeneralSection.getKey());
         return result;
-       }
+    }
 
-       public static CdmPreference getPreferenceFromDB(IPreferencePredicate predicate){
+    public static CdmPreference getPreferenceFromDB(IPreferencePredicate predicate){
         ICdmRepository controller;
         CdmPreference pref = null;
 
@@ -567,7 +529,7 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     }
 
-       public static List<CdmPreference> getPreferencesFromDB(IPreferencePredicate predicate){
+    public static List<CdmPreference> getPreferencesFromDB(IPreferencePredicate predicate){
         ICdmRepository controller;
         List<CdmPreference> prefs = null;
 
@@ -585,7 +547,27 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     }
 
-       public static CdmPreference getPreferenceFromDB(PrefKey key){
+    public static void setPreferencesToDB(CdmPreference preference, boolean setDefault){
+        ICdmRepository controller;
+        try{
+            if(CdmStore.isActive()){
+                controller = CdmStore.getCurrentApplicationConfiguration();
+
+                if (setDefault){
+                    controller.getPreferenceService().remove(preference.getKey());
+                }else{
+                    controller.getPreferenceService().set(preference);
+                }
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+
+
+
+    }
+
+    public static CdmPreference getPreferenceFromDB(PrefKey key){
         ICdmRepository controller;
         CdmPreference pref = null;
 
@@ -602,14 +584,16 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     }
 
-
-
     public static void setPreferenceToDB(CdmPreference preference){
         ICdmRepository controller;
         try{
             if(CdmStore.isActive()){
                 controller = CdmStore.getCurrentApplicationConfiguration();
-                controller.getPreferenceService().set(preference);
+                if (preference.getValue() == null && preference.isAllowOverride()){
+                    controller.getPreferenceService().remove(preference.getKey());
+                }else{
+                    controller.getPreferenceService().set(preference);
+                }
                 CdmPreferenceCache.instance().put(preference);
             }
         }catch(Exception e){
@@ -618,347 +602,321 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     }
 
+    public static String getPreferredDefaultLangugae(){
+        String preferredLanguage = getStringValue(DEFAULT_LANGUAGE_EDITOR);
+        if(StringUtils.isNotEmpty(preferredLanguage) && StringUtils.isNotBlank(preferredLanguage)){
+            return preferredLanguage;
+        }
+        return null;
+    }
 
-
-       public static String getPreferredDefaultLangugae(){
-           String preferredLanguage = getStringValue(DEFAULT_LANGUAGE_EDITOR);
-           if(StringUtils.isNotEmpty(preferredLanguage) && StringUtils.isNotBlank(preferredLanguage)){
-               return preferredLanguage;
-           }
-           return null;
-       }
-
-       public static boolean isShowMediaPreview(){
+    public static boolean isShowMediaPreview(){
         boolean isShowMediaPreview = getBooleanValue(SHOW_MEDIA_PREVIEW);
         return isShowMediaPreview;
     }
 
-       /**
-        * Get the match strategy for the given class that was stored in preferences
-        * or the default strategy if it was not stored in preferences
-        *
-        * @param clazz
-        *            a {@link java.lang.Class} object.
-        * @return a {@link eu.etaxonomy.cdm.strategy.match.IMatchStrategy} object.
-        */
-       public static IMatchStrategy getMatchStrategy(Class<?> clazz) {
-               String className = clazz.getName();
-               if (getBooleanValue(MATCH_STRATEGY_PREFIX + className)) {
-                       IMatchStrategy matchStrategy = getDefaultMatchStrategy(clazz);
-
-                       //TODO CacheMatchers (or multiple field matchers in future) are missing here
-                       for (FieldMatcher fieldMatcher : matchStrategy.getMatching().getFieldMatchers(false)) {
-                               String fieldName = fieldMatcher.getPropertyName();
-                               String matchModeName = getStringValue(
-                                               getMatchStrategyFieldName(className, fieldName));
-                               MatchMode matchMode = MatchMode.valueOf(matchModeName);
-                               try {
-                                       matchStrategy.setMatchMode(fieldName, matchMode);
-                               } catch (MatchException e) {
-                                       MessagingUtils.error(PreferencesUtil.class, e);
-                                       throw new RuntimeException(e);
-                               }
-                       }
-
-                       return matchStrategy;
-               }
-               return getDefaultMatchStrategy(clazz);
-       }
-
-       /**
-        * Stores a matchStrategy into the preference store.
-        *
-        * @param matchStrategy
-        *            a {@link eu.etaxonomy.cdm.strategy.match.IMatchStrategy}
-        *            object.
-        */
-       public static void setMatchStrategy(IMatchStrategy matchStrategy) {
-               String className = "ANY class"; //FIXME was: matchStrategy.getMatchClass().getName(); seems currently not in use
-               setBooleanValue(MATCH_STRATEGY_PREFIX + className, true);
-
-               List<FieldMatcher> fieldMatchers = matchStrategy.getMatching().getFieldMatchers(false);
-
-               for (FieldMatcher fieldMatcher : fieldMatchers) {
-                       String fieldName = fieldMatcher.getPropertyName();
-                       setStringValue(
-                                       getMatchStrategyFieldName(className, fieldName),
-                                       fieldMatcher.getMatchMode().name());
-               }
-       }
-
-       /**
-        * Helper method to create the preference property for a match field.
-        *
-        * @param className
-        * @param fieldName
-        * @return
-        */
-       private static String getMatchStrategyFieldName(String className,
-                       String fieldName) {
-               return MATCH_STRATEGY_PREFIX + className + "." + fieldName;
-       }
-
-       /**
-        * Returns the default match strategy for a given class.
-        *
-        * @param clazz
-        *            a {@link java.lang.Class} object.
-        * @return a {@link eu.etaxonomy.cdm.strategy.match.IMatchStrategy} object.
-        */
-       public static IMatchStrategy getDefaultMatchStrategy(Class clazz) {
-               return DefaultMatchStrategy.NewInstance(clazz);
-       }
-
-       /**
-        * <p>
-        * getDateFormatPattern
-        * </p>
-        *
-        * @return a {@link java.lang.String} object.
-        */
-       public static String getDateFormatPattern() {
-               // TODO make this configurable in properties
-               String pattern = "Y-M-d H:m";
-               return pattern;
-       }
-
-       /**
-        * <p>
-        * addTermToPreferredTerms
-        * </p>
-        *
-        * @param term
-        *            a T object.
-        * @param <T>
-        *            a T object.
-        */
-       public static <T extends TermBase> void addTermToPreferredTerms(T term) {
-
-               // VocabularyEnum vocabulary =
-               // VocabularyEnum.getVocabularyEnum(term.getClass());
-               //
-               // getPreferenceStore().setValue(getPreferenceKey(term),
-               // VocabularyStore.getTermVocabulary(vocabulary).getTerms().contains(term));
-               //
-               // firePreferencesChanged(term.getClass());
-       }
-
-       /**
-        * Construct a unique key using the CdmBase object's uuid
-        *
-        * @param cdmBase
-        * @return
-        */
-       private static String getPreferenceKey(ICdmBase cdmBase) {
-               cdmBase = HibernateProxyHelper.deproxy(cdmBase);
-
-               String key = cdmBase.getClass().getName().concat(".")
-                               .concat(cdmBase.getUuid().toString());
-               if (key.contains("javassist")) {
-                       MessagingUtils.info("proxy");
-               }
-               return key;
-       }
-
-       /**
-        * Construct a unique key using the CdmBase object's uuid
-        *
-        * @param cdmBase
-        * @return
-        */
-       public static String getPreferenceKey(ISimpleTerm simpleTerm) {
-               simpleTerm = HibernateProxyHelper.deproxy(simpleTerm);
-               String key = simpleTerm.getClass().getName().concat(".")
-                               .concat(simpleTerm.getUuid().toString());
-               if (key.contains("javassist")) {
-                       MessagingUtils.warn(PreferencesUtil.class,
-                                       "Trying to persist a preference based on a proxy class.");
-               }
-               return key;
-       }
-
-
-
-       /**
-        * Construct a unique key using the CdmBase object's uuid
-        *
-        * @param cdmBase
-        * @return
-        */
-       public static String getPreferenceKey(IDefinedTerm definedTerm) {
-               definedTerm = HibernateProxyHelper.deproxy(definedTerm);
-               String key = definedTerm.getClass().getName().concat(".")
-                               .concat(definedTerm.getUuid().toString());
-               if (key.contains("javassist")) {
-                       MessagingUtils.warn(PreferencesUtil.class,
-                                       "Trying to persist a preference based on a proxy class.");
-               }
-               return key;
-       }
-
-       /**
-        * Retrieves search preferences from the preference store
-        *
-        * @return an {@link ITaxonServiceConfigurator} to pass to search methods
-        */
-       public static IFindTaxaAndNamesConfigurator getSearchConfigurator() {
-               IFindTaxaAndNamesConfigurator configurator = initializeSearchConfigurator();
-
-               configurator.setDoTaxa(getBooleanValue(
-                               TAXON_SERVICE_CONFIGURATOR_TAXA));
-               configurator.setDoSynonyms(getBooleanValue(
-                               TAXON_SERVICE_CONFIGURATOR_SYNONYMS));
-               configurator.setDoNamesWithoutTaxa(getBooleanValue(
-                               TAXON_SERVICE_CONFIGURATOR_NAMES));
-               configurator.setDoTaxaByCommonNames(getBooleanValue(
-                               TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES));
-               //configurator.setMatchMode(eu.etaxonomy.cdm.persistence.query.MatchMode.valueOf(getStringValue(TAXON_SERVICE_CONFIGURATOR_MATCH_MODE)));
-
-               return configurator;
-       }
-
-       /**
-        * create new preferences, setting all search options to true
-        *
-        * @return a
-        *         {@link eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator}
-        *         object.
-        */
-       public static IFindTaxaAndNamesConfigurator initializeSearchConfigurator() {
-               IFindTaxaAndNamesConfigurator configurator = FindTaxaAndNamesConfiguratorImpl.NewInstance();
-
-               configurator.setDoTaxa(true);
-               configurator.setDoSynonyms(true);
-               configurator.setDoNamesWithoutTaxa(true);
-               configurator.setDoTaxaByCommonNames(true);
-
-               configurator.setTaxonPropertyPath(Arrays.asList("$", "titleCache",
-                               "name", "name.$", "relationsFromThisTaxon.$"));
-
-               configurator.setSynonymPropertyPath(Arrays.asList("$", "titleCache",
-                               "name", "name.$", "synonyms.relatedTo.*"));
-
-               // DEFAULT VALUES
-               // match mode is a simple like, actually all other match modes are kind
-               // of bogus
-               configurator
-                               .setMatchMode(eu.etaxonomy.cdm.persistence.query.MatchMode.ANYWHERE);
-               // we set page number and size here as this should always be unlimited
-               configurator.setPageNumber(0);
-               // TODO currently limit results to 10000
-               configurator.setPageSize(10000);
-               //setSearchConfigurator(configurator) ;
-               return configurator;
-       }
-
-       /**
-        * Store search preferences
-        *
-        * @param configurator
-        *            a
-        *            {@link eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator}
-        *            object.
-        */
-       public static void setSearchConfigurator(
-                       IFindTaxaAndNamesConfigurator configurator) {
-               getPreferenceStore().setValue(TAXON_SERVICE_CONFIGURATOR_TAXA,
-                               configurator.isDoTaxa());
-               getPreferenceStore().setValue(TAXON_SERVICE_CONFIGURATOR_SYNONYMS,
-                               configurator.isDoSynonyms());
-               getPreferenceStore().setValue(TAXON_SERVICE_CONFIGURATOR_NAMES,
-                               configurator.isDoNamesWithoutTaxa());
-               getPreferenceStore().setValue(TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES,
-                               configurator.isDoTaxaByCommonNames());
-       }
-
-       /**
-        * <p>
-        * firePreferencesChanged
-        * </p>
-        *
-        * @param clazz
-        *            a {@link java.lang.Class} object.
-        */
-       public static void firePreferencesChanged(Class clazz) {
-               getPreferenceStore().firePropertyChangeEvent(PREFERRED_TERMS_CHANGE,
-                               null, clazz);
-       }
-
-       public static String createPreferenceString(String property){
-          return prefKey(property);
-
-       }
-       public static String createOverridePreferenceString(String property){
-              return prefOverrideKey(property);
-
-           }
-
-       /**
-        * Set default values for preferences
-        */
-       public static void setDefaults() {
-               getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_TAXA, true);
-               getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_SYNONYMS,
-                               true);
-               getPreferenceStore().setDefault(createPreferenceString(EDIT_MAP_SERVICE_ACCES_POINT),
-                               "http://edit.africamuseum.be/edit_wp5/v1.2/rest_gen.php");
-               //FIXME : changed default for SHOULD_CONNECT_AT_STARTUP to false (ticket 3828) until resolution
-               getPreferenceStore().setDefault(createPreferenceString(SHOULD_CONNECT_AT_STARTUP), false);
-               getPreferenceStore().setDefault(createPreferenceString(OPENURL_ACCESS_POINT),
-                               "http://www.biodiversitylibrary.org/openurl");
-               getPreferenceStore().setDefault(createPreferenceString(OPENURL_IMAGE_MAX_WIDTH), "1000");
-               getPreferenceStore().setDefault(createPreferenceString(OPENURL_IMAGE_MAX_HEIGHT), "1000");
-               //Distribution Editor:
-               getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DistributionEditorActivated.getKey()), Boolean.valueOf(PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString()));
-//             getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString());
-//             getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisplayOfStatus.getKey()), PreferencePredicate.DisplayOfStatus.getDefaultValue().toString());
-
-
-               //Name Details
-               getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.NameDetailsView.getKey()), new NameDetailsConfigurator(false).toString());
-
-               //Navigator preferences
-               getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.TaxonNodeOrder.getKey()), NavigatorOrderEnum.RankAndNameOrder.getKey());
-
-               //getPreferenceStore().setDefault(createPreferenceString(Prefe), true);
-
-               getPreferenceStore().setDefault(createPreferenceString(SHOW_ADVANCED_MEDIA_SECTION), false);
+    /**
+     * Get the match strategy for the given class that was stored in preferences
+     * or the default strategy if it was not stored in preferences
+     *
+     * @param clazz
+     *            a {@link java.lang.Class} object.
+     * @return a {@link eu.etaxonomy.cdm.strategy.match.IMatchStrategy} object.
+     */
+    public static IMatchStrategy getMatchStrategy(Class<?> clazz) {
+        String className = clazz.getName();
+        if (getBooleanValue(MATCH_STRATEGY_PREFIX + className)) {
+            IMatchStrategy matchStrategy = getDefaultMatchStrategy(clazz);
+
+            //TODO CacheMatchers (or multiple field matchers in future) are missing here
+            for (FieldMatcher fieldMatcher : matchStrategy.getMatching().getFieldMatchers(false)) {
+                String fieldName = fieldMatcher.getPropertyName();
+                String matchModeName = getStringValue(
+                        getMatchStrategyFieldName(className, fieldName));
+                MatchMode matchMode = MatchMode.valueOf(matchModeName);
+                try {
+                    matchStrategy.setMatchMode(fieldName, matchMode);
+                } catch (MatchException e) {
+                    MessagingUtils.error(PreferencesUtil.class, e);
+                    throw new RuntimeException(e);
+                }
+            }
+
+            return matchStrategy;
+        }
+        return getDefaultMatchStrategy(clazz);
+    }
+
+    /**
+     * Stores a matchStrategy into the preference store.
+     *
+     * @param matchStrategy
+     *            a {@link eu.etaxonomy.cdm.strategy.match.IMatchStrategy}
+     *            object.
+     */
+    public static void setMatchStrategy(IMatchStrategy matchStrategy) {
+        String className = "ANY class"; //FIXME was: matchStrategy.getMatchClass().getName(); seems currently not in use
+        setBooleanValue(MATCH_STRATEGY_PREFIX + className, true);
+
+        List<FieldMatcher> fieldMatchers = matchStrategy.getMatching().getFieldMatchers(false);
+
+        for (FieldMatcher fieldMatcher : fieldMatchers) {
+            String fieldName = fieldMatcher.getPropertyName();
+            setStringValue(
+                    getMatchStrategyFieldName(className, fieldName),
+                    fieldMatcher.getMatchMode().name());
+        }
+    }
+
+    /**
+     * Helper method to create the preference property for a match field.
+     *
+     * @param className
+     * @param fieldName
+     * @return
+     */
+    private static String getMatchStrategyFieldName(String className,
+            String fieldName) {
+        return MATCH_STRATEGY_PREFIX + className + "." + fieldName;
+    }
+
+    /**
+     * Returns the default match strategy for a given class.
+     *
+     * @param clazz
+     *            a {@link java.lang.Class} object.
+     * @return a {@link eu.etaxonomy.cdm.strategy.match.IMatchStrategy} object.
+     */
+    public static IMatchStrategy getDefaultMatchStrategy(Class clazz) {
+        return DefaultMatchStrategy.NewInstance(clazz);
+    }
+
+    public static String getDateFormatPattern() {
+        // TODO make this configurable in properties
+        String pattern = "Y-M-d H:m";
+        return pattern;
+    }
+
+    public static <T extends TermBase> void addTermToPreferredTerms(T term) {
+
+        // VocabularyEnum vocabulary =
+        // VocabularyEnum.getVocabularyEnum(term.getClass());
+        //
+        // getPreferenceStore().setValue(getPreferenceKey(term),
+        // VocabularyStore.getTermVocabulary(vocabulary).getTerms().contains(term));
+        //
+        // firePreferencesChanged(term.getClass());
+    }
+
+    /**
+     * Construct a unique key using the CdmBase object's uuid
+     *
+     * @param cdmBase
+     * @return
+     */
+    private static String getPreferenceKey(ICdmBase cdmBase) {
+        cdmBase = HibernateProxyHelper.deproxy(cdmBase);
+
+        String key = cdmBase.getClass().getName().concat(".")
+                .concat(cdmBase.getUuid().toString());
+        if (key.contains("javassist")) {
+            MessagingUtils.info("proxy");
+        }
+        return key;
+    }
+
+    /**
+     * Construct a unique key using the CdmBase object's uuid
+     *
+     * @param cdmBase
+     * @return
+     */
+    public static String getPreferenceKey(ISimpleTerm simpleTerm) {
+        simpleTerm = HibernateProxyHelper.deproxy(simpleTerm);
+        String key = simpleTerm.getClass().getName().concat(".")
+                .concat(simpleTerm.getUuid().toString());
+        if (key.contains("javassist")) {
+            MessagingUtils.warn(PreferencesUtil.class,
+                    "Trying to persist a preference based on a proxy class.");
+        }
+        return key;
+    }
+
+
+
+    /**
+     * Construct a unique key using the CdmBase object's uuid
+     *
+     * @param cdmBase
+     * @return
+     */
+    public static String getPreferenceKey(IDefinedTerm definedTerm) {
+        definedTerm = HibernateProxyHelper.deproxy(definedTerm);
+        String key = definedTerm.getClass().getName().concat(".")
+                .concat(definedTerm.getUuid().toString());
+        if (key.contains("javassist")) {
+            MessagingUtils.warn(PreferencesUtil.class,
+                    "Trying to persist a preference based on a proxy class.");
+        }
+        return key;
+    }
+
+    /**
+     * Retrieves search preferences from the preference store
+     *
+     * @return an {@link ITaxonServiceConfigurator} to pass to search methods
+     */
+    public static IFindTaxaAndNamesConfigurator getSearchConfigurator() {
+        IFindTaxaAndNamesConfigurator configurator = initializeSearchConfigurator();
+
+        configurator.setDoTaxa(getBooleanValue(
+                TAXON_SERVICE_CONFIGURATOR_TAXA));
+        configurator.setDoSynonyms(getBooleanValue(
+                TAXON_SERVICE_CONFIGURATOR_SYNONYMS));
+        configurator.setDoNamesWithoutTaxa(getBooleanValue(
+                TAXON_SERVICE_CONFIGURATOR_NAMES));
+        configurator.setDoTaxaByCommonNames(getBooleanValue(
+                TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES));
+        //configurator.setMatchMode(eu.etaxonomy.cdm.persistence.query.MatchMode.valueOf(getStringValue(TAXON_SERVICE_CONFIGURATOR_MATCH_MODE)));
+
+        return configurator;
+    }
+
+    /**
+     * create new preferences, setting all search options to true
+     *
+     * @return a
+     *         {@link eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator}
+     *         object.
+     */
+    public static IFindTaxaAndNamesConfigurator initializeSearchConfigurator() {
+        IFindTaxaAndNamesConfigurator configurator = FindTaxaAndNamesConfiguratorImpl.NewInstance();
+
+        configurator.setDoTaxa(true);
+        configurator.setDoSynonyms(true);
+        configurator.setDoNamesWithoutTaxa(true);
+        configurator.setDoTaxaByCommonNames(true);
+
+        configurator.setTaxonPropertyPath(Arrays.asList("$", "titleCache",
+                "name", "name.$", "relationsFromThisTaxon.$"));
+
+        configurator.setSynonymPropertyPath(Arrays.asList("$", "titleCache",
+                "name", "name.$", "synonyms.relatedTo.*"));
+
+        // DEFAULT VALUES
+        // match mode is a simple like, actually all other match modes are kind
+        // of bogus
+        configurator
+                .setMatchMode(eu.etaxonomy.cdm.persistence.query.MatchMode.ANYWHERE);
+        // we set page number and size here as this should always be unlimited
+        configurator.setPageNumber(0);
+        // TODO currently limit results to 10000
+        configurator.setPageSize(10000);
+        //setSearchConfigurator(configurator) ;
+        return configurator;
+    }
+
+    /**
+     * Store search preferences
+     *
+     * @param configurator
+     *            a
+     *            {@link eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator}
+     *            object.
+     */
+    public static void setSearchConfigurator(
+            IFindTaxaAndNamesConfigurator configurator) {
+        getPreferenceStore().setValue(TAXON_SERVICE_CONFIGURATOR_TAXA,
+                configurator.isDoTaxa());
+        getPreferenceStore().setValue(TAXON_SERVICE_CONFIGURATOR_SYNONYMS,
+                configurator.isDoSynonyms());
+        getPreferenceStore().setValue(TAXON_SERVICE_CONFIGURATOR_NAMES,
+                configurator.isDoNamesWithoutTaxa());
+        getPreferenceStore().setValue(TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES,
+                configurator.isDoTaxaByCommonNames());
+    }
+
+    public static void firePreferencesChanged(Class clazz) {
+        getPreferenceStore().firePropertyChangeEvent(PREFERRED_TERMS_CHANGE,
+                null, clazz);
+    }
+
+    public static String createPreferenceString(String property){
+       return prefKey(property);
+
+    }
+    public static String createOverridePreferenceString(String property){
+           return prefOverrideKey(property);
+
+        }
+
+    /**
+     * Set default values for preferences
+     */
+    public static void setDefaults() {
+        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_TAXA, true);
+        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_SYNONYMS,
+                true);
+        getPreferenceStore().setDefault(createPreferenceString(EDIT_MAP_SERVICE_ACCES_POINT),
+                "http://edit.africamuseum.be/edit_wp5/v1.2/rest_gen.php");
+        //FIXME : changed default for SHOULD_CONNECT_AT_STARTUP to false (ticket 3828) until resolution
+        getPreferenceStore().setDefault(createPreferenceString(SHOULD_CONNECT_AT_STARTUP), false);
+        getPreferenceStore().setDefault(createPreferenceString(OPENURL_ACCESS_POINT),
+                "http://www.biodiversitylibrary.org/openurl");
+        getPreferenceStore().setDefault(createPreferenceString(OPENURL_IMAGE_MAX_WIDTH), "1000");
+        getPreferenceStore().setDefault(createPreferenceString(OPENURL_IMAGE_MAX_HEIGHT), "1000");
+        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_TAXA, true);
+        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_SYNONYMS, true);
+        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_NAMES, true);
+        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES, true);
+
+        //Distribution Editor:
+//      getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DistributionEditorActivated.getKey()), Boolean.valueOf(PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString()));
+//      getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString());
+//      getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisplayOfStatus.getKey()), PreferencePredicate.DisplayOfStatus.getDefaultValue().toString());
+
+
+        //Name Details
+        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.NameDetailsView.getKey()), new NameDetailsConfigurator(false).toString());
+
+        //Navigator preferences
+        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.TaxonNodeOrder.getKey()), NavigatorOrderEnum.RankAndNameOrder.getKey());
+
+        //getPreferenceStore().setDefault(createPreferenceString(Prefe), true);
+
+        getPreferenceStore().setDefault(createPreferenceString(SHOW_ADVANCED_MEDIA_SECTION), false);
 
         getPreferenceStore().setDefault(createPreferenceString(SHOW_MEDIA_PREVIEW), false);
-               //override db preferences
-               getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.AbcdImportConfig.getKey())), false);
-               getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.ShowSpecimen.getKey())), true);
-               getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.NameDetailsView.getKey())), false);
-               getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey())), true);
-               getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.AvailableDistributionStatus.getKey())), true);
-               getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.AvailableDistributionAreaTerms.getKey())), true);
-               getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey())), true);
-               getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.CommonNameAreaVocabularies.getKey())), false);
-               getPreferenceStore().setDefault(createPreferenceString(FILTER_COMMON_NAME_REFERENCES), false);
-               getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowTaxonNodeWizard.getKey()), Boolean.valueOf(PreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString()));
-               getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowNamespaceInSource.getKey()), Boolean.valueOf(PreferencePredicate.ShowNamespaceInSource.getDefaultValue().toString()));
-               getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowIdInSource.getKey()), Boolean.valueOf(PreferencePredicate.ShowIdInSource.getDefaultValue().toString()));
-               getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisableMultiClassification.getKey()), Boolean.valueOf(PreferencePredicate.DisableMultiClassification.getDefaultValue().toString()));
-               getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowImportExportMenu.getKey()), Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString()));
-
-       }
-
-       /**
-        * <p>
-        * checkNomenclaturalCode
-        * </p>
-        */
-       public static void checkNomenclaturalCode() {
-               // First time Editor is opened, no nomenclatural code has been set
-               if (PreferencesUtil.getPreferredNomenclaturalCode() == null) {
-                       PreferencesUtil.setPreferredNomenclaturalCode(getPreferenceKey(NomenclaturalCode.ICNAFP), true);
-               }
-
-
-
-       }
-       public static void setNomenclaturalCodePreferences(){
-           ICdmRepository controller;
+        //override db preferences
+        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.AbcdImportConfig.getKey())), false);
+        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.ShowSpecimen.getKey())), true);
+        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.NameDetailsView.getKey())), false);
+        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.DistributionEditorActivated.getKey())), true);
+        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.AvailableDistributionStatus.getKey())), true);
+        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.AvailableDistributionAreaTerms.getKey())), true);
+        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey())), true);
+        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.CommonNameAreaVocabularies.getKey())), false);
+        getPreferenceStore().setDefault(createPreferenceString(FILTER_COMMON_NAME_REFERENCES), false);
+        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowTaxonNodeWizard.getKey()), Boolean.valueOf(PreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString()));
+        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowNamespaceInSource.getKey()), Boolean.valueOf(PreferencePredicate.ShowNamespaceInSource.getDefaultValue().toString()));
+        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowIdInSource.getKey()), Boolean.valueOf(PreferencePredicate.ShowIdInSource.getDefaultValue().toString()));
+        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisableMultiClassification.getKey()), Boolean.valueOf(PreferencePredicate.DisableMultiClassification.getDefaultValue().toString()));
+        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowImportExportMenu.getKey()), Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString()));
+        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.ShowSpecimen.getKey()), Boolean.valueOf(PreferencePredicate.ShowSpecimen.getDefaultValue().toString()));
+
+    }
+
+    public static void checkNomenclaturalCode() {
+        // First time Editor is opened, no nomenclatural code has been set
+        if (PreferencesUtil.getPreferredNomenclaturalCode() == null) {
+            PreferencesUtil.setPreferredNomenclaturalCode(getPreferenceKey(NomenclaturalCode.ICNAFP), true);
+        }
+
+
+
+    }
+    public static void setNomenclaturalCodePreferences(){
+        ICdmRepository controller;
         controller = CdmStore.getCurrentApplicationConfiguration();
         PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.NomenclaturalCode);
         CdmPreference preference = null;
@@ -978,210 +936,146 @@ public class PreferencesUtil implements IPreferenceKeys {
         setStringValue(PREFERRED_NOMENCLATURAL_CODE_KEY,
                 getPreferenceKey(preferredCode));
 
-       }
-
-       public static void checkDefaultLanguage(){
-           if(PreferencesUtil.getPreferredDefaultLangugae() == null){
-              Shell shell = AbstractUtility.getShell();
-              int open = new DefaultLanguageDialog(shell).open();
-              if(open == Window.OK){
-                  PlatformUI.getWorkbench().restart();
-              }
-           }else{
-               //TODO:In case of a reinstall, the config.ini will be overwritten
-               //     here you create config.ini with the stored key from preferences
-           }
-       }
-
-       /**
-        * <p>
-        * getMapServiceAccessPoint
-        * </p>
-        *
-        * @return a {@link java.lang.String} object.
-        */
-       public static String getMapServiceAccessPoint() {
-               return getStringValue(EDIT_MAP_SERVICE_ACCES_POINT);
-       }
-
-       /**
-        * <p>
-        * shouldConnectAtStartUp
-        * </p>
-        *
-        * @return a boolean.
-        */
-       public static boolean shouldConnectAtStartUp() {
-               //FIXME :  force SHOULD_CONNECT_AT_STARTUP to false (ticket 3828) until resolution
-               //return getBooleanValue(SHOULD_CONNECT_AT_STARTUP);
-               return false;
-       }
-
-       /**
-        * <p>
-        * getDefaultFeatureTreeForTextualDescription
-        * </p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.model.term.FeatureTree} object.
-        */
-       public static FeatureTree getDefaultFeatureTreeForTextualDescription() {
-               String uuidString = getStringValue(
-                               FEATURE_TREE_DEFAULT_TEXT);
-               if (StringUtils.isBlank(uuidString)) {
+    }
+
+    public static void checkDefaultLanguage(){
+        if(PreferencesUtil.getPreferredDefaultLangugae() == null){
+           Shell shell = AbstractUtility.getShell();
+           int open = new DefaultLanguageDialog(shell).open();
+           if(open == Window.OK){
+               PlatformUI.getWorkbench().restart();
+           }
+        }else{
+            //TODO:In case of a reinstall, the config.ini will be overwritten
+            //     here you create config.ini with the stored key from preferences
+        }
+    }
+
+    public static String getMapServiceAccessPoint() {
+        return getStringValue(EDIT_MAP_SERVICE_ACCES_POINT);
+    }
+
+    public static boolean shouldConnectAtStartUp() {
+        //FIXME :  force SHOULD_CONNECT_AT_STARTUP to false (ticket 3828) until resolution
+        //return getBooleanValue(SHOULD_CONNECT_AT_STARTUP);
+        return false;
+    }
+
+    public static FeatureTree getDefaultFeatureTreeForTextualDescription() {
+        String uuidString = getStringValue(
+                FEATURE_TREE_DEFAULT_TEXT);
+        if (StringUtils.isBlank(uuidString)) {
             return null;
         }
-               FeatureTree tree = CdmStore.getService(
-                       IFeatureTreeService.class).load(UUID.fromString(uuidString));
-               if (tree.getId() == 0) {
+        FeatureTree tree = CdmStore.getService(
+                    IFeatureTreeService.class).load(UUID.fromString(uuidString));
+        if (tree.getId() == 0) {
             return null;
         }
-               return tree;
-       }
-
-       /**
-        * <p>
-        * getDefaultFeatureTreeForStructuredDescription
-        * </p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.model.term.FeatureTree} object.
-        */
-       public static FeatureTree getDefaultFeatureTreeForStructuredDescription() {
-               String uuidString = getStringValue(
-                               FEATURE_TREE_DEFAULT_STRUCTURE);
-               return CdmUtils.isEmpty(uuidString) ? null : CdmStore.getService(
-                               IFeatureTreeService.class).load(UUID.fromString(uuidString));
-       }
-
-       /**
-        * <p>
-        * setSortRanksHierarchichally
-        * </p>
-        *
-        * @param selection
-        *            a boolean.
-        */
-       public static void setSortRanksHierarchichally(boolean selection) {
-               setBooleanValue(SORT_RANKS_HIERARCHICHALLY, selection);
-       }
-
-       /**
-        * <p>
-        * getSortRanksHierarchichally
-        * </p>
-        *
-        * @return a boolean.
-        */
-       public static boolean getSortRanksHierarchichally() {
-               return getBooleanValue(SORT_RANKS_HIERARCHICHALLY);
-       }
-
-       public static boolean isMultilanguageTextEditingCapability() {
-               return getBooleanValue(
-                               MULTILANGUAGE_TEXT_EDITING_CAPABILITY);
-       }
-
-       public static Language getGlobalLanguage() {
-
-
-               String languageUuidString = getStringValue(
-                               GLOBAL_LANGUAGE_UUID);
-
-               if(!CdmStore.isActive()) {
+        return tree;
+    }
+
+    public static FeatureTree getDefaultFeatureTreeForStructuredDescription() {
+        String uuidString = getStringValue(
+                FEATURE_TREE_DEFAULT_STRUCTURE);
+        return CdmUtils.isEmpty(uuidString) ? null : CdmStore.getService(
+                IFeatureTreeService.class).load(UUID.fromString(uuidString));
+    }
+
+    public static void setSortRanksHierarchichally(boolean selection) {
+        setBooleanValue(SORT_RANKS_HIERARCHICHALLY, selection);
+    }
+
+    public static boolean getSortRanksHierarchichally() {
+        return getBooleanValue(SORT_RANKS_HIERARCHICHALLY);
+    }
+
+    public static boolean isMultilanguageTextEditingCapability() {
+        return getBooleanValue(
+                MULTILANGUAGE_TEXT_EDITING_CAPABILITY);
+    }
+
+    public static Language getGlobalLanguage() {
+
+
+        String languageUuidString = getStringValue(
+                GLOBAL_LANGUAGE_UUID);
+
+        if(!CdmStore.isActive()) {
             MessagingUtils.noDataSourceWarningDialog(languageUuidString);
             return null;
         }
 
-               if (CdmUtils.isBlank(languageUuidString)) {
-                       return Language.getDefaultLanguage();
-               }
-
-               UUID languageUuid = UUID.fromString(languageUuidString);
-               return (Language) CdmStore.getService(ITermService.class).load(
-                               languageUuid);
-       }
-
-       public static void setGlobalLanguage(Language language) {
-           if(language != null) {
-               setStringValue(GLOBAL_LANGUAGE_UUID,language.getUuid().toString());
-               CdmStore.setDefaultLanguage(language);
-           }
-
-       }
-
-       /**
-        * @return
-        */
-       public static Map<MarkerType, Boolean> getEditMarkerTypePreferences() {
-               List<MarkerType> markerTypes = CdmStore.getTermManager()
-                               .getPreferredTerms(MarkerType.class);
-
-               Map<MarkerType, Boolean> result = new HashMap<MarkerType, Boolean>();
-
-               for (MarkerType markerType : markerTypes) {
-                       String name = getMarkerTypeEditingPreferenceKey(markerType);
-                       Boolean value = getBooleanValue(name);
-
-                       result.put(markerType, value);
-               }
-
-               return result;
-       }
-
-       /**
-        * @param markerTypeEditingMap
-        */
-       public static void setEditMarkerTypePreferences(
-                       Map<MarkerType, Boolean> markerTypeEditingMap) {
-               for (MarkerType markerType : markerTypeEditingMap.keySet()) {
-                       String name = getMarkerTypeEditingPreferenceKey(markerType);
-                       setBooleanValue(name,
-                                       markerTypeEditingMap.get(markerType));
-               }
-
-       }
-
-       private static String getMarkerTypeEditingPreferenceKey(
-                       MarkerType markerType) {
-               markerType = HibernateProxyHelper.deproxy(markerType);
-               return markerType.getClass().getName() + EDIT_MARKER_TYPE_PREFIX;
-       }
-
-       /**
-        * <p>
-        * setEditMarkerTypePreference
-        * </p>
-        *
-        * @param input
-        *            a {@link org.eclipse.ui.IEditorInput} object.
-        * @param markerType
-        *            a {@link eu.etaxonomy.cdm.model.common.MarkerType} object.
-        * @param edit
-        *            a boolean.
-        */
-       public static void setEditMarkerTypePreference(MarkerType markerType,
-                       boolean edit) {
-               setBooleanValue(
-                               getMarkerTypeEditingPreferenceKey(markerType), edit);
-       }
-
-       /**
-        * @return
-        */
-       public static DerivedUnitFacadeConfigurator getDerivedUnitConfigurator() {
-               DerivedUnitFacadeConfigurator configurator = DerivedUnitFacadeConfigurator
-                               .NewInstance();
-               configurator.setMoveDerivedUnitMediaToGallery(true);
-               configurator.setMoveFieldObjectMediaToGallery(true);
-               return configurator;
-       }
-
-       /**
-        * This method will write language properties to the config.ini located in the configuration folder
-        * of the Taxonomic Ediitor. <b>This method is only used to set the default language for Taxonomic Editor.</b>
-        *
-        * @param setLanguage 0 is for german and 1 for english.
-        * @throws IOException
-        */
+        if (CdmUtils.isBlank(languageUuidString)) {
+            return Language.getDefaultLanguage();
+        }
+
+        UUID languageUuid = UUID.fromString(languageUuidString);
+        return (Language) CdmStore.getService(ITermService.class).load(
+                languageUuid);
+    }
+
+    public static void setGlobalLanguage(Language language) {
+        if(language != null) {
+            setStringValue(GLOBAL_LANGUAGE_UUID,language.getUuid().toString());
+            CdmStore.setDefaultLanguage(language);
+        }
+
+    }
+
+    public static Map<MarkerType, Boolean> getEditMarkerTypePreferences() {
+        List<MarkerType> markerTypes = CdmStore.getTermManager()
+                .getPreferredTerms(MarkerType.class);
+
+        Map<MarkerType, Boolean> result = new HashMap<MarkerType, Boolean>();
+
+        for (MarkerType markerType : markerTypes) {
+            String name = getMarkerTypeEditingPreferenceKey(markerType);
+            Boolean value = getBooleanValue(name);
+
+            result.put(markerType, value);
+        }
+
+        return result;
+    }
+
+    public static void setEditMarkerTypePreferences(
+            Map<MarkerType, Boolean> markerTypeEditingMap) {
+        for (MarkerType markerType : markerTypeEditingMap.keySet()) {
+            String name = getMarkerTypeEditingPreferenceKey(markerType);
+            setBooleanValue(name,
+                    markerTypeEditingMap.get(markerType));
+        }
+
+    }
+
+    private static String getMarkerTypeEditingPreferenceKey(
+            MarkerType markerType) {
+        markerType = HibernateProxyHelper.deproxy(markerType);
+        return markerType.getClass().getName() + EDIT_MARKER_TYPE_PREFIX;
+    }
+
+    public static void setEditMarkerTypePreference(MarkerType markerType,
+            boolean edit) {
+        setBooleanValue(
+                getMarkerTypeEditingPreferenceKey(markerType), edit);
+    }
+
+    public static DerivedUnitFacadeConfigurator getDerivedUnitConfigurator() {
+        DerivedUnitFacadeConfigurator configurator = DerivedUnitFacadeConfigurator
+                .NewInstance();
+        configurator.setMoveDerivedUnitMediaToGallery(true);
+        configurator.setMoveFieldObjectMediaToGallery(true);
+        return configurator;
+    }
+
+    /**
+     * This method will write language properties to the config.ini located in the configuration folder
+     * of the Taxonomic Ediitor. <b>This method is only used to set the default language for Taxonomic Editor.</b>
+     *
+     * @param setLanguage 0 is for german and 1 for english.
+     * @throws IOException
+     */
     public void writePropertyToConfigFile(int setLanguage) throws IOException {
         File file = org.eclipse.core.runtime.preferences.ConfigurationScope.INSTANCE.getLocation().toFile();
         //give warning to user if the directory has no write access
@@ -1306,80 +1200,44 @@ public class PreferencesUtil implements IPreferenceKeys {
         }
     }
 
-
-
-
-    /**
-     * @param orderActivated
-     */
     public static void setSortNodes(NavigatorOrderEnum nodesOrder) {
         setStringValue(PreferencePredicate.TaxonNodeOrder.getKey(), nodesOrder.key);
 
     }
 
-    /**
-     * @param orderActivated
-     */
     public static NavigatorOrderEnum getSortNodes() {
         return NavigatorOrderEnum.valueOf(getStringValue(PreferencePredicate.TaxonNodeOrder.getKey()));
 
     }
 
-    /**
-     * @param orderActivated
-     */
     public static boolean isNodesSortedNaturally() {
         NavigatorOrderEnum value = NavigatorOrderEnum.valueOf(getStringValue(PreferencePredicate.TaxonNodeOrder.getKey()));
         return value.equals(NavigatorOrderEnum.NaturalOrder);
 
     }
 
-    /**
-     * @param orderActivated
-     */
     public static boolean isNodesSortedByName() {
         NavigatorOrderEnum value = NavigatorOrderEnum.valueOf(getStringValue(PreferencePredicate.TaxonNodeOrder.getKey()));
         return value.equals(NavigatorOrderEnum.AlphabeticalOrder);
 
     }
 
-    /**
-     * @param orderActivated
-     */
     public static boolean isNodesSortedByNameAndRank() {
         NavigatorOrderEnum value = NavigatorOrderEnum.valueOf(getStringValue(PreferencePredicate.TaxonNodeOrder.getKey()));
         return value.equals(NavigatorOrderEnum.RankAndNameOrder);
 
     }
-       /**
-        * <p>
-        * setStoreNavigatorState
-        * </p>
-        *
-        * @param selection
-        *            a boolean.
-        */
-       public static boolean isStoreNavigatorState() {
-               return getBooleanValue(RESTORE_NAVIGATOR_STATE);
-
-       }
-
-       /**
-        * <p>
-        * setStoreNavigatorState
-        * </p>
-        *
-        * @param selection
-        *            a boolean.
-        */
-       public static void setStoreNavigatorState(boolean selection) {
-               setBooleanValue(RESTORE_NAVIGATOR_STATE, selection);
-
-       }
 
-    /**
-     * @return
-     */
+    public static boolean isStoreNavigatorState() {
+        return getBooleanValue(RESTORE_NAVIGATOR_STATE);
+
+    }
+
+    public static void setStoreNavigatorState(boolean selection) {
+        setBooleanValue(RESTORE_NAVIGATOR_STATE, selection);
+
+    }
+
     public static boolean isShowUpWidgetIsDisposedMessages() {
        return getBooleanValue(IS_SHOW_UP_WIDGET_IS_DISPOSED);
     }
@@ -1387,9 +1245,6 @@ public class PreferencesUtil implements IPreferenceKeys {
         setBooleanValue(IS_SHOW_UP_WIDGET_IS_DISPOSED, selection);
     }
 
-    /**
-     * @return
-     */
     public static boolean isShowIdInVocabularyInChecklistEditor() {
         String area_display = getStringValue(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey());
         if (area_display.equals(TermDisplayEnum.IdInVocabulary.getKey())) {
@@ -1426,9 +1281,6 @@ public class PreferencesUtil implements IPreferenceKeys {
         return getBooleanValue(PreferencePredicate.OwnDescriptionForDistributionEditor.getKey());
     }
 
-    /**
-     * @return
-     */
     public static String displayAreaInChecklistEditor() {
         String result = getStringValue(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey());
         if (StringUtils.isBlank(result)){
@@ -1437,9 +1289,6 @@ public class PreferencesUtil implements IPreferenceKeys {
        return result;
     }
 
-    /**
-     * @return
-     */
     public static String displayStatusInChecklistEditor() {
         String result = getStringValue(PreferencePredicate.DisplayOfStatus.getKey());
         if (StringUtils.isBlank(result)){
@@ -1452,9 +1301,6 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     }
 
-    /**
-     * @return
-     */
     public static boolean isShowRankInChecklistEditor() {
         return getBooleanValue(PreferencePredicate.ShowRankInDistributionEditor.getKey());
     }
@@ -1462,11 +1308,6 @@ public class PreferencesUtil implements IPreferenceKeys {
        setBooleanValue(PreferencePredicate.ShowRankInDistributionEditor.getKey(), selection);
     }
 
-    /**
-     * @param object
-     * @param b
-     * @return
-     */
     public static NameDetailsConfigurator getPreferredNameDetailsConfiguration( boolean local) {
         NameDetailsConfigurator config = new NameDetailsConfigurator(true);
         CdmPreferenceCache cache = CdmPreferenceCache.instance();
@@ -1487,45 +1328,31 @@ public class PreferencesUtil implements IPreferenceKeys {
         }else{
             value = getStringValue(PreferencePredicate.NameDetailsView.getKey(), local);
         }
-        String [] sections = value.split(";");
-        Map<String, Boolean> sectionMap = new HashMap<String, Boolean>();
-        String[] sectionValues;
-        for (String sectionValue: sections){
-            sectionValues = sectionValue.split(":");
-            sectionMap.put(sectionValues[0], Boolean.valueOf(sectionValues[1]));
-        }
-
-        config.setSimpleDetailsViewActivated(getValue(sectionMap, "simpleViewActivated"));
-
-        config.setTaxonSectionActivated(getValue(sectionMap, "taxon"));
-
-        config.setSecDetailsActivated(getValue(sectionMap, "taxon.SecDetails"));
-        config.setSecEnabled(getValue(sectionMap, "taxon.SecEnabled"));
-
-        config.setLSIDActivated(getValue(sectionMap, "lsid"));
-
-        config.setNomenclaturalCodeActived(getValue(sectionMap, "nc"));
-
-        config.setAppendedPhraseActivated(getValue(sectionMap, "ap"));
-
-        config.setRankActivated(getValue(sectionMap, "rank"));
-
-        config.setAtomisedEpithetsActivated(getValue(sectionMap, "atomisedEpithets"));
-
-        config.setAuthorshipSectionActivated(getValue(sectionMap,"author"));
-
-        config.setNomenclaturalReferenceSectionActivated(sectionMap.get("nomRef"));
-
-        config.setNomenclaturalStatusSectionActivated(getValue(sectionMap, "nomStat"));
-
-        config.setProtologueActivated(getValue(sectionMap,"protologue"));
-
-        config.setTypeDesignationSectionActivated(getValue(sectionMap,"typeDes"));
-
-        config.setNameRelationsSectionActivated(getValue(sectionMap,"nameRelation"));
-
+        if (value!= null){
+            String [] sections = value.split(";");
+            Map<String, Boolean> sectionMap = new HashMap<String, Boolean>();
+            String[] sectionValues;
+            for (String sectionValue: sections){
+                sectionValues = sectionValue.split(":");
+                sectionMap.put(sectionValues[0], Boolean.valueOf(sectionValues[1]));
+            }
+            config.setSimpleDetailsViewActivated(getValue(sectionMap, "simpleViewActivated"));
+            config.setTaxonSectionActivated(getValue(sectionMap, "taxon"));
+            config.setSecDetailsActivated(getValue(sectionMap, "taxon.SecDetails"));
+            config.setSecEnabled(getValue(sectionMap, "taxon.SecEnabled"));
+            config.setLSIDActivated(getValue(sectionMap, "lsid"));
+            config.setNomenclaturalCodeActived(getValue(sectionMap, "nc"));
+            config.setAppendedPhraseActivated(getValue(sectionMap, "ap"));
+            config.setRankActivated(getValue(sectionMap, "rank"));
+            config.setAtomisedEpithetsActivated(getValue(sectionMap, "atomisedEpithets"));
+            config.setAuthorshipSectionActivated(getValue(sectionMap,"author"));
+            config.setNomenclaturalReferenceSectionActivated(sectionMap.get("nomRef"));
+            config.setNomenclaturalStatusSectionActivated(getValue(sectionMap, "nomStat"));
+            config.setProtologueActivated(getValue(sectionMap,"protologue"));
+            config.setTypeDesignationSectionActivated(getValue(sectionMap,"typeDes"));
+            config.setNameRelationsSectionActivated(getValue(sectionMap,"nameRelation"));
             config.setHybridActivated(getValue(sectionMap,"hybrid"));
-
+        }
         return config;
     }
 
@@ -1578,12 +1405,6 @@ public class PreferencesUtil implements IPreferenceKeys {
         return config;
     }
 
-
-    /**
-     * @param object
-     * @param b
-     * @return
-     */
     public static void setPreferredNameDetailsConfiguration(NameDetailsConfigurator config, boolean local) {
         CdmPreference preference = null;
 
@@ -1600,25 +1421,14 @@ public class PreferencesUtil implements IPreferenceKeys {
     }
 
     private static Boolean getValue(Map<String, Boolean> sectionMap, String string) {
-               if (sectionMap.containsKey(string)){
-                       return sectionMap.get(string);
-               }else{
-                       return true;
-               }
-
-       }
-
+        if (sectionMap.containsKey(string)){
+            return sectionMap.get(string);
+        }else{
+            return true;
+        }
 
+    }
 
-    /**
-     * <p>
-     * setAbcdConfigurator
-     * </p>
-     *
-     * @param preferredConfiguration
-     *            a {@link eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator}
-     *            object.
-     */
     public static Abcd206ImportConfigurator getDBAbcdImportConfigurationPreference() {
 
         Abcd206ImportConfigurator config = Abcd206ImportConfigurator.NewInstance(null,null);
@@ -1634,53 +1444,54 @@ public class PreferencesUtil implements IPreferenceKeys {
             return config;
          } else{
              String configString = preference.getValue();
-             String[] configArray = configString.split(";");
-
-             for (String configItem: configArray){
-                 String[] keyValue = configItem.split(":");
-                 String keyString = keyValue[0];
-                 String valueString = null;
-                 if (keyValue.length>1){
-                      valueString = keyValue[1];
-                 }
-                 if (keyString.equals("ignoreImportOfExistingSpecimen")){
-                     config.setIgnoreImportOfExistingSpecimen(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("addIndividualsAssociationsSuchAsSpecimenAndObservations")){
-                     config.setAddIndividualsAssociationsSuchAsSpecimenAndObservations(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("reuseExistingTaxaWhenPossible")){
-                     config.setReuseExistingTaxaWhenPossible(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("ignoreAuthorship")){
-                     config.setIgnoreAuthorship(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("addMediaAsMediaSpecimen")){
-                     config.setAddMediaAsMediaSpecimen(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("reuseExistingMetaData")){
-                     config.setReuseExistingMetaData(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("reuseExistingDescriptiveGroups")){
-                     config.setReuseExistingDescriptiveGroups(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("allowReuseOtherClassifications")){
-                     config.setAllowReuseOtherClassifications(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("deduplicateReferences")){
-                     config.setDeduplicateReferences(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("deduplicateClassifications")){
-                     config.setDeduplicateClassifications(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("moveNewTaxaToDefaultClassification")){
-                     config.setMoveNewTaxaToDefaultClassification(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("mapUnitIdToCatalogNumber")){
-                     config.setMapUnitIdToCatalogNumber(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("mapUnitIdToAccessionNumber")){
-                     config.setMapUnitIdToAccessionNumber(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("mapUnitIdToBarcode")){
-                     config.setMapUnitIdToBarcode(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("overwriteExistingSpecimens")){
-                     config.setOverwriteExistingSpecimens(Boolean.valueOf(valueString));
-                 }else if (keyString.equals("nomenclaturalCode")){
+             if(configString!=null){
+                 String[] configArray = configString.split(";");
+
+                 for (String configItem: configArray){
+                     String[] keyValue = configItem.split(":");
+                     String keyString = keyValue[0];
+                     String valueString = null;
+                     if (keyValue.length>1){
+                         valueString = keyValue[1];
+                     }
+                     if (keyString.equals("ignoreImportOfExistingSpecimen")){
+                         config.setIgnoreImportOfExistingSpecimen(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("addIndividualsAssociationsSuchAsSpecimenAndObservations")){
+                         config.setAddIndividualsAssociationsSuchAsSpecimenAndObservations(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("reuseExistingTaxaWhenPossible")){
+                         config.setReuseExistingTaxaWhenPossible(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("ignoreAuthorship")){
+                         config.setIgnoreAuthorship(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("addMediaAsMediaSpecimen")){
+                         config.setAddMediaAsMediaSpecimen(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("reuseExistingMetaData")){
+                         config.setReuseExistingMetaData(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("reuseExistingDescriptiveGroups")){
+                         config.setReuseExistingDescriptiveGroups(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("allowReuseOtherClassifications")){
+                         config.setAllowReuseOtherClassifications(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("deduplicateReferences")){
+                         config.setDeduplicateReferences(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("deduplicateClassifications")){
+                         config.setDeduplicateClassifications(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("moveNewTaxaToDefaultClassification")){
+                         config.setMoveNewTaxaToDefaultClassification(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("mapUnitIdToCatalogNumber")){
+                         config.setMapUnitIdToCatalogNumber(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("mapUnitIdToAccessionNumber")){
+                         config.setMapUnitIdToAccessionNumber(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("mapUnitIdToBarcode")){
+                         config.setMapUnitIdToBarcode(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("overwriteExistingSpecimens")){
+                         config.setOverwriteExistingSpecimens(Boolean.valueOf(valueString));
+                     }else if (keyString.equals("nomenclaturalCode")){
                          config.setNomenclaturalCode(NomenclaturalCode.fromString(valueString));
-                 }else{
-                     logger.debug("This key of the abcd configurator needs to be added to the transformer: " + keyString);
+                     }else{
+                         logger.debug("This key of the abcd configurator needs to be added to the transformer: " + keyString);
+                     }
                  }
-
              }
-        }
+         }
         return config;
     }
 
@@ -1707,12 +1518,15 @@ public class PreferencesUtil implements IPreferenceKeys {
         config.setReuseExistingMetaData(getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_META_DATA));
         config.setReuseExistingTaxaWhenPossible(getBooleanValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_REUSE_EXISTING_TAXA_WHEN_POSSIBLE));
         config.setNomenclaturalCode(NomenclaturalCode.getByKey(getStringValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_NOMENCLATURAL_CODE)));
-
+        try{
+            config.setDnaSoure(!StringUtils.isBlank(getStringValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DNA_PROVIDER))? URI.create(getStringValue(IPreferenceKeys.ABCD_IMPORT_CONFIGURATOR_DNA_PROVIDER)):null);
+        }catch(Exception e){
+            config.setDnaSoure(null);
+        }
         return config;
 
     }
 
-
     public static void updateAbcdImportConfigurationPreference() {
         CdmPreferenceCache cache = CdmPreferenceCache.instance();
 
@@ -1749,56 +1563,28 @@ public class PreferencesUtil implements IPreferenceKeys {
         }
     }
 
+    public static boolean isSortTaxaByRankAndName() {
 
+        return getBooleanValue(IPreferenceKeys.SORT_TAXA_BY_RANK_AND_NAME);
+    }
 
+    public static String getSortNamedAreasInDistributionEditor() {
 
+        return getStringValue(PreferencePredicate.AreasSortedInDistributionEditor.getKey());
+    }
 
+    public static void setSortNamedAreasInDistributionEditor(String isSortByVocabularyOrder) {
+        setStringValue(PreferencePredicate.AreasSortedInDistributionEditor.getKey(), isSortByVocabularyOrder);
 
+    }
 
-/**
- * @return
- */
-public static boolean isSortTaxaByRankAndName() {
-
-    return getBooleanValue(IPreferenceKeys.SORT_TAXA_BY_RANK_AND_NAME);
-}
-
-/**
- * @return
- */
-public static String getSortNamedAreasInDistributionEditor() {
-
-    return getStringValue(PreferencePredicate.AreasSortedInDistributionEditor.getKey());
-}
-
-public static void setSortNamedAreasInDistributionEditor(String isSortByVocabularyOrder) {
-    setStringValue(PreferencePredicate.AreasSortedInDistributionEditor.getKey(), isSortByVocabularyOrder);
-
-}
-
-/**
- * <p>
- * setPreferredNamedAreasForDistributionEditor
- * </p>
- *
- * @param saveCheckedElements
- * @param saveGrayedElements
- */
-public static void setLastSelectedReference(
-        List<String> lastSelectedReferences) {
+    public static void setLastSelectedReference(
+            List<String> lastSelectedReferences) {
 
         setStringValue(PreferencesUtil.LAST_SELECTED_REFERENCES, lastSelectedReferences.toString());
     }
 
-/**
- * <p>
- * setPreferredNamedAreasForDistributionEditor
- * </p>
- *
- * @param saveCheckedElements
- * @param saveGrayedElements
- */
-public static List<String> getLastSelectedReferences() {
+    public static List<String> getLastSelectedReferences() {
 
         //IPreferenceStore preferenceStore = PreferencesUtil.getPreferenceStore();
         String lastSelected = getStringValue(PreferencesUtil.LAST_SELECTED_REFERENCES);
@@ -1809,182 +1595,155 @@ public static List<String> getLastSelectedReferences() {
         return result;
     }
 
+    public static void setPreferredNamedAreasForDistributionEditor(
+            String saveCheckedElements, String saveGrayedElements, boolean local) {
+        if (local){
+            setStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(), saveCheckedElements);
 
-/**
- * <p>
- * setPreferredNamedAreasForDistributionEditor
- * </p>
- *
- * @param saveCheckedElements
- * @param saveGrayedElements
- */
-public static void setPreferredNamedAreasForDistributionEditor(
-        String saveCheckedElements, String saveGrayedElements, boolean local) {
-    if (local){
-        setStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(), saveCheckedElements);
+        }
+        else{
+            CdmPreference preference = null;
 
-    }
-    else{
-        CdmPreference preference = null;
+            if (saveCheckedElements == null){
+                preference = getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaTerms);
 
-        if (saveCheckedElements == null){
-            preference = getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaTerms);
+                if (preference == null){
+                    return ;
+                } else{
+                    setStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(),
+                            saveCheckedElements);
+                    preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);
+                    setPreferenceToDB(preference);
 
-            if (preference == null){
-                return ;
+                }
             } else{
-                setStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(),
-                        saveCheckedElements);
                 preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);
                 setPreferenceToDB(preference);
+                setStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(),
+                        saveCheckedElements);
 
             }
-        } else{
-           preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaTerms, saveCheckedElements);
-           setPreferenceToDB(preference);
-           setStringValue(PreferencePredicate.AvailableDistributionAreaTerms.getKey(),
-                    saveCheckedElements);
-
         }
-    }
 
-}
-
-/**
- * @param saveCheckedElements
- * @param saveCheckedElements2
- * @param b
- */
-public static void setPreferredVocabulariesForDistributionEditor(String saveCheckedElements,
-        boolean local, boolean isOverride) {
-    if (local){
-      setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(), saveCheckedElements);
-      setBooleanValue(prefOverrideKey(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey()), isOverride);
     }
-    else{
-        ICdmRepository controller;
-        CdmPreference preference = null;
-
-        if (saveCheckedElements == null){
-            preference = getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
 
-            if (preference == null){
-                return ;
+    public static void setPreferredVocabulariesForDistributionEditor(String saveCheckedElements,
+            boolean local, boolean isOverride) {
+        if (local){
+            setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(), saveCheckedElements);
+            setBooleanValue(prefOverrideKey(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey()), isOverride);
+        }
+        else{
+            ICdmRepository controller;
+            CdmPreference preference = null;
+
+            if (saveCheckedElements == null){
+                preference = getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
+
+                if (preference == null){
+                    return ;
+                } else{
+                    setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(),
+                            saveCheckedElements);
+                    preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaVocabularies, saveCheckedElements);
+                    preference.setAllowOverride(isOverride);
+                    setPreferenceToDB(preference);
+                }
             } else{
-                setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(),
-                        saveCheckedElements);
                 preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaVocabularies, saveCheckedElements);
                 preference.setAllowOverride(isOverride);
                 setPreferenceToDB(preference);
-            }
-        } else{
-            preference = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionAreaVocabularies, saveCheckedElements);
-            preference.setAllowOverride(isOverride);
-            setPreferenceToDB(preference);
-            setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(),
-                    saveCheckedElements);
+                setStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(),
+                        saveCheckedElements);
 
+            }
         }
     }
-}
 
+    public static String getPreferredVocabulariesForDistributionEditor(boolean local) {
+        if (local){
 
-/**
- * @param saveCheckedElements
- * @param saveCheckedElements2
- * @param b
- */
-public static String getPreferredVocabulariesForDistributionEditor(boolean local) {
-    if (local){
+            String pref = getStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(), local);
+            return pref;
+        }
+        else{
+            CdmPreference preference = null;
+            preference = getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
+            if (preference == null){
+                return null;
+            } else{
+                return preference.getValue();
+            }
 
-        String pref = getStringValue(PreferencePredicate.AvailableDistributionAreaVocabularies.getKey(), local);
-        return pref;
+        }
     }
-    else{
-        CdmPreference preference = null;
-        preference = getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies);
-        if (preference == null){
+
+    public static List<UUID> createUUIDListFromStringPref(String prefKey) {
+        String prefValue = PreferencesUtil.getStringValue(prefKey);
+        if (prefValue == null){
             return null;
-        } else{
-            return preference.getValue();
         }
-
+        String[] stringArray = prefValue.split(";");
+        List<UUID> uuidList = new ArrayList();
+        for (String uuid: stringArray){
+            if (!StringUtils.isBlank(uuid)){
+                uuidList.add(UUID.fromString(uuid));
+            }
+        }
+        return uuidList;
     }
-}
 
-public static List<UUID> createUUIDListFromStringPref(String prefKey) {
-    String prefValue = PreferencesUtil.getStringValue(prefKey);
-    String[] stringArray = prefValue.split(";");
-    List<UUID> uuidList = new ArrayList();
-    for (String uuid: stringArray){
-        if (!StringUtils.isBlank(uuid)){
-            uuidList.add(UUID.fromString(uuid));
+    public static boolean getFilterCommonNameReferences(){
+        Boolean result = getBooleanValue(PreferencesUtil.FILTER_COMMON_NAME_REFERENCES);
+        if (result == null){
+            return false;
         }
+        return result;
     }
-    return uuidList;
-}
 
-public static boolean getFilterCommonNameReferences(){
-    return getBooleanValue(PreferencesUtil.FILTER_COMMON_NAME_REFERENCES);
-}
-
-/**
- *
- */
-public static void updateDBPreferences() {
-    CdmPreference preference = null;
-    CdmPreferenceCache cache = CdmPreferenceCache.instance();
-    cache.getAllTaxEditorDBPreferences();
-
-    //ABCD Configurator
-
-    updateAbcdImportConfigurationPreference();
-
-    //Name Details
-    NameDetailsConfigurator config = getPreferredNameDetailsConfiguration(false);
-//    if (config != null ){
-//        if (!getBooleanValue(OVERRIDE_NAME_DETAILS) ||  !getBooleanValue(ALLOW_OVERRIDE_NAME_DETAILS)){
-//            setPreferredNameDetailsConfiguration(config, false);
-//        }
-//    }
+    public static void updateDBPreferences() {
 
 
+        CdmPreferenceCache cache = CdmPreferenceCache.instance();
+        cache.getAllTaxEditorDBPreferences();
 
+        //ABCD Configurator
 
+        updateAbcdImportConfigurationPreference();
 
+        //Name Details
+        NameDetailsConfigurator config = getPreferredNameDetailsConfiguration(false);
+        //    if (config != null ){
+        //        if (!getBooleanValue(OVERRIDE_NAME_DETAILS) ||  !getBooleanValue(ALLOW_OVERRIDE_NAME_DETAILS)){
+        //            setPreferredNameDetailsConfiguration(config, false);
+        //        }
+        //    }
 
+    }
 
+    public static void setPreferencesToDB(List<CdmPreference> preferences) {
 
-}
+        ICdmRepository controller;
+        //try{
+            if(CdmStore.isActive()){
+                controller = CdmStore.getCurrentApplicationConfiguration();
+                for (CdmPreference preference: preferences){
+                    if (preference.getValue() == null && preference.isAllowOverride()){
+                        controller.getPreferenceService().remove(preference.getKey());
 
-/**
- * @param string
- * @param saveCheckedElements
- */
-public static void setPreferencesToDB(List<CdmPreference> preferences) {
+                    }else{
+                        controller.getPreferenceService().set(preference);
 
-    ICdmRepository controller;
-    try{
-        if(CdmStore.isActive()){
-            controller = CdmStore.getCurrentApplicationConfiguration();
-            for (CdmPreference preference: preferences){
+                    }
 
-                controller.getPreferenceService().set(preference);
+                }
+                CdmPreferenceCache.instance().getAllTaxEditorDBPreferences();
 
-                CdmPreferenceCache.instance().put(preference);
             }
-        }
-    }catch(Exception e){
-        e.printStackTrace();
+        /*}catch(Exception e){
+            e.printStackTrace();
+        }*/
     }
-}
-
-
-
-
-
-
-
 
     /**
      * Returns whether the named preference is known.
@@ -1995,4 +1754,6 @@ public static void setPreferencesToDB(List<CdmPreference> preferences) {
         return getPreferenceStore().contains(prefKey(prefKey));
     }
 
+
+
 }