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

[Gavin King]

  User: gavin   
  Date: 06/09/28 13:03:52

  Modified:    src/ui/org/jboss/seam/ui   HtmlLink.java UISelection.java
  Log:
  append var name to dataModelSelection
  
  Revision  Changes    Path
  1.13      +1 -0      jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HtmlLink.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- HtmlLink.java	27 Sep 2006 03:53:50 -0000	1.12
  +++ HtmlLink.java	28 Sep 2006 17:03:52 -0000	1.13
  @@ -42,6 +42,7 @@
               String dataModelName = dataModelExpression.substring(2, dataModelExpression.length()-1).replace('$','.');
               UISelection uiSelection = new UISelection();
               uiSelection.setDataModel(dataModelName);
  +            uiSelection.setVar( parentUIData.getVar() );
               return uiSelection;
            }
            else
  
  
  
  1.3       +12 -1     jboss-seam/src/ui/org/jboss/seam/ui/UISelection.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UISelection.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UISelection.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UISelection.java	3 Jul 2006 16:03:04 -0000	1.2
  +++ UISelection.java	28 Sep 2006 17:03:52 -0000	1.3
  @@ -12,6 +12,7 @@
      public static final String COMPONENT_TYPE = "org.jboss.seam.ui.UISelection";
      
      private String dataModel;
  +   private String var;
      
      @Override
      public String getName()
  @@ -25,7 +26,7 @@
         Object value = Contexts.lookupInStatefulContexts(dataModel);
         int rowIndex = ( (DataModel) value ).getRowIndex();
         return value==null || rowIndex<0 ? 
  -            null : dataModel + '[' + rowIndex + ']';
  +            null : var + ':' + dataModel + '[' + rowIndex + ']';
      }
   
      @Override
  @@ -52,4 +53,14 @@
      {
         this.dataModel = dataModel;
      }
  +
  +   public String getVar()
  +   {
  +      return var;
  +   }
  +
  +   public void setVar(String var)
  +   {
  +      this.var = var;
  +   }
   }