Revision: 4759
http://sourceforge.net/p/jump-pilot/code/4759
Author: edso
Date: 2016-01-10 16:58:58 +0000 (Sun, 10 Jan 2016)
Log Message:
-----------
adapt to new Logger
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/io/ShapefileReader.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/HTMLPanel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/InternalFrameTest.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/TextFrame.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/network/ProxySettingsOptionsPanel.java
Modified: core/trunk/src/com/vividsolutions/jump/io/ShapefileReader.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/io/ShapefileReader.java
2016-01-10 16:53:53 UTC (rev 4758)
+++ core/trunk/src/com/vividsolutions/jump/io/ShapefileReader.java
2016-01-10 16:58:58 UTC (rev 4759)
@@ -36,23 +36,33 @@
*/
package com.vividsolutions.jump.io;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
import org.geotools.dbffile.DbfFile;
import org.geotools.shapefile.Shapefile;
-import org.geotools.shapefile.ShapefileException;
-import com.vividsolutions.jts.geom.*;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryCollection;
+import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jump.I18N;
-import com.vividsolutions.jump.feature.*;
+import com.vividsolutions.jump.feature.AttributeType;
+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.FeatureSchema;
+import com.vividsolutions.jump.workbench.Logger;
/**
* ShapefileReader is a {@link JUMPReader} specialized to read Shapefiles.
@@ -99,8 +109,6 @@
private File delete_this_tmp_shx = null;
private File delete_this_tmp_cpg = null;
- private static Logger LOG = Logger.getLogger(ShapefileReader.class);
-
public static final String FILE_PROPERTY_KEY = "File";
public static final String DEFAULT_VALUE_PROPERTY_KEY = "DefaultValue";
public static final String COMPRESSED_FILE_PROPERTY_KEY = "CompressedFile";
@@ -154,7 +162,7 @@
charsetName = cpgCharset;
}
} catch (IllegalCharsetNameException ice) {
- LOG.info("Could not interpret charset name " + cpgCharset
+ " : revert to default " + charsetName);
+ Logger.info("Could not interpret charset name " +
cpgCharset + " : revert to default " + charsetName);
}
}
} finally {
@@ -233,7 +241,7 @@
if (collection.getNumGeometries() > mydbf.getLastRec()) {
String message =
I18N.getMessage("com.vividsolutions.jump.io.ShapefileReader.shp-gt-dbf",
new Object[]{shpFileName,
collection.getNumGeometries(), mydbf.getLastRec()});
- LOG.error(message);
+ Logger.error(message);
getExceptions().add(new Exception(message));
for (int x = mydbf.getLastRec() ; x <
collection.getNumGeometries() ; x++) {
Feature feature = new BasicFeature(fs);
@@ -245,7 +253,7 @@
if (collection.getNumGeometries() < mydbf.getLastRec()) {
String message =
I18N.getMessage("com.vividsolutions.jump.io.ShapefileReader.shp-lt-dbf",
new Object[]{shpFileName,
collection.getNumGeometries(), mydbf.getLastRec()});
- LOG.error(message);
+ Logger.error(message);
getExceptions().add(new Exception(message));
List emptyList = new ArrayList();
for (int x = collection.getNumGeometries() ; x <
mydbf.getLastRec() ; x++) {
@@ -322,9 +330,7 @@
delete_this_tmp_shx = file; // to be deleted later on
return shxInputStream;
} catch (Exception e) {
- String msg = e.getMessage();
- LOG.info(msg);
- System.err.println(msg);
+ Logger.error(e);
}
}
@@ -376,9 +382,7 @@
delete_this_tmp_cpg = file; // to be deleted later on
return cpgInputStream;
} catch (Exception e) {
- String msg = e.getMessage();
- LOG.info(msg);
- System.err.println(msg);
+ Logger.error(e);
}
}
@@ -445,9 +449,7 @@
delete_this_tmp_dbf = file; // to be deleted later on
return mydbf;
} catch (Exception e) {
- String msg = e.getMessage();
- LOG.info(msg);
- System.err.println(msg);
+ Logger.error(e);
}
}
@@ -495,6 +497,4 @@
} else return esri_cp.replaceAll(" ","-");
}
-
-
}
Modified: core/trunk/src/com/vividsolutions/jump/workbench/ui/HTMLPanel.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/HTMLPanel.java
2016-01-10 16:53:53 UTC (rev 4758)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/HTMLPanel.java
2016-01-10 16:58:58 UTC (rev 4759)
@@ -17,11 +17,10 @@
import javax.swing.ScrollPaneConstants;
import javax.swing.SwingUtilities;
-import org.apache.log4j.Logger;
-
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.util.FileUtil;
import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
public class HTMLPanel extends JPanel implements RecordPanelModel {
private ArrayList history = new ArrayList();
@@ -31,8 +30,8 @@
private JScrollPane scrollPane = new JScrollPane();
private JEditorPane editorPane = new JEditorPane();
private int currentIndex = -1;
- private static final Logger LOGGER = Logger.getLogger(HTMLFrame.class);
+
public HTMLPanel() {
try {
jbInit();
@@ -179,7 +178,7 @@
String texto = history.get(currentIndex).toString();
FileUtil.setContents(archivo.getAbsolutePath(), texto);
} catch (Exception e1) {
- LOGGER.error("", e1);
+ Logger.error(e1);
JUMPWorkbench
.getInstance()
.getFrame()
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/InternalFrameTest.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/InternalFrameTest.java
2016-01-10 16:53:53 UTC (rev 4758)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/InternalFrameTest.java
2016-01-10 16:58:58 UTC (rev 4759)
@@ -2,7 +2,6 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
import java.util.Date;
import javax.swing.JDesktopPane;
@@ -11,38 +10,40 @@
import javax.swing.event.InternalFrameEvent;
import javax.swing.event.InternalFrameListener;
-import org.apache.log4j.Logger;
+import com.vividsolutions.jump.workbench.Logger;
+
+
public class InternalFrameTest {
- private static Logger LOG = Logger.getLogger(InternalFrameTest.class);
+
public static InternalFrameListener listener = new
InternalFrameListener() {
public void internalFrameOpened(InternalFrameEvent e) {
- LOG.debug(new Date()+ "public void
internalFrameOpened(InternalFrameEvent e) {");
+ Logger.debug(new Date()+ "public void
internalFrameOpened(InternalFrameEvent e) {");
}
public void internalFrameClosing(InternalFrameEvent e) {
- LOG.debug(new Date()+ "public void
internalFrameClosing(InternalFrameEvent e) {");
+ Logger.debug(new Date()+ "public void
internalFrameClosing(InternalFrameEvent e) {");
}
public void internalFrameClosed(InternalFrameEvent e) {
- LOG.debug(new Date()+ " public void
internalFrameClosed(InternalFrameEvent e) {");
+ Logger.debug(new Date()+ " public void
internalFrameClosed(InternalFrameEvent e) {");
}
public void internalFrameIconified(InternalFrameEvent e) {
- LOG.debug(new Date()+ "public void
internalFrameIconified(InternalFrameEvent e) {");
+ Logger.debug(new Date()+ "public void
internalFrameIconified(InternalFrameEvent e) {");
}
public void internalFrameDeiconified(InternalFrameEvent e) {
- LOG.debug(new Date()+ "public void
internalFrameDeiconified(InternalFrameEvent e) {");
+ Logger.debug(new Date()+ "public void
internalFrameDeiconified(InternalFrameEvent e) {");
}
public void internalFrameActivated(InternalFrameEvent e) {
- LOG.debug(new Date()+ "public void
internalFrameActivated(InternalFrameEvent e) {");
+ Logger.debug(new Date()+ "public void
internalFrameActivated(InternalFrameEvent e) {");
}
public void internalFrameDeactivated(InternalFrameEvent e) {
- LOG.debug(new Date()+ "public void
internalFrameDeactivated(InternalFrameEvent e) {");
+ Logger.debug(new Date()+ "public void
internalFrameDeactivated(InternalFrameEvent e) {");
}
};
@@ -65,7 +66,7 @@
GUIUtil.addInternalFrameListener(desktopPane, GUIUtil
.toInternalFrameListener(new ActionListener() {
public void actionPerformed(ActionEvent
e) {
- LOG.debug(new Date());
+ Logger.debug(new
Date().toString());
}
}));
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java
2016-01-10 16:53:53 UTC (rev 4758)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java
2016-01-10 16:58:58 UTC (rev 4759)
@@ -51,7 +51,6 @@
import javax.swing.border.EmptyBorder;
import javax.swing.tree.TreeCellRenderer;
-import org.apache.log4j.Logger;
import org.openjump.core.rasterimage.RasterImageLayer;
import com.vividsolutions.jts.geom.Envelope;
@@ -81,9 +80,7 @@
public static final String USE_CLOCK_ANIMATION_KEY =
LayerNameRenderer.class
.getName() + " - USE CLOCK ANIMATION";
- /** Logger */
- private static final Logger LOGGER = Logger
- .getLogger(LayerNameRenderer.class);
+
private final static Color UNSELECTED_EDITABLE_FONT_COLOR = Color.red;
private final static Color SELECTED_EDITABLE_FONT_COLOR = Color.yellow;
protected JCheckBox checkBox = new JCheckBox();
Modified: core/trunk/src/com/vividsolutions/jump/workbench/ui/TextFrame.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/TextFrame.java
2016-01-10 16:53:53 UTC (rev 4758)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/TextFrame.java
2016-01-10 16:58:58 UTC (rev 4759)
@@ -44,11 +44,13 @@
import javax.swing.JScrollPane;
import javax.swing.UIManager;
-import org.apache.log4j.Logger;
+import com.vividsolutions.jump.workbench.Logger;
+
+
public class TextFrame extends JInternalFrame {
- private static Logger LOG = Logger.getLogger(TextFrame.class);
+
BorderLayout borderLayout1 = new BorderLayout();
private OKCancelPanel okCancelPanel = new OKCancelPanel();
protected JPanel scrollPanePanel = new JPanel();
@@ -105,7 +107,7 @@
editorPane.setText(s);
editorPane.setCaretPosition(0);
} catch (Throwable t) {
- LOG.error(s);
+ Logger.error(s);
errorHandler.handleThrowable(t);
}
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/network/ProxySettingsOptionsPanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/network/ProxySettingsOptionsPanel.java
2016-01-10 16:53:53 UTC (rev 4758)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/network/ProxySettingsOptionsPanel.java
2016-01-10 16:58:58 UTC (rev 4759)
@@ -77,7 +77,6 @@
import javax.swing.event.DocumentListener;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
import org.saig.core.gui.swing.sldeditor.util.FormUtils;
import org.saig.jump.widgets.config.HTTPProxySettings;
import org.saig.jump.widgets.config.ProxyAuth;
@@ -87,6 +86,7 @@
import com.vividsolutions.jump.util.Blackboard;
import com.vividsolutions.jump.util.StringUtil;
import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.ui.OptionsPanelV2;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
@@ -107,10 +107,6 @@
/** long serialVersionUID field */
private static final long serialVersionUID = 1L;
- /** Log */
- private final static Logger LOGGER = Logger
- .getLogger(ProxySettingsOptionsPanel.class);
-
/** Panel icon */
public final static Icon ICON = IconLoader.icon("fugue/globe-network.png");
@@ -518,7 +514,7 @@
throw new UnknownHostException(urlHost);
} catch (Exception e) {
- LOGGER.error(e);
+ Logger.error(e);
errorMessage =
getMessage("server-or-proxy-port-is-not-correct-check-provided-parameters");
errorMessage += "\n " + e.getClass().getName() + " -> "
+ e.getMessage();
------------------------------------------------------------------------------
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
