[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit ParsedHTML.java,1.36,1.37 WebTable.java,1.20,1.21

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

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

Modified Files:
	ParsedHTML.java WebTable.java 
Log Message:
simplified some string handling

Index: ParsedHTML.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/ParsedHTML.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ParsedHTML.java	27 Nov 2002 15:06:41 -0000	1.36
+++ ParsedHTML.java	18 Dec 2002 23:58:10 -0000	1.37
@@ -89,8 +89,7 @@
     public WebForm getFormWithID( String ID ) {
         WebForm[] forms = getForms();
         for (int i = 0; i < forms.length; i++) {
-            if (forms[i].getID().equals( ID )) return forms[i];
-            else if (HttpUnitOptions.getMatchesIgnoreCase() && forms[i].getID().equalsIgnoreCase( ID )) return forms[i];
+            if (HttpUnitUtils.matches( ID, forms[i].getID() )) return forms[i];
         }
         return null;
     }
@@ -102,8 +101,7 @@
     public WebForm getFormWithName( String name ) {
         WebForm[] forms = getForms();
         for (int i = 0; i < forms.length; i++) {
-            if (forms[i].getName().equals( name )) return forms[i];
-            else if (HttpUnitOptions.getMatchesIgnoreCase() && forms[i].getName().equalsIgnoreCase( name )) return forms[i];
+            if (HttpUnitUtils.matches( name, forms[i].getName() )) return forms[i];
         }
         return null;
     }
@@ -223,8 +221,7 @@
     public WebImage getImageWithName( String name ) {
         WebImage[] images = getImages();
         for (int i = 0; i < images.length; i++) {
-            if (images[i].getName().equals( name )) return images[i];
-            else if (HttpUnitOptions.getMatchesIgnoreCase() && images[i].getName().equalsIgnoreCase( name )) return images[i];
+            if (HttpUnitUtils.matches( name, images[i].getName() )) return images[i];
         }
         return null;
     }
@@ -236,8 +233,7 @@
     public WebImage getImageWithSource( String source ) {
         WebImage[] images = getImages();
         for (int i = 0; i < images.length; i++) {
-            if (images[i].getSource().equals( source )) return images[i];
-            else if (HttpUnitOptions.getMatchesIgnoreCase() && images[i].getSource().equalsIgnoreCase( source )) return images[i];
+            if (HttpUnitUtils.matches( source, images[i].getSource() )) return images[i];
         }
         return null;
     }
@@ -249,8 +245,7 @@
     public WebImage getImageWithAltText( String altText ) {
         WebImage[] images = getImages();
         for (int i = 0; i < images.length; i++) {
-            if (images[i].getSource().equals( altText )) return images[i];
-            else if (HttpUnitOptions.getMatchesIgnoreCase() && images[i].getAltText().equalsIgnoreCase( altText )) return images[i];
+            if (HttpUnitUtils.matches( altText, images[i].getAltText() )) return images[i];
         }
         return null;
     }

Index: WebTable.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebTable.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- WebTable.java	25 Nov 2002 17:02:21 -0000	1.20
+++ WebTable.java	18 Dec 2002 23:58:10 -0000	1.21
@@ -110,11 +110,7 @@
             for (int j = 0; j < getColumnCount(); j++) {
                 if (_cells[i][j]!=null) {
                     idToCompare = NodeUtils.getNodeAttribute( _cells[i][j].getOriginalDOM(), "id" );
-                    if (HttpUnitOptions.getMatchesIgnoreCase())
-                        if (id.equalsIgnoreCase(idToCompare))
-                            return _cells[i][j];
-                        else if (id.equals(idToCompare))
-                            return _cells[i][j];
+                    if (HttpUnitUtils.matches( id, idToCompare )) return _cells[i][j];
                 }
             }
         }