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

[Gavin King]

  User: gavin   
  Date: 06/09/28 13:02:58

  Modified:    src/main/org/jboss/seam/jsf  AbstractSeamPhaseListener.java
  Log:
  parse var name from s:link dataModelSelection
  
  Revision  Changes    Path
  1.11      +10 -6     jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractSeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- AbstractSeamPhaseListener.java	3 Jul 2006 16:03:04 -0000	1.10
  +++ AbstractSeamPhaseListener.java	28 Sep 2006 17:02:58 -0000	1.11
  @@ -86,15 +86,19 @@
         String dataModelSelection = (String) parameters.get("dataModelSelection");
         if (dataModelSelection!=null)
         {
  -         int loc = dataModelSelection.indexOf('[');
  -         if (loc>0)
  -         {
  -            String name = dataModelSelection.substring(0, loc);
  -            int index = Integer.parseInt( dataModelSelection.substring( loc+1, dataModelSelection.length()-1 ) );
  +         int colonLoc = dataModelSelection.indexOf(':');
  +         int bracketLoc = dataModelSelection.indexOf('[');
  +         if (colonLoc>0 && bracketLoc>colonLoc)
  +         {
  +            String var = dataModelSelection.substring(0, colonLoc);
  +            String name = dataModelSelection.substring(colonLoc+1, bracketLoc);
  +            int index = Integer.parseInt( dataModelSelection.substring( bracketLoc+1, dataModelSelection.length()-1 ) );
               Object value = Contexts.lookupInStatefulContexts(name);
               if (value!=null)
               {
  -               ( (DataModel) value ).setRowIndex(index);
  +               DataModel dataModel = (DataModel) value;
  +               dataModel.setRowIndex(index);
  +               Contexts.getEventContext().set( var, dataModel.getRowData() );
               }
            }
         }