Merge branch 'master' of github.com:code4craft/tinyioc

code4craft · code4craft · commit 78e84e68663e · 2014-01-13T18:33:56.000+08:00
Conflicts:
	src/main/java/us/codecraft/tinyioc/aop/JdkDynamicAopProxy.java
	src/main/java/us/codecraft/tinyioc/aop/TargetSource.java
diff --git a/src/main/java/us/codecraft/tinyioc/aop/JdkDynamicAopProxy.java b/src/main/java/us/codecraft/tinyioc/aop/JdkDynamicAopProxy.java
@@ -19,7 +19,7 @@ public JdkDynamicAopProxy(AdvisedSupport advised) {
 		this.advised = advised;
 	}
 
-	@Override
+    @Override
 	public Object getProxy() {
 		return Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] { advised.getTargetSource()
 				.getTargetClass() }, this);

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public JdkDynamicAopProxy(AdvisedSupport advised) {`
`19`	`19`	`this.advised = advised;`
`20`	`20`	`}`
`21`	`21`
`22`		`- @Override`
	`22`	`+ @Override`
`23`	`23`	`public Object getProxy() {`
`24`	`24`	`return Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] { advised.getTargetSource()`
`25`	`25`	`.getTargetClass() }, this);`