[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit HTMLElement.java,1.6,1.7 HTMLElementBase.java,1.7,1.8 HTMLElementScriptable.java,1.2,1.3 WebRequestSource.java,1.42,1.43

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22496/src/com/meterware/httpunit

Modified Files:
	HTMLElement.java HTMLElementBase.java 
	HTMLElementScriptable.java WebRequestSource.java 
Log Message:
From Vladimir Korenev: support tagName and nodeName

Index: HTMLElement.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/HTMLElement.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HTMLElement.java	29 Sep 2004 17:15:24 -0000	1.6
+++ HTMLElement.java	29 Oct 2004 00:41:24 -0000	1.7
@@ -83,4 +83,12 @@
      * @since 1.6
      */
     String getText();
+
+
+    /**
+     * Returns the tag name of this node.
+     *
+     * @since 1.6.1
+     */
+    String getTagName();
 }

Index: HTMLElementBase.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/HTMLElementBase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HTMLElementBase.java	21 Jul 2004 01:07:32 -0000	1.7
+++ HTMLElementBase.java	29 Oct 2004 00:41:24 -0000	1.8
@@ -85,6 +85,11 @@
     }
 
 
+    public String getTagName() {
+        return _node.getNodeName();
+    }
+
+
     protected HTMLElementBase( Node node ) {
         _node = node;
         supportAttribute( "id" );

Index: HTMLElementScriptable.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/HTMLElementScriptable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HTMLElementScriptable.java	19 Sep 2003 18:53:43 -0000	1.2
+++ HTMLElementScriptable.java	29 Oct 2004 00:41:24 -0000	1.3
@@ -32,7 +32,11 @@
     private HTMLElement _element;
 
     public Object get( String propertyName ) {
-        if (propertyName.equalsIgnoreCase( "title" )) {
+        if (propertyName.equals( "nodeName" )) {
+            return _element.getTagName();
+        } else if (propertyName.equals( "tagName" )) {
+            return _element.getTagName();
+        } else if (propertyName.equalsIgnoreCase( "title" )) {
             return _element.getTitle();
         } else if (_element.isSupportedAttribute( propertyName )) {
             return _element.getAttribute( propertyName );

Index: WebRequestSource.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebRequestSource.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- WebRequestSource.java	29 Sep 2004 17:15:25 -0000	1.42
+++ WebRequestSource.java	29 Oct 2004 00:41:24 -0000	1.43
@@ -297,6 +297,11 @@
     }
 
 
+    public String getTagName() {
+        return _node.getNodeName();
+    }
+
+
     String getAttribute( final String name, String defaultValue ) {
         return NodeUtils.getNodeAttribute( _node, name, defaultValue );
     }