Revision: 4764
http://sourceforge.net/p/jump-pilot/code/4764
Author: edso
Date: 2016-01-10 17:59:18 +0000 (Sun, 10 Jan 2016)
Log Message:
-----------
adapt to new Logger
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/FirstTaskFramePlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/ShortcutKeysPlugIn.java
core/trunk/src/de/fho/jump/pirol/plugins/EditAttributeByFormula/EditAttributeByFormulaPlugIn.java
core/trunk/src/de/fho/jump/pirol/utilities/i18n/I18NPlug.java
core/trunk/src/de/latlon/deejump/plugin/manager/ExtensionHelper.java
core/trunk/src/de/latlon/deejump/plugin/style/LayerStyle2SLDPlugIn.java
core/trunk/src/de/soldin/jumpcore/ExtCorePlugIn.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/FirstTaskFramePlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/FirstTaskFramePlugIn.java
2016-01-10 17:57:11 UTC (rev 4763)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/FirstTaskFramePlugIn.java
2016-01-10 17:59:18 UTC (rev 4764)
@@ -38,12 +38,12 @@
import java.io.File;
import java.util.Iterator;
-import org.apache.log4j.Logger;
import org.openjump.core.ui.plugin.file.OpenFilePlugIn;
import org.openjump.core.ui.plugin.file.OpenProjectPlugIn;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
@@ -55,8 +55,6 @@
*/
public class FirstTaskFramePlugIn extends AbstractPlugIn {// AbstractPlugIn {
- private static Logger LOG = Logger.getLogger(FirstTaskFramePlugIn.class);
-
public FirstTaskFramePlugIn() {
}
@@ -83,7 +81,7 @@
// load -project
if (filename != null ) {// create empty task
- LOG.info("Found initial '-project' file: " + filename);
+ Logger.info("Found initial '-project' file: " + filename);
f = new File(filename);
try {
@@ -95,7 +93,7 @@
new ActionEvent(this, 0, ""));
} catch (Exception ex) {
String mesg =
I18N.getMessage(this.getClass().getName()+".could-not-load-file-{0}", f);
- LOG.error(mesg);
+ Logger.error(mesg);
context.getWorkbenchFrame().warnUser(mesg);
}
}
@@ -124,7 +122,7 @@
}
} catch (Exception e2) {
String mesg =
I18N.getMessage(this.getClass().getName()+".could-not-load-file-{0}", f);
- LOG.error(mesg);
+ Logger.error(mesg);
}
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/ShortcutKeysPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/ShortcutKeysPlugIn.java
2016-01-10 17:57:11 UTC (rev 4763)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/ShortcutKeysPlugIn.java
2016-01-10 17:59:18 UTC (rev 4764)
@@ -58,7 +58,7 @@
import javax.swing.KeyStroke;
import javax.swing.MenuElement;
-import org.apache.log4j.Logger;
+
import
org.openjump.core.ui.plugin.edittoolbox.cursortools.ConstrainedMultiClickTool;
import com.vividsolutions.jump.I18N;
@@ -87,8 +87,8 @@
public class ShortcutKeysPlugIn extends AbstractPlugIn {
public static final ImageIcon ICON = IconLoader.icon("keyboard.png");
public static final String NAME =
I18N.get(ShortcutKeysPlugIn.class.getName());
- private static Logger LOG = Logger.getLogger(ShortcutKeysPlugIn.class);
+
public boolean execute(PlugInContext context) throws Exception {
ShortcutKeysFrame dlg = ShortcutKeysFrame.instance();
dlg.setVisible(true);
Modified:
core/trunk/src/de/fho/jump/pirol/plugins/EditAttributeByFormula/EditAttributeByFormulaPlugIn.java
===================================================================
---
core/trunk/src/de/fho/jump/pirol/plugins/EditAttributeByFormula/EditAttributeByFormulaPlugIn.java
2016-01-10 17:57:11 UTC (rev 4763)
+++
core/trunk/src/de/fho/jump/pirol/plugins/EditAttributeByFormula/EditAttributeByFormulaPlugIn.java
2016-01-10 17:59:18 UTC (rev 4764)
@@ -80,16 +80,13 @@
*/
package de.fho.jump.pirol.plugins.EditAttributeByFormula;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.apache.log4j.Logger;
import org.openjump.core.apitools.FeatureCollectionTools;
import org.openjump.io.PropertiesHandler;
import org.openjump.util.metaData.MetaInformationHandler;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.feature.FeatureCollection;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.Layer;
import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
@@ -125,7 +122,7 @@
protected static PropertiesHandler storedFormulas = null;
protected static final String storedFormulasFileName =
"Formula.properties"; //$NON-NLS-1$
//[sstein 24.March.2007] added this logger instead using Personal logger
- private static final Logger LOG =
Logger.getLogger(EditAttributeByFormulaPlugIn.class);
+
public void initialize(PlugInContext context) throws Exception {
context.getFeatureInstaller().addMainMenuItem(this,
@@ -196,16 +193,16 @@
}
/* catch (FileNotFoundException e1) {
//this.logger.printWarning(e1.getMessage());
- this.LOG.warn(e1.getMessage());
+ this.Logger.warn(e1.getMessage());
}
catch (IOException e1) {
//this.logger.printWarning(e1.getMessage());
- this.LOG.warn(e1.getMessage());
+ this.Logger.warn(e1.getMessage());
}
**/
catch (Exception e1) {
//this.logger.printWarning(e1.getMessage());
- this.LOG.warn(e1.getMessage());
+ Logger.warn(e1.getMessage());
}
/* [sstein 24.March 2007] replaced - since we dont have stored formulas
@@ -261,8 +258,8 @@
} catch (Exception e){
//--[sstein 24.March 2007]: disabled since I changed from
StandardPirolPlugIn to AbstractPlugIn
//this.handleThrowable(e);
- LOG.debug(e.getMessage());
- e.printStackTrace();
+ Logger.debug(e);
+
//return this.finishExecution(context, false);
return false;
}
Modified: core/trunk/src/de/fho/jump/pirol/utilities/i18n/I18NPlug.java
===================================================================
--- core/trunk/src/de/fho/jump/pirol/utilities/i18n/I18NPlug.java
2016-01-10 17:57:11 UTC (rev 4763)
+++ core/trunk/src/de/fho/jump/pirol/utilities/i18n/I18NPlug.java
2016-01-10 17:59:18 UTC (rev 4764)
@@ -147,7 +147,7 @@
I18N.plugInsResourceBundle.put(pluginName, ResourceBundle
.getBundle(bundle,
locale));
-
//LOG.debug(I18N.plugInsResourceBundle.get(pluginName)+" "+bundle+" "+locale);
+
//Logger.debug(I18N.plugInsResourceBundle.get(pluginName)+" "+bundle+"
"+locale);
}
Modified: core/trunk/src/de/latlon/deejump/plugin/manager/ExtensionHelper.java
===================================================================
--- core/trunk/src/de/latlon/deejump/plugin/manager/ExtensionHelper.java
2016-01-10 17:57:11 UTC (rev 4763)
+++ core/trunk/src/de/latlon/deejump/plugin/manager/ExtensionHelper.java
2016-01-10 17:59:18 UTC (rev 4764)
@@ -22,12 +22,11 @@
import java.util.zip.ZipEntry;
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.plugin.Configuration;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
@@ -35,8 +34,8 @@
public class ExtensionHelper {
- private static Logger LOG = Logger.getLogger( ExtensionHelper.class );
+
private ExtensionHelper() {
// no, no, never instantiate
@@ -268,12 +267,11 @@
+ ". Refine class name algorithm.");
return null;
} catch (Throwable t) {
- LOG.error("Throwable encountered loading " + className
- + ":");
+ Logger.error(t);
//e.g. java.lang.VerifyError: class
// org.apache.xml.serialize.XML11Serializer
//overrides final method [Jon Aquino]
- t.printStackTrace(System.out);
+
return null;
}
return candidate;
Modified:
core/trunk/src/de/latlon/deejump/plugin/style/LayerStyle2SLDPlugIn.java
===================================================================
--- core/trunk/src/de/latlon/deejump/plugin/style/LayerStyle2SLDPlugIn.java
2016-01-10 17:57:11 UTC (rev 4763)
+++ core/trunk/src/de/latlon/deejump/plugin/style/LayerStyle2SLDPlugIn.java
2016-01-10 17:59:18 UTC (rev 4764)
@@ -71,8 +71,6 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
import org.openjump.core.ui.images.IconLoader;
import org.openjump.core.ui.util.ScreenScale;
@@ -83,6 +81,7 @@
import com.vividsolutions.jump.feature.FeatureSchema;
import com.vividsolutions.jump.util.Blackboard;
import com.vividsolutions.jump.util.java2xml.Java2XML;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.Layer;
import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
@@ -104,7 +103,7 @@
*/
public class LayerStyle2SLDPlugIn extends AbstractPlugIn {
- private static final Logger LOG =
Logger.getLogger(LayerStyle2SLDPlugIn.class);
+
public static final ImageIcon ICON = IconLoader.icon("sld_out_16.png");
@@ -403,9 +402,7 @@
e.printStackTrace();
}
- if (LOG.getLevel() == Level.DEBUG) {
- LOG.debug(sw.toString());
- }
+ Logger.debug(sw.toString());
return sw.toString();
}
Modified: core/trunk/src/de/soldin/jumpcore/ExtCorePlugIn.java
===================================================================
--- core/trunk/src/de/soldin/jumpcore/ExtCorePlugIn.java 2016-01-10
17:57:11 UTC (rev 4763)
+++ core/trunk/src/de/soldin/jumpcore/ExtCorePlugIn.java 2016-01-10
17:59:18 UTC (rev 4764)
@@ -8,13 +8,12 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
-
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.plugin.PlugIn;
// adds i18n support
public abstract class ExtCorePlugIn implements PlugIn {
- private final Logger logger = Logger.getLogger(this.getClass());
+
protected String i18nPath = "language/plugin";
protected ResourceBundle rb = null;
@@ -54,11 +53,11 @@
message = mformat.format( numbers.toArray() );
} catch (NullPointerException e) {
// sh** happens
- logger.error("missing resource bundle", e);
+ Logger.error("missing resource bundle", e);
System.out.println( e.getLocalizedMessage() );
} catch (java.util.MissingResourceException e) {
// translation missing
- logger.error("translation missing", e);
+ Logger.error("translation missing", e);
System.out.println( e.getLocalizedMessage() );
}
@@ -98,12 +97,10 @@
message = mformat.format(objects);
} catch (NullPointerException e) {
// sh** happens
- logger.error("missing resource bundle", e);
- System.out.println( e.getLocalizedMessage() );
+ Logger.error("missing resource bundle", e);
} catch (java.util.MissingResourceException e) {
// translation missing
- logger.error("translation missing", e);
- System.out.println( e.getLocalizedMessage() );
+ Logger.warn("translation missing",
Logger.isDebugEnabled() ? e : null);
}
if (message == null) {
final String[] labelpath = label.split("\\..+");
------------------------------------------------------------------------------
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
