cvs commit: incubator-myfaces/src/components/org/apache/myfaces/custom/tree HtmlTree.java

[or...@apache.org]

oros        2004/11/26 04:33:54

  Modified:    src/components/org/apache/myfaces/custom/tree HtmlTree.java
  Log:
  MYFACES-9: store iconChildMiddle in component state
  
  Revision  Changes    Path
  1.26      +52 -47    incubator-myfaces/src/components/org/apache/myfaces/custom/tree/HtmlTree.java
  
  Index: HtmlTree.java
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/tree/HtmlTree.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- HtmlTree.java	26 Nov 2004 12:14:10 -0000	1.25
  +++ HtmlTree.java	26 Nov 2004 12:33:54 -0000	1.26
  @@ -49,6 +49,9 @@
    * @version $Revision$ $Date$
    *          <p/>
    *          $Log$
  + *          Revision 1.26  2004/11/26 12:33:54  oros
  + *          MYFACES-9: store iconChildMiddle in component state
  + *
    *          Revision 1.25  2004/11/26 12:14:10  oros
    *          MYFACES-8: applied tree table patch by David Le Strat
    *
  @@ -569,32 +572,33 @@
   
       public Object saveState(FacesContext context)
       {
  -        Object values[] = new Object[25];
  +        Object values[] = new Object[26];
           values[0] = super.saveState(context);
           values[1] = iconChild;
           values[2] = iconChildFirst;
  -        values[3] = iconChildLast;
  -        values[4] = iconLine;
  -        values[5] = iconNodeClose;
  -        values[6] = iconNodeCloseFirst;
  -        values[7] = iconNodeCloseLast;
  -        values[8] = iconNodeCloseMiddle;
  -        values[9] = iconNodeOpen;
  -        values[10] = iconNodeOpenFirst;
  -        values[11] = iconNodeOpenLast;
  -        values[12] = iconNodeOpenMiddle;
  -        values[13] = iconNoline;
  -        values[14] = styleClass;
  -        values[15] = nodeClass;
  -        values[16] = selectedNodeClass;
  -        values[17] = new Integer(uniqueIdCounter);
  -        values[18] = selectedPath;
  -        values[19] = iconClass;
  -        values[20] = new Integer(internalId);
  -        values[21] = new Long(expireListeners);
  -        values[22] = rowClasses;
  -        values[23] = columnClasses;
  -        values[24] = var;
  +        values[3] = iconChildMiddle;
  +        values[4] = iconChildLast;
  +        values[5] = iconLine;
  +        values[6] = iconNodeClose;
  +        values[7] = iconNodeCloseFirst;
  +        values[8] = iconNodeCloseLast;
  +        values[9] = iconNodeCloseMiddle;
  +        values[10] = iconNodeOpen;
  +        values[11] = iconNodeOpenFirst;
  +        values[12] = iconNodeOpenLast;
  +        values[13] = iconNodeOpenMiddle;
  +        values[14] = iconNoline;
  +        values[15] = styleClass;
  +        values[16] = nodeClass;
  +        values[17] = selectedNodeClass;
  +        values[18] = new Integer(uniqueIdCounter);
  +        values[19] = selectedPath;
  +        values[20] = iconClass;
  +        values[21] = new Integer(internalId);
  +        values[22] = new Long(expireListeners);
  +        values[23] = rowClasses;
  +        values[24] = columnClasses;
  +        values[25] = var;
           return ((Object) (values));
       }
   
  @@ -605,28 +609,29 @@
           super.restoreState(context, values[0]);
           iconChild = (String) values[1];
           iconChildFirst = (String) values[2];
  -        iconChildLast = (String) values[3];
  -        iconLine = (String) values[4];
  -        iconNodeClose = (String) values[5];
  -        iconNodeCloseFirst = (String) values[6];
  -        iconNodeCloseLast = (String) values[7];
  -        iconNodeCloseMiddle = (String) values[8];
  -        iconNodeOpen = (String) values[9];
  -        iconNodeOpenFirst = (String) values[10];
  -        iconNodeOpenLast = (String) values[11];
  -        iconNodeOpenMiddle = (String) values[12];
  -        iconNoline = (String) values[13];
  -        styleClass = (String) values[14];
  -        nodeClass = (String) values[15];
  -        selectedNodeClass = (String) values[16];
  -        uniqueIdCounter = ((Integer) values[17]).intValue();
  -        selectedPath = (int[]) values[18];
  -        iconClass = (String) values[19];
  -        internalId = ((Integer) values[20]).intValue();
  -        expireListeners = ((Long) values[21]).longValue();
  -        rowClasses = (String) values[22];
  -        columnClasses = (String) values[23];
  -        var = (String) values[24];
  +        iconChildMiddle = (String) values[3];
  +        iconChildLast = (String) values[4];
  +        iconLine = (String) values[5];
  +        iconNodeClose = (String) values[6];
  +        iconNodeCloseFirst = (String) values[7];
  +        iconNodeCloseLast = (String) values[8];
  +        iconNodeCloseMiddle = (String) values[9];
  +        iconNodeOpen = (String) values[10];
  +        iconNodeOpenFirst = (String) values[11];
  +        iconNodeOpenLast = (String) values[12];
  +        iconNodeOpenMiddle = (String) values[13];
  +        iconNoline = (String) values[14];
  +        styleClass = (String) values[15];
  +        nodeClass = (String) values[16];
  +        selectedNodeClass = (String) values[17];
  +        uniqueIdCounter = ((Integer) values[18]).intValue();
  +        selectedPath = (int[]) values[19];
  +        iconClass = (String) values[20];
  +        internalId = ((Integer) values[21]).intValue();
  +        expireListeners = ((Long) values[22]).longValue();
  +        rowClasses = (String) values[23];
  +        columnClasses = (String) values[24];
  +        var = (String) values[25];
           addToModelListeners();
       }