Some changes added to compile and run with Java 6 and Java 7.cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56cm-10.2.1cm-10.2.0cm-10.2-M1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1staging/cm-12.1staging/cm-12.0-cafstable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Istable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0stable/cm-10.2shipping/cm-11.0mr1.1-stagingcm-12.1cm-12.0cm-11.0cm-10.2cm-10.1

  - overload problems

Change-Id: I15a367dbce3a52557c8236fe0888f0174dfff024

1 files changed, 0 insertions, 90 deletions

diff --git a/src/com/google/android/testing/mocking/AndroidMock.java b/src/com/google/android/testing/mocking/AndroidMock.java
index 88f79b1..8378c4e 100644
--- a/src/com/google/android/testing/mocking/AndroidMock.java
+++ b/src/com/google/android/testing/mocking/AndroidMock.java
@@ -2361,96 +2361,6 @@ public class AndroidMock {
   }
 
   /**
-   * Expect any {@code int/Integer} as a parameter to the mocked method, but capture it for later
-   * use.
-   * 
-   * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
-   * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
-   * 
-   * @param captured a container to hold the captured value, retrieved by
-   * {@link org.easymock.Capture#getValue()}
-   * @return {@code 0}. The return value is always ignored.
-   */
-  public static int capture(Capture<Integer> captured) {
-    return EasyMock.capture(captured);
-  }
-
-  /**
-   * Expect any {@code long/Long} as a parameter to the mocked method, but capture it for later
-   * use.
-   * 
-   * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
-   * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
-   * 
-   * @param captured a container to hold the captured value, retrieved by
-   * {@link org.easymock.Capture#getValue()}
-   * @return {@code 0}. The return value is always ignored.
-   */
-  public static long capture(Capture<Long> captured) {
-    return EasyMock.capture(captured);
-  }
-
-  /**
-   * Expect any {@code float/Float} as a parameter to the mocked method, but capture it for later
-   * use.
-   * 
-   * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
-   * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
-   * 
-   * @param captured a container to hold the captured value, retrieved by
-   * {@link org.easymock.Capture#getValue()}
-   * @return {@code 0}. The return value is always ignored.
-   */
-  public static float capture(Capture<Float> captured) {
-    return EasyMock.capture(captured);
-  }
-
-  /**
-   * Expect any {@code double/Double} as a parameter to the mocked method, but capture it for later
-   * use.
-   * 
-   * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
-   * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
-   * 
-   * @param captured a container to hold the captured value, retrieved by
-   * {@link org.easymock.Capture#getValue()}
-   * @return {@code 0}. The return value is always ignored.
-   */
-  public static double capture(Capture<Double> captured) {
-    return EasyMock.capture(captured);
-  }
-
-  /**
-   * Expect any {@code byte/Byte} as a parameter to the mocked method, but capture it for later
-   * use.
-   * 
-   * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
-   * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
-   * 
-   * @param captured a container to hold the captured value, retrieved by
-   * {@link org.easymock.Capture#getValue()}
-   * @return {@code 0}
-   */
-  public static byte capture(Capture<Byte> captured) {
-    return EasyMock.capture(captured);
-  }
-
-  /**
-   * Expect any {@code char/Character} as a parameter to the mocked method, but capture it for later
-   * use.
-   * 
-   * {@link org.easymock.Capture} allows for capturing of the incoming value. Use
-   * {@link org.easymock.Capture#getValue()} to retrieve the captured value.
-   * 
-   * @param captured a container to hold the captured value, retrieved by
-   * {@link org.easymock.Capture#getValue()}
-   * @return {@code 0}
-   */
-  public static char capture(Capture<Character> captured) {
-    return EasyMock.capture(captured);
-  }
-
-  /**
    * Switches the given mock objects (more exactly: the controls of the mock
    * objects) to replay mode.
    *