X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.utils.ui%2Fsrc%2Forg%2Fsimantics%2Futils%2Fui%2FErrorLogger.java;h=c8c49d17dcd816cf9f71248614c9508473302790;hb=b7250834202635a09dd18e25370ed9b4c32b1380;hp=80157b1fe862fdfa27c14f95ba6b18d48d1b29f7;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/ErrorLogger.java b/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/ErrorLogger.java
index 80157b1fe..c8c49d17d 100644
--- a/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/ErrorLogger.java
+++ b/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/ErrorLogger.java
@@ -1,153 +1,152 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.utils.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.simantics.utils.ui.internal.Activator;
-
-
-/**
- * ErrorLogger sends error messages to "Error log" view.
- * 
- * @author Toni Kalajainen
- */
-public class ErrorLogger {
-
-    public static final boolean ECHO = true;
-
-    private final Plugin plugin;
-    private String pluginID;
-
-
-    public ErrorLogger(Plugin plugin) {
-        this.plugin = plugin;
-    }
-
-    private String getPluginID() {
-        if (pluginID==null)
-            pluginID = plugin.getBundle().getSymbolicName();
-        return pluginID;
-    }
-
-    /**
-     * Log a warning event.
-     * 
-     * @param message message of the error
-     * @param exception the exception, or <code>null</code>
-     */
-    public void logWarning(String message, Throwable exception) {
-        log(IStatus.WARNING, IStatus.OK, message, exception);
-    }
-
-    /**
-     * Log a message.
-     * 
-     * @param message message of the error
-     * @param exception the exception, or <code>null</code>
-     */
-    public void logMessage(String message, Throwable exception) {
-        log(IStatus.INFO, IStatus.OK, message, exception);
-    }
-
-    /**
-     * Log an error event.
-     * 
-     * @param message message of the error
-     * @param exception the exception, or <code>null</code>
-     */
-    public void logError(String message, Throwable exception) {
-        // Errors are much more useful with a stack trace!
-        if (exception == null) {
-            exception = new RuntimeException();
-        }
-        log(IStatus.ERROR, IStatus.OK, message, exception);
-    }
-
-    public void log(int severity, int code, String message, Throwable exception) {
-        IStatus status = new Status(severity, getPluginID(), code, message, exception);
-        log(status);
-    }
-
-    public void log(IStatus status) {
-        plugin.getLog().log(status);
-    }
-
-    public static ErrorLogger getDefault() {
-        return Activator.getDefault().getErrorLogger();
-    }
-
-    public static void defaultLogError(String message, Throwable exception) {
-        getDefault().logError(message, exception);
-        if(ECHO && exception != null) exception.printStackTrace();
-    }
-
-    public static void defaultLogError(Throwable exception) {
-        getDefault().logError(getUIFriendErrorMessage(exception), exception);
-        if(ECHO && exception != null) exception.printStackTrace();
-    }
-
-    public static void defaultLogWarning(String message, Throwable exception) {
-        getDefault().logWarning(message, exception);
-        if(ECHO && exception != null) exception.printStackTrace();
-    }
-
-    public static void defaultLogWarning(Throwable exception) {
-        getDefault().logWarning(getUIFriendErrorMessage(exception), exception);
-        if(ECHO && exception != null) exception.printStackTrace();
-    }
-
-    public static void defaultLog(IStatus status) {
-        getDefault().log(status);
-        if(ECHO) System.out.println(status);
-    }
-
-    /**
-     * This call makes verbose error message that is suitable for
-     * UI Dialgos. The full cause hierarchy is shown with the tree.
-     * In this case verbose includes class names.
-     * 
-     * @param e exception
-     * @return message
-     */
-    public static String getUIFriendErrorMessageVerbose(Throwable e) {
-        String result = "";
-        Throwable pe = null;
-        while (e!=null && pe!=e) {
-            result += e.getClass().getName()+": "+e.getMessage()+"\n";
-            pe = e;
-            e = e.getCause();
-        }
-        return result;
-    }
-
-    /**
-     * This call makes error message that is suitable for
-     * UI Dialogs. The full cause hierarchy is shown with the tree.
-     * In this case verbose includes class names.
-     * 
-     * @param e exception
-     * @return message
-     */
-    public static String getUIFriendErrorMessage(Throwable e) {
-        String result = "";
-        Throwable pe = null;
-        while (e!=null && pe!=e) {
-            result += e.getMessage()+"\n";
-            pe = e;
-            e = e.getCause();
-        }
-        return result;
-    }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2018 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.utils.ui;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.simantics.utils.ui.internal.Activator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * ErrorLogger sends error messages to "Error log" view.
+ * 
+ * @author Toni Kalajainen
+ * @author Jani Simomaa
+ */
+public class ErrorLogger {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ErrorLogger.class);
+    private final Plugin plugin;
+    private String pluginID;
+
+
+    public ErrorLogger(Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    private String getPluginID() {
+        if (pluginID==null)
+            pluginID = plugin.getBundle().getSymbolicName();
+        return pluginID;
+    }
+
+    /**
+     * Log a warning event.
+     * 
+     * @param message message of the error
+     * @param exception the exception, or <code>null</code>
+     */
+    public void logWarning(String message, Throwable exception) {
+        log(IStatus.WARNING, IStatus.OK, message, exception);
+        LOGGER.warn(message, exception);
+    }
+
+    /**
+     * Log a message.
+     * 
+     * @param message message of the error
+     * @param exception the exception, or <code>null</code>
+     */
+    public void logMessage(String message, Throwable exception) {
+        log(IStatus.INFO, IStatus.OK, message, exception);
+        LOGGER.info(message, exception);
+    }
+
+    /**
+     * Log an error event.
+     * 
+     * @param message message of the error
+     * @param exception the exception, or <code>null</code>
+     */
+    public void logError(String message, Throwable exception) {
+        // Errors are much more useful with a stack trace!
+        if (exception == null) {
+            exception = new RuntimeException();
+        }
+        log(IStatus.ERROR, IStatus.OK, message, exception);
+        LOGGER.error(message, exception);
+    }
+
+    public void log(int severity, int code, String message, Throwable exception) {
+        IStatus status = new Status(severity, getPluginID(), code, message, exception);
+        log(status);
+    }
+
+    public void log(IStatus status) {
+        plugin.getLog().log(status);
+    }
+
+    public static ErrorLogger getDefault() {
+        return Activator.getDefault().getErrorLogger();
+    }
+
+    public static void defaultLogError(String message, Throwable exception) {
+        getDefault().logError(message, exception);
+    }
+
+    public static void defaultLogError(Throwable exception) {
+        getDefault().logError(getUIFriendErrorMessage(exception), exception);
+    }
+
+    public static void defaultLogWarning(String message, Throwable exception) {
+        getDefault().logWarning(message, exception);
+    }
+
+    public static void defaultLogWarning(Throwable exception) {
+        getDefault().logWarning(getUIFriendErrorMessage(exception), exception);
+    }
+
+    public static void defaultLog(IStatus status) {
+        getDefault().log(status);
+    }
+
+    /**
+     * This call makes verbose error message that is suitable for
+     * UI Dialgos. The full cause hierarchy is shown with the tree.
+     * In this case verbose includes class names.
+     * 
+     * @param e exception
+     * @return message
+     */
+    public static String getUIFriendErrorMessageVerbose(Throwable e) {
+        String result = "";
+        Throwable pe = null;
+        while (e!=null && pe!=e) {
+            result += e.getClass().getName()+": "+e.getMessage()+"\n";
+            pe = e;
+            e = e.getCause();
+        }
+        return result;
+    }
+
+    /**
+     * This call makes error message that is suitable for
+     * UI Dialogs. The full cause hierarchy is shown with the tree.
+     * In this case verbose includes class names.
+     * 
+     * @param e exception
+     * @return message
+     */
+    public static String getUIFriendErrorMessage(Throwable e) {
+        String result = "";
+        Throwable pe = null;
+        while (e!=null && pe!=e) {
+            result += e.getMessage()+"\n";
+            pe = e;
+            e = e.getCause();
+        }
+        return result;
+    }
+
+}