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 563b8a8a923cb0aa00f5a04e57c2657ead140708..5144ab8b77fe53b0f1bd798d3a1770e6fe58bb02 100644 (file)
--- 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.");
     }
 
                 + "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}.
      *
     /**
      * 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 2ed42b85b4a8abb4419df3ffa335da12fc48b57c..8ef10b1e3c67de315fa604a61b26d822016070f5 100644 (file)
--- 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.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;
 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.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;
 
 /**
 import eu.etaxonomy.taxeditor.webapp.CDMServer;
 
 /**


@@ -131,9 +129,9 @@ public class CdmStore {
             return instance;
         } else{// if (instance == null || !instance.isConnected) {
 
             return instance;
         } else{// if (instance == null || !instance.isConnected) {
 

-            MessagingUtils.noDataSourceWarningDialog(instance);
+            MessagingUtils.dataSourceNotAvailableWarningDialog(instance);
+

 
 

-            AbstractUtility.showView(CdmDataSourceViewPart.ID);

             return null;
         }
     }
             return null;
         }
     }


@@ -266,7 +264,7 @@ public class CdmStore {
             ICdmSource cdmSource) {
         instance = new CdmStore(applicationController, cdmSource);
         CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher());
             ICdmSource cdmSource) {
         instance = new CdmStore(applicationController, cdmSource);
         CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher());

-        
+

     }
 
     private CdmStore(ICdmApplicationConfiguration applicationController,
     }
 
     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 f7bef1fee62072f95f2ad1949a6ebc20886d5cd5..30a04836706a5e5ada7c9772aeb3fe9be65fd6bb 100644 (file)
--- 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();
                        startManagedServer();
                } else {
                        connect();

-                       PreferencesUtil.setNomenclaturalCodePreferences();
+                       if (CdmStore.isActive()){
+                           PreferencesUtil.setNomenclaturalCodePreferences();
+                       }
+

                }
        }
 
                }
        }