[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit Button.java,1.6,1.7 WebForm.java,1.80,1.81

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

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

Modified Files:
	Button.java WebForm.java 
Log Message:
Renamed button predicates

Index: Button.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/Button.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Button.java	13 Mar 2003 20:16:17 -0000	1.6
+++ Button.java	13 Mar 2003 20:19:01 -0000	1.7
@@ -33,8 +33,8 @@
  **/
 public class Button extends FormControl {
 
-    static final public HTMLElementPredicate HAS_ID;
-    static final public HTMLElementPredicate HAS_LABEL;
+    static final public HTMLElementPredicate WITH_ID;
+    static final public HTMLElementPredicate WITH_LABEL;
 
     private String _onClickEvent = "";
 
@@ -105,13 +105,13 @@
 
 
     static {
-        HAS_ID = new HTMLElementPredicate() {
+        WITH_ID = new HTMLElementPredicate() {
             public boolean matchesCriteria( Object button, Object id ) {
                 return ((Button) button).getID().equals( id );
             };
         };
 
-        HAS_LABEL = new HTMLElementPredicate() {
+        WITH_LABEL = new HTMLElementPredicate() {
             public boolean matchesCriteria( Object button, Object label ) {
                 return ((Button) button).getValue().equals( label );
             };

Index: WebForm.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebForm.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- WebForm.java	13 Mar 2003 20:16:17 -0000	1.80
+++ WebForm.java	13 Mar 2003 20:19:02 -0000	1.81
@@ -133,7 +133,7 @@
      * Convenience method which returns the button with the specified ID.
      */
     public Button getButtonWithID( String buttonID ) {
-        return getButton( Button.HAS_ID, buttonID );
+        return getButton( Button.WITH_ID, buttonID );
     }