You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/01/27 19:26:20 UTC

svn commit: r372939 - in /beehive/trunk/samples/netui-samples: src/org/apache/beehive/samples/netui/loginexample/ web/advanced/actioninterceptors/ web/advanced/actioninterceptors/interceptme/ web/advanced/actioninterceptors/nested/ web/advanced/clients...

Author: ekoneil
Date: Fri Jan 27 10:25:41 2006
New Revision: 372939

URL: http://svn.apache.org/viewcvs?rev=372939&view=rev
Log:
Bunch of netui-samples cleanup:

- reformatting the code for a more consistent style
- fix two UI samples that were using the deprecated FormData class
- fix the fileupload sample that was using deprecated Struts APIs

BB: self
Test: clean / build pass



Modified:
    beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java
    beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/Controller.java
    beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/interceptme/Controller.java
    beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/nested/Controller.java
    beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/Controller.java
    beehive/trunk/samples/netui-samples/web/advanced/customvalidator/Controller.java
    beehive/trunk/samples/netui-samples/web/advanced/dynaforms/Controller.java
    beehive/trunk/samples/netui-samples/web/basicnesting/main/MainFlow.java
    beehive/trunk/samples/netui-samples/web/basicnesting/nested/NestedFlow.java
    beehive/trunk/samples/netui-samples/web/exceptions/Controller.java
    beehive/trunk/samples/netui-samples/web/fileupload/Controller.java
    beehive/trunk/samples/netui-samples/web/lifecycle/base/BasePageFlow.java
    beehive/trunk/samples/netui-samples/web/lifecycle/longlived/LongLivedPageFlow.java
    beehive/trunk/samples/netui-samples/web/lifecycle/normal/NormalPageFlow.java
    beehive/trunk/samples/netui-samples/web/loginexample/loginflow/Controller.java
    beehive/trunk/samples/netui-samples/web/loginexample/protectedflow/Controller.java
    beehive/trunk/samples/netui-samples/web/loginexample/start/Controller.java
    beehive/trunk/samples/netui-samples/web/nesting/Controller.java
    beehive/trunk/samples/netui-samples/web/templateactions/MainFlow.java
    beehive/trunk/samples/netui-samples/web/templateactions/flow1/Flow1.java
    beehive/trunk/samples/netui-samples/web/templateactions/flow2/Flow2.java
    beehive/trunk/samples/netui-samples/web/templateactions/shared/SharedFlow.java
    beehive/trunk/samples/netui-samples/web/tiles/MainFlow.java
    beehive/trunk/samples/netui-samples/web/tiles/flow1/Flow1.java
    beehive/trunk/samples/netui-samples/web/tiles/flow2/Flow2.java
    beehive/trunk/samples/netui-samples/web/tiles/shared/SharedFlow.java
    beehive/trunk/samples/netui-samples/web/ui/formposting/Controller.java
    beehive/trunk/samples/netui-samples/web/ui/popup/Controller.java
    beehive/trunk/samples/netui-samples/web/ui/popup/getcolor/GetColorController.java
    beehive/trunk/samples/netui-samples/web/ui/repeaterediting/Controller.java
    beehive/trunk/samples/netui-samples/web/validation/Controller.java

Modified: beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java (original)
+++ beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/loginexample/ExampleLoginHandler.java Fri Jan 27 10:25:41 2006
@@ -57,6 +57,7 @@
 
     private static class UserPrincipal
         implements Principal {
+
         public String getName() {
             return "good";
         }

Modified: beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/Controller.java Fri Jan 27 10:25:41 2006
@@ -30,6 +30,5 @@
     }
 )
 public class Controller
-    extends PageFlowController
-{
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/interceptme/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/interceptme/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/interceptme/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/interceptme/Controller.java Fri Jan 27 10:25:41 2006
@@ -32,6 +32,5 @@
     }
 )
 public class Controller
-    extends PageFlowController
-{
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/nested/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/nested/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/nested/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/nested/Controller.java Fri Jan 27 10:25:41 2006
@@ -37,6 +37,5 @@
     }
 )
 public class Controller
-    extends PageFlowController
-{
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/Controller.java Fri Jan 27 10:25:41 2006
@@ -32,55 +32,50 @@
         @Jpf.MessageBundle(bundlePath="org.apache.beehive.samples.netui.resources.clientsidevalidation.messages")
     }
 )
-public class Controller extends PageFlowController
-{
+public class Controller
+    extends PageFlowController {
+
     @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="success", path="success.jsp")
-        },
-        validationErrorForward=@Jpf.Forward(name="failure", path="index.jsp")
+        forwards = {
+        @Jpf.Forward(name = "success", path = "success.jsp")
+            },
+        validationErrorForward = @Jpf.Forward(name = "failure", path = "index.jsp")
     )
-    public Forward submit(MyForm form)
-    {
+    public Forward submit(MyForm form) {
         return new Forward("success");
     }
 
     /**
      * The form bean, with validation annotations on its properties.
      */
-    public static class MyForm implements java.io.Serializable
-    {
+    public static class MyForm implements java.io.Serializable {
         private String _fullName;
         private String _email;
 
         @Jpf.ValidatableProperty(
-            displayNameKey="displayname.fullName",
-            validateRequired=@Jpf.ValidateRequired(messageKey="errors.required"),
-            validateMinLength=@Jpf.ValidateMinLength(chars=3, messageKey="errors.minlength"),
-            validateMask=@Jpf.ValidateMask(regex="^[A-Za-z ]*$", messageKey="errors.letters")
+            displayNameKey = "displayname.fullName",
+            validateRequired = @Jpf.ValidateRequired(messageKey = "errors.required"),
+            validateMinLength = @Jpf.ValidateMinLength(chars = 3, messageKey = "errors.minlength"),
+            validateMask = @Jpf.ValidateMask(regex = "^[A-Za-z ]*$", messageKey = "errors.letters")
         )
-        public String getFullName()
-        {
+        public String getFullName() {
             return _fullName;
         }
 
-        public void setFullName(String fullName)
-        {
+        public void setFullName(String fullName) {
             _fullName = fullName;
         }
-     
+
         @Jpf.ValidatableProperty(
-            displayNameKey="displayname.email",
-            validateRequired=@Jpf.ValidateRequired(messageKey="errors.required"),
-            validateEmail=@Jpf.ValidateEmail(messageKey="errors.email")
+            displayNameKey = "displayname.email",
+            validateRequired = @Jpf.ValidateRequired(messageKey = "errors.required"),
+            validateEmail = @Jpf.ValidateEmail(messageKey = "errors.email")
         )
-        public String getEmail()
-        {
+        public String getEmail() {
             return _email;
         }
 
-        public void setEmail(String email)
-        {
+        public void setEmail(String email) {
             _email = email;
         }
     }

Modified: beehive/trunk/samples/netui-samples/web/advanced/customvalidator/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/advanced/customvalidator/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/customvalidator/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/customvalidator/Controller.java Fri Jan 27 10:25:41 2006
@@ -41,8 +41,7 @@
         },
         validationErrorForward=@Jpf.Forward(name="failure", path="index.jsp")
     )
-    public Forward submit(MyFormBean form)
-    {
+    public Forward submit(MyFormBean form) {
         return new Forward("success");
     }
 }

Modified: beehive/trunk/samples/netui-samples/web/advanced/dynaforms/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/advanced/dynaforms/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/advanced/dynaforms/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/advanced/dynaforms/Controller.java Fri Jan 27 10:25:41 2006
@@ -23,7 +23,7 @@
 import org.apache.struts.action.DynaActionForm;
 
 // Note: the merge file "merge-struts-config-dynaforms.xml" is in this directory
-// mainly to make the example more encapsulated.  It could also reside in WEB-INF,
+// to make the example more encapsulated.  It could also reside in WEB-INF,
 // and be referenced as "/WEB-INF/merge-struts-config-dynaforms.xml".
 
 @Jpf.Controller(
@@ -32,8 +32,9 @@
         @Jpf.SimpleAction(name="begin", path="input.jsp")
     }
 )
-public class Controller extends PageFlowController
-{
+public class Controller
+    extends PageFlowController {
+
     @Jpf.Action(
         forwards={
             @Jpf.Forward(name="output", path="output.jsp")
@@ -56,11 +57,10 @@
         },
         validationErrorForward=@Jpf.Forward(name="failure", path="input.jsp")
     )
-    public Forward submit(DynaActionForm form)
-    {
+    public Forward submit(DynaActionForm form) {
         Forward fwd = new Forward("output");
-        fwd.addActionOutput( "name", form.get( "name" ) );
-        fwd.addActionOutput( "age", form.get( "age" ) );
+        fwd.addActionOutput("name", form.get("name"));
+        fwd.addActionOutput("age", form.get("age"));
         return fwd;
     }
 }

Modified: beehive/trunk/samples/netui-samples/web/basicnesting/main/MainFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/basicnesting/main/MainFlow.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/basicnesting/main/MainFlow.java (original)
+++ beehive/trunk/samples/netui-samples/web/basicnesting/main/MainFlow.java Fri Jan 27 10:25:41 2006
@@ -27,6 +27,6 @@
         @Jpf.SimpleAction(name="nestedDone", path="success.jsp")
     }
 )
-public class MainFlow extends PageFlowController
-{
+public class MainFlow
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/basicnesting/nested/NestedFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/basicnesting/nested/NestedFlow.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/basicnesting/nested/NestedFlow.java (original)
+++ beehive/trunk/samples/netui-samples/web/basicnesting/nested/NestedFlow.java Fri Jan 27 10:25:41 2006
@@ -27,6 +27,6 @@
         @Jpf.SimpleAction(name="done", returnAction="nestedDone")
     }
 )
-public class NestedFlow extends PageFlowController
-{
+public class NestedFlow
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/exceptions/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/exceptions/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/exceptions/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/exceptions/Controller.java Fri Jan 27 10:25:41 2006
@@ -21,7 +21,6 @@
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowController;
 
-
 /**
  * Demonstration of Page Flow declarative exception handling.
  */
@@ -56,25 +55,26 @@
         )
     }
 )
-public class Controller extends PageFlowController
-{
+public class Controller extends PageFlowController {
     public static abstract class BaseException
-        extends Exception
-    {
-        public String getMessage()
-        {
+        extends Exception {
+        public String getMessage() {
             return "This is the result of calling getMessage() on the exception.";
         }
     }
 
-    public class Exception1 extends BaseException {}
-    public class Exception2 extends BaseException {}
-    public class Exception3 extends BaseException {}
+    public class Exception1 extends BaseException {
+    }
+
+    public class Exception2 extends BaseException {
+    }
+
+    public class Exception3 extends BaseException {
+    }
 
     @Jpf.Action()
     public Forward throwException1()
-        throws Exception1
-    {
+        throws Exception1 {
         // Note that there is no need to catch Exception1 *inside* this action method; just put
         // Exception1 in the 'throws' for the method.
         throw new Exception1();
@@ -82,25 +82,22 @@
 
     @Jpf.Action()
     public Forward throwException2()
-        throws Exception2
-    {
+        throws Exception2 {
         throw new Exception2();
     }
-    
+
     @Jpf.Action()
     public Forward throwException3()
-        throws Exception3
-    {
+        throws Exception3 {
         throw new Exception3();
     }
 
     @Jpf.ExceptionHandler(
-        forwards={
-            @Jpf.Forward(name="caughtPage", path="caught.jsp")
-        }
+        forwards = {
+        @Jpf.Forward(name = "caughtPage", path = "caught.jsp")
+            }
     )
-    public Forward handleIt(BaseException ex, String actionName, String message, Object formBean)
-    {
+    public Forward handleIt(BaseException ex, String actionName, String message, Object formBean) {
         return new Forward("caughtPage");
     }
 }

Modified: beehive/trunk/samples/netui-samples/web/fileupload/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/fileupload/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/fileupload/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/fileupload/Controller.java Fri Jan 27 10:25:41 2006
@@ -20,19 +20,16 @@
 import java.io.Serializable;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Validatable;
-
 import org.apache.struts.upload.FormFile;
 import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionMessages;
-
+import org.apache.struts.action.ActionMessage;
 
 /**
  * Demonstration of file upload to a page flow action.
@@ -46,14 +43,13 @@
             bundlePath="org.apache.beehive.samples.netui.resources.fileupload.messages"
         )
     },
-
     // For security, multipart request handling is disabled by default.  It can be enabled on a
     // per-pageflow basis (as it is here), or in WEB-INF/beehive-netui-config.xml, using the
     // <multipart-handler> element in <pageflow-config>.
-    multipartHandler=Jpf.MultipartHandler.memory
+    multipartHandler = Jpf.MultipartHandler.memory
 )
-public class Controller extends PageFlowController
-{
+public class Controller extends PageFlowController {
+
     @Jpf.Action(
         forwards={
             @Jpf.Forward(
@@ -63,11 +59,10 @@
                     @Jpf.ActionOutput(name="uploadForm", type=UploadForm.class, required=true)
                 }
             )
-        },
-        validationErrorForward=@Jpf.Forward(name="failure", path="index.jsp")
+            },
+        validationErrorForward = @Jpf.Forward(name = "failure", path = "index.jsp")
     )
-    public Forward upload(UploadForm form)
-    {
+    public Forward upload(UploadForm form) {
         // Add the UploadForm as an "action output" for the results page.
         Forward fwd = new Forward("success");
         fwd.addActionOutput("uploadForm", form);
@@ -75,24 +70,20 @@
     }
 
     public static class UploadForm
-        implements Serializable, Validatable
-    {
+        implements Serializable, Validatable {
+
         private String _label;
         private FormFile _file;
 
-
-        public void setLabel( String label )
-        {
+        public void setLabel(String label) {
             _label = label;
         }
 
-        public String getLabel()
-        {
+        public String getLabel() {
             return _label;
         }
 
-        public void setFile( FormFile file )
-        {
+        public void setFile(FormFile file) {
             _file = file;
         }
 
@@ -100,35 +91,30 @@
          * The submitted file (required) ends up as this FormFile object.
          */
         @Jpf.ValidatableProperty(
-            validateRequired=@Jpf.ValidateRequired(messageKey="errors.filerequired")
+            validateRequired = @Jpf.ValidateRequired(messageKey = "errors.filerequired")
         )
-        public FormFile getFile()
-        {
+        public FormFile getFile() {
             return _file;
         }
-        
+
         /**
          * In addition to any declarative validation that is defined per-property, this method
          * ensures that the submitted file is an HTML file or a text file.
          */
-        public void validate(ActionMapping mapping, HttpServletRequest req, ActionMessages errors)
-        {
-            if (_file != null)
-            {
+        public void validate(ActionMapping mapping, HttpServletRequest req, ActionMessages errors) {
+            if (_file != null) {
                 String fileName = _file.getFileName();
-                if (! fileName.endsWith(".html") && ! fileName.endsWith(".txt"))
-                {
-                    errors.add("file", new ActionError("errors.fileextension"));
+                if (! fileName.endsWith(".html") && ! fileName.endsWith(".txt")) {
+                    errors.add("file", new ActionMessage("errors.fileextension"));
                 }
             }
         }
-        
+
         /**
          * This getter is bound to from results.jsp.
          */
         public String getFileDataString()
-            throws FileNotFoundException, IOException
-        {
+            throws FileNotFoundException, IOException {
             return new String(_file.getFileData());
         }
     }

Modified: beehive/trunk/samples/netui-samples/web/lifecycle/base/BasePageFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/lifecycle/base/BasePageFlow.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/lifecycle/base/BasePageFlow.java (original)
+++ beehive/trunk/samples/netui-samples/web/lifecycle/base/BasePageFlow.java Fri Jan 27 10:25:41 2006
@@ -17,6 +17,8 @@
  */
 package lifecycle.base;
 
+import javax.servlet.http.HttpSession;
+
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowController;
@@ -28,40 +30,36 @@
  * can't be hit directly.
  */
 @Jpf.Controller(
-    simpleActions={
-        @Jpf.SimpleAction(name="begin", path="index.jsp"),
-        @Jpf.SimpleAction(name="goNormal", path="/lifecycle/normal/NormalPageFlow.jpf"),
-        @Jpf.SimpleAction(name="goLongLived", path="/lifecycle/longlived/LongLivedPageFlow.jpf")
-    }
+    simpleActions = {
+    @Jpf.SimpleAction(name = "begin", path = "index.jsp"),
+    @Jpf.SimpleAction(name = "goNormal", path = "/lifecycle/normal/NormalPageFlow.jpf"),
+    @Jpf.SimpleAction(name = "goLongLived", path = "/lifecycle/longlived/LongLivedPageFlow.jpf")
+        }
 )
 public abstract class BasePageFlow
-    extends PageFlowController
-{
+    extends PageFlowController {
+
     private int _num = 0;
 
-    public int getNum()
-    {
+    public int getNum() {
         return _num;
     }
 
     @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="current", navigateTo=Jpf.NavigateTo.currentPage)
-        }
+        forwards = {
+        @Jpf.Forward(name = "current", navigateTo = Jpf.NavigateTo.currentPage)
+            }
     )
-    public Forward increment()
-    {
+    public Forward increment() {
         _num++;
         return new Forward("current");
     }
 
-    protected void onCreate()
-    {
-        System.out.println( "**** in onCreate for " + getClass().getName() );
+    protected void onCreate() {
+        System.out.println("**** in onCreate for " + getClass().getName());
     }
 
-    protected void onDestroy()
-    {
-        System.out.println( "**** in onDestroy for " + getClass().getName() );
+    protected void onDestroy(HttpSession session) {
+        System.out.println("**** in onDestroy for " + getClass().getName());
     }
 }

Modified: beehive/trunk/samples/netui-samples/web/lifecycle/longlived/LongLivedPageFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/lifecycle/longlived/LongLivedPageFlow.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/lifecycle/longlived/LongLivedPageFlow.java (original)
+++ beehive/trunk/samples/netui-samples/web/lifecycle/longlived/LongLivedPageFlow.java Fri Jan 27 10:25:41 2006
@@ -30,6 +30,5 @@
     longLived=true
 )
 public class LongLivedPageFlow
-    extends BasePageFlow
-{
+    extends BasePageFlow {
 }

Modified: beehive/trunk/samples/netui-samples/web/lifecycle/normal/NormalPageFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/lifecycle/normal/NormalPageFlow.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/lifecycle/normal/NormalPageFlow.java (original)
+++ beehive/trunk/samples/netui-samples/web/lifecycle/normal/NormalPageFlow.java Fri Jan 27 10:25:41 2006
@@ -27,6 +27,5 @@
  */
 @Jpf.Controller()
 public class NormalPageFlow
-    extends BasePageFlow
-{
+    extends BasePageFlow {
 }

Modified: beehive/trunk/samples/netui-samples/web/loginexample/loginflow/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/loginexample/loginflow/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/loginexample/loginflow/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/loginexample/loginflow/Controller.java Fri Jan 27 10:25:41 2006
@@ -36,56 +36,50 @@
         @Jpf.MessageBundle(bundlePath="org.apache.beehive.samples.netui.resources.loginexample.messages")
     }
 )
-public class Controller extends PageFlowController
-{
+public class Controller extends PageFlowController {
+
     @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="success", returnAction="loginSuccess")
-        },
-        validationErrorForward=@Jpf.Forward(name="failure", path="index.jsp")
+        forwards = {
+        @Jpf.Forward(name = "success", returnAction = "loginSuccess")
+            },
+        validationErrorForward = @Jpf.Forward(name = "failure", path = "index.jsp")
     )
-    public Forward login( LoginForm form )
-        throws LoginException
-    {
+    public Forward login(LoginForm form)
+        throws LoginException {
         // This ultimately calls login on org.apache.beehive.samples.netui.login.ExampleLoginHandler.
-        login( form.getUsername(), form.getPassword() );
-        return new Forward( "success" );
+        login(form.getUsername(), form.getPassword());
+        return new Forward("success");
     }
 
-    public static class LoginForm implements java.io.Serializable
-    {
+    public static class LoginForm implements java.io.Serializable {
         private String _username;
         private String _password;
 
         @Jpf.ValidatableProperty(
             // We could have also used the 'displayName' attribute -- a hardcoded string or a 
             // JSP 2.0-style expression.
-            displayNameKey="displaynames.username",
-            validateRequired=@Jpf.ValidateRequired(),
-            validateMinLength=@Jpf.ValidateMinLength(chars=4)
+            displayNameKey = "displaynames.username",
+            validateRequired = @Jpf.ValidateRequired(),
+            validateMinLength = @Jpf.ValidateMinLength(chars = 4)
         )
-        public String getUsername()
-        {
+        public String getUsername() {
             return _username;
         }
 
-        public void setUsername( String username )
-        {
+        public void setUsername(String username) {
             _username = username;
         }
 
         @Jpf.ValidatableProperty(
-            displayNameKey="displaynames.password",
-            validateRequired=@Jpf.ValidateRequired(),
-            validateMinLength=@Jpf.ValidateMinLength(chars=4)
+            displayNameKey = "displaynames.password",
+            validateRequired = @Jpf.ValidateRequired(),
+            validateMinLength = @Jpf.ValidateMinLength(chars = 4)
         )
-        public String getPassword()
-        {
+        public String getPassword() {
             return _password;
         }
 
-        public void setPassword( String password )
-        {
+        public void setPassword(String password) {
             _password = password;
         }
     }

Modified: beehive/trunk/samples/netui-samples/web/loginexample/protectedflow/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/loginexample/protectedflow/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/loginexample/protectedflow/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/loginexample/protectedflow/Controller.java Fri Jan 27 10:25:41 2006
@@ -28,6 +28,6 @@
         @Jpf.SimpleAction(name="done", returnAction="protectedFlowDone")
     }
 )
-public class Controller extends PageFlowController
-{
+public class Controller
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/loginexample/start/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/loginexample/start/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/loginexample/start/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/loginexample/start/Controller.java Fri Jan 27 10:25:41 2006
@@ -27,6 +27,6 @@
         @Jpf.SimpleAction(name="protectedFlowDone", navigateTo=Jpf.NavigateTo.currentPage)
     }
 )
-public class Controller extends BaseFlow
-{
+public class Controller
+    extends BaseFlow {
 }

Modified: beehive/trunk/samples/netui-samples/web/nesting/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/nesting/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/nesting/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/nesting/Controller.java Fri Jan 27 10:25:41 2006
@@ -38,8 +38,8 @@
         @Jpf.SimpleAction(name="chooseAirportCancelled", navigateTo=Jpf.NavigateTo.currentPage)
     }
 )
-public class Controller extends PageFlowController
-{
+public class Controller
+    extends PageFlowController {
     // This property ("yourName") is used in the JSPs to show that this page flow's state is
     // restored when you return from the nested flow.
     private String _yourName;
@@ -63,8 +63,7 @@
             )
         }
     )
-    protected Forward chooseAirportDone( ChooseAirport.Results results )
-    {
+    protected Forward chooseAirportDone(ChooseAirport.Results results) {
         Forward fwd = new Forward("results");
         fwd.addActionOutput("airport", results.getAirport());
         return fwd;

Modified: beehive/trunk/samples/netui-samples/web/templateactions/MainFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/templateactions/MainFlow.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/templateactions/MainFlow.java (original)
+++ beehive/trunk/samples/netui-samples/web/templateactions/MainFlow.java Fri Jan 27 10:25:41 2006
@@ -29,6 +29,6 @@
         @Jpf.SharedFlowRef(name="templateSharedFlow", type=templateactions.shared.SharedFlow.class)
     }
 )
-public class MainFlow extends PageFlowController
-{
+public class MainFlow
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/templateactions/flow1/Flow1.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/templateactions/flow1/Flow1.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/templateactions/flow1/Flow1.java (original)
+++ beehive/trunk/samples/netui-samples/web/templateactions/flow1/Flow1.java Fri Jan 27 10:25:41 2006
@@ -28,6 +28,6 @@
         @Jpf.SharedFlowRef(name="templateSharedFlow", type=templateactions.shared.SharedFlow.class)
     }
 )
-public class Flow1 extends PageFlowController
-{
+public class Flow1
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/templateactions/flow2/Flow2.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/templateactions/flow2/Flow2.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/templateactions/flow2/Flow2.java (original)
+++ beehive/trunk/samples/netui-samples/web/templateactions/flow2/Flow2.java Fri Jan 27 10:25:41 2006
@@ -28,6 +28,6 @@
         @Jpf.SharedFlowRef(name="templateSharedFlow", type=templateactions.shared.SharedFlow.class)
     }
 )
-public class Flow2 extends PageFlowController
-{
+public class Flow2
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/templateactions/shared/SharedFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/templateactions/shared/SharedFlow.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/templateactions/shared/SharedFlow.java (original)
+++ beehive/trunk/samples/netui-samples/web/templateactions/shared/SharedFlow.java Fri Jan 27 10:25:41 2006
@@ -22,28 +22,26 @@
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(
-    simpleActions={
-        @Jpf.SimpleAction(name="goMain",path="/templateactions/MainFlow.jpf"),
-        @Jpf.SimpleAction(name="goFlow1",path="/templateactions/flow1/Flow1.jpf"),
-        @Jpf.SimpleAction(name="goFlow2",path="/templateactions/flow2/Flow2.jpf")
-    }
+    simpleActions = {
+    @Jpf.SimpleAction(name = "goMain", path = "/templateactions/MainFlow.jpf"),
+    @Jpf.SimpleAction(name = "goFlow1", path = "/templateactions/flow1/Flow1.jpf"),
+    @Jpf.SimpleAction(name = "goFlow2", path = "/templateactions/flow2/Flow2.jpf")
+        }
 )
-public class SharedFlow extends SharedFlowController
-{
+public class SharedFlow extends SharedFlowController {
+
     private boolean _notesVisible = false;
 
-    public boolean isNotesVisible()
-    {
+    public boolean isNotesVisible() {
         return _notesVisible;
     }
 
     @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="currentPage", navigateTo=Jpf.NavigateTo.currentPage)
-        }
+        forwards = {
+        @Jpf.Forward(name = "currentPage", navigateTo = Jpf.NavigateTo.currentPage)
+            }
     )
-    public Forward toggleNotes()
-    {
+    public Forward toggleNotes() {
         _notesVisible = ! _notesVisible;
         return new Forward("currentPage");
     }

Modified: beehive/trunk/samples/netui-samples/web/tiles/MainFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/tiles/MainFlow.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/tiles/MainFlow.java (original)
+++ beehive/trunk/samples/netui-samples/web/tiles/MainFlow.java Fri Jan 27 10:25:41 2006
@@ -32,6 +32,6 @@
         @Jpf.SharedFlowRef(name="tilesSharedFlow", type=tiles.shared.SharedFlow.class)
     }
 )
-public class MainFlow extends PageFlowController
-{
+public class MainFlow
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/tiles/flow1/Flow1.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/tiles/flow1/Flow1.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/tiles/flow1/Flow1.java (original)
+++ beehive/trunk/samples/netui-samples/web/tiles/flow1/Flow1.java Fri Jan 27 10:25:41 2006
@@ -31,6 +31,6 @@
         @Jpf.SharedFlowRef(name="tilesSharedFlow", type=tiles.shared.SharedFlow.class)
     }
 )
-public class Flow1 extends PageFlowController
-{
+public class Flow1
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/tiles/flow2/Flow2.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/tiles/flow2/Flow2.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/tiles/flow2/Flow2.java (original)
+++ beehive/trunk/samples/netui-samples/web/tiles/flow2/Flow2.java Fri Jan 27 10:25:41 2006
@@ -31,6 +31,6 @@
         @Jpf.SharedFlowRef(name="tilesSharedFlow", type=tiles.shared.SharedFlow.class)
     }
 )
-public class Flow2 extends PageFlowController
-{
+public class Flow2
+    extends PageFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/tiles/shared/SharedFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/tiles/shared/SharedFlow.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/tiles/shared/SharedFlow.java (original)
+++ beehive/trunk/samples/netui-samples/web/tiles/shared/SharedFlow.java Fri Jan 27 10:25:41 2006
@@ -27,6 +27,6 @@
         @Jpf.SimpleAction(name="goFlow2", path="/tiles/flow2/Flow2.jpf")
     }
 )
-public class SharedFlow extends SharedFlowController
-{
+public class SharedFlow
+    extends SharedFlowController {
 }

Modified: beehive/trunk/samples/netui-samples/web/ui/formposting/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/ui/formposting/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/ui/formposting/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/ui/formposting/Controller.java Fri Jan 27 10:25:41 2006
@@ -20,14 +20,13 @@
 import java.io.Serializable;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Validatable;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
-import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 
 @Jpf.Controller(
     forwards={
@@ -80,7 +79,6 @@
     }
 
     public static class NameForm
-        extends FormData
         implements Serializable {
 
         private String _name = null;
@@ -95,18 +93,17 @@
     }
 
     public static class ValidatedNameForm
-        extends NameForm {
+        extends NameForm
+        implements Validatable {
 
         private static final String REQUIRED_NAME = "Frank";
 
-        public ActionErrors validate(ActionMapping actionMapping, HttpServletRequest servletRequest) {
-            ActionErrors errors = null;
+        public void validate(ActionMapping actionMapping,
+                             HttpServletRequest httpServletRequest,
+                             ActionMessages actionMessages) {
             if(!REQUIRED_NAME.equals(getName())) {
-                errors = new ActionErrors();
-                errors.add("name", new ActionMessage("formposting.invalidname"));
+                actionMessages.add("name", new ActionMessage("formposting.invalidname"));
             }
-
-            return errors;
         }
     }
 }

Modified: beehive/trunk/samples/netui-samples/web/ui/popup/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/ui/popup/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/ui/popup/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/ui/popup/Controller.java Fri Jan 27 10:25:41 2006
@@ -26,18 +26,17 @@
 import ui.popup.getcolor.GetColorController;
 
 @Jpf.Controller(
-    simpleActions={
-        @Jpf.SimpleAction(name="begin", path="index.jsp"),
-        @Jpf.SimpleAction(name="getColor", path="getcolor/GetColorController.jpf"),
-        @Jpf.SimpleAction(name="getColorCancel", forwardRef="_auto")
-    },
-    messageBundles={
-        @Jpf.MessageBundle(bundlePath="org.apache.beehive.samples.netui.resources.popup.messages")
-    }
+    simpleActions = {
+    @Jpf.SimpleAction(name = "begin", path = "index.jsp"),
+    @Jpf.SimpleAction(name = "getColor", path = "getcolor/GetColorController.jpf"),
+    @Jpf.SimpleAction(name = "getColorCancel", forwardRef = "_auto")
+        },
+    messageBundles = {
+    @Jpf.MessageBundle(bundlePath = "org.apache.beehive.samples.netui.resources.popup.messages")
+        }
 )
-public class Controller 
-    extends PageFlowController
-{
+public class Controller
+    extends PageFlowController {
     /**
      * Returning the special "_auto" Forward causes the popup window to close, and automatically
      * runs the JavaScript to map return values from the nested page flow into fields on the
@@ -45,19 +44,17 @@
      * forward.
      */
     @Jpf.Action()
-    public Forward getColorSuccess(GetColorController.ColorForm colorForm)
-    {
+    public Forward getColorSuccess(GetColorController.ColorForm colorForm) {
         return new Forward("_auto");
     }
 
     @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="success", path="show.jsp")
-        },
-        validationErrorForward=@Jpf.Forward(name="failure", navigateTo=Jpf.NavigateTo.currentPage)
+        forwards = {
+        @Jpf.Forward(name = "success", path = "show.jsp")
+            },
+        validationErrorForward = @Jpf.Forward(name = "failure", navigateTo = Jpf.NavigateTo.currentPage)
     )
-    public Forward submit(SubmitForm form)
-    {
+    public Forward submit(SubmitForm form) {
         Forward forward = new Forward("success");
         forward.addActionOutput("form", form);
         return forward;
@@ -66,55 +63,47 @@
 
     public static class SubmitForm
         implements Serializable {
-        
+
         private String _name;
         private String _address;
         private String _city;
         private String _color;
 
         @Jpf.ValidatableProperty(
-            validateRequired=@Jpf.ValidateRequired(messageKey="errors.nameRequired")
+            validateRequired = @Jpf.ValidateRequired(messageKey = "errors.nameRequired")
         )
-        public String getName()
-        {
+        public String getName() {
             return _name;
         }
 
-        public void setName(String value)
-        {
+        public void setName(String value) {
             _name = value;
         }
 
-        public String getAddress()
-        {
+        public String getAddress() {
             return _address;
         }
 
-        public void setAddress( String address )
-        {
+        public void setAddress(String address) {
             _address = address;
         }
 
-        public String getCity()
-        {
+        public String getCity() {
             return _city;
         }
 
-        public void setCity( String city )
-        {
+        public void setCity(String city) {
             _city = city;
         }
 
         @Jpf.ValidatableProperty(
-            validateRequired=@Jpf.ValidateRequired(messageKey="errors.colorRequired")
+            validateRequired = @Jpf.ValidateRequired(messageKey = "errors.colorRequired")
         )
-        public String getColor()
-        {
+        public String getColor() {
             return _color;
         }
 
-        public void setColor( String color )
-        {
+        public void setColor(String color) {
             _color = color;
         }
     }

Modified: beehive/trunk/samples/netui-samples/web/ui/popup/getcolor/GetColorController.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/ui/popup/getcolor/GetColorController.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/ui/popup/getcolor/GetColorController.java (original)
+++ beehive/trunk/samples/netui-samples/web/ui/popup/getcolor/GetColorController.java Fri Jan 27 10:25:41 2006
@@ -24,57 +24,51 @@
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(
-    nested=true,
-    simpleActions={
-        @Jpf.SimpleAction(name="begin", path="index.jsp"),
-        @Jpf.SimpleAction(name="cancel", returnAction="getColorCancel")
-    }
+    nested = true,
+    simpleActions = {
+    @Jpf.SimpleAction(name = "begin", path = "index.jsp"),
+    @Jpf.SimpleAction(name = "cancel", returnAction = "getColorCancel")
+        }
 )
-public class GetColorController extends PageFlowController
-{
+public class GetColorController extends PageFlowController {
     private ColorForm _returnFormBean;
 
     @Jpf.Action(
-        useFormBean="_returnFormBean",
-        forwards={
-            @Jpf.Forward(
-                name="confirm",
-                path="confirm.jsp",
-                actionOutputs={
-                    @Jpf.ActionOutput(name="chosenColor", type=String.class, required=true)
+        useFormBean = "_returnFormBean",
+        forwards = {
+        @Jpf.Forward(
+            name = "confirm",
+            path = "confirm.jsp",
+            actionOutputs = {
+            @Jpf.ActionOutput(name = "chosenColor", type = String.class, required = true)
                 }
-            )
-        }
+        )
+            }
     )
-    public Forward submitColor(ColorForm form)
-    {
+    public Forward submitColor(ColorForm form) {
         Forward fwd = new Forward("confirm");
         fwd.addActionOutput("chosenColor", form.getColor());
         return fwd;
     }
 
     @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="success", returnAction="getColorSuccess", outputFormBeanType=ColorForm.class)
-        }
+        forwards = {
+        @Jpf.Forward(name = "success", returnAction = "getColorSuccess", outputFormBeanType = ColorForm.class)
+            }
     )
-    public Forward done(ColorForm form)
-    {
+    public Forward done(ColorForm form) {
         return new Forward("success", _returnFormBean);
     }
 
     public static class ColorForm
-        implements Serializable
-    {
+        implements Serializable {
         private String _color;
 
-        public String getColor()
-        {
+        public String getColor() {
             return _color;
         }
 
-        public void setColor(String value)
-        {
+        public void setColor(String value) {
             _color = value;
         }
     }

Modified: beehive/trunk/samples/netui-samples/web/ui/repeaterediting/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/ui/repeaterediting/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/ui/repeaterediting/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/ui/repeaterediting/Controller.java Fri Jan 27 10:25:41 2006
@@ -24,13 +24,12 @@
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
+import org.apache.beehive.netui.pageflow.Validatable;
 import org.apache.beehive.samples.controls.pets.Pets;
 import org.apache.beehive.samples.netui.beans.PetType;
-
-import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 
 /**
  */
@@ -53,7 +52,7 @@
     @Jpf.Action(
         forwards=
             @Jpf.Forward(name="success", path="index.jsp",
-                actionOutputs=@Jpf.ActionOutput(name="totalPrice", type=java.lang.Double.class))
+                         actionOutputs=@Jpf.ActionOutput(name="totalPrice", type=java.lang.Double.class))
     )
     public Forward begin() {
         PetType[] pets = _petControl.getPetList();
@@ -94,8 +93,7 @@
     }
 
     public static class CartForm
-        extends FormData
-        implements Serializable {
+        implements Validatable, Serializable {
 
         private CartItem[] _items;
 
@@ -109,17 +107,16 @@
             return _items;
         }
 
-        public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) {
-            ActionErrors errors = new ActionErrors();
+        public void validate(ActionMapping actionMapping,
+                             HttpServletRequest httpServletRequest,
+                             ActionMessages actionMessages) {
 
             for(int i = 0; i < _items.length; i++) {
                 CartItem item = _items[i];
                 if(item.getQuantity() <= 0) {
-                    errors.add("invalidQuantity" + i, new ActionMessage("invalidquantity", item.getQuantity()));
+                    actionMessages.add("invalidQuantity" + i, new ActionMessage("invalidquantity", item.getQuantity()));
                 }
             }
-
-            return errors;
         }
     }
 

Modified: beehive/trunk/samples/netui-samples/web/validation/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/web/validation/Controller.java?rev=372939&r1=372938&r2=372939&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/web/validation/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/web/validation/Controller.java Fri Jan 27 10:25:41 2006
@@ -27,99 +27,91 @@
  * Demonstration of Page Flow declarative field validation.
  */
 @Jpf.Controller(
-    simpleActions={
-        @Jpf.SimpleAction(name="begin",path="index.jsp")
-    },
-    messageBundles={
-        @Jpf.MessageBundle(bundlePath="org.apache.beehive.samples.netui.resources.validation.messages")
-    }
+    simpleActions = {
+    @Jpf.SimpleAction(name = "begin", path = "index.jsp")
+        },
+    messageBundles = {
+    @Jpf.MessageBundle(bundlePath = "org.apache.beehive.samples.netui.resources.validation.messages")
+        }
 )
-public class Controller extends PageFlowController
-{
+public class Controller extends PageFlowController {
     /**
      * Basic submit action -- uses validation rules defined on MyForm.
      */
     @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="success", path="success.jsp")
-        },
-        validationErrorForward=@Jpf.Forward(name="fail", navigateTo=Jpf.NavigateTo.currentPage)
+        forwards = {
+        @Jpf.Forward(name = "success", path = "success.jsp")
+            },
+        validationErrorForward = @Jpf.Forward(name = "fail", navigateTo = Jpf.NavigateTo.currentPage)
     )
-    public Forward submit(MyForm form)
-    {
+    public Forward submit(MyForm form) {
         Forward fwd = new Forward("success");
         fwd.addActionOutput("value", form.getValue());
         return fwd;
     }
-    
+
     /**
      * This action adds an additional validation rule for the 'value' property.
      */
     @Jpf.Action(
-        forwards={
-            @Jpf.Forward(name="success", path="success.jsp")
-        },
-        validationErrorForward=@Jpf.Forward(name="fail", navigateTo=Jpf.NavigateTo.currentPage),
+        forwards = {
+        @Jpf.Forward(name = "success", path = "success.jsp")
+            },
+        validationErrorForward = @Jpf.Forward(name = "fail", navigateTo = Jpf.NavigateTo.currentPage),
 
         // This is the extra validation rule.
-        validatableProperties={
-            @Jpf.ValidatableProperty(
-                propertyName="value",
-                validateMaxLength=@Jpf.ValidateMaxLength(chars=4, messageKey="errors.toolong")
-            )
-        }
+        validatableProperties = {
+        @Jpf.ValidatableProperty(
+            propertyName = "value",
+            validateMaxLength = @Jpf.ValidateMaxLength(chars = 4, messageKey = "errors.toolong")
+        )
+            }
     )
-    public Forward submitWithExtraRule(MyForm form)
-    {
+    public Forward submitWithExtraRule(MyForm form) {
         Forward fwd = new Forward("success");
         fwd.addActionOutput("value", form.getValue());
         return fwd;
     }
-    
+
     /**
      * The form bean class.  Note that form beans do <i>not</i> have to be inner classes; validation
      * annotations work on external form bean classes, too.
-     *
+     * <p/>
      * This form bean class uses message resources from the page flow's message bundle (defined
      * inside the @Jpf.Controller annotation).  A form bean class can also define its <i>own</i>
      * message bundle through the @Jpf.FormBean annotation.
      */
     public static class MyForm
-        implements Serializable
-    {
+        implements Serializable {
         private String _value;
         private String _confirmValue;
 
         @Jpf.ValidatableProperty(
-            displayNameKey="displayname.value",
-            validateRequired=@Jpf.ValidateRequired(),
-            validateMinLength=@Jpf.ValidateMinLength(chars=3)
+            displayNameKey = "displayname.value",
+            validateRequired = @Jpf.ValidateRequired(),
+            validateMinLength = @Jpf.ValidateMinLength(chars = 3)
         )
-        public String getValue()
-        {
+        public String getValue() {
             return _value;
         }
 
-        public void setValue( String value )
-        {
+        public void setValue(String value) {
             _value = value;
         }
 
         @Jpf.ValidatableProperty(
-            displayNameKey="displayname.confirmvalue",
-            validateRequired=@Jpf.ValidateRequired(),
-            validateValidWhen=@Jpf.ValidateValidWhen(
-                condition="${actionForm.confirmValue == actionForm.value}",
-                messageKey="errors.nomatch"
+            displayNameKey = "displayname.confirmvalue",
+            validateRequired = @Jpf.ValidateRequired(),
+            validateValidWhen = @Jpf.ValidateValidWhen(
+                condition = "${actionForm.confirmValue == actionForm.value}",
+                messageKey = "errors.nomatch"
             )
         )
-        public String getConfirmValue()
-        {
+        public String getConfirmValue() {
             return _confirmValue;
         }
 
-        public void setConfirmValue( String confirmValue )
-        {
+        public void setConfirmValue(String confirmValue) {
             _confirmValue = confirmValue;
         }
     }