svn commit: r729555 - in /lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase: AbstractUsecase.java impl/UsecaseInvokerImpl.java impl/UsecaseProxy.java

Author: andreas
Date: Fri Dec 26 15:17:21 2008
New Revision: 729555

URL: http://svn.apache.org/viewvc?rev=729555&view=rev
Log:
Code simplification, initialize parameters in UsecaseInvokerImpl, added UsecaseProxy.getParameterAsInteger()

Modified:
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java

Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java?rev=729555&r1=729554&r2=729555&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java Fri Dec 26 15:17:21 2008
@@ -428,22 +428,15 @@
      */
     public Object getParameter(String name, Object defaultValue) {
         Object value = getParameter(name);
-        if (value == null) {
-            value = defaultValue;
-        }
-        return value;
+        return value == null ? defaultValue : value;
     }
 
     /**
      * @see org.apache.lenya.cms.usecase.Usecase#getParameterAsString(java.lang.String)
      */
     public String getParameterAsString(String name) {
-        String valueString = null;
         Object value = getParameter(name);
-        if (value != null) {
-            valueString = value.toString();
-        }
-        return valueString;
+        return value == null ? null : value.toString();
     }
 
     /**
@@ -453,12 +446,8 @@
      * @return A string.
      */
     public String getParameterAsString(String name, String defaultValue) {
-        String valueString = defaultValue;
         Object value = getParameter(name);
-        if (value != null) {
-            valueString = value.toString();
-        }
-        return valueString;
+        return value == null ? defaultValue : value.toString();
     }
 
     /**
@@ -468,12 +457,8 @@
      * @return An integer.
      */
     public int getParameterAsInteger(String name, int defaultValue) {
-        int valueInt = defaultValue;
         Object value = getParameter(name);
-        if (value != null) {
-            valueInt = Integer.valueOf(value.toString()).intValue();
-        }
-        return valueInt;
+        return value == null ? defaultValue : Integer.valueOf(value.toString()).intValue();
     }
 
     /**

Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java?rev=729555&r1=729554&r2=729555&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/UsecaseInvokerImpl.java Fri Dec 26 15:17:21 2008
@@ -134,6 +134,7 @@
                 usecase.setTestSession(testSession);
             }
 
+            usecase.getParameterNames(); // initialize usecase parameters to enable overriding
             passParameters(usecase, parameters);
 
             usecase.checkPreconditions();

Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java?rev=729555&r1=729554&r2=729555&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/impl/UsecaseProxy.java Fri Dec 26 15:17:21 2008
@@ -68,7 +68,7 @@
 
         String[] names = getParameterNames();
         for (int i = 0; i < names.length; i++) {
-            usecase.setParameter(names[i], parameters.get(names[i]));
+            usecase.setParameter(names[i], this.parameters.get(names[i]));
         }
     }
 
@@ -205,4 +205,19 @@
         return this.sourceUrl;
     }
 
+    /**
+     * Returns a parameter as integer. If the parameter does not exist, a default value is returned.
+     * @param name The parameter name.
+     * @param defaultValue The default value.
+     * @return An integer.
+     */
+    public int getParameterAsInteger(String name, int defaultValue) {
+        int valueInt = defaultValue;
+        Object value = getParameter(name);
+        if (value != null) {
+            valueInt = Integer.valueOf(value.toString()).intValue();
+        }
+        return valueInt;
+    }
+
 }