[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit TableRow.java,NONE,1.1 ParsedHTML.java,1.62,1.63 WebTable.java,1.30,1.31

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

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

Modified Files:
	ParsedHTML.java WebTable.java 
Added Files:
	TableRow.java 
Log Message:
patch 1413171: expose TableRow element

***** Error reading new file[Errno 2] No such file or directory: 'TableRow.java'
Index: ParsedHTML.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/ParsedHTML.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ParsedHTML.java	2 Dec 2004 00:54:59 -0000	1.62
+++ ParsedHTML.java	9 Mar 2006 01:52:28 -0000	1.63
@@ -569,19 +569,19 @@
         }
         protected boolean addToContext() { return true; }
         protected void addToLists( NodeUtils.PreOrderTraversal pot, HTMLElement htmlElement ) {
-            getWebTable( pot ).addRow( (WebTable.TableRow) htmlElement );
+            getWebTable( pot ).addRow( (TableRow) htmlElement );
         }
     }
 
 
     static class TableCellFactory extends HTMLElementFactory {
         HTMLElement toHTMLElement( NodeUtils.PreOrderTraversal pot, ParsedHTML parsedHTML, Element element ) {
-            WebTable.TableRow tr = getTableRow( pot );
+            TableRow tr = getTableRow( pot );
             if (tr == null) return null;
             return tr.newTableCell( element );
         }
-        private WebTable.TableRow getTableRow( NodeUtils.PreOrderTraversal pot ) {
-            return (WebTable.TableRow) getClosestContext( pot, WebTable.TableRow.class );
+        private TableRow getTableRow( NodeUtils.PreOrderTraversal pot ) {
+            return (TableRow) getClosestContext( pot, TableRow.class );
         }
         protected boolean addToContext() { return true; }
         protected void addToLists( NodeUtils.PreOrderTraversal pot, HTMLElement htmlElement ) {

Index: WebTable.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebTable.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- WebTable.java	13 Jan 2005 04:15:46 -0000	1.30
+++ WebTable.java	9 Mar 2006 01:52:28 -0000	1.31
@@ -303,47 +303,20 @@
 
 
     TableRow newTableRow( Element element ) {
-        return new TableRow( element );
+        return new TableRow( this, element );
     }
 
 
-    private TableRow[] getRows() {
+    /**
+     * Returns an array of rows for this table.
+     */
+    public TableRow[] getRows() {
         return (TableRow[]) _rows.toArray( new TableRow[ _rows.size() ] );
     }
 
 
-    class TableRow extends HTMLElementBase {
-
-        private ArrayList _cells = new ArrayList();
-
-        TableRow( Element rowNode ) {
-            super( rowNode );
-        }
-
-
-        TableCell[] getCells() {
-            return (TableCell[]) _cells.toArray( new TableCell[ _cells.size() ]);
-        }
-
-
-        TableCell newTableCell( Element element ) {
-            return new TableCell( _response, _frameName, element, _url, _baseTarget, _characterSet );
-        }
-
-
-        void addTableCell( TableCell cell ) {
-            _cells.add( cell );
-        }
-
-
-        protected ScriptableDelegate newScriptable() {
-            return new HTMLElementScriptable( this );
-        }
-
-
-        protected ScriptableDelegate getParentDelegate() {
-            return _response.getScriptableObject().getDocument();
-        }
+    TableCell newTableCell( Element element ) {
+        return new TableCell( _response, _frameName, element, _url, _baseTarget, _characterSet );
     }