From 3d982813b34f6f230baf4a467cdc37ec92a77595 Mon Sep 17 00:00:00 2001
From: netconomy <netconomy@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Fri, 17 Aug 2007 06:10:56 +0000
Subject: Performance

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@167 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 .../knowcenter/wag/egov/egiz/cfg/ConfigLogger.java |  2 ++
 .../wag/egov/egiz/cfg/SettingsReader.java          | 24 +++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'src/main/java/at/knowcenter/wag/egov/egiz/cfg')

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/cfg/ConfigLogger.java b/src/main/java/at/knowcenter/wag/egov/egiz/cfg/ConfigLogger.java
index 3b32c22..e0a8a3d 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/cfg/ConfigLogger.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/cfg/ConfigLogger.java
@@ -27,6 +27,8 @@ import org.apache.log4j.Logger;
 /**
  * This logger class is the main logger class for the pdf-as project. It holds static logger
  * instances with could be configured the level with one method.
+ * 
+ * @deprecated use commons.logging instead
  */
 public class ConfigLogger {
 
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/cfg/SettingsReader.java b/src/main/java/at/knowcenter/wag/egov/egiz/cfg/SettingsReader.java
index 96286ad..a158729 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/cfg/SettingsReader.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/cfg/SettingsReader.java
@@ -18,17 +18,17 @@
 
 package at.knowcenter.wag.egov.egiz.cfg;
 
-import java.io.FileInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.Vector;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Properties;
+import java.util.Vector;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import at.knowcenter.wag.egov.egiz.exceptions.SettingNotFoundException;
 import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;
@@ -120,7 +120,7 @@ import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;
  * 
  * @author wlackner
  */
-public class SettingsReader implements Settings, Serializable
+public class SettingsReader implements Serializable
 {
 
   /**
@@ -252,9 +252,9 @@ public class SettingsReader implements Settings, Serializable
   private PropertyTree pTree_ = new PropertyTree();
 
   /**
-   * The logger definition.
+   * The log.
    */
-  private static final Logger logger_ = ConfigLogger.getLogger(SettingsReader.class);
+  private static final Log logger_ = LogFactory.getLog(SettingsReader.class);
 
   /**
    * Make this constructor private. Use the method
@@ -321,7 +321,7 @@ public class SettingsReader implements Settings, Serializable
     }
     catch (IOException e)
     {
-      throw new SettingsException(e);
+      throw new SettingsException("Couldn't load settings from file " + settingsFile, e);
     }
   }
 
@@ -385,11 +385,11 @@ public class SettingsReader implements Settings, Serializable
     if (result == null)
     {
       String log_message = "Configuration key not found: '" + key + "'! Check '" + settingsFile_ + "' file.";
-      if (logger_.isEnabledFor(Level.WARN))
+      if (logger_.isWarnEnabled())
       {
         logger_.warn(log_message);
       }
-      SettingNotFoundException snf = new SettingNotFoundException(100, log_message);
+      SettingNotFoundException snf = new SettingNotFoundException(log_message);
       throw snf;
     }
 //    if (logger_.isDebugEnabled())
@@ -524,14 +524,14 @@ public class SettingsReader implements Settings, Serializable
     }
     catch (NumberFormatException e)
     {
-      if (logger_.isEnabledFor(Level.WARN))
+      if (logger_.isWarnEnabled())
       {
         logger_.warn("Can not convert " + value + " to int.");
       }
     }
     catch (SettingNotFoundException e)
     {
-      if (logger_.isEnabledFor(Level.WARN))
+      if (logger_.isWarnEnabled())
       {
         logger_.warn("Setting " + key + " not found, return default value:" + defaultValue);
       }
-- 
cgit v1.2.3