Revision: 4757
http://sourceforge.net/p/jump-pilot/code/4757
Author: edso
Date: 2016-01-10 16:27:48 +0000 (Sun, 10 Jan 2016)
Log Message:
-----------
adapt to new Logger
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/I18N.java
core/trunk/src/com/vividsolutions/jump/io/datasource/DataSource.java
core/trunk/src/com/vividsolutions/jump/tools/OverlayEngine.java
core/trunk/src/com/vividsolutions/jump/util/java2xml/Java2XML.java
core/trunk/src/com/vividsolutions/jump/util/java2xml/XML2Java.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadDatasetPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadDatasetPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/imagery/ecw/ECWImageFactory.java
core/trunk/src/com/vividsolutions/jump/workbench/imagery/mrsid/MrSIDImageFactory.java
core/trunk/src/com/vividsolutions/jump/workbench/model/WMSLayer.java
core/trunk/src/com/vividsolutions/jump/workbench/plugin/AbstractPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
Modified: core/trunk/src/com/vividsolutions/jump/I18N.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/I18N.java 2016-01-10 16:20:45 UTC
(rev 4756)
+++ core/trunk/src/com/vividsolutions/jump/I18N.java 2016-01-10 16:27:48 UTC
(rev 4757)
@@ -40,14 +40,16 @@
import java.util.Map;
import java.util.ResourceBundle;
-import org.apache.log4j.Logger;
+import com.vividsolutions.jump.workbench.Logger;
+
+
/**
* Singleton for the Internationalization (I18N)
**/
public final class I18N {
- private static final Logger LOG = Logger.getLogger(I18N.class);
+
private static final I18N instance = new I18N();
// [Michael Michaud 2007-03-23] plugInsResourceBundle is deactivated because
@@ -159,13 +161,11 @@
return resourceBundle3.getString(key);
} catch (java.util.MissingResourceException e) {
if (!missing.contains(key)) {
- String msg = getClass().getName()
- + "\nNo resource bundle or no translation found for''{0}''.\nError
was:\n{1}";
- msg = new MessageFormat(msg).format(new String[] { key,
- e.getLocalizedMessage() });
- LOG.debug(msg);
- System.out.println("Missing translation for '" + key
- + "' in resource bundle '" + this.resourcePath + "'.");
+ String msg = "No translation for key ''{0}'' in bundle ''{1}''.";
+ msg = MessageFormat.format(msg, key, resourcePath);
+
+ Logger.warn(msg, Logger.isDebugEnabled() ? e : null);
+
missing.add(key);
// uncomment and add a search string to get staks telling you where the
// call came from
@@ -300,13 +300,13 @@
String[] lc = localeCode.split("_");
Locale locale = Locale.getDefault();
if (lc.length > 1) {
- LOG.debug("lang:" + lc[0] + " " + "country:" + lc[1]);
+ Logger.debug("lang:" + lc[0] + " " + "country:" + lc[1]);
locale = new Locale(lc[0], lc[1]);
} else if (lc.length > 0) {
- LOG.debug("lang:" + lc[0]);
+ Logger.debug("lang:" + lc[0]);
locale = new Locale(lc[0]);
} else {
- LOG.debug(localeCode
+ Logger.debug(localeCode
+ " is an illegal argument to define lang [and country]");
}
@@ -430,8 +430,9 @@
return mformat.format(objects);
} catch (java.util.MissingResourceException e) {
final String[] labelpath = label.split("\\.");
- LOG.warn(e.getMessage() + " no default value, the resource key is used: "
+ Logger.warn(e.getMessage() + " no default value, the resource key is
used: "
+ labelpath[labelpath.length - 1]);
+
final MessageFormat mformat = new MessageFormat(
labelpath[labelpath.length - 1]);
return mformat.format(objects);
Modified: core/trunk/src/com/vividsolutions/jump/io/datasource/DataSource.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/io/datasource/DataSource.java
2016-01-10 16:20:45 UTC (rev 4756)
+++ core/trunk/src/com/vividsolutions/jump/io/datasource/DataSource.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -34,8 +34,8 @@
import com.vividsolutions.jump.coordsys.CoordinateSystem;
import com.vividsolutions.jump.coordsys.CoordinateSystemRegistry;
import com.vividsolutions.jump.feature.FeatureCollection;
-import org.apache.log4j.Logger;
+
import java.util.HashMap;
import java.util.Map;
/**
@@ -47,8 +47,6 @@
*/
public abstract class DataSource {
- private static Logger LOG = Logger.getLogger(DataSource.class);
-
private Map properties;
/**
Modified: core/trunk/src/com/vividsolutions/jump/tools/OverlayEngine.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/tools/OverlayEngine.java
2016-01-10 16:20:45 UTC (rev 4756)
+++ core/trunk/src/com/vividsolutions/jump/tools/OverlayEngine.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -36,13 +36,19 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.log4j.Logger;
-
-import com.vividsolutions.jts.geom.*;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryCollection;
+import com.vividsolutions.jts.geom.MultiPolygon;
+import com.vividsolutions.jts.geom.Polygon;
import com.vividsolutions.jts.precision.EnhancedPrecisionOp;
import com.vividsolutions.jump.I18N;
-import com.vividsolutions.jump.feature.*;
+import com.vividsolutions.jump.feature.BasicFeature;
+import com.vividsolutions.jump.feature.Feature;
+import com.vividsolutions.jump.feature.FeatureCollection;
+import com.vividsolutions.jump.feature.FeatureDataset;
+import com.vividsolutions.jump.feature.IndexedFeatureCollection;
import com.vividsolutions.jump.task.TaskMonitor;
+import com.vividsolutions.jump.workbench.Logger;
/**
@@ -50,7 +56,7 @@
* FeatureCollection containing the intersections of all pairs of input
features.
*/
public class OverlayEngine {
- private static Logger LOG = Logger.getLogger(OverlayEngine.class);
+
private boolean splittingGeometryCollections = true;
private boolean allowingPolygonsOnly = true;
@@ -127,8 +133,8 @@
b.getGeometry());
} catch (Exception ex) {
monitor.report(ex);
- LOG.error(a.getGeometry());
- LOG.error(b.getGeometry());
+ Logger.error(a.getGeometry().toString());
+ Logger.error(b.getGeometry().toString());
}
if ((intersection == null) || intersection.isEmpty()) {
Modified: core/trunk/src/com/vividsolutions/jump/util/java2xml/Java2XML.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/util/java2xml/Java2XML.java
2016-01-10 16:20:45 UTC (rev 4756)
+++ core/trunk/src/com/vividsolutions/jump/util/java2xml/Java2XML.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -25,14 +25,12 @@
* (250)385-6040 www.vividsolutions.com
*/
package com.vividsolutions.jump.util.java2xml;
-import org.apache.log4j.Logger;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.StringWriter;
+import java.io.Writer;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
@@ -41,8 +39,16 @@
import java.util.Map;
import javax.xml.namespace.QName;
+
+import org.jdom.Attribute;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.output.Format;
+import org.jdom.output.XMLOutputter;
+
+import com.vividsolutions.jump.workbench.Logger;
public class Java2XML extends XMLBinder {
- private static Logger LOG = Logger.getLogger(Java2XML.class);
+
public Java2XML() {
}
public String write(Object object, String rootTagName) throws Exception {
@@ -115,7 +121,7 @@
}
}, object.getClass());
} catch (Exception e) {
- LOG.error("Java2XML: Exception writing "
+ Logger.error("Java2XML: Exception writing "
+ object.getClass());
throw e;
}
Modified: core/trunk/src/com/vividsolutions/jump/util/java2xml/XML2Java.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/util/java2xml/XML2Java.java
2016-01-10 16:20:45 UTC (rev 4756)
+++ core/trunk/src/com/vividsolutions/jump/util/java2xml/XML2Java.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -25,21 +25,32 @@
* (250)385-6040 www.vividsolutions.com
*/
package com.vividsolutions.jump.util.java2xml;
-import com.vividsolutions.jts.util.Assert;
-import com.vividsolutions.jump.util.StringUtil;
-import org.apache.log4j.Logger;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.StringReader;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
-import javax.xml.namespace.QName;
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
+import com.vividsolutions.jts.util.Assert;
+import com.vividsolutions.jump.util.StringUtil;
+import com.vividsolutions.jump.workbench.Logger;
public class XML2Java extends XMLBinder {
private ArrayList listeners = new ArrayList();
private ClassLoader classLoader = getClass().getClassLoader();
- private static Logger LOG = Logger.getLogger(XMLBinder.class);
+
public XML2Java() {
}
public XML2Java(ClassLoader classLoader) {
@@ -129,7 +140,7 @@
// [sstein 5April2008] replaced XMLB exception by Log
// so when a problem with styling appears data are still
loaded
if (tag.getName().equalsIgnoreCase("style")){
- LOG.warn(msg);
+ Logger.warn(msg);
System.out.println(msg);
return; //return to avoid further messages
}
@@ -139,7 +150,7 @@
(xmlName.equalsIgnoreCase("editable") ||
xmlName.equalsIgnoreCase("selectable") ||
xmlName.equalsIgnoreCase("read-only") ) ) {
- LOG.warn(msg);
+ Logger.warn(msg);
System.out.println(msg);
return; //return to avoid further messages
}
@@ -169,7 +180,7 @@
try {
return read(tag, Class.forName(tag.getAttributeValue("class"),
true, classLoader));
} catch (ClassNotFoundException e) {
- LOG.error("Could not find class for " + tag, e);
+ Logger.error("Could not find class for " + tag, e);
System.out.println("Class not found for tag " + tag.getName()
+ ": " + tag.getAttribute("class").getValue());
throw e;
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadDatasetPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadDatasetPlugIn.java
2016-01-10 16:20:45 UTC (rev 4756)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadDatasetPlugIn.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -7,8 +7,8 @@
import java.util.Collection;
import java.util.Iterator;
-import org.apache.log4j.Logger;
+
import com.vividsolutions.jts.util.Assert;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.coordsys.CoordinateSystemRegistry;
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadDatasetPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadDatasetPlugIn.java
2016-01-10 16:20:45 UTC (rev 4756)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/LoadDatasetPlugIn.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -62,10 +62,7 @@
import java.util.Collection;
import java.util.Iterator;
-import org.apache.log4j.Logger;
-
import javax.swing.ImageIcon;
-import javax.swing.SwingUtilities;
import javax.swing.JFileChooser;
import java.awt.event.*;
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/imagery/ecw/ECWImageFactory.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/imagery/ecw/ECWImageFactory.java
2016-01-10 16:20:45 UTC (rev 4756)
+++
core/trunk/src/com/vividsolutions/jump/workbench/imagery/ecw/ECWImageFactory.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -42,9 +42,6 @@
import com.vividsolutions.jump.workbench.imagery.ReferencedImage;
import com.vividsolutions.jump.workbench.imagery.ReferencedImageFactory;
-import org.apache.log4j.Logger;
-import org.openjump.util.UriUtil;
-
/**
*/
public class ECWImageFactory implements ReferencedImageFactory {
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/imagery/mrsid/MrSIDImageFactory.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/imagery/mrsid/MrSIDImageFactory.java
2016-01-10 16:20:45 UTC (rev 4756)
+++
core/trunk/src/com/vividsolutions/jump/workbench/imagery/mrsid/MrSIDImageFactory.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -38,7 +38,6 @@
import java.net.URI;
import java.util.HashMap;
-import org.apache.log4j.Logger;
import org.openjump.core.CheckOS;
import org.openjump.util.UriUtil;
@@ -52,9 +51,6 @@
public class MrSIDImageFactory implements ReferencedImageFactory {
- private Logger logger = Logger.getLogger(MrSIDImageFactory.class);
-
- // --
public static final String MRSIDDECODE = "mrsidgeodecode";
public static final String MRSIDINFO = "mrsidgeoinfo";
private static HashMap<String, String> binariesAvailable = new HashMap();
Modified: core/trunk/src/com/vividsolutions/jump/workbench/model/WMSLayer.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/model/WMSLayer.java
2016-01-10 16:20:45 UTC (rev 4756)
+++ core/trunk/src/com/vividsolutions/jump/workbench/model/WMSLayer.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -35,6 +35,9 @@
import java.awt.Image;
import java.awt.MediaTracker;
import java.io.IOException;
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -44,30 +47,20 @@
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jts.util.Assert;
import com.vividsolutions.jump.util.Blackboard;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.ui.LayerNameRenderer;
import com.vividsolutions.jump.workbench.ui.LayerViewPanel;
import com.vividsolutions.jump.workbench.ui.renderer.RenderingManager;
-import com.vividsolutions.wms.AxisOrder;
import com.vividsolutions.wms.BoundingBox;
import com.vividsolutions.wms.MapLayer;
import com.vividsolutions.wms.MapRequest;
import com.vividsolutions.wms.WMService;
-import java.net.URL;
-
-import java.lang.ref.Reference;
-import java.lang.ref.SoftReference;
-import java.util.Iterator;
-
-import org.apache.log4j.Logger;
-
/**
* A Layerable that retrieves images from a Web Map Server.
*/
public class WMSLayer extends AbstractLayerable implements Cloneable {
- private static Logger LOG = Logger.getLogger(WMSLayer.class);
-
private String format;
private List<String> layerNames = new ArrayList<String>();
@@ -290,8 +283,7 @@
}
}
} catch (IOException e) {
- LOG.error("Exception caught during WMSLayer envelope calculation: "
- + e.toString());
+ Logger.error("Exception caught during WMSLayer envelope calculation.",
e);
}
return envelope;
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/plugin/AbstractPlugIn.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/plugin/AbstractPlugIn.java
2016-01-10 16:20:45 UTC (rev 4756)
+++ core/trunk/src/com/vividsolutions/jump/workbench/plugin/AbstractPlugIn.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -48,12 +48,11 @@
import javax.swing.KeyStroke;
import javax.swing.undo.UndoableEdit;
-import org.apache.log4j.Logger;
-
import com.vividsolutions.jts.util.Assert;
import com.vividsolutions.jump.I18N;
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.CategoryEvent;
import com.vividsolutions.jump.workbench.model.FeatureEvent;
@@ -74,7 +73,7 @@
* example), and supporting undo.
*/
public abstract class AbstractPlugIn implements PlugIn, ShortcutEnabled,
EnableChecked, Iconified, Recordable {
- private static Logger LOG = Logger.getLogger(AbstractPlugIn.class);
+
protected int shortcutModifiers = 0;
protected int shortcutKeys = 0;
private String name;
@@ -297,7 +296,7 @@
return I18N.get(plugInClass.getName());
} catch (java.util.MissingResourceException e) {
// No I18N for the PlugIn so log it, but don't stop
- LOG.error(e.getMessage() + " " + plugInClass.getName());
+ Logger.error(e.getMessage() + " " + plugInClass.getName());
return StringUtil.toFriendlyName(plugInClass.getName(), "PlugIn");
}
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
2016-01-10 16:20:45 UTC (rev 4756)
+++ core/trunk/src/com/vividsolutions/jump/workbench/plugin/PlugInManager.java
2016-01-10 16:27:48 UTC (rev 4757)
@@ -43,12 +43,11 @@
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
-import org.apache.log4j.Logger;
-
import com.vividsolutions.jts.util.Assert;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.task.TaskMonitor;
import com.vividsolutions.jump.util.StringUtil;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.WorkbenchProperties;
import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller;
@@ -58,8 +57,6 @@
* depend on, from the plug-in directory.
*/
public class PlugInManager {
- private static Logger LOG = Logger.getLogger(PlugInManager.class);
-
private static final String NOT_INITIALIZED =
"com.vividsolutions.jump.workbench.plugin.PlugInManager.could-not-be-initialized";
private static final String LOADING =
"com.vividsolutions.jump.workbench.plugin.PlugInManager.loading";
private static final String LOADING_ERROR =
"com.vividsolutions.jump.workbench.plugin.PlugInManager.throwable-encountered-loading";
@@ -160,7 +157,7 @@
if (plugInDirectory != null) {
start = secondsSince(0);
configurations.addAll(findConfigurations(plugInDirectory));
- System.out.println("Finding all OJ extensions took "
+ Logger.info("Finding all OJ extensions took "
+ secondsSinceString(start) + "s");
}
@@ -169,7 +166,7 @@
start = secondsSince(0);
loadConfigurations();
- System.out.println("Loading all OJ extensions took "
+ Logger.info("Loading all OJ extensions took "
+ secondsSinceString(start) + "s");
// enable autoseparating in installer for plugins possibly installed
later on
@@ -190,8 +187,7 @@
// we used the plugin classloader to instantiate extensions already
above
configuration.configure(pc);
//System.out.println(Arrays.toString(((URLClassLoader)classLoader).getURLs()));
- System.out
- .println("Loading Config " + name(configuration) + " "
+ Logger.info("Loading Config " + name(configuration) + " "
+ version(configuration) + " took " + secondsSinceString(start)
+ "s");
}
@@ -375,7 +371,7 @@
} catch (ZipException e) {
// Might not be a zipfile. Eat it. [Jon Aquino]
}
- System.out.println("Scanning " + file + " took " +
secondsSinceString(start)
+ Logger.info("Scanning " + file + " took " + secondsSinceString(start)
+ "s");
}
@@ -457,11 +453,10 @@
+ ". Refine class name algorithm.");
return null;
} catch (Throwable t) {
- LOG.error(I18N.get(LOADING_ERROR) + " " + className + ":");
+ Logger.error(I18N.get(LOADING_ERROR) + " " + className + ":");
//e.g. java.lang.VerifyError: class
// org.apache.xml.serialize.XML11Serializer
//overrides final method [Jon Aquino]
- t.printStackTrace(System.out);
return null;
}
return candidate;
------------------------------------------------------------------------------
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
