[waffle-scm] [509] trunk/waffle-core/src/main/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinder.java: simplified if statement

[mward]

Title: [waffle-scm] [509] trunk/waffle-core/src/main/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinder.java: simplified if statement

Revision

509

Author

mward

Date

2007-12-18 21:54:59 -0600 (Tue, 18 Dec 2007)

Log Message

simplified if statement

Modified Paths

• trunk/waffle-core/src/main/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinder.java

Diff

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinder.java (508 => 509)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinder.java	2007-12-19 03:26:59 UTC (rev 508)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinder.java	2007-12-19 03:54:59 UTC (rev 509)
@@ -10,6 +10,18 @@
  *****************************************************************************/
 package org.codehaus.waffle.action;
 
+import org.codehaus.waffle.WaffleException;
+import org.codehaus.waffle.action.annotation.ActionMethod;
+import org.codehaus.waffle.bind.ValueConverterFinder;
+import org.codehaus.waffle.context.ContextContainer;
+import org.codehaus.waffle.context.RequestLevelContainer;
+import org.codehaus.waffle.i18n.MessagesContext;
+import org.codehaus.waffle.monitor.ActionMonitor;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.text.MessageFormat;
@@ -20,19 +32,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.codehaus.waffle.WaffleException;
-import org.codehaus.waffle.action.annotation.ActionMethod;
-import org.codehaus.waffle.bind.ValueConverterFinder;
-import org.codehaus.waffle.context.ContextContainer;
-import org.codehaus.waffle.context.RequestLevelContainer;
-import org.codehaus.waffle.i18n.MessagesContext;
-import org.codehaus.waffle.monitor.ActionMonitor;
-
 /**
  * Abstract base implementation for all method definition finders
  *
@@ -110,10 +109,7 @@
 
     private boolean isDefaultActionMethod(Method method) {
         ActionMethod actionMethod = method.getAnnotation(ActionMethod.class);
-        if ( actionMethod != null ){
-            return actionMethod.asDefault();
-        }
-        return false;
+        return actionMethod != null && actionMethod.asDefault();
     }
 
     private MethodDefinition findPragmaticActionMethod(Object controller,

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email