Moved all logging and dialog functionality to the new class MessagingUtils.

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / store / CdmStore.java

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 7d18e0d3aba1178eb47165eeb0fbc4639d7f09cb..00a999bd835a197d2a17f7243d8f25cea94fedcd 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
@@ -44,6 +44,7 @@ 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.store.internal.TaxeditorStorePlugin;
 import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;
@@ -101,7 +102,7 @@ public class CdmStore {
                        return instance;
                } else if (instance == null || !instance.isConnected) {
 
-                       AbstractUtility
+                       MessagingUtils
                                        .warningDialog(
                                                        "Application is not connected to a datastore",
                                                        instance,
@@ -125,7 +126,7 @@ public class CdmStore {
                        cdmSource = CdmDataSourceRepository.getCurrentCdmSource();
                        connect(cdmSource);
                } catch (CdmRemoteSourceException e) {
-                       StoreUtil.errorDialog("Connection to CDM Source Failed", CdmStore.class, "Could not connect to target CDM Source", e);
+                       MessagingUtils.messageDialog("Connection to CDM Source Failed", CdmStore.class, "Could not connect to target CDM Source", e);
                }
 
                
@@ -152,7 +153,7 @@ public class CdmStore {
        private static void connect(final ICdmSource cdmSource,
                        final DbSchemaValidation dbSchemaValidation,
                        final Resource applicationContextBean) {
-               StoreUtil.info("Connecting to datasource: " + cdmSource);
+               MessagingUtils.info("Connecting to datasource: " + cdmSource);
 
                job = new CdmStoreConnector(Display.getDefault(), cdmSource,
                                dbSchemaValidation, applicationContextBean);
@@ -216,7 +217,7 @@ public class CdmStore {
                try {
                        return applicationConfiguration;
                } catch (Exception e) {
-                       StoreUtil.error(CdmStore.class, e);
+                       MessagingUtils.error(CdmStore.class, e);
                }
                return null;
        }
@@ -254,7 +255,7 @@ public class CdmStore {
                try{
                        conversation.startTransaction();
                }catch(Exception e){
-                       StoreUtil.errorDialog("No database connection", CdmStore.class, "No database connection available", e);
+                       MessagingUtils.messageDialog("No database connection", CdmStore.class, "No database connection available", e);
                }
                return conversation;
        }
@@ -283,11 +284,11 @@ public class CdmStore {
                                        service = (T) method.invoke(configuration, null);
                                        break;
                                } catch (IllegalArgumentException e) {
-                                       StoreUtil.error(CdmStore.class, e);
+                                       MessagingUtils.error(CdmStore.class, e);
                                } catch (IllegalAccessException e) {
-                                       StoreUtil.error(CdmStore.class, e);
+                                       MessagingUtils.error(CdmStore.class, e);
                                } catch (InvocationTargetException e) {
-                                       StoreUtil.error(CdmStore.class, e);
+                                       MessagingUtils.error(CdmStore.class, e);
                                }
                        }
                }