Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Java 5 code style

Browse Source
This commit is contained in:
Juergen Hoeller
2008-11-28 11:39:36 +00:00
parent fda7100866
commit f8c690c542
55 changed files with 356 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2007 the original author or authors.
* Copyright 2002-2008 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public class AspectJPointcutAdvisor implements PointcutAdvisor, Ordered {
}
public void setOrder(int order) {
this.order = new Integer(order);
this.order = order;
}
@@ -70,7 +70,7 @@ public class AspectJPointcutAdvisor implements PointcutAdvisor, Ordered {
public int getOrder() {
if (this.order != null) {
return this.order.intValue();
return this.order;
}
else {
return this.advice.getOrder();

4
org.springframework.aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
View File

@@ -159,11 +159,11 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
try {
if (!this.equalsDefined && AopUtils.isEqualsMethod(method)) {
// The target does not implement the equals(Object) method itself.
return (equals(args[0]) ? Boolean.TRUE : Boolean.FALSE);
return equals(args[0]);
}
if (!this.hashCodeDefined && AopUtils.isHashCodeMethod(method)) {
// The target does not implement the hashCode() method itself.
return new Integer(hashCode());
return hashCode();
}
if (!this.advised.opaque && method.getDeclaringClass().isInterface() &&
method.getDeclaringClass().isAssignableFrom(Advised.class)) {