fix #6307 Show contextPath in error log

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 5fa462cf79b99eabd84b9b9e9427b6b507c9616b..433442235bc052805e13bcf6a81b8f99022c706e 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
@@ -14,7 +14,10 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Display;
 
+import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.config.ICdmSource;
 import eu.etaxonomy.cdm.test.integration.SecurityExceptionUtils;
+import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
@@ -175,6 +178,7 @@ public class MessagingUtils {
     public static List<String> getContextInfo() {
         List<String> contextInfo = new ArrayList<String>();
         String name = "";
+        String contextPath = "";
         String schemaVersion = "";
         String server = "";
         String version = "";
@@ -182,11 +186,15 @@ public class MessagingUtils {
         try {
             version = Platform.getBundle("eu.etaxonomy.taxeditor.application").getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION);
 
-            if(CdmStore.getActiveCdmSource() != null ) {
+            ICdmSource activeCdmSource = CdmStore.getActiveCdmSource();
+            if(activeCdmSource != null ) {
                 login = CdmStore.getLoginManager().getAuthenticatedUser().getUsername();
-                name = CdmStore.getActiveCdmSource().getName();
-                schemaVersion = CdmStore.getActiveCdmSource().getDbSchemaVersion();
-                server = CdmStore.getActiveCdmSource().getServer();
+                name = activeCdmSource.getName();
+                schemaVersion = activeCdmSource.getDbSchemaVersion();
+                server = activeCdmSource.getServer();
+                if(activeCdmSource instanceof CdmRemoteSource){
+                    contextPath = ((CdmRemoteSource) activeCdmSource).getContextPath();
+                }
             }
 
         } catch (Exception e) {
@@ -194,7 +202,7 @@ public class MessagingUtils {
         }
         contextInfo.add("login : " + login);
         contextInfo.add("editor version : " + version);
-        contextInfo.add("server : " + server + " / " + name);
+        contextInfo.add("server : " + server + " / " + name + (CdmUtils.isNotBlank(contextPath)?" / "+contextPath:""));
         contextInfo.add("schema version : " + schemaVersion);
         contextInfo.add("os : " + System.getProperty("os.name")+" "+System.getProperty("os.version")+" "+System.getProperty("os.arch"));
         contextInfo.add("java : "+System.getProperty("java.version"));