[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit/javascript JavaScript.java,1.52,1.53

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

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript
In directory sc8-pr-cvs1:/tmp/cvs-serv20521/src/com/meterware/httpunit/javascript

Modified Files:
	JavaScript.java 
Log Message:
bug #721989: support control ids as javascript element references

Index: JavaScript.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/javascript/JavaScript.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- JavaScript.java	2 Apr 2003 15:31:09 -0000	1.52
+++ JavaScript.java	23 May 2003 21:55:12 -0000	1.53
@@ -210,6 +210,11 @@
         }
 
 
+        String getID() {
+            return _scriptable instanceof IdentifiedDelegate ? ((IdentifiedDelegate) _scriptable).getID() : "";
+        }
+
+
         public boolean has( String propertyName, Scriptable scriptable ) {
             return super.has( propertyName, scriptable ) ||
                     (_scriptable != null && _scriptable.get( propertyName ) != null);
@@ -817,9 +822,18 @@
         public Object get( String name, Scriptable scriptable ) {
             for (int i = 0; i < _contents.length; i++) {
                 JavaScriptEngine content = _contents[ i ];
+                if (name.equalsIgnoreCase( content.getID() )) return content;
+            }
+            for (int i = 0; i < _contents.length; i++) {
+                JavaScriptEngine content = _contents[ i ];
                 if (name.equalsIgnoreCase( content.getName() )) return content;
             }
             return super.get( name, scriptable );
+        }
+
+
+        protected JavaScriptEngine[] getContents() {
+            return _contents;
         }
     }