[Mocklib-checkins] mocklib2/input/javasrc/biz/xsoftware/mock2 MockObjectFactory.java,1.2,1.3 MockObjectImpl.java,1.1,NONE

[Nobody <fas...@us...>]

Update of /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13634/input/javasrc/biz/xsoftware/mock2

Modified Files:
	MockObjectFactory.java 
Removed Files:
	MockObjectImpl.java 
Log Message:
get build passing again by modifying design slightly and in some cases modifying code to adhere to design.

--- MockObjectImpl.java DELETED ---

Index: MockObjectFactory.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2/MockObjectFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockObjectFactory.java	3 Jan 2006 15:36:45 -0000	1.2
--- MockObjectFactory.java	13 Jan 2006 14:48:31 -0000	1.3
***************
*** 4,8 ****
  
  import biz.xsoftware.mock2.MockObject;
! import biz.xsoftware.mock2.MockObjectImpl;
  
  /**
--- 4,8 ----
  
  import biz.xsoftware.mock2.MockObject;
! import biz.xsoftware.mock2.impl.MockObjectImpl;
  
  /**
***************
*** 13,28 ****
   */
  public abstract class MockObjectFactory {
  	public static MockObject createMock(Class[] interfacesToMock) {
! 		Class[] interfacesPlusMock = new Class[interfacesToMock.length + 1];
! 		interfacesPlusMock[0] = MockObject.class;
! 		for (int i = 1; i < interfacesPlusMock.length; i++) {
! 			interfacesPlusMock[i] = interfacesToMock[i - 1];
! 		}
! 
! 		ClassLoader cl = MockObjectFactory.class.getClassLoader();
! 		MockObjectImpl impl = new MockObjectImpl(interfacesToMock);
! 		Object o = Proxy.newProxyInstance(cl, interfacesPlusMock, impl);
! 		MockObject m = (MockObject) o;
! 		return m;
  	}
  
--- 13,24 ----
   */
  public abstract class MockObjectFactory {
+ 	
+ 	private static MockObjectFactory singleton() {
+ 		//fix this using reflection....
+ 		return null;
+ 	}
+ 	
  	public static MockObject createMock(Class[] interfacesToMock) {
! 		return singleton().createMock(interfacesToMock);
  	}
  
***************
*** 32,44 ****
  
  	public static MockObject createMock(Class interfaceToMock, Object realObject) {
! 		// TODO: Implement me!
! 		Class[] interfacePlusMock = new Class[1];
! 		interfacePlusMock[0] = MockObject.class;
! 
! 		ClassLoader cl = MockObjectFactory.class.getClassLoader();
! 		MockObjectImpl impl = new MockObjectImpl(interfaceToMock, realObject);
! 		Object o = Proxy.newProxyInstance(cl, interfacePlusMock, impl);
! 		MockObject m = (MockObject) o;
! 		return m;
  	}
  }
--- 28,32 ----
  
  	public static MockObject createMock(Class interfaceToMock, Object realObject) {
! 		return singleton().createMock(interfaceToMock, realObject);
  	}
  }