summaryrefslogtreecommitdiff
path: root/dev-java/easymock/files/easymock-2.5.5-nameClash.patch
blob: 7a4f0d92ab64ec0af82ffcee18578a8cd7ad5560 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
--- a/src/main/java/org/easymock/EasyMock.java	Thu Feb 23 10:32:43 2012 +0100
+++ b/src/main/java/org/easymock/EasyMock.java	Thu Feb 23 11:25:46 2012 +0100
@@ -1452,81 +1452,200 @@
     
     /**
      * Expect any object but captures it for later use.
-     *  
-     * @param <T> Type of the captured object
-     * @param captured Where the parameter is captured
+     *
+     * @param <T>
+     *            Type of the captured object
+     * @param captured
+     *            Where the parameter is captured
      * @return <code>null</code>
      */
-    public static <T> T capture(Capture<T> captured) {
+    public static <T> T capture(final Capture<T> captured) {
         reportMatcher(new Captures<T>(captured));
         return null;
     }
-    
+
+    /**
+     * Expect any boolean but captures it for later use.
+     *
+     * @param captured
+     *            Where the parameter is captured
+     * @return <code>false</code>
+     */
+    public static boolean captureBoolean(final Capture<Boolean> captured) {
+        reportMatcher(new Captures<Boolean>(captured));
+        return false;
+    }
+
+//    /**
+//     * Expect any boolean but captures it for later use.
+//     *
+//     * @param captured
+//     *            Where the parameter is captured
+//     * @return <code>0</code>
+//     *
+//     * @deprecated Because of harder erasure enforcement, doesn't compile in
+//     *             Java 7
+//     */
+//    @Deprecated
+//    public static boolean capture(final Capture<Boolean> captured) {
+//        return captureBoolean(captured);
+//    }
+
     /**
      * Expect any int but captures it for later use.
-     *  
-     * @param captured Where the parameter is captured
+     *
+     * @param captured
+     *            Where the parameter is captured
      * @return <code>0</code>
      */
-    public static int capture(Capture<Integer> captured) {
+    public static int captureInt(final Capture<Integer> captured) {
         reportMatcher(new Captures<Integer>(captured));
         return 0;
     }
-    
+//    /**
+//     * Expect any int but captures it for later use.
+//     *
+//     * @param captured
+//     *            Where the parameter is captured
+//     * @return <code>0</code>
+//     *
+//     * @deprecated Because of harder erasure enforcement, doesn't compile in
+//     *             Java 7
+//     */
+//    @Deprecated
+//    public static int capture(final Capture<Integer> captured) {
+//        return captureInt(captured);
+//    }
+
     /**
      * Expect any long but captures it for later use.
-     *  
-     * @param captured Where the parameter is captured
+     *
+     * @param captured
+     *            Where the parameter is captured
      * @return <code>0</code>
      */
-    public static long capture(Capture<Long> captured) {
+    public static long captureLong(final Capture<Long> captured) {
         reportMatcher(new Captures<Long>(captured));
         return 0;
     }
-    
+//    /**
+//     * Expect any long but captures it for later use.
+//     *
+//     * @param captured
+//     *            Where the parameter is captured
+//     * @return <code>0</code>
+//     *
+//     * @deprecated Because of harder erasure enforcement, doesn't compile in
+//     *             Java 7
+//     */
+//    @Deprecated
+//    public static long capture(final Capture<Long> captured) {
+//        return captureLong(captured);
+//    }
+
     /**
      * Expect any float but captures it for later use.
-     *  
-     * @param captured Where the parameter is captured
+     *
+     * @param captured
+     *            Where the parameter is captured
      * @return <code>0</code>
      */
-    public static float capture(Capture<Float> captured) {
+    public static float captureFloat(final Capture<Float> captured) {
         reportMatcher(new Captures<Float>(captured));
         return 0;
     }
-    
+//    /**
+//     * Expect any float but captures it for later use.
+//     *
+//     * @param captured
+//     *            Where the parameter is captured
+//     * @return <code>0</code>
+//     *
+//     * @deprecated Because of harder erasure enforcement, doesn't compile in
+//     *             Java 7
+//     */
+//    @Deprecated
+//    public static float capture(final Capture<Float> captured) {
+//        return captureFloat(captured);
+//    }
+
     /**
      * Expect any double but captures it for later use.
-     *  
-     * @param captured Where the parameter is captured
+     *
+     * @param captured
+     *            Where the parameter is captured
      * @return <code>0</code>
      */
-    public static double capture(Capture<Double> captured) {
+    public static double captureDouble(final Capture<Double> captured) {
         reportMatcher(new Captures<Double>(captured));
         return 0;
     }
+//    /**
+//     * Expect any double but captures it for later use.
+//     *
+//     * @param captured
+//     *            Where the parameter is captured
+//     * @return <code>0</code>
+//     *
+//     * @deprecated Because of harder erasure enforcement, doesn't compile in
+//     *             Java 7
+//     */
+//    @Deprecated
+//    public static double capture(final Capture<Double> captured) {
+//        return captureDouble(captured);
+//    }
 
     /**
      * Expect any byte but captures it for later use.
-     *  
-     * @param captured Where the parameter is captured
+     *
+     * @param captured
+     *            Where the parameter is captured
      * @return <code>0</code>
      */
-    public static byte capture(Capture<Byte> captured) {
+    public static byte captureByte(final Capture<Byte> captured) {
         reportMatcher(new Captures<Byte>(captured));
         return 0;
     }
-    
+//    /**
+//     * Expect any byte but captures it for later use.
+//     *
+//     * @param captured
+//     *            Where the parameter is captured
+//     * @return <code>0</code>
+//     *
+//     * @deprecated Because of harder erasure enforcement, doesn't compile in
+//     *             Java 7
+//     */
+//    @Deprecated
+//    public static byte capture(final Capture<Byte> captured) {
+//        return captureByte(captured);
+//    }
+
     /**
      * Expect any char but captures it for later use.
-     *  
-     * @param captured Where the parameter is captured
+     *
+     * @param captured
+     *            Where the parameter is captured
      * @return <code>0</code>
      */
-    public static char capture(Capture<Character> captured) {
+    public static char captureChar(final Capture<Character> captured) {
         reportMatcher(new Captures<Character>(captured));
         return 0;
     }
+//    /**
+//     * Expect any char but captures it for later use.
+//     *
+//     * @param captured
+//     *            Where the parameter is captured
+//     * @return <code>0</code>
+//     *
+//     * @deprecated Because of harder erasure enforcement, doesn't compile in
+//     *             Java 7
+//     */
+//    @Deprecated
+//    public static char capture(final Capture<Character> captured) {
+//        return captureChar(captured);
+//    }
     
     /**
      * Switches the given mock objects (more exactly: the controls of the mock