Improved error message when connecting to datasource fails in the first place

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
index 8e560cf54a0bb0381edc680ea93cf178210da7ad..0892ec48e47addd511a335fe558ac5b4833d4e09 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
@@ -93,7 +93,8 @@ class CdmStoreConnector extends Job {
                                                applicationContextBean, dataSource, dbSchemaValidation,
                                                false, subprogressMonitor);
                        } catch (Exception e) {
                                                applicationContextBean, dataSource, dbSchemaValidation,
                                                false, subprogressMonitor);
                        } catch (Exception e) {

-                               StoreUtil.error(this.getClass(), e.getMessage(), e);
+                               monitor.done();
+                               return new Status(IStatus.ERROR, "Could not connect to CDM Store", "An error occurred while trying to connect to datasource: " + dataSource.getName(), e);

                        }
                }
 
                        }
                }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java
index f1b64d77ab6d47a87d9cbfb4fee647359c7701da..42e9e9e3659438da1cb26cbb8df075116aba005c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java
@@ -131,7 +131,7 @@ public class LoginManager extends Observable implements IConversationEnabled, IC
        }
 
        @Override
        }
 
        @Override

-       public void contextStart(IMemento memento, IProgressMonitor monitor) {
+       public void contextStart(IMemento memento, IProgressMonitor monitor){

                conversation = CdmStore.createConversation();
        }
 
                conversation = CdmStore.createConversation();
        }