diff --git a/configuration/pom.xml b/configuration/pom.xml index debb8f0..d75b26b 100644 --- a/configuration/pom.xml +++ b/configuration/pom.xml @@ -25,5 +25,12 @@ junit test + + + log4j + log4j + provided + + diff --git a/configuration/src/main/java/de/muehlencord/shared/configuration/DefaultConfiguration.java b/configuration/src/main/java/de/muehlencord/shared/configuration/DefaultConfiguration.java index b89d8e2..f4fe1dd 100644 --- a/configuration/src/main/java/de/muehlencord/shared/configuration/DefaultConfiguration.java +++ b/configuration/src/main/java/de/muehlencord/shared/configuration/DefaultConfiguration.java @@ -33,9 +33,11 @@ public class DefaultConfiguration implements Configuration * * @return the map of parameters and values */ + /* protected Map, V> getParameterMap() { return parameterMap; } + */ /** * adds a new parameter to the configuration @@ -95,9 +97,11 @@ public class DefaultConfiguration implements Configuration * @throws ConfigurationException if the parameter is not defined */ public void setParameterValue (Map, V> map) throws ConfigurationException { - for ( Parameter key : map.keySet()) { + for ( Map.Entry,V> entry : map.entrySet()) { + Parameter key = entry.getKey(); + V value = entry.getValue(); if (parameterMap.containsKey(key)) { - parameterMap.put (key, map.get(key)); + parameterMap.put (key, value); } else { throw new ConfigurationException("Parameter " + key.getName() + " not defined"); } diff --git a/configuration/src/main/java/de/muehlencord/shared/configuration/Parameter.java b/configuration/src/main/java/de/muehlencord/shared/configuration/Parameter.java index dc04045..6c9b3be 100644 --- a/configuration/src/main/java/de/muehlencord/shared/configuration/Parameter.java +++ b/configuration/src/main/java/de/muehlencord/shared/configuration/Parameter.java @@ -2,6 +2,7 @@ package de.muehlencord.shared.configuration; import java.util.LinkedList; import java.util.List; +import org.apache.log4j.Logger; /** * @@ -9,6 +10,8 @@ import java.util.List; * @author jomu */ public abstract class Parameter { + + private final static Logger LOGGER = Logger.getLogger(Parameter.class); /** the name of the parameter */ private String name; @@ -133,6 +136,7 @@ public abstract class Parameter { validator.validate(value); return true; } catch (ValidationException ex) { + LOGGER.debug (ex.toString(), ex); return false; } } diff --git a/configuration/src/main/java/de/muehlencord/shared/configuration/validator/StringValueListValidator.java b/configuration/src/main/java/de/muehlencord/shared/configuration/validator/StringValueListValidator.java index 1a704c6..567253f 100644 --- a/configuration/src/main/java/de/muehlencord/shared/configuration/validator/StringValueListValidator.java +++ b/configuration/src/main/java/de/muehlencord/shared/configuration/validator/StringValueListValidator.java @@ -2,7 +2,6 @@ package de.muehlencord.shared.configuration.validator; import de.muehlencord.shared.configuration.ValidationException; import de.muehlencord.shared.configuration.Validator; -import java.util.Arrays; import static java.util.Arrays.asList; import java.util.LinkedList; import java.util.List;