Update of /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock
In directory sc8-pr-cvs16:/tmp/cvs-serv20175/input/javasrc/biz/xsoftware/mock
Modified Files:
CalledMethod.java MockObjectFactory.java MockObject.java
Log Message:
fix generics warnings and some other stuff.
Index: CalledMethod.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/CalledMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CalledMethod.java 14 May 2007 14:26:13 -0000 1.2
--- CalledMethod.java 14 May 2007 18:31:31 -0000 1.3
***************
*** 75,79 ****
@Override
public String toString() {
! List paramList = null;
if(params != null)
paramList = Arrays.asList(params);
--- 75,79 ----
@Override
public String toString() {
! List<Object> paramList = null;
if(params != null)
paramList = Arrays.asList(params);
Index: MockObject.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/MockObject.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MockObject.java 14 May 2007 14:26:14 -0000 1.11
--- MockObject.java 14 May 2007 18:31:32 -0000 1.12
***************
*** 105,109 ****
* @param argTypes The parameters types of the method so overloaded method can be specified
*/
! public void setDefaultBehavior(String method, Behavior b, Class ... argTypes);
/**
--- 105,109 ----
* @param argTypes The parameters types of the method so overloaded method can be specified
*/
! public void setDefaultBehavior(String method, Behavior b, Class<?> ... argTypes);
/**
***************
*** 162,166 ****
* @param argTypes The parameters to the method to distinguish between overloaded methods.
*/
! public void addBehavior(String method, Behavior behavior, Class... argTypes);
/**
--- 162,166 ----
* @param argTypes The parameters to the method to distinguish between overloaded methods.
*/
! public void addBehavior(String method, Behavior behavior, Class<?>... argTypes);
/**
Index: MockObjectFactory.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/mock/MockObjectFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MockObjectFactory.java 15 Sep 2006 21:22:56 -0000 1.5
--- MockObjectFactory.java 14 May 2007 18:31:31 -0000 1.6
***************
*** 30,34 ****
* cases can call expect event on.
*/
! public static MockObject createMock(String id, Class theInterface) {
return createMock(new Class[] { theInterface });
}
--- 30,34 ----
* cases can call expect event on.
*/
! public static MockObject createMock(String id, Class<?> theInterface) {
return createMock(new Class[] { theInterface });
}
***************
*** 50,55 ****
* cases can call expect event on.
*/
! public static MockObject createMock(Class theInterface) {
! return createMock(new Class[] { theInterface });
}
--- 50,55 ----
* cases can call expect event on.
*/
! public static MockObject createMock(Class<?> theInterface) {
! return createMock(new Class<?>[] { theInterface });
}
***************
*** 73,77 ****
* cases can call expect event on.
*/
! public static MockObject createMock(Class[] interfaces) {
return createMock("(no id specified)", interfaces);
}
--- 73,77 ----
* cases can call expect event on.
*/
! public static MockObject createMock(Class<?>[] interfaces) {
return createMock("(no id specified)", interfaces);
}
***************
*** 96,100 ****
* cases can call expect event on.
*/
! public static synchronized MockObject createMock(String id, Class[] interfaces) {
if(factory == null) {
loadFactory();
--- 96,100 ----
* cases can call expect event on.
*/
! public static synchronized MockObject createMock(String id, Class<?>[] interfaces) {
if(factory == null) {
loadFactory();
***************
*** 117,120 ****
}
! public abstract MockObject createMockImpl(String id, Class[] interfaces);
}
--- 117,120 ----
}
! public abstract MockObject createMockImpl(String id, Class<?>[] interfaces);
}
|