Performance

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@167 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 12 insertions, 12 deletions

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);

       }