svn commit: r215947 - /lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java

Author: andreas
Date: Tue Jul 12 06:44:02 2005
New Revision: 215947

URL: http://svn.apache.org/viewcvs?rev=215947&view=rev
Log:
Allow Boolean objects in AbstractUsecase.getBooleanParameter()

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java

Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java?rev=215947&r1=215946&r2=215947&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java 
(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java Tue 
Jul 12 06:44:02 2005
@@ -390,9 +390,15 @@
         boolean valueBoolean = defaultValue;
         Object value = getParameter(name);
         if (value != null) {
-            valueBoolean = Boolean.valueOf(value.toString()).booleanValue();
+            if (value instanceof String) {
+                valueBoolean = Boolean.valueOf((String) value).booleanValue();
+            } else if (value instanceof Boolean) {
+                valueBoolean = ((Boolean) value).booleanValue();
+            } else {
+                throw new IllegalArgumentException("Cannot get boolean value 
of parameter [" + name
+                        + "] (class " + value.getClass().getName() + ")");
+            }
         }
-
         return valueBoolean;
     }
 
@@ -634,9 +640,8 @@
     public final void lockInvolvedObjects(Transactionable[] objects) throws 
UsecaseException {
 
         if (getLogger().isDebugEnabled())
-            getLogger()
-                    .debug("AbstractUsecase::lockInvolvedObjects() called, are 
there objects to lock ? "
-                            + (objects != null));
+            getLogger().debug("AbstractUsecase::lockInvolvedObjects() called, 
are there objects to lock ? "
+                    + (objects != null));
 
         try {
             boolean canExecute = true;
@@ -644,9 +649,8 @@
             for (int i = 0; i < objects.length; i++) {
                 if (objects[i].isCheckedOut() && 
!objects[i].isCheckedOutByUser()) {
                     if (getLogger().isDebugEnabled())
-                        getLogger()
-                                .debug("AbstractUsecase::lockInvolvedObjects() 
can not execute, object ["
-                                        + objects[i] + "] is already checked 
out");
+                        
getLogger().debug("AbstractUsecase::lockInvolvedObjects() can not execute, 
object ["
+                                + objects[i] + "] is already checked out");
 
                     canExecute = false;
                 }