[jboss-cvs] jboss-seam/src/main/org/jboss/seam/actionparam ...

[Gavin King]

  User: gavin   
  Date: 06/12/18 10:38:49

  Modified:    src/main/org/jboss/seam/actionparam  
                        ActionParamMethodBinding.java
                        MethodExpressionParser.java
  Log:
  new validation component,
  reworked navigation rules
  
  Revision  Changes    Path
  1.4       +16 -8     jboss-seam/src/main/org/jboss/seam/actionparam/ActionParamMethodBinding.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActionParamMethodBinding.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/actionparam/ActionParamMethodBinding.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ActionParamMethodBinding.java	12 Oct 2006 01:37:28 -0000	1.3
  +++ ActionParamMethodBinding.java	18 Dec 2006 15:38:49 -0000	1.4
  @@ -51,8 +51,10 @@
           application = ( (SeamApplication11) FacesContext.getCurrentInstance().getApplication() ).getDelegate();
       }
       
  -    public ActionParamMethodBinding(Application application, String expWithParams) {
  -        if (MethodExpressionParser.isStringLiteral(expWithParams)) {
  +    public ActionParamMethodBinding(Application application, String expWithParams)
  +    {
  +        if ( MethodExpressionParser.isStringLiteral(expWithParams) ) 
  +        {
               throw new EvaluationException(expWithParams + " is not an EL expression");
           }
           
  @@ -62,7 +64,8 @@
       }
       
       @Override
  -    public Class getType(FacesContext facesContext) throws MethodNotFoundException {
  +    public Class getType(FacesContext facesContext) throws MethodNotFoundException 
  +    {
           return String.class; // since this is a JSF 1.1 style action, we assume it returns a String
       }
   
  @@ -72,24 +75,29 @@
       }
   
       @Override
  -    public String getExpressionString() {
  +    public String getExpressionString() 
  +    {
           return expWithParams;
       }
       
  -    public void restoreState(FacesContext facesContext, Object object) {
  +    public void restoreState(FacesContext facesContext, Object object) 
  +    {
           this.expWithParams = (String) object;
           this.helper = new ActionParamBindingHelper(application, expWithParams);
       }
   
  -    public Object saveState(FacesContext facesContext) {
  +    public Object saveState(FacesContext facesContext) 
  +    {
           return this.expWithParams;
       }
       
  -    public void setTransient(boolean isTransient) {
  +    public void setTransient(boolean isTransient) 
  +    {
           this.isTransient = isTransient;
       }
   
  -    public boolean isTransient() {
  +    public boolean isTransient() 
  +    {
           return this.isTransient;
       }
   }
  \ No newline at end of file
  
  
  
  1.3       +2 -2      jboss-seam/src/main/org/jboss/seam/actionparam/MethodExpressionParser.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MethodExpressionParser.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/actionparam/MethodExpressionParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- MethodExpressionParser.java	17 Nov 2006 22:21:04 -0000	1.2
  +++ MethodExpressionParser.java	18 Dec 2006 15:38:49 -0000	1.3
  @@ -63,7 +63,7 @@
               
               this.hasParamsInExpression = hasParams(noBrackets);
   
  -            if (isStringLiteral(expression)) 
  +            if ( isStringLiteral(expression) ) 
               {
                   this.params = new String[0];
                   this.baseExpression = expression.trim();
  @@ -72,7 +72,7 @@
                   return;
               }
               
  -            if (hasNoMethod(noBrackets))
  +            if ( hasNoMethod(noBrackets) )
               {
                   this.params = new String[0];
                   this.baseExpression = noBrackets;