Author: dolander
Date: Fri Feb 18 10:36:42 2005
New Revision: 154333

URL: http://svn.apache.org/viewcvs?view=rev&rev=154333
Log:
Jira bugs 306 and 320 required renaming many attributes on the
Tree JSP tags and also renaming those same properties on some
of the supporting classes.  This change does that.  Below are
all of the renames.


Tree
The following JSP attribute names where changed on the tree tag:
imageHandleDownLast -> lastNodeExpandedImage
imageHandleDownMiddle -> nodeExpandedImage
imageHandleRightLast -> lastNodeCollapsedImage
imageHandleRightMiddle -> nodeCollapsedImage
imageLineLast -> lastLineJoinImage
imageLineMiddle -> lineJoinImage
imageLineVertical -> verticalLineImage
defaultIcon -> itemIcon
renderJavaScript -> renderTagIdLookup
selectionStyle ->selectedStyle
selectionClass -> selectedStyleClass
unselectStyle -> unselectedStyle
unselectClass -> unselectedStyleClass
treeClass -> treeStyleClass
disableClass ->disabledStyleClass

TreePropertyOverride tag
The following JSP attribute changes where made:
imageHandleDownLast -> lastNodeExpandedImage
imageHandleDownMiddle -> nodeExpandedImage
imageHandleRightLast -> lastNodeCollapsedImage
imageHandleRightMiddle -> nodeCollapsedImage
imageLineLast -> lastLineJoinImage
imageLineMiddle -> lineJoinImage
imageLineVertical -> verticalLineImage
defaultIcon -> itemIcon

TreeRenderState
The following fields where changed in this class:
selectionStyle -> selectedStyle
selectionClass -> selectedStyleClass
unselectStyle -> unselectedStyle
unselectClass -> unselectedStyleClass
disabledStyle -> disabledStyle  (unchanged)
disabledClass -> disabledStyleClass

InheritableStatte
The following property changes (set/get) were made to this class:
imageHandleDownLast -> lastNodeExpandedImage
imageHandleDownMiddle -> nodeExpandedImage
imageHandleRightLast -> lastNodeCollapsedImage
imageHandleRightMiddle -> nodeCollapsedImage
imageLineLast -> lastLineJoinImage
imageLineMiddle -> lineJoinImage
imageLineVertical -> verticalLineImage



Modified:
    
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java
    
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
    
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
    
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java
    
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Test.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/tree/nullbinding/index.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/idmap/tree/index.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/idmap/treeNoHtml/index.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/disabled.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/dynamicClient.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/override.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/overrideTwo.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/selectStyles.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeFrame.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeFrame2.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC2.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC3.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC4.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSCError.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeStyle.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/expand/Test.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images/Test.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Test.jsp
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/inherit/index.jsp
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/params/index.jsp

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java
 Fri Feb 18 10:36:42 2005
@@ -25,13 +25,13 @@
     private static final String DEFAULT_ICON = "folder_16_pad.gif";
 
     // The private state of the state
-    private String _imageHandleDownLast = null;
-    private String _imageHandleDownMiddle = null;
-    private String _imageHandleRightLast = null;
-    private String _imageHandleRightMiddle = null;
-    private String _imageLineLast = null;
-    private String _imageLineMiddle = null;
-    private String _imageLineVertical = null;
+    private String _lastNodeExpandedImage = null;
+    private String _nodeExpandedImage = null;
+    private String _lastNodeCollapsedImage = null;
+    private String _nodeCollapsedImage = null;
+    private String _lastLineJoinImage = null;
+    private String _lineJoinImage = null;
+    private String _verticalLineImage = null;
     private String _imageSpacer = null;
     private String _defaultIcon = null;
     private String _selectionAction = null;
@@ -53,102 +53,102 @@
         return _parent;
     }
 
-    public String getImageHandleDownLast()
+    public String getLastNodeExpandedImage()
     {
-        if (_imageHandleDownLast != null)
-            return _imageHandleDownLast;
+        if (_lastNodeExpandedImage != null)
+            return _lastNodeExpandedImage;
         if (_parent != null)
-            return _parent.getImageHandleDownLast();
+            return _parent.getLastNodeExpandedImage();
         return null;
     }
 
-    public void setImageHandleDownLast(String imageHandleDownLast)
+    public void setLastNodeExpandedImage(String lastNodeExpandedImage)
     {
-        _imageHandleDownLast = imageHandleDownLast;
+        _lastNodeExpandedImage = lastNodeExpandedImage;
     }
 
-    public String getImageHandleDownMiddle()
+    public String getNodeExpandedImage()
     {
-        if (_imageHandleDownMiddle != null)
-            return _imageHandleDownMiddle;
+        if (_nodeExpandedImage != null)
+            return _nodeExpandedImage;
         if (_parent != null)
-            return _parent.getImageHandleDownMiddle();
+            return _parent.getNodeExpandedImage();
         return null;
     }
 
-    public void setImageHandleDownMiddle(String imageHandleDownMiddle)
+    public void setNodeExpandedImage(String nodeExpandedImage)
     {
-        _imageHandleDownMiddle = imageHandleDownMiddle;
+        _nodeExpandedImage = nodeExpandedImage;
     }
 
-    public String getImageHandleRightLast()
+    public String getLastNodeCollapsedImage()
     {
-        if (_imageHandleRightLast != null)
-            return _imageHandleRightLast;
+        if (_lastNodeCollapsedImage != null)
+            return _lastNodeCollapsedImage;
         if (_parent != null)
-            return _parent.getImageHandleRightLast();
+            return _parent.getLastNodeCollapsedImage();
         return null;
     }
 
-    public void setImageHandleRightLast(String imageHandleRightLast)
+    public void setLastNodeCollapsedImage(String lastNodeCollapsedImage)
     {
-        _imageHandleRightLast = imageHandleRightLast;
+        _lastNodeCollapsedImage = lastNodeCollapsedImage;
     }
 
-    public String getImageHandleRightMiddle()
+    public String getNodeCollapsedImage()
     {
-        if (_imageHandleRightMiddle != null)
-            return _imageHandleRightMiddle;
+        if (_nodeCollapsedImage != null)
+            return _nodeCollapsedImage;
         if (_parent != null)
-            return _parent.getImageHandleRightMiddle();
+            return _parent.getNodeCollapsedImage();
         return null;
     }
 
-    public void setImageHandleRightMiddle(String imageHandleRightMiddle)
+    public void setNodeCollapsedImage(String nodeCollapsedImage)
     {
-        _imageHandleRightMiddle = imageHandleRightMiddle;
+        _nodeCollapsedImage = nodeCollapsedImage;
     }
 
-    public String getImageLineLast()
+    public String getLastLineJoinImage()
     {
-        if (_imageLineLast != null)
-            return _imageLineLast;
+        if (_lastLineJoinImage != null)
+            return _lastLineJoinImage;
         if (_parent != null)
-            return _parent.getImageLineLast();
+            return _parent.getLastLineJoinImage();
         return null;
     }
 
-    public void setImageLineLast(String imageLineLast)
+    public void setLastLineJoinImage(String imageLineLast)
     {
-        _imageLineLast = imageLineLast;
+        _lastLineJoinImage = imageLineLast;
     }
 
-    public String getImageLineMiddle()
+    public String getLineJoinImage()
     {
-        if (_imageLineMiddle != null)
-            return _imageLineMiddle;
+        if (_lineJoinImage != null)
+            return _lineJoinImage;
         if (_parent != null)
-            return _parent.getImageLineMiddle();
+            return _parent.getLineJoinImage();
         return null;
     }
 
-    public void setImageLineMiddle(String imageLineMiddle)
+    public void setLineJoinImage(String imageLineMiddle)
     {
-        _imageLineMiddle = imageLineMiddle;
+        _lineJoinImage = imageLineMiddle;
     }
 
-    public String getImageLineVertical()
+    public String getVerticalLineImage()
     {
-        if (_imageLineVertical != null)
-            return _imageLineVertical;
+        if (_verticalLineImage != null)
+            return _verticalLineImage;
         if (_parent != null)
-            return _parent.getImageLineVertical();
+            return _parent.getVerticalLineImage();
         return null;
     }
 
-    public void setImageLineVertical(String imageLineVertical)
+    public void setVerticalLineImage(String imageLineVertical)
     {
-        _imageLineVertical = imageLineVertical;
+        _verticalLineImage = imageLineVertical;
     }
 
     public String getImageSpacer()
@@ -165,18 +165,18 @@
         _imageSpacer = imageSpacer;
     }
 
-    public String getDefaultIcon()
+    public String getItemIcon()
     {
         if (_defaultIcon != null)
             return _defaultIcon;
         if (_parent != null)
-            return _parent.getDefaultIcon();
+            return _parent.getItemIcon();
         return null;
     }
 
-    public void setDefaultIcon(String defaultIcon)
+    public void setItemIcon(String itemIcon)
     {
-        _defaultIcon = defaultIcon;
+        _defaultIcon = itemIcon;
     }
 
     public String getSelectionAction()
@@ -241,13 +241,13 @@
      */
     public void initalizeTreeState()
     {
-        _imageHandleDownLast = IMAGE_HANDLE_DOWN_LAST;
-        _imageHandleDownMiddle = IMAGE_HANDLE_DOWN_MIDDLE;
-        _imageHandleRightLast = IMAGE_HANDLE_RIGHT_LAST;
-        _imageHandleRightMiddle = IMAGE_HANDLE_RIGHT_MIDDLE;
-        _imageLineLast = IMAGE_LINE_LAST;
-        _imageLineMiddle = IMAGE_LINE_MIDDLE;
-        _imageLineVertical = IMAGE_LINE_VERTICAL;
+        _lastNodeExpandedImage = IMAGE_HANDLE_DOWN_LAST;
+        _nodeExpandedImage = IMAGE_HANDLE_DOWN_MIDDLE;
+        _lastNodeCollapsedImage = IMAGE_HANDLE_RIGHT_LAST;
+        _nodeCollapsedImage = IMAGE_HANDLE_RIGHT_MIDDLE;
+        _lastLineJoinImage = IMAGE_LINE_LAST;
+        _lineJoinImage = IMAGE_LINE_MIDDLE;
+        _verticalLineImage = IMAGE_LINE_VERTICAL;
         _imageSpacer = IMAGE_SPACER;
         _defaultIcon = DEFAULT_ICON;
         _imageRoot = null;

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java
 Fri Feb 18 10:36:42 2005
@@ -107,14 +107,16 @@
 
     // The new style and class attributes
     private String _treeStyle;           // tree style
-    private String _treeClass;           // tree class
+    private String _treeStyleClass;           // tree class
 
     private StringBuilder _errorText;           // Text of any error that may 
have occurred.
 
     private String _dataSource = null;       // The name of the tree.
-    private boolean _outputJavaScript = false; // cause the base javascript 
support to be output
+    private boolean _renderTagIdLookup = false; // cause the base javascript 
support to be output
 
     private InheritableState _iState = new InheritableState();
+    private String _rootNodeCollapsedImage;
+    private String _rootNodeExpandedImage;
 
     // These are used in a stateless manner.  They do not have to be cleared
     // in the local release because each state is cleared before it is set to 
write a start tag.
@@ -201,7 +203,7 @@
     /**
      * Sets the image name for an open non-leaf node with no
      * line below it.  (Defaults to "handledownlast.gif").
-     * @param imageHandleDownLast - the image name (including extension)
+     * @param lastNodeExpandedImage - the image name (including extension)
      * @jsptagref.attributedescription The image name for an open non-leaf 
node with no line below it. (Defaults to "handledownlast.gif".)
      * @jsptagref.databindable false
      * @jsptagref.attributesyntaxvalue <i>string_imageHandleDownLast</i>
@@ -210,17 +212,17 @@
      * line below it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageHandleDownLast(String imageHandleDownLast)
+    public void setLastNodeExpandedImage(String lastNodeExpandedImage)
     {
-        String val = setNonEmptyValueAttribute(imageHandleDownLast);
+        String val = setNonEmptyValueAttribute(lastNodeExpandedImage);
         if (val != null)
-            _iState.setImageHandleDownLast(setNonEmptyValueAttribute(val));
+            _iState.setLastNodeExpandedImage(setNonEmptyValueAttribute(val));
     }
 
     /**
      * Sets the image name for an open non-leaf node with a
      * line below it.  (Defaults to "handledownmiddle.gif").
-     * @param imageHandleDownMiddle - the image name (including extension)
+     * @param nodeExpandedImage - the image name (including extension)
      * @jsptagref.attributedescription The image name for an open non-leaf 
node with a
      * line below it. (Defaults to "handledownmiddle.gif".)
      * @jsptagref.databindable false
@@ -230,17 +232,17 @@
      * line below it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageHandleDownMiddle(String imageHandleDownMiddle)
+    public void setNodeExpandedImage(String nodeExpandedImage)
     {
-        String val = setNonEmptyValueAttribute(imageHandleDownMiddle);
+        String val = setNonEmptyValueAttribute(nodeExpandedImage);
         if (val != null)
-            _iState.setImageHandleDownMiddle(setNonEmptyValueAttribute(val));
+            _iState.setNodeExpandedImage(setNonEmptyValueAttribute(val));
     }
 
     /**
      * Sets the image name for a closed non-leaf node with no
      * line below it.  (Defaults to "handlerightlast.gif").
-     * @param imageHandleRightLast - the image name (including extension)
+     * @param lastNodeCollapsedImage - the image name (including extension)
      * @jsptagref.attributedescription The image name for a closed non-leaf 
node with no
      * line below it. (Defaults to "handlerightlast.gif".)
      * @jsptagref.databindable false
@@ -250,17 +252,17 @@
      * line below it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageHandleRightLast(String imageHandleRightLast)
+    public void setLastNodeCollapsedImage(String lastNodeCollapsedImage)
     {
-        String val = setNonEmptyValueAttribute(imageHandleRightLast);
+        String val = setNonEmptyValueAttribute(lastNodeCollapsedImage);
         if (val != null)
-            _iState.setImageHandleRightLast(setNonEmptyValueAttribute(val));
+            _iState.setLastNodeCollapsedImage(setNonEmptyValueAttribute(val));
     }
 
     /**
      * Sets the image name for a closed non-leaf node with a
      * line below it.  (Defaults to "handlerightmiddle.gif").
-     * @param imageHandleRightMiddle - the image name (including extension)
+     * @param nodeCollapsedImage - the image name (including extension)
      * @jsptagref.attributedescription The image name for a closed non-leaf 
node with a
      * line below it. (Defaults to "handlerightmiddle.gif".)
      * @jsptagref.databindable false
@@ -270,17 +272,17 @@
      * line below it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageHandleRightMiddle(String imageHandleRightMiddle)
+    public void setNodeCollapsedImage(String nodeCollapsedImage)
     {
-        String val = setNonEmptyValueAttribute(imageHandleRightMiddle);
+        String val = setNonEmptyValueAttribute(nodeCollapsedImage);
         if (val != null)
-            _iState.setImageHandleRightMiddle(setNonEmptyValueAttribute(val));
+            _iState.setNodeCollapsedImage(setNonEmptyValueAttribute(val));
     }
 
     /**
      * Sets the image name for a blank area of the tree.
      * (Defaults to "linelastnode.gif").
-     * @param imageLineLast - the image name (including extension)
+     * @param lastLineJoinImage - the image name (including extension)
      * @jsptagref.attributedescription The image name for a blank area of the 
tree.
      * (Defaults to "linelastnode.gif")
      * @jsptagref.databindable false
@@ -289,32 +291,32 @@
      * description="Sets the image name for a blank area of the tree."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageLineLast(String imageLineLast)
+    public void setLastLineJoinImage(String lastLineJoinImage)
     {
-        String val = setNonEmptyValueAttribute(imageLineLast);
+        String val = setNonEmptyValueAttribute(lastLineJoinImage);
         if (val != null)
-            _iState.setImageLineLast(setNonEmptyValueAttribute(val));
+            _iState.setLastLineJoinImage(setNonEmptyValueAttribute(val));
     }
 
     /**
      * Sets the default icon for TreeElements for a blank area of the tree.
      * (Defaults to "linelastnode.gif").
-     * @param defaultIcon - the image name of the defaultIcon
+     * @param itemIcon - the image name of the itemIcon
      * @netui:attribute required="false"  rtexprvalue="true"
      * description="Sets the default icon for TreeElements for a blank area of 
the tree."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setDefaultIcon(String defaultIcon)
+    public void setItemIcon(String itemIcon)
     {
-        String val = setNonEmptyValueAttribute(defaultIcon);
+        String val = setNonEmptyValueAttribute(itemIcon);
         if (val != null)
-            _iState.setDefaultIcon(setNonEmptyValueAttribute(val));
+            _iState.setItemIcon(setNonEmptyValueAttribute(val));
     }
 
     /**
      * Sets the image name for an area with a line through it.
      * (Defaults to "linemiddlenode.gif").
-     * @param imageLineMiddle - the image name (including extension)
+     * @param lineJoinImage - the image name (including extension)
      * @jsptagref.attributedescription The image name for an area with a line 
through it.
      * (Defaults to "linemiddlenode.gif").
      * @jsptagref.databindable false
@@ -323,17 +325,17 @@
      * description="Sets the image name for an area with a line through it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageLineMiddle(String imageLineMiddle)
+    public void setLineJoinImage(String lineJoinImage)
     {
-        String val = setNonEmptyValueAttribute(imageLineMiddle);
+        String val = setNonEmptyValueAttribute(lineJoinImage);
         if (val != null)
-            _iState.setImageLineMiddle(setNonEmptyValueAttribute(val));
+            _iState.setLineJoinImage(setNonEmptyValueAttribute(val));
     }
 
     /**
      * Sets the image name for an area with a line through it.
      * (Defaults to "linevertical.gif").
-     * @param imageLineVertical - the image name (including extension)
+     * @param verticalLineImage - the image name (including extension)
      * @jsptagref.attributedescription The image name for an area with a line 
through it.
      * (Defaults to "linevertical.gif").
      * @jsptagref.databindable false
@@ -342,11 +344,11 @@
      * description="Sets the image name for an area with a line through it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageLineVertical(String imageLineVertical)
+    public void setVerticalLineImage(String verticalLineImage)
     {
-        String val = setNonEmptyValueAttribute(imageLineVertical);
+        String val = setNonEmptyValueAttribute(verticalLineImage);
         if (val != null)
-            _iState.setImageLineVertical(setNonEmptyValueAttribute(val));
+            _iState.setVerticalLineImage(setNonEmptyValueAttribute(val));
     }
 
     /**
@@ -368,6 +370,37 @@
     }
 
     /**
+     * Sets the image that will be used for the root when it is Collapsed.  
The root must implement
+     * ITreeRootElement to support this.
+     * @param rootNodeCollapsedImage - the image representing a root that is 
collapsed.
+     * @jsptagref.attributedescription The image representing the root when it 
is collapsed.
+     * @jsptagref.databindable true
+     * @jsptagref.attributesyntaxvalue <i>string_rootNodeCollapsedImage</i>
+     * @netui:attribute required="false" rtexprvalue="true"
+     * description="Sets the image representing the root when it is collapsed."
+     * @netui.tldx:attribute category="images"
+     */
+    public void setRootNodeCollapsedImage(String rootNodeCollapsedImage)
+    {
+        _rootNodeCollapsedImage = 
setNonEmptyValueAttribute(rootNodeCollapsedImage);
+    }
+
+    /**
+     * Sets the image that will be used for the root when it is Expanded.  The 
root must implement
+     * ITreeRootElement to support this.
+     * @param rootNodeExpandedImage - the image representing a root that is 
expanded.
+     * @jsptagref.attributedescription The image representing the root when it 
is expanded.
+     * @jsptagref.databindable true
+     * @jsptagref.attributesyntaxvalue <i>string_rootNodeExpandedImage</i>
+     * @netui:attribute required="false" rtexprvalue="true"
+     * description="Sets the image representing the root when it is expanded."
+     * @netui.tldx:attribute category="images"
+     */
+    public void setRootNodeExpandedImage(String rootNodeExpandedImage)
+    {
+        _rootNodeExpandedImage = 
setNonEmptyValueAttribute(rootNodeExpandedImage);
+    }
+    /**
      * @param runAtClient
      * @netui:attribute required="false" rtexprvalue="false"
      * description="Indicate that base expand and contraction will happen on 
the client."
@@ -393,13 +426,13 @@
      * This will cause the standard tagId to Id JavaScript to be output.  For 
most
      * of the HTML tags this is automatically output.  For the tree, because 
the tagId
      * is a required attribute, we make javascript support optional.
-     * @param outputJavaScript
+     * @param renderTagIdLookup
      * @netui:attribute required="false"
      * description="Output the standard tagId to Id JavaScript."
      */
-    public void setRenderJavaScript(boolean outputJavaScript)
+    public void setRenderTagIdLookup(boolean renderTagIdLookup)
     {
-        _outputJavaScript = outputJavaScript;
+        _renderTagIdLookup = renderTagIdLookup;
     }
 
     /**
@@ -422,30 +455,30 @@
     /**
      * Set the style of a tree element when is is selected.  This results in a 
<code>style</code>
      * attribute being generated for this tree node.
-     * @param selectionStyle
+     * @param selectedStyle
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style of a tree element when is is selected.  This 
results in a <code>style</code>
      * attribute being generated for this tree node."
      * @netui.tldx:attribute category="format" 
propertyclass="workshop.jspdesigner.properties.JspStyleProperty"
      */
-    public void setSelectionStyle(String selectionStyle)
+    public void setSelectedStyle(String selectedStyle)
     {
-        _trs.selectionStyle = setNonEmptyValueAttribute(selectionStyle);
+        _trs.selectedStyle = setNonEmptyValueAttribute(selectedStyle);
     }
 
     /**
      * Set the style class of a tree element when is is disabled.  A disabled 
element will have
      * a style can my be expanded/contracted, but my not be selected.
-     * @param disableClass
+     * @param disableStyleClass
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style class of a tree element when is is disabled. 
 A disabled element will have
      * a style can my be expanded/contracted, but my not be selected."
      * @netui.tldx:attribute category="format"
      */
 
-    public void setDisableClass(String disableClass)
+    public void setDisabledStyleClass(String disableStyleClass)
     {
-        _trs.disabledClass = setNonEmptyValueAttribute(disableClass);
+        _trs.disabledStyleClass = setNonEmptyValueAttribute(disableStyleClass);
     }
 
     /**
@@ -465,43 +498,43 @@
     /**
      * Set the style class of a tree element when is is selected.  This 
results in a <code>class</code>
      * attribute being generated for this tree node.
-     * @param selectionClass
+     * @param selectedStyleClass
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style class of a tree element when is is selected. 
 This results in a <code>class</code>
      * attribute being generated for this tree node."
      * @netui.tldx:attribute category="format"
      */
-    public void setSelectionClass(String selectionClass)
+    public void setSelectedStyleClass(String selectedStyleClass)
     {
-        _trs.selectionClass = setNonEmptyValueAttribute(selectionClass);
+        _trs.selectedStyleClass = 
setNonEmptyValueAttribute(selectedStyleClass);
     }
 
     /**
      * Set the style class of a tree element when is is not selected.  This 
results in a <code>style</code>
      * attribute being generated for this tree node.
-     * @param unselectStyle
+     * @param unselectedStyle
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style class of a tree element when is is not 
selected.  This results in a <code>style</code>
      * attribute being generated for this tree node."
      * @netui.tldx:attribute category="format"  
propertyclass="workshop.jspdesigner.properties.JspStyleProperty"
      */
-    public void setUnselectStyle(String unselectStyle)
+    public void setUnselectedStyle(String unselectedStyle)
     {
-        _trs.unselectStyle = setNonEmptyValueAttribute(unselectStyle);
+        _trs.unselectedStyle = setNonEmptyValueAttribute(unselectedStyle);
     }
 
     /**
      * Set the style class of a tree element when is is selected.  This 
results in a <code>class</code>
      * attribute being generated for this tree node.
-     * @param unselectClass
+     * @param unselectedStyleClass
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Set the style class of a tree element when is is selected. 
 This results in a <code>class</code>
      * attribute being generated for this tree node."
      * @netui.tldx:attribute category="format"
      */
-    public void setUnselectClass(String unselectClass)
+    public void setUnselectedStyleClass(String unselectedStyleClass)
     {
-        _trs.unselectClass = setNonEmptyValueAttribute(unselectClass);
+        _trs.unselectedStyleClass = 
setNonEmptyValueAttribute(unselectedStyleClass);
     }
 
     /**
@@ -517,15 +550,16 @@
     }
 
     /**
-     * Sets the <code>class</code> attribute of the tree.
-     * @param treeClass - the style
+     * Sets the <code>class</code> attribute of the tree.  This will be set
+     * on the containing &lt;div> for the tree.
+     * @param treeStyleClass - the style
      * @netui:attribute required="false" rtexprvalue="true"
      * description="Sets the <code>class</code> attribute of the tree."
      * @netui.tldx:attribute category="format"
      */
-    public void setTreeClass(String treeClass)
+    public void setTreeStyleClass(String treeStyleClass)
     {
-        _treeClass = setNonEmptyValueAttribute(treeClass);
+        _treeStyleClass = setNonEmptyValueAttribute(treeStyleClass);
     }
 
     /**
@@ -685,10 +719,10 @@
             Object[] args = new Object[6];
             args[0] =  _iState.getImageRoot() + "/";
             args[1] =  tre.getObjectName();
-            args[2] =  _iState.getImageHandleRightMiddle();
-            args[3] =  _iState.getImageHandleDownMiddle();
-            args[4] =  _iState.getImageHandleRightLast();
-            args[5] =  _iState.getImageHandleDownLast();
+            args[2] =  _iState.getNodeCollapsedImage();
+            args[3] =  _iState.getNodeExpandedImage();
+            args[4] =  _iState.getLastNodeCollapsedImage();
+            args[5] =  _iState.getLastNodeExpandedImage();
             srs.writeFeature(sr, writer, CoreScriptFeature.TREE_INIT, false, 
false, args);
 
             tre.setTreeRenderState(_trs);
@@ -697,10 +731,10 @@
 
         // create a containing tree level <div> and place the tree level 
styles on it.
         _divState.clear();
-        _divState.styleClass = _treeClass;
+        _divState.styleClass = _treeStyleClass;
         _divState.style = _treeStyle;
         String divId = null;
-        if (_outputJavaScript) {
+        if (_renderTagIdLookup) {
             _divState.id = _trs.tagId;
             divId = _divState.id;
         }
@@ -730,7 +764,7 @@
         write(sb.toString());
 
         // check to see if we are writing out the java.
-        if (_outputJavaScript) {
+        if (_renderTagIdLookup) {
             String jsOut = renderDefaultJavaScript(request, divId);
             if (jsOut != null)
                 write(jsOut);

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreePropertyOverride.java
 Fri Feb 18 10:36:42 2005
@@ -66,109 +66,109 @@
     /**
      * Sets the image name for an open non-leaf node with no
      * line below it.  (Defaults to "handledownlast.gif").
-     * @param imageHandleDownLast - the image name (including extension)
+     * @param lastNodeExpandedImage - the image name (including extension)
      * @netui:attribute required="false"
      * description="Sets the image name for an open non-leaf node with no
      * line below it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageHandleDownLast(String imageHandleDownLast)
+    public void setLastNodeExpandedImage(String lastNodeExpandedImage)
     {
-        _iState.setImageHandleDownLast(imageHandleDownLast);
+        _iState.setLastNodeExpandedImage(lastNodeExpandedImage);
     }
 
     /**
      * Sets the image name for an open non-leaf node with a
      * line below it.  (Defaults to "handledownmiddle.gif").
-     * @param imageHandleDownMiddle - the image name (including extension)
+     * @param nodeExpandedImage - the image name (including extension)
      * @netui:attribute required="false"
      * description="Sets the image name for an open non-leaf node with a
      * line below it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageHandleDownMiddle(String imageHandleDownMiddle)
+    public void setNodeExpandedImage(String nodeExpandedImage)
     {
-        _iState.setImageHandleDownMiddle(imageHandleDownMiddle);
+        _iState.setNodeExpandedImage(nodeExpandedImage);
     }
 
     /**
      * Sets the image name for a closed non-leaf node with no
      * line below it.  (Defaults to "handlerightlast.gif").
-     * @param imageHandleRightLast - the image name (including extension)
+     * @param lastNodeCollapsedImage - the image name (including extension)
      * @netui:attribute required="false"
      * description="Sets the image name for a closed non-leaf node with no
      * line below it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageHandleRightLast(String imageHandleRightLast)
+    public void setLastNodeCollapsedImage(String lastNodeCollapsedImage)
     {
-        _iState.setImageHandleRightLast(imageHandleRightLast);
+        _iState.setLastNodeCollapsedImage(lastNodeCollapsedImage);
     }
 
     /**
      * Sets the image name for a closed non-leaf node with a
      * line below it.  (Defaults to "handlerightmiddle.gif").
-     * @param imageHandleRightMiddle - the image name (including extension)
+     * @param nodeCollapsedImage - the image name (including extension)
      * @netui:attribute required="false"
      * description="Sets the image name for a closed non-leaf node with a
      * line below it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageHandleRightMiddle(String imageHandleRightMiddle)
+    public void setNodeCollapsedImage(String nodeCollapsedImage)
     {
-        _iState.setImageHandleRightMiddle(imageHandleRightMiddle);
+        _iState.setNodeCollapsedImage(nodeCollapsedImage);
     }
 
     /**
      * Sets the image name for a blank area of the tree.
      * (Defaults to "linelastnode.gif").
-     * @param imageLineLast - the image name (including extension)
+     * @param lastLineJoinImage - the image name (including extension)
      * @netui:attribute required="false"
      * description="Sets the image name for a blank area of the tree."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageLineLast(String imageLineLast)
+    public void setLastLineJoinImage(String lastLineJoinImage)
     {
-        _iState.setImageLineLast(imageLineLast);
+        _iState.setLastLineJoinImage(lastLineJoinImage);
     }
 
     /**
      * Sets the default icon for TreeElements for a blank area of the tree.
      * (Defaults to "linelastnode.gif").
-     * @param defaultIcon - the image name of the defaultIcon
+     * @param itemIcon - the image name of the itemIcon
      * @netui:attribute required="false"
      * description="Sets the default icon for TreeElements for a blank area of 
the tree."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setDefaultIcon(String defaultIcon)
+    public void setItemIcon(String itemIcon)
     {
-        _iState.setDefaultIcon(defaultIcon);
+        _iState.setItemIcon(itemIcon);
     }
 
     /**
      * Sets the image name for an area with a line through it.
      * (Defaults to "linemiddlenode.gif").
-     * @param imageLineMiddle - the image name (including extension)
+     * @param lineJoinImage - the image name (including extension)
      * @netui:attribute required="false"
      * description="Sets the image name for an area with a line through it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageLineMiddle(String imageLineMiddle)
+    public void setLineJoinImage(String lineJoinImage)
     {
-        _iState.setImageLineMiddle(imageLineMiddle);
+        _iState.setLineJoinImage(lineJoinImage);
     }
 
     /**
      * Sets the image name for an area with a line through it.
      * (Defaults to "linevertical.gif").
-     * @param imageLineVertical - the image name (including extension)
+     * @param verticalLineImage - the image name (including extension)
      * @netui:attribute required="false"
      * description="Sets the image name for an area with a line through it."
      * @netui.tldx:attribute category="images" reftype="img-url"
      */
-    public void setImageLineVertical(String imageLineVertical)
+    public void setVerticalLineImage(String verticalLineImage)
     {
-        _iState.setImageLineVertical(imageLineVertical);
+        _iState.setVerticalLineImage(verticalLineImage);
     }
 
     /**

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderState.java
 Fri Feb 18 10:36:42 2005
@@ -19,14 +19,14 @@
 
 public class TreeRenderState implements java.io.Serializable
  {
-    public String selectionStyle;      // selection style
-    public String selectionClass;      // selection class
-    public String unselectStyle;       // unselect style
-    public String unselectClass;       // unselect class
-    public String disabledStyle;       // disabled style
-    public String disabledClass;       // disabled class
+    public String selectedStyle;          // selection style
+    public String selectedStyleClass;     // selection class
+    public String unselectedStyle;        // unselect style
+    public String unselectedStyleClass;   // unselect class
+    public String disabledStyle;          // disabled style
+    public String disabledStyleClass;     // disabled class
 
-    public String tagId;               // tag that should uniquely indentify a 
tree.  Required for multiple tree using auto expand
+    public String tagId;                  // tag that should uniquely 
indentify a tree.  Required for multiple tree using auto expand
 
     public boolean runAtClient;
     public boolean escapeContent = false;  // esapce the content of labels

Modified: 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
 Fri Feb 18 10:36:42 2005
@@ -198,7 +198,7 @@
                 _imgState.style = null;
             }
             else {
-                img.append(state.getImageLineVertical());
+                img.append(state.getVerticalLineImage());
                 _imgState.style = "vertical-align:middle;";
             }
             sb.append("      ");
@@ -224,21 +224,21 @@
         img.append('/');
         if (node.isLeaf()) {                        // leaf node either last 
or middle
             if (node.isLast())
-                img.append(state.getImageLineLast());
+                img.append(state.getLastLineJoinImage());
             else
-                img.append(state.getImageLineMiddle());
+                img.append(state.getLineJoinImage());
         }
         else if (node.isExpanded()) {               // interior node that is 
expanded
             if (node.isLast())
-                img.append(state.getImageHandleDownLast());
+                img.append(state.getLastNodeExpandedImage());
             else
-                img.append(state.getImageHandleDownMiddle());
+                img.append(state.getNodeExpandedImage());
         }
         else {                                      // interior not expanded
             if (node.isLast())
-                img.append(state.getImageHandleRightLast());
+                img.append(state.getLastNodeCollapsedImage());
             else
-                img.append(state.getImageHandleRightMiddle());
+                img.append(state.getNodeCollapsedImage());
         }
 
         // write out the image which occurs next to the icon
@@ -338,12 +338,12 @@
 
             // set the selection styles
             if (node.isSelected()) {
-                _anchorState.style = _trs.selectionStyle;
-                _anchorState.styleClass = _trs.selectionClass;
+                _anchorState.style = _trs.selectedStyle;
+                _anchorState.styleClass = _trs.selectedStyleClass;
             }
             else {
-                _anchorState.style = _trs.unselectStyle;
-                _anchorState.styleClass = _trs.unselectClass;
+                _anchorState.style = _trs.unselectedStyle;
+                _anchorState.styleClass = _trs.unselectedStyleClass;
             }
 
             // render any attributes applied to the HTML
@@ -368,7 +368,7 @@
             // This node doesn's support selection.  This means we consider it 
disabled.  We will
             // put a span around it and set the style/class to indicate that 
it is disabled.
             _spanState.clear();
-            _spanState.styleClass = _trs.disabledClass;
+            _spanState.styleClass = _trs.disabledStyleClass;
             _spanState.style = _trs.disabledStyle;
             sb.append("      ");
             _spanRenderer.doStartTag(writer, _spanState);
@@ -380,7 +380,7 @@
         // icons by setting the useDefaultIcons attribute to false.
         String icon = node.getIcon();
         if (icon == null) {
-            icon = state.getImageRoot() + "/" + state.getDefaultIcon();
+            icon = state.getImageRoot() + "/" + state.getItemIcon();
         }
         else {
             icon = state.getImageRoot() + "/" + icon;
@@ -523,15 +523,15 @@
             if (imgOverride) {
                 if (node.isLast()) {
                     
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, 
TreeElement.TREE_COLLAPSE_IMAGE,
-                            state.getImageRoot() + "/" + 
state.getImageHandleRightLast());
+                            state.getImageRoot() + "/" + 
state.getLastNodeCollapsedImage());
                     
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, 
TreeElement.TREE_EXPAND_IMAGE,
-                            state.getImageRoot() + "/" + 
state.getImageHandleDownLast());
+                            state.getImageRoot() + "/" + 
state.getLastNodeExpandedImage());
                 }
                 else {
                     
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, 
TreeElement.TREE_COLLAPSE_IMAGE,
-                            state.getImageRoot() + "/" + 
state.getImageHandleRightMiddle());
+                            state.getImageRoot() + "/" + 
state.getNodeCollapsedImage());
                     
_anchorState.registerAttribute(AbstractHtmlState.ATTR_GENERAL, 
TreeElement.TREE_EXPAND_IMAGE,
-                            state.getImageRoot() + "/" + 
state.getImageHandleDownMiddle());
+                            state.getImageRoot() + "/" + 
state.getNodeExpandedImage());
                 }
             }
 

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Test.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Test.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Test.jsp 
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j297/Test.jsp 
Fri Feb 18 10:36:42 2005
@@ -17,8 +17,8 @@
     <netui:scriptHeader/>
     <netui:tree dataSource="pageFlow.root" escapeForHtml="true"
         selectionAction="select" tagId="tree" runAtClient="true"
-        selectionStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
-       unselectStyle="text-decoration: none"
+        selectedStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
+       unselectedStyle="text-decoration: none"
     >
             <netui:treeItem expanded="true">
                 <netui:treeLabel>0</netui:treeLabel>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/tree/nullbinding/index.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/tree/nullbinding/index.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/tree/nullbinding/index.jsp
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/coretags/tree/nullbinding/index.jsp
 Fri Feb 18 10:36:42 2005
@@ -25,9 +25,9 @@
     </ul>
     <netui:tree selectionAction="begin" dataSource="pageFlow.tree[0]" 
tagId="t1" selectionTarget="${pageFlow.nullValue}">
         <netui:treeItem 
expanded="true">selectionTarget</netui:treeItem></netui:tree>
-    <netui:tree selectionAction="begin" dataSource="pageFlow.tree[1]" 
tagId="t1" disableClass="${pageFlow.nullValue}" 
disabledStyle="${pageFlow.nullValue}" selectionClass="${pageFlow.nullValue}" 
selectionStyle="${pageFlow.nullValue}" treeClass="${pageFlow.nullValue}" 
treeStyle="${pageFlow.nullValue}" unselectClass="${pageFlow.nullValue}" 
unselectStyle="${pageFlow.nullValue}">
+    <netui:tree selectionAction="begin" dataSource="pageFlow.tree[1]" 
tagId="t1" disabledStyleClass="${pageFlow.nullValue}" 
disabledStyle="${pageFlow.nullValue}" 
selectedStyleClass="${pageFlow.nullValue}" 
selectedStyle="${pageFlow.nullValue}" treeStyleClass="${pageFlow.nullValue}" 
treeStyle="${pageFlow.nullValue}" unselectedStyleClass="${pageFlow.nullValue}" 
unselectedStyle="${pageFlow.nullValue}">
         <netui:treeItem expanded="true">class and 
styles</netui:treeItem></netui:tree>
-    <netui:tree selectionAction="begin" dataSource="pageFlow.tree[2]" 
tagId="t1" defaultIcon="${pageFlow.nullValue}" 
imageHandleDownLast="${pageFlow.nullValue}" 
imageHandleDownMiddle="${pageFlow.nullValue}" 
imageHandleRightLast="${pageFlow.nullValue}" 
imageHandleRightMiddle="${pageFlow.nullValue}" 
imageLineLast="${pageFlow.nullValue}" imageLineMiddle="${pageFlow.nullValue}" 
imageLineVertical="${pageFlow.nullValue}" imageRoot="${pageFlow.nullValue}">
+    <netui:tree selectionAction="begin" dataSource="pageFlow.tree[2]" 
tagId="t1" itemIcon="${pageFlow.nullValue}" 
lastNodeExpandedImage="${pageFlow.nullValue}" 
nodeExpandedImage="${pageFlow.nullValue}" 
lastNodeCollapsedImage="${pageFlow.nullValue}" 
nodeCollapsedImage="${pageFlow.nullValue}" 
lastLineJoinImage="${pageFlow.nullValue}" lineJoinImage="${pageFlow.nullValue}" 
verticalLineImage="${pageFlow.nullValue}" imageRoot="${pageFlow.nullValue}">
         <netui:treeItem expanded="true">images</netui:treeItem></netui:tree>
     </netui:body>
 </netui:html>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/idmap/tree/index.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/idmap/tree/index.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/idmap/tree/index.jsp 
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/idmap/tree/index.jsp 
Fri Feb 18 10:36:42 2005
@@ -15,7 +15,7 @@
        <hr>
         <span id="scopeOneSpan" />
         <netui:tree dataSource="pageFlow.tree" selectionAction="select" 
tagId="tree"
-               renderJavaScript="true">
+               renderTagIdLookup="true">
            <netui:treeItem expanded="true" 
tagId="item">Item-PageOne</netui:treeItem>
         </netui:tree>
        <hr>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/idmap/treeNoHtml/index.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/idmap/treeNoHtml/index.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/idmap/treeNoHtml/index.jsp
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/idmap/treeNoHtml/index.jsp
 Fri Feb 18 10:36:42 2005
@@ -14,7 +14,7 @@
        <hr>
         <span id="scopeOneSpan" />
         <netui:tree dataSource="pageFlow.tree" selectionAction="select" 
tagId="tree"
-               renderJavaScript="true">
+               renderTagIdLookup="true">
            <netui:treeItem expanded="true">Item-PageOne</netui:treeItem>
         </netui:tree>
        <hr>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/disabled.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/disabled.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/disabled.jsp 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/disabled.jsp 
Fri Feb 18 10:36:42 2005
@@ -35,7 +35,7 @@
         may not be selected.
         <hr style="clear:left">
         <div class="content">
-        <netui:tree dataSource="pageFlow.tree16" selectionAction="postback" 
tagId="tree" selectionClass="treeSelected" treeClass="treeStyle" 
disableClass="treeDisabled" unselectClass="treeUnselected">
+        <netui:tree dataSource="pageFlow.tree16" selectionAction="postback" 
tagId="tree" selectedStyleClass="treeSelected" treeStyleClass="treeStyle" 
disabledStyleClass="treeDisabled" unselectedStyleClass="treeUnselected">
             <netui:treeItem expanded="true" action="postback">
                 <netui:treeLabel>Node 0</netui:treeLabel>
                 <netui:treeItem expanded="true">

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/dynamicClient.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/dynamicClient.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/dynamicClient.jsp
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/dynamicClient.jsp
 Fri Feb 18 10:36:42 2005
@@ -34,7 +34,7 @@
        <netui:scriptContainer generateIdScope="true">
         <netui:scriptHeader />
         <netui:tree dataSource="pageFlow.tree36" selectionAction="postback"
-               selectionStyle="color:red" unselectStyle="color:blue"
+               selectedStyle="color:red" unselectedStyle="color:blue"
                tagId="tree" runAtClient="true" />
        </netui:scriptContainer>
        </td></tr>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/override.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/override.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/override.jsp 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/override.jsp 
Fri Feb 18 10:36:42 2005
@@ -38,7 +38,7 @@
         labels of the node reflect the expected action to be called on 
selection.
         <hr style="clear:left">
         <div class="content">
-        <netui:tree dataSource="pageFlow.tree17" selectionAction="postback" 
tagId="tree" selectionClass="treeSelected" treeClass="treeStyle" 
disableClass="treeDisabled" unselectClass="treeUnselected">
+        <netui:tree dataSource="pageFlow.tree17" selectionAction="postback" 
tagId="tree" selectedStyleClass="treeSelected" treeStyleClass="treeStyle" 
disabledStyleClass="treeDisabled" unselectedStyleClass="treeUnselected">
             <netui:treeItem expanded="true" action="postback">
                 <netui:treeLabel>Node 0</netui:treeLabel>
                 <netui:treeItem expanded="true">

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/overrideTwo.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/overrideTwo.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/overrideTwo.jsp 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/overrideTwo.jsp 
Fri Feb 18 10:36:42 2005
@@ -35,7 +35,7 @@
         expansion action set on the <b>tree</b> tag.  This is how you can 
create two actions, one for expansion and one for selection on a tree.
         <hr style="clear:left">
         <div class="content">
-        <netui:tree dataSource="pageFlow.tree18" selectionAction="postback" 
tagId="tree" selectionClass="treeSelected" treeClass="treeStyle" 
disableClass="treeDisabled" unselectClass="treeUnselected">
+        <netui:tree dataSource="pageFlow.tree18" selectionAction="postback" 
tagId="tree" selectedStyleClass="treeSelected" treeStyleClass="treeStyle" 
disabledStyleClass="treeDisabled" unselectedStyleClass="treeUnselected">
             <netui:treeItem expanded="true">
                 <netui:treePropertyOverride selectionAction="postbackTwo" />
                 <netui:treeLabel>0 [2]</netui:treeLabel>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/selectStyles.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/selectStyles.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/selectStyles.jsp
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/selectStyles.jsp
 Fri Feb 18 10:36:42 2005
@@ -33,7 +33,7 @@
         indicate the currently selected element within the tree.            
         <hr style="clear:left">
         <div class="content">
-        <netui:tree dataSource="pageFlow.tree3" selectionAction="postback" 
tagId="tree" selectionClass="treeSelected" unselectClass="treeUnselected">
+        <netui:tree dataSource="pageFlow.tree3" selectionAction="postback" 
tagId="tree" selectedStyleClass="treeSelected" 
unselectedStyleClass="treeUnselected">
             <netui:treeItem expanded="true" action="postback">
                 <netui:treeLabel>Node 0</netui:treeLabel>
                 <netui:treeItem expanded="true" action="postback">

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeFrame.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeFrame.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeFrame.jsp 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeFrame.jsp 
Fri Feb 18 10:36:42 2005
@@ -8,8 +8,8 @@
     </head>
     <netui:body style="border: 20pt 5%;background-color:#ccffcc;">
         <div class="content">
-        <netui:tree dataSource="pageFlow.tree19" selectionAction="goTreeFrame" 
tagId="tree" selectionClass="treeSelected" treeClass="treeStyle" 
-                disableClass="treeDisabled" unselectClass="treeUnselected"
+        <netui:tree dataSource="pageFlow.tree19" selectionAction="goTreeFrame" 
tagId="tree" selectedStyleClass="treeSelected" treeStyleClass="treeStyle" 
+                disabledStyleClass="treeDisabled" 
unselectedStyleClass="treeUnselected"
                selectionTarget="contentFrame">
             <netui:treeItem expanded="true" disabled="true">
                 <netui:treeLabel>HREF Test Tree</netui:treeLabel>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeFrame2.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeFrame2.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeFrame2.jsp 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeFrame2.jsp 
Fri Feb 18 10:36:42 2005
@@ -12,10 +12,10 @@
                selectionAction="goSelectFrame"
                expansionAction="goSelectTree"
                tagId="tree"
-               selectionClass="treeSelected"
-               treeClass="treeStyle" 
-                disableClass="treeDisabled"
-               unselectClass="treeUnselected"
+               selectedStyleClass="treeSelected"
+               treeStyleClass="treeStyle" 
+                disabledStyleClass="treeDisabled"
+               unselectedStyleClass="treeUnselected"
                selectionTarget="contentFrame"
        >
             <netui:treeItem expanded="true" disabled="true">

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC.jsp 
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC.jsp 
Fri Feb 18 10:36:42 2005
@@ -32,8 +32,8 @@
        <netui:scriptContainer generateIdScope="true">
         <netui:scriptHeader />
         <netui:tree dataSource="pageFlow.tree24" selectionAction="postback"
-               selectionStyle="color:red" unselectStyle="color:blue"
-               tagId="tree" renderJavaScript="true" runAtClient="true">
+               selectedStyle="color:red" unselectedStyle="color:blue"
+               tagId="tree" renderTagIdLookup="true" runAtClient="true">
             <netui:treeItem tagId="Item0" expanded="true" action="postback">
                 <netui:treeLabel>0</netui:treeLabel>
                 <netui:treeItem tagId="item00" expanded="true" 
action="postback">

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC2.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC2.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC2.jsp 
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC2.jsp 
Fri Feb 18 10:36:42 2005
@@ -34,8 +34,8 @@
        <netui:scriptContainer generateIdScope="true">
         <netui:scriptHeader />
         <netui:tree dataSource="pageFlow.tree28" selectionAction="postback"
-               selectionStyle="color:red" unselectStyle="color:blue"
-               tagId="tree" renderJavaScript="true" runAtClient="true">
+               selectedStyle="color:red" unselectedStyle="color:blue"
+               tagId="tree" renderTagIdLookup="true" runAtClient="true">
             <netui:treeItem tagId="Item0" expanded="true" action="postback">
                 <netui:treeLabel>0</netui:treeLabel>
                 <netui:treeItem tagId="item00" expanded="true" 
action="postback">
@@ -52,8 +52,8 @@
        </netui:scriptContainer>
        </td><td width="50%" valign="top">
         <netui:tree dataSource="pageFlow.tree29" selectionAction="postback"
-               selectionStyle="color:red" unselectStyle="color:blue"
-               tagId="tree" renderJavaScript="true" runAtClient="true">
+               selectedStyle="color:red" unselectedStyle="color:blue"
+               tagId="tree" renderTagIdLookup="true" runAtClient="true">
             <netui:treeItem tagId="Item0" expanded="true" action="postback">
                 <netui:treeLabel>0</netui:treeLabel>
                 <netui:treeItem tagId="item00" expanded="true" 
action="postback">

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC3.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC3.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC3.jsp 
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC3.jsp 
Fri Feb 18 10:36:42 2005
@@ -34,8 +34,8 @@
        <netui:scriptContainer generateIdScope="true">
         <netui:scriptHeader />
         <netui:tree dataSource="pageFlow.tree30" selectionAction="postback"
-               selectionStyle="color:red" unselectStyle="color:blue"
-               tagId="tree" renderJavaScript="true" runAtClient="true">
+               selectedStyle="color:red" unselectedStyle="color:blue"
+               tagId="tree" renderTagIdLookup="true" runAtClient="true">
             <netui:treeItem tagId="Item0" expanded="true" action="postback">
                 <netui:treeLabel>0</netui:treeLabel>
                 <netui:treeItem tagId="item00" expanded="true" 
action="postback">
@@ -53,8 +53,8 @@
        </td><td width="50%" valign="top">
        <netui:scriptContainer generateIdScope="true">
         <netui:tree dataSource="pageFlow.tree31" selectionAction="postback"
-               selectionStyle="color:red" unselectStyle="color:blue"
-               tagId="tree" renderJavaScript="true" runAtClient="true">
+               selectedStyle="color:red" unselectedStyle="color:blue"
+               tagId="tree" renderTagIdLookup="true" runAtClient="true">
             <netui:treeItem tagId="Item0" expanded="true" action="postback">
                 <netui:treeLabel>0</netui:treeLabel>
                 <netui:treeItem tagId="item00" expanded="true" 
action="postback">

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC4.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC4.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC4.jsp 
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSC4.jsp 
Fri Feb 18 10:36:42 2005
@@ -40,8 +40,8 @@
         <span id="scopeOneSpan" />
         <netui:scriptHeader />
         <netui:tree dataSource="pageFlow.tree34" selectionAction="postback"
-               selectionStyle="color:red" unselectStyle="color:blue"
-               tagId="tree" renderJavaScript="true" runAtClient="true">
+               selectedStyle="color:red" unselectedStyle="color:blue"
+               tagId="tree" renderTagIdLookup="true" runAtClient="true">
             <netui:treeItem tagId="Item0" expanded="true" action="postback">
                 <netui:treeLabel>0</netui:treeLabel>
                 <netui:treeItem tagId="item00" expanded="true" 
action="postback">
@@ -60,8 +60,8 @@
        <netui:scriptContainer generateIdScope="true">
         <span id="scopeTwoSpan" />
         <netui:tree dataSource="pageFlow.tree35" selectionAction="postback"
-               selectionStyle="color:red" unselectStyle="color:blue"
-               tagId="tree" renderJavaScript="true" runAtClient="true">
+               selectedStyle="color:red" unselectedStyle="color:blue"
+               tagId="tree" renderTagIdLookup="true" runAtClient="true">
             <netui:treeItem tagId="Item0" expanded="true" action="postback">
                 <netui:treeLabel>0</netui:treeLabel>
                 <netui:treeItem tagId="item00" expanded="true" 
action="postback">

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSCError.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSCError.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSCError.jsp 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeSCError.jsp 
Fri Feb 18 10:36:42 2005
@@ -37,8 +37,8 @@
        <netui:scriptContainer generateIdScope="true">
         <netui:scriptHeader />
         <netui:tree dataSource="pageFlow.tree32" selectionAction="postback"
-               selectionStyle="color:red" unselectStyle="color:blue"
-               tagId="tree" renderJavaScript="true" runAtClient="true">
+               selectedStyle="color:red" unselectedStyle="color:blue"
+               tagId="tree" renderTagIdLookup="true" runAtClient="true">
             <netui:treeItem tagId="Item0" expanded="true" action="postback">
                 <netui:treeLabel>0</netui:treeLabel>
                 <netui:treeItem tagId="item00" expanded="true" 
action="postback">
@@ -55,8 +55,8 @@
        </netui:scriptContainer>
        </td><td width="50%" valign="top">
         <netui:tree dataSource="pageFlow.tree33" selectionAction="postback"
-               selectionStyle="color:red" unselectStyle="color:blue"
-               tagId="tree" renderJavaScript="true" runAtClient="true">
+               selectedStyle="color:red" unselectedStyle="color:blue"
+               tagId="tree" renderTagIdLookup="true" runAtClient="true">
             <netui:treeItem tagId="Item0" expanded="true" action="postback">
                 <netui:treeLabel>0</netui:treeLabel>
                 <netui:treeItem tagId="item00" expanded="true" 
action="postback">

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeStyle.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeStyle.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeStyle.jsp 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/richTree/treeStyle.jsp 
Fri Feb 18 10:36:42 2005
@@ -34,7 +34,7 @@
         the overall font is set for the tree.
         <hr style="clear:left">
         <div class="content">
-        <netui:tree dataSource="pageFlow.tree4" selectionAction="postback" 
tagId="tree" selectionClass="treeSelected" treeClass="treeStyle">
+        <netui:tree dataSource="pageFlow.tree4" selectionAction="postback" 
tagId="tree" selectedStyleClass="treeSelected" treeStyleClass="treeStyle">
             <netui:treeItem expanded="true" action="postback">
                 <netui:treeLabel>Node 0</netui:treeLabel>
                 <netui:treeItem expanded="true" action="postback">

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp
 (original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp
 Fri Feb 18 10:36:42 2005
@@ -18,7 +18,7 @@
     <netui:body>
         <table width="100%" cellspacing="5"><tr><td width="20%" valign="top">
         <netui:tree selectionAction="treePost"  
-                dataSource="pageFlow.tree" selectionClass="selected"  
unselectClass="unselected" 
+                dataSource="pageFlow.tree" selectedStyleClass="selected"  
unselectedStyleClass="unselected" 
                 tagId="Tree1" runAtClient="true" >
             <netui:treeItem clientAction='divPanel.showPage("RootPage");' 
expanded="true">
                 <netui:treeLabel>Tree</netui:treeLabel>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/expand/Test.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/expand/Test.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/expand/Test.jsp 
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/expand/Test.jsp 
Fri Feb 18 10:36:42 2005
@@ -15,7 +15,7 @@
     <netui:scriptHeader/>
     <netui:tree dataSource="pageFlow.root" escapeForHtml="true"
         selectionAction="select" tagId="tree" runAtClient="true"
-        selectionStyle="background-color: #FFD185; font-color: #FFFFFF;"/>
+        selectedStyle="background-color: #FFD185; font-color: #FFFFFF;"/>
 </netui:scriptContainer>
 </div>
 <!--End scriptContainer-->

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images/Test.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images/Test.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images/Test.jsp 
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images/Test.jsp 
Fri Feb 18 10:36:42 2005
@@ -15,17 +15,17 @@
     <netui:scriptHeader/>
     <netui:tree dataSource="pageFlow.root" escapeForHtml="true"
         selectionAction="select" tagId="tree" runAtClient="true"
-        selectionStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
-       unselectStyle="text-decoration: none"
+        selectedStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
+       unselectedStyle="text-decoration: none"
         imageRoot="/coreWeb/tree/images"
-        imageHandleRightLast="plusbottom.gif"
-        imageHandleRightMiddle="plus.gif"
-        imageHandleDownLast="minusbottom.gif"
-        imageHandleDownMiddle="minus.gif"
-        imageLineMiddle="join.gif"
-        imageLineVertical="line.gif"
-        imageLineLast="joinbottom.gif"
-       defaultIcon="folder.gif"
+        lastNodeCollapsedImage="plusbottom.gif"
+        nodeCollapsedImage="plus.gif"
+        lastNodeExpandedImage="minusbottom.gif"
+        nodeExpandedImage="minus.gif"
+        lineJoinImage="join.gif"
+        verticalLineImage="line.gif"
+        lastLineJoinImage="joinbottom.gif"
+       itemIcon="folder.gif"
     >
             <netui:treeItem expanded="true" action="select">
                 <netui:treeLabel>0</netui:treeLabel>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Test.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Test.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Test.jsp 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/images2/Test.jsp 
Fri Feb 18 10:36:42 2005
@@ -17,17 +17,17 @@
 <tr><td width="50%" valign="top">
     <netui:tree dataSource="pageFlow.root" escapeForHtml="true"
         selectionAction="select" tagId="tree" runAtClient="true"
-        selectionStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
-       unselectStyle="text-decoration: none"
+        selectedStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
+       unselectedStyle="text-decoration: none"
         imageRoot="/coreWeb/tree/images"
-        imageHandleRightLast="plusbottom.gif"
-        imageHandleRightMiddle="plus.gif"
-        imageHandleDownLast="minusbottom.gif"
-        imageHandleDownMiddle="minus.gif"
-        imageLineMiddle="join.gif"
-        imageLineVertical="line.gif"
-        imageLineLast="joinbottom.gif"
-       defaultIcon="folder.gif"
+        lastNodeCollapsedImage="plusbottom.gif"
+        nodeCollapsedImage="plus.gif"
+        lastNodeExpandedImage="minusbottom.gif"
+        nodeExpandedImage="minus.gif"
+        lineJoinImage="join.gif"
+        verticalLineImage="line.gif"
+        lastLineJoinImage="joinbottom.gif"
+       itemIcon="folder.gif"
     >
             <netui:treeItem expanded="true" action="select">
                 <netui:treeLabel>0</netui:treeLabel>
@@ -53,8 +53,8 @@
 </td><td width="50%" valign="top">
     <netui:tree dataSource="pageFlow.tree" escapeForHtml="true"
         selectionAction="select" tagId="tree2" runAtClient="true"
-        selectionStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
-       unselectStyle="text-decoration: none"
+        selectedStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
+       unselectedStyle="text-decoration: none"
     >
             <netui:treeItem expanded="true" action="select">
                 <netui:treeLabel>0</netui:treeLabel>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/inherit/index.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/inherit/index.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/inherit/index.jsp 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/inherit/index.jsp 
Fri Feb 18 10:36:42 2005
@@ -16,8 +16,8 @@
     <netui:scriptHeader/>
     <netui:tree dataSource="pageFlow.root"
         selectionAction="select" tagId="tree" runAtClient="true"
-        selectionStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
-       unselectStyle="text-decoration: none"
+        selectedStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
+       unselectedStyle="text-decoration: none"
     >
             <netui:treeItem expanded="true">
                 <netui:treeLabel>0</netui:treeLabel>
@@ -25,14 +25,14 @@
                     <netui:treeLabel>0.0</netui:treeLabel>
                     <netui:treePropertyOverride 
selectionAction="selectOverride"
                       imageRoot="/coreWeb/tree/images"
-                      imageHandleRightLast="plusbottom.gif"
-                      imageHandleRightMiddle="plus.gif"
-                      imageHandleDownLast="minusbottom.gif"
-                      imageHandleDownMiddle="minus.gif"
-                      imageLineMiddle="join.gif"
-                      imageLineVertical="line.gif"
-                      imageLineLast="joinbottom.gif"
-                      defaultIcon="folder.gif"
+                       lastNodeCollapsedImage="plusbottom.gif"
+                       nodeCollapsedImage="plus.gif"
+                       lastNodeExpandedImage="minusbottom.gif"
+                       nodeExpandedImage="minus.gif"
+                       lineJoinImage="join.gif"
+                       verticalLineImage="line.gif"
+                       lastLineJoinImage="joinbottom.gif"
+                       itemIcon="folder.gif"
                    />
                     <netui:treeItem expanded="false">
                         <netui:treeLabel>0.0.0</netui:treeLabel>

Modified: 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/params/index.jsp
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/params/index.jsp?view=diff&r1=154332&r2=154333
==============================================================================
--- 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/params/index.jsp 
(original)
+++ 
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/params/index.jsp 
Fri Feb 18 10:36:42 2005
@@ -15,8 +15,8 @@
     <netui:scriptHeader/>
     <netui:tree dataSource="pageFlow.root"
         selectionAction="select" tagId="tree" runAtClient="true"
-        selectionStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
-       unselectStyle="text-decoration: none"
+        selectedStyle="background-color: #FFD185; font-color: #FFFFFF; 
text-decoration: none;"
+       unselectedStyle="text-decoration: none"
     >
             <netui:treeItem expanded="true">
                 <netui:treeLabel>0</netui:treeLabel>


Reply via email to