#1395

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index b46e6edd8b6254b55dfbde4b829cd6c90c37cc0e..f008102af88222559e6f8253a05228ce263ad225 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -88,8 +88,11 @@ public class CdmStore{
         * @return
         */
        protected static CdmStore getDefault(){
-/*             if(instance == null){
+               if(instance == null){
                        
+                       // This is a workaround. Please relocate this initial setting to an adequate place.
+                       PreferencesUtil.setHideDatasourceChooser(true);
+
                        // Prompt user for datasource if there are more than one
                        if(! PreferencesUtil.getPreferenceStore().getBoolean(PreferencesUtil.HIDE_DATASOURCE_CHOOSER) 
                                && CdmDataSourceRepository.getAll().size() > 1){
@@ -107,11 +110,8 @@ public class CdmStore{
                                instance = initialize(DEFAULT_DB_SCHEMA_VALIDATION, DEFAULT_APPLICATION_CONTEXT);
                        }
                
-               }*/
-               
-               if (instance == null) {
-                       instance = initialize(DEFAULT_DB_SCHEMA_VALIDATION, DEFAULT_APPLICATION_CONTEXT);
                }
+               
                return instance;
        }