[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui/facelet ...

[Gavin King]

  User: gavin   
  Date: 06/10/25 11:37:37

  Modified:    src/ui/org/jboss/seam/ui/facelet   
                        MethodExpressionHelper.java
                        ParamValueExpression.java
                        SeamFaceletViewHandler.java
  Log:
  many minor
  
  Revision  Changes    Path
  1.3       +4 -3      jboss-seam/src/ui/org/jboss/seam/ui/facelet/MethodExpressionHelper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MethodExpressionHelper.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/facelet/MethodExpressionHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- MethodExpressionHelper.java	28 Sep 2006 01:21:22 -0000	1.2
  +++ MethodExpressionHelper.java	25 Oct 2006 15:37:37 -0000	1.3
  @@ -60,7 +60,7 @@
           this.expWithParams = parser.getUnparsedExpression();
           this.parser = parser;
           
  -        if (parser.isStringLiteral(expWithParams)) 
  +        if ( MethodExpressionParser.isStringLiteral(expWithParams) ) 
           {
               setMethodExpression(elContext, new Class[0]);
               this.isStringLiteral = true;
  @@ -69,7 +69,7 @@
           }
           
           // if there are no params, we can go ahead and create the expression
  -        if (parser.getParams().length == 0) 
  +        if ( parser.getParams().length == 0 ) 
           {
               setMethodExpression(elContext, new Class[0]);
               this.expressionInitializedInCtor = true;
  @@ -118,7 +118,7 @@
           {
               String param = params[i].trim();
               
  -            if (parser.isQuotedString(param)) 
  +            if ( MethodExpressionParser.isQuotedString(param) ) 
               {
                   // strip quotes
                   results[i] = param.substring(1, param.length() - 1);
  @@ -238,6 +238,7 @@
               super(methodName, Object.class, new Class[0]);
           }
           
  +        @Override
           public Class<?>[] getParamTypes() 
           {
               throw new IllegalStateException("paramTypes unknown until MethodExpression is invoked.");
  
  
  
  1.3       +7 -0      jboss-seam/src/ui/org/jboss/seam/ui/facelet/ParamValueExpression.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ParamValueExpression.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/facelet/ParamValueExpression.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ParamValueExpression.java	28 Sep 2006 01:21:22 -0000	1.2
  +++ ParamValueExpression.java	25 Oct 2006 15:37:37 -0000	1.3
  @@ -51,36 +51,43 @@
                                             .createValueExpression(elContext, parser.getCombinedExpression(), expectedType);
       }
   
  +    @Override
       public void setValue(ELContext elContext, Object object) 
       {
           this.wrappedExpression.setValue(elContext, object);
       }
   
  +    @Override
       public boolean isReadOnly(ELContext elContext) 
       {
           return this.wrappedExpression.isReadOnly(elContext);
       }
   
  +    @Override
       public Object getValue(ELContext elContext) 
       {
           return this.wrappedExpression.getValue(elContext);
       }
   
  +    @Override
       public Class getType(ELContext elContext) 
       {
           return this.wrappedExpression.getType(elContext);
       }
   
  +    @Override
       public boolean isLiteralText() 
       {
           return this.wrappedExpression.isLiteralText();
       }
   
  +    @Override
       public String getExpressionString() 
       {
           return this.parser.getUnparsedExpression();
       }
   
  +    @Override
       public Class getExpectedType() 
       {
           return this.wrappedExpression.getExpectedType();
  
  
  
  1.3       +1 -0      jboss-seam/src/ui/org/jboss/seam/ui/facelet/SeamFaceletViewHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamFaceletViewHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/facelet/SeamFaceletViewHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- SeamFaceletViewHandler.java	28 Sep 2006 01:21:22 -0000	1.2
  +++ SeamFaceletViewHandler.java	25 Oct 2006 15:37:37 -0000	1.3
  @@ -42,6 +42,7 @@
           super(parent);
       }
       
  +    @Override
       protected Compiler createCompiler() 
       {
           Compiler compiler = super.createCompiler();