svn commit: r1155076 - /cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/pipeline/components/parameters/Parameters.java

[st...@apache.org]

Author: stevendolg
Date: Mon Aug  8 20:16:20 2011
New Revision: 1155076

URL: http://svn.apache.org/viewvc?rev=1155076&view=rev
Log:
Reworked class to fix warnings

Modified:
    cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/pipeline/components/parameters/Parameters.java

Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/pipeline/components/parameters/Parameters.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/pipeline/components/parameters/Parameters.java?rev=1155076&r1=1155075&r2=1155076&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/pipeline/components/parameters/Parameters.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/pipeline/components/parameters/Parameters.java Mon Aug  8 20:16:20 2011
@@ -20,42 +20,45 @@ import java.util.Map;
 
 public class Parameters {
 
-    private Map<String, ? extends Object> param;
+    private Map<String, ? extends Object> values;
 
     public Parameters(Map<String, ? extends Object> configuration) {
-        this.param = configuration;
+        this.values = configuration;
     }
 
-    public int getAsInteger(String key, int i) {
-        boolean hasValue = param.containsKey(key);
-        if (hasValue){
-            return new Integer((String) param.get(key));
+    public int getAsInteger(String key, int defaultValue) {
+        Object value = this.values.get(key);
+        if (value == null) {
+            return defaultValue;
         }
-        return i;
+
+        return Integer.valueOf((String) value);
     }
 
-    public String get(String key, Object object) {
-        boolean hasValue = param.containsKey(key);
-        if (hasValue){
-            return  (String) param.get(key);
+    public String get(String key, String defaultValue) {
+        Object value = this.values.get(key);
+        if (value == null) {
+            return defaultValue;
         }
-        return (String) object;
+
+        return (String) value;
     }
 
-    public boolean getAsBoolean(String key, boolean b) {
-        boolean hasValue = param.containsKey(key);
-        if (hasValue){
-            return  new Boolean((String) param.get(key));
+    public boolean getAsBoolean(String key, boolean defaultValue) {
+        Object value = this.values.get(key);
+        if (value == null) {
+            return defaultValue;
         }
-        return b;
+
+        return Boolean.valueOf((String) value);
     }
 
-    public long getAsLong(String key, long l) {
-        boolean hasValue = param.containsKey(key);
-        if (hasValue){
-            return new Long((String) param.get(key));
+    public long getAsLong(String key, long defaultValue) {
+        Object value = this.values.get(key);
+        if (value == null) {
+            return defaultValue;
         }
-        return l;
-    }
 
+        return Long.valueOf((String) value);
+    }
 }