From: Katja Luther <k.luther@bgbm.org>
Date: Mon, 21 Nov 2016 14:56:35 +0000 (+0100)
Subject: fix #6209: adapt the message if a datasource is not available
X-Git-Tag: 4.4.0^2~20
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/af45abb87611c04e93d103bd7c7df6221ca9e877

fix #6209: adapt the message if a datasource is not available
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
index 563b8a8a9..5144ab8b7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
@@ -549,6 +549,20 @@ public class MessagingUtils {
                 + "connected to a datasource. You may choose a datasource to connect to or create a new one in the datasource view.");
     }
 
+    /**
+     * Standard warning dialog for the case when the datasource is not available
+     *
+     * @param source
+     */
+    public static void dataSourceNotAvailableWarningDialog(Object source) {
+        MessagingUtils
+        .warningDialog(
+                "The datasource is not available",
+                source,
+                "The choosen datasource is not available, please contact the administrator.");
+    }
+
+
     /**
      * Displays a warning {@link org.eclipse.jface.dialogs.MessageDialog}.
      *
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index 2ed42b85b..8ef10b1e3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -58,7 +58,6 @@ import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
 import eu.etaxonomy.taxeditor.io.ExportManager;
 import eu.etaxonomy.taxeditor.io.ImportManager;
-import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.remoting.cache.CdmRemoteCacheManager;
@@ -67,7 +66,6 @@ import eu.etaxonomy.taxeditor.session.mock.MockCdmEntitySessionManager;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 import eu.etaxonomy.taxeditor.ui.dialog.RemotingLoginDialog;
 import eu.etaxonomy.taxeditor.util.ProgressMonitorClientManager;
-import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;
 import eu.etaxonomy.taxeditor.webapp.CDMServer;
 
 /**
@@ -131,9 +129,9 @@ public class CdmStore {
             return instance;
         } else{// if (instance == null || !instance.isConnected) {
 
-            MessagingUtils.noDataSourceWarningDialog(instance);
+            MessagingUtils.dataSourceNotAvailableWarningDialog(instance);
+
 
-            AbstractUtility.showView(CdmDataSourceViewPart.ID);
             return null;
         }
     }
@@ -266,7 +264,7 @@ public class CdmStore {
             ICdmSource cdmSource) {
         instance = new CdmStore(applicationController, cdmSource);
         CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher());
-        
+
     }
 
     private CdmStore(ICdmApplicationConfiguration applicationController,
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
index f7bef1fee..30a048367 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/RemotingLoginDialog.java
@@ -479,7 +479,10 @@ public class RemotingLoginDialog extends Dialog implements ICDMServerError {
 			startManagedServer();
 		} else {
 			connect();
-			PreferencesUtil.setNomenclaturalCodePreferences();
+			if (CdmStore.isActive()){
+			    PreferencesUtil.setNomenclaturalCodePreferences();
+			}
+
 		}
 	}