[jbehave-scm] [735] trunk/core/src/java/org/jbehave/core/mock: [EK] No point doing containsInOrder(...) with only one argument.

Thu, 24 May 2007 11:02:51 -0700

Title: [735] trunk/core/src/java/org/jbehave/core/mock: [EK] No point doing containsInOrder(...) with only one argument.

Diff

Modified: trunk/core/src/java/org/jbehave/core/matchers/UsingArrayMatchers.java (734 => 735)

--- trunk/core/src/java/org/jbehave/core/matchers/UsingArrayMatchers.java	2007-05-24 17:43:38 UTC (rev 734)
+++ trunk/core/src/java/org/jbehave/core/matchers/UsingArrayMatchers.java	2007-05-24 18:02:00 UTC (rev 735)
@@ -152,10 +152,6 @@
         return matchers;
     }
     
-    public static CustomMatcher containsInOrder(Object a) {
-        return containsInOrder(new Object[] {a});
-    }
-    
     public static CustomMatcher containsInOrder(Object a, Object b) {
         return containsInOrder(new Object[] {a, b});
     }
@@ -168,10 +164,6 @@
         return containsInOrder(allEq(objects));
     }
 
-    public static CustomMatcher containsInOrder(Matcher a) {
-        return containsInOrder(new Matcher[] {a});
-    }
-    
     public static CustomMatcher containsInOrder(Matcher a, Matcher b) {
         return containsInOrder(new Matcher[] {a, b});
     }

Modified: trunk/core/src/java/org/jbehave/core/matchers/UsingCollectionMatchers.java (734 => 735)

--- trunk/core/src/java/org/jbehave/core/matchers/UsingCollectionMatchers.java	2007-05-24 17:43:38 UTC (rev 734)
+++ trunk/core/src/java/org/jbehave/core/matchers/UsingCollectionMatchers.java	2007-05-24 18:02:00 UTC (rev 735)
@@ -154,10 +154,6 @@
 		return matchers;
 	}
 	
-	public static CustomMatcher containsInOrder(Object a) {
-		return containsInOrder(new Object[] {a});
-	}
-	
 	public static CustomMatcher containsInOrder(Object a, Object b) {
 		return containsInOrder(new Object[] {a, b});
 	}
@@ -169,10 +165,6 @@
 	public static CustomMatcher containsInOrder(Object[] objects) {
 		return containsInOrder(allEq(objects));
 	}
-
-	public static CustomMatcher containsInOrder(Matcher a) {
-		return containsInOrder(new Matcher[] {a});
-	}
 	
 	public static CustomMatcher containsInOrder(Matcher a, Matcher b) {
 		return containsInOrder(new Matcher[] {a, b});

Modified: trunk/core/src/java/org/jbehave/core/mock/UsingMatchers.java (734 => 735)

--- trunk/core/src/java/org/jbehave/core/mock/UsingMatchers.java	2007-05-24 17:43:38 UTC (rev 734)
+++ trunk/core/src/java/org/jbehave/core/mock/UsingMatchers.java	2007-05-24 18:02:00 UTC (rev 735)
@@ -317,10 +317,6 @@
     }
     
     
-    public CustomMatcher collectionContainingInOrder(Object a) {
-        return UsingCollectionMatchers.containsInOrder(a);
-    }
-    
     public CustomMatcher collectionContainingInOrder(Object a, Object b) {
         return UsingCollectionMatchers.containsInOrder(a, b);
     }
@@ -337,10 +333,6 @@
         return UsingCollectionMatchers.containsInOrder(objects);
     }
     
-    public CustomMatcher collectionContainingInOrder(Matcher a) {
-        return UsingCollectionMatchers.containsInOrder(a);
-    }
-    
     public CustomMatcher collectionContainingInOrder(Matcher a, Matcher b) {
         return UsingCollectionMatchers.containsInOrder(a, b);
     }
@@ -414,11 +406,6 @@
         return UsingArrayMatchers.containsOnly(a, b, c);
     }
     
-    
-    public CustomMatcher arrayContainingInOrder(Object a) {
-        return UsingArrayMatchers.containsInOrder(a);
-    }
-    
     public CustomMatcher arrayContainingInOrder(Object a, Object b) {
         return UsingArrayMatchers.containsInOrder(a, b);
     }
@@ -435,10 +422,6 @@
         return UsingArrayMatchers.containsInOrder(objects);
     }
     
-    public CustomMatcher arrayContainingInOrder(Matcher a) {
-        return UsingArrayMatchers.containsInOrder(a);
-    }
-    
     public CustomMatcher arrayContainingInOrder(Matcher a, Matcher b) {
         return UsingArrayMatchers.containsInOrder(a, b);
     }

Modified: trunk/extensions/swing/src/java/org/jbehave/threaded/swing/CharacterTyper.java (734 => 735)

--- trunk/extensions/swing/src/java/org/jbehave/threaded/swing/CharacterTyper.java	2007-05-24 17:43:38 UTC (rev 734)
+++ trunk/extensions/swing/src/java/org/jbehave/threaded/swing/CharacterTyper.java	2007-05-24 18:02:00 UTC (rev 735)
@@ -4,8 +4,6 @@
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.EventQueue;
-import java.awt.ItemSelectable;
-import java.awt.TextComponent;
 import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.KeyEvent;
@@ -14,8 +12,6 @@
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
-import javax.swing.SwingUtilities;
-import javax.swing.text.JTextComponent;
 
 import org.jbehave.core.threaded.TimeoutException;

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to