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

[Gavin King]

  User: gavin   
  Date: 06/10/09 23:15:27

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  defaulting for page parameter names
  
  Revision  Changes    Path
  1.30      +12 -2     jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -b -r1.29 -r1.30
  --- Pages.java	9 Oct 2006 00:10:30 -0000	1.29
  +++ Pages.java	10 Oct 2006 03:15:27 -0000	1.30
  @@ -168,8 +168,18 @@
               List<Element> children = page.elements("param");
               for (Element param: children)
               {
  -               PageParameter pageParameter = new PageParameter( param.attributeValue("name") );
  -               pageParameter.valueBinding = Expressions.instance().createValueBinding( param.attributeValue("value") );
  +               String valueExpression = param.attributeValue("value");
  +               if (valueExpression==null)
  +               {
  +                  throw new IllegalArgumentException("must specify value for page <param/> declaration");
  +               }
  +               String name = param.attributeValue("name");
  +               if (name==null)
  +               {
  +                  name = valueExpression.substring(2, valueExpression.length()-1);
  +               }
  +               PageParameter pageParameter = new PageParameter( name );
  +               pageParameter.valueBinding = Expressions.instance().createValueBinding( valueExpression );
                  pageParameter.converterId = param.attributeValue("converterId");
                  String converterExpression = param.attributeValue("converter");
                  if (converterExpression!=null)