You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by or...@apache.org on 2004/11/26 13:46:38 UTC
cvs commit: incubator-myfaces/tlds myfaces_ext.tld
oros 2004/11/26 04:46:38
Modified: src/components/org/apache/myfaces/custom/tree/renderkit/html
HtmlTreeRenderer.java
src/components/org/apache/myfaces/custom/tree/taglib
TreeTag.java
src/components/org/apache/myfaces/custom/tree HtmlTree.java
HtmlTreeNode.java
tlds myfaces_ext.tld
Log:
cleanup: removed unused iconChild attribute
Revision Changes Path
1.12 +6 -6 incubator-myfaces/src/components/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java
Index: HtmlTreeRenderer.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HtmlTreeRenderer.java 26 Nov 2004 12:14:09 -0000 1.11
+++ HtmlTreeRenderer.java 26 Nov 2004 12:46:38 -0000 1.12
@@ -43,6 +43,9 @@
* @version $Revision$ $Date$
*
* $Log$
+ * Revision 1.12 2004/11/26 12:46:38 oros
+ * cleanup: removed unused iconChild attribute
+ *
* Revision 1.11 2004/11/26 12:14:09 oros
* MYFACES-8: applied tree table patch by David Le Strat
*
@@ -403,8 +406,7 @@
int state = layout[layout.length - 1];
String url = getLayoutImage(tree, state);
- if (state == HtmlTreeNode.CHILD || state == HtmlTreeNode.CHILD_FIRST || state == HtmlTreeNode.CHILD_SINGLE
- || state == HtmlTreeNode.CHILD_LAST)
+ if (state == HtmlTreeNode.CHILD || state == HtmlTreeNode.CHILD_FIRST || state == HtmlTreeNode.CHILD_LAST)
{
// no action, just img
writeImageElement(url, facesContext, writer, child);
@@ -538,8 +540,6 @@
return tree.getIconChildFirst();
case HtmlTreeNode.CHILD_LAST:
return tree.getIconChildLast();
- case HtmlTreeNode.CHILD_SINGLE:
- return tree.getIconChild();
case HtmlTreeNode.LINE:
return tree.getIconLine();
case HtmlTreeNode.EMPTY:
1.9 +4 -13 incubator-myfaces/src/components/org/apache/myfaces/custom/tree/taglib/TreeTag.java
Index: TreeTag.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/tree/taglib/TreeTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TreeTag.java 26 Nov 2004 12:14:10 -0000 1.8
+++ TreeTag.java 26 Nov 2004 12:46:38 -0000 1.9
@@ -35,6 +35,9 @@
* @version $Revision$ $Date: 2004/10/13 11:50:58
*
* $ $Log$
+ * $ Revision 1.9 2004/11/26 12:46:38 oros
+ * $ cleanup: removed unused iconChild attribute
+ * $
* $ Revision 1.8 2004/11/26 12:14:10 oros
* $ MYFACES-8: applied tree table patch by David Le Strat
* $
@@ -46,7 +49,6 @@
private String var;
private String iconLine;
private String iconNoline;
- private String iconChild;
private String iconChildFirst;
private String iconChildMiddle;
private String iconChildLast;
@@ -126,16 +128,6 @@
this.iconNoline = iconNoline;
}
- public String getIconChild()
- {
- return iconChild;
- }
-
- public void setIconChild(String iconChild)
- {
- this.iconChild = iconChild;
- }
-
/**
* @return Returns the rowClasses.
*/
@@ -436,7 +428,6 @@
setStringProperty(component, "var", var);
setStringProperty(component, "iconLine", iconLine);
setStringProperty(component, "iconNoline", iconNoline);
- setStringProperty(component, "iconChild", iconChild);
setStringProperty(component, "iconChildFirst", iconChildFirst);
setStringProperty(component, "iconChildMiddle", iconChildMiddle);
setStringProperty(component, "iconChildLast", iconChildLast);
1.27 +53 -65 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- HtmlTree.java 26 Nov 2004 12:33:54 -0000 1.26
+++ HtmlTree.java 26 Nov 2004 12:46:38 -0000 1.27
@@ -49,6 +49,9 @@
* @version $Revision$ $Date$
* <p/>
* $Log$
+ * Revision 1.27 2004/11/26 12:46:38 oros
+ * cleanup: removed unused iconChild attribute
+ *
* Revision 1.26 2004/11/26 12:33:54 oros
* MYFACES-9: store iconChildMiddle in component state
*
@@ -79,7 +82,6 @@
private String iconClass;
private String iconLine = "images/tree/line.gif";
private String iconNoline = "images/tree/noline.gif";
- private String iconChild = "images/tree/noline.gif";
private String iconChildFirst = "images/tree/line_first.gif";
private String iconChildMiddle = "images/tree/line_middle.gif";
private String iconChildLast = "images/tree/line_last.gif";
@@ -190,18 +192,6 @@
}
- public String getIconChild()
- {
- return iconChild;
- }
-
-
- public void setIconChild(String iconChild)
- {
- this.iconChild = iconChild;
- }
-
-
public String getIconChildFirst()
{
return iconChildFirst;
@@ -572,33 +562,32 @@
public Object saveState(FacesContext context)
{
- Object values[] = new Object[26];
+ Object values[] = new Object[25];
values[0] = super.saveState(context);
- values[1] = iconChild;
- values[2] = iconChildFirst;
- 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;
+ values[1] = iconChildFirst;
+ values[2] = iconChildMiddle;
+ 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;
return ((Object) (values));
}
@@ -607,31 +596,30 @@
{
Object values[] = (Object[]) state;
super.restoreState(context, values[0]);
- iconChild = (String) values[1];
- iconChildFirst = (String) values[2];
- 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];
+ iconChildFirst = (String) values[1];
+ iconChildMiddle = (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];
addToModelListeners();
}
1.12 +4 -2 incubator-myfaces/src/components/org/apache/myfaces/custom/tree/HtmlTreeNode.java
Index: HtmlTreeNode.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/tree/HtmlTreeNode.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HtmlTreeNode.java 26 Nov 2004 12:14:10 -0000 1.11
+++ HtmlTreeNode.java 26 Nov 2004 12:46:38 -0000 1.12
@@ -32,6 +32,9 @@
* @version $Revision$ $Date$
*
* $Log$
+ * Revision 1.12 2004/11/26 12:46:38 oros
+ * cleanup: removed unused iconChild attribute
+ *
* Revision 1.11 2004/11/26 12:14:10 oros
* MYFACES-8: applied tree table patch by David Le Strat
*
@@ -56,7 +59,6 @@
public static final int CHILD = 20;
public static final int CHILD_FIRST = 21;
public static final int CHILD_LAST = 22;
- public static final int CHILD_SINGLE = 23;
public static final int LINE = 30;
public static final int EMPTY = 40;
private static final int OFFSET = 10;
1.130 +0 -5 incubator-myfaces/tlds/myfaces_ext.tld
Index: myfaces_ext.tld
===================================================================
RCS file: /home/cvs/incubator-myfaces/tlds/myfaces_ext.tld,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- myfaces_ext.tld 26 Nov 2004 12:14:10 -0000 1.129
+++ myfaces_ext.tld 26 Nov 2004 12:46:38 -0000 1.130
@@ -1290,11 +1290,6 @@
<rtexprvalue>false</rtexprvalue>
</attribute>
<attribute>
- <name>iconChild</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
<name>iconChildFirst</name>
<required>false</required>
<rtexprvalue>false</rtexprvalue>