Revision: 4758
http://sourceforge.net/p/jump-pilot/code/4758
Author: edso
Date: 2016-01-10 16:53:53 +0000 (Sun, 10 Jan 2016)
Log Message:
-----------
adapt to new Logger
streamline error handling with new Logger
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java
2016-01-10 16:27:48 UTC (rev 4757)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/WorkbenchFrame.java
2016-01-10 16:53:53 UTC (rev 4758)
@@ -96,7 +96,7 @@
import javax.swing.event.PopupMenuListener;
import javax.swing.text.JTextComponent;
-import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
import org.openjump.core.CheckOS;
import org.openjump.core.model.TaskEvent;
import org.openjump.core.model.TaskListener;
@@ -112,6 +112,7 @@
import com.vividsolutions.jump.util.CollectionUtil;
import com.vividsolutions.jump.util.StringUtil;
import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.Category;
import com.vividsolutions.jump.workbench.model.CategoryEvent;
@@ -155,7 +156,6 @@
.get("ui.WorkbenchFrame.save-project-before-closing-openjump");
private String PROJECT_SAVED = I18N
.get("ui.WorkbenchFrame.save-project-saved");
- private static final Logger LOGGER =
Logger.getLogger(WorkbenchFrame.class);
BorderLayout borderLayout1 = new BorderLayout();
@@ -208,7 +208,6 @@
};
private TaskFrame activeTaskFrame = null;
- private static Logger LOG = Logger.getLogger(WorkbenchFrame.class);
// StatusBar
private JPanel statusPanel;
@@ -374,7 +373,7 @@
// <<TODO:NAMING>> This name is not clear [Jon Aquino]
private int minimumFeatureExtentForAnyRenderingInPixels = 2;
- private StringBuffer log = new StringBuffer();
+// private StringBuffer log = new StringBuffer();
private int taskSequence = 1;
@@ -603,20 +602,21 @@
}
public void log(String message) {
- log(message, this.getClass());
+ log(message, null, new Exception().getStackTrace()[0]);
}
public void log(String message, Class clazz) {
- Logger.getLogger(clazz).info(message);
- log.append(new Date() + " " + message
- + System.getProperty("line.separator"));
- System.out.println(message);
+ log(message, null, new Exception().getStackTrace()[0]);
}
- public String getLog() {
- return log.toString();
+ public void log(String message, Throwable t) {
+ log(message, t, new Exception().getStackTrace()[0]);
}
+ private void log(String message, Throwable t, StackTraceElement
calledFrom) {
+ Logger.log(message, null, Level.INFO, calledFrom);
+ }
+
public void setMinimumFeatureExtentForAnyRenderingInPixels(
int newMinimumFeatureExtentForAnyRenderingInPixels) {
minimumFeatureExtentForAnyRenderingInPixels =
newMinimumFeatureExtentForAnyRenderingInPixels;
@@ -1738,7 +1738,7 @@
}
} catch (Exception e) {
- LOGGER.error("", e); //$NON-NLS-1$
+ log(null, e);
}
// PersistentBlackboardPlugIn listens for when the workbench is
@@ -1784,7 +1784,7 @@
return;
}
} catch (Exception e) {
- LOGGER.error("", e); //$NON-NLS-1$
+ log("", e);
}
// There are other internal frames associated with this task
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
