[jboss-cvs] JBossAS SVN: r96367 - in projects/aop/trunk/aop/src/main/java/org/jboss/aop: annotation/compiler and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 13 12:56:27 EST 2009
Author: kabir.khan at jboss.com
Date: 2009-11-13 12:56:26 -0500 (Fri, 13 Nov 2009)
New Revision: 96367
Modified:
projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectXmlLoader.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/Deployment.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/Dispatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/HotSwapStrategy.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/annotation/compiler/MemberValuePopulate.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ArrayRegistry.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/BooleanArrayElementReadInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/BooleanArrayElementWriteInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ByteArrayElementReadInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ByteArrayElementWriteInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/CharArrayElementReadInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/CharArrayElementWriteInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/DoubleArrayElementReadInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/DoubleArrayElementWriteInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/FloatArrayElementReadInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/FloatArrayElementWriteInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/IntArrayElementReadInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/IntArrayElementWriteInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/LongArrayElementReadInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/LongArrayElementWriteInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ShortArrayElementReadInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ShortArrayElementWriteInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/expressions/ParameterExpression.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinPointGenerator.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/AnnotationMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/CFlowMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/CallMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ConstructionMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ConstructorCallMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/DeclareTypeMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ExecutionConstructorMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ExecutionMethodMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldGetMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldSetMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MatcherHelper.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MethodCallMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/NewExprMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/SoftClassMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/TypeMatcher.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/Util.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ProxyFactory.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ProxyMethodInvocation.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerProxyFactory.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/ClassInfoMethodHashing.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/JavassistMethodHashing.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/MethodHashing.java
Log:
[JBAOP-757] More bug fixes
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -280,7 +280,7 @@
String pruneit = System.getProperty("jboss.aop.prune", null);
if (pruneit != null)
{
- AOPClassPoolRepository.getInstance().setPrune((new Boolean(pruneit)).booleanValue());
+ AOPClassPoolRepository.getInstance().setPrune((Boolean.valueOf(pruneit)).booleanValue());
}
manager = new AspectManager();
//Initialise frequently used fields needed by the top-level manager
@@ -295,7 +295,7 @@
if (!verbose)
{
- verbose = (new Boolean(System.getProperty("jboss.aop.verbose", "false"))).booleanValue();
+ verbose = (Boolean.valueOf(System.getProperty("jboss.aop.verbose", "false"))).booleanValue();
}
String exclude = System.getProperty("jboss.aop.exclude", null);
if (exclude != null)
@@ -331,13 +331,13 @@
String debugClass = System.getProperty("jboss.aop.debug.classes", null);
if (debugClass != null)
{
- debugClasses = (new Boolean(debugClass)).booleanValue();
+ debugClasses = (Boolean.valueOf(debugClass)).booleanValue();
}
String methodInterceptors = System.getProperty("jboss.aop.advisor.methodInterceptors", null);
if (methodInterceptors != null)
{
- maintainAdvisorMethodInterceptors = (new Boolean(methodInterceptors)).booleanValue();
+ maintainAdvisorMethodInterceptors = (Boolean.valueOf(methodInterceptors)).booleanValue();
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectXmlLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectXmlLoader.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectXmlLoader.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -810,7 +810,7 @@
throw new RuntimeException("annotation introduction must have an invisible attribute");
}
- boolean isInvisble = new Boolean(invisible).booleanValue();
+ boolean isInvisble = Boolean.valueOf(invisible).booleanValue();
String annotation = XmlHelper.getElementContent(pointcut);
@@ -890,7 +890,7 @@
}
else
{
- isTransient = new Boolean(isTransientString).booleanValue();
+ isTransient = Boolean.valueOf(isTransientString).booleanValue();
}
intfs = XmlHelper.getUniqueChildContent(mixin, "interfaces");
@@ -1013,7 +1013,7 @@
}
else
{
- parentFirst = new Boolean(parentFirstString).booleanValue();
+ parentFirst = Boolean.valueOf(parentFirstString).booleanValue();
}
boolean inheritDefs = true;
@@ -1024,7 +1024,7 @@
}
else
{
- inheritDefs = new Boolean(inheritDefsString).booleanValue();
+ inheritDefs = Boolean.valueOf(inheritDefsString).booleanValue();
}
boolean inheritBindings = false;
@@ -1035,7 +1035,7 @@
}
else
{
- inheritBindings = new Boolean(inheritBindingsString).booleanValue();
+ inheritBindings = Boolean.valueOf(inheritBindingsString).booleanValue();
}
AspectManager parent = manager;
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/Deployment.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/Deployment.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/Deployment.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -68,7 +68,7 @@
public static void preconfigThroughClassPath()
{
String search = System.getProperty("jboss.aop.search.classpath", null);
- if (search != null) searchClasspath = (new Boolean(search)).booleanValue();
+ if (search != null) searchClasspath = Boolean.valueOf(search).booleanValue();
if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("jboss.aop.search.classpath: '" + search + "' " + searchClasspath);
if (searchClasspath)
{
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/Dispatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/Dispatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/Dispatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -113,7 +113,7 @@
// For non-advised methods, we can only do public method invocations
long methodHash = methodInvocation.getMethodHash();
HashMap<Long, MethodPersistentReference> methodMap = ClassProxyFactory.getMethodMap(target.getClass());
- MethodPersistentReference ref = methodMap.get(new Long(methodHash));
+ MethodPersistentReference ref = methodMap.get(Long.valueOf(methodHash));
Method method = (Method)ref.get();
Object[] args = methodInvocation.getArguments();
try
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/HotSwapStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/HotSwapStrategy.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/HotSwapStrategy.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -490,12 +490,12 @@
{
if(indexMap[i] != -1)
{
- newlyAdvised.add(new Integer(indexMap[i]));
+ newlyAdvised.add(Integer.valueOf(indexMap[i]));
}
}
else
{
- newlyAdvised.add(new Integer(i));
+ newlyAdvised.add(Integer.valueOf(i));
}
}
@@ -505,12 +505,12 @@
{
if(indexMap[i] != -1)
{
- newlyUnadvised.add(new Integer(indexMap[i]));
+ newlyUnadvised.add(Integer.valueOf(indexMap[i]));
}
}
else
{
- newlyUnadvised.add(new Integer(i));
+ newlyUnadvised.add(Integer.valueOf(i));
}
}
}
@@ -528,11 +528,11 @@
if (this.instanceAdvisors.containsKey(instanceAdvisor))
{
Integer interceptors = instanceAdvisors.get(instanceAdvisor);
- instanceAdvisors.put(instanceAdvisor, new Integer(interceptors.intValue() + interceptorsAdded));
+ instanceAdvisors.put(instanceAdvisor, Integer.valueOf(interceptors.intValue() + interceptorsAdded));
}
else
{
- instanceAdvisors.put(instanceAdvisor, new Integer(interceptorsAdded));
+ instanceAdvisors.put(instanceAdvisor, Integer.valueOf(interceptorsAdded));
}
}
@@ -571,7 +571,7 @@
{
if (interceptors[i] == null || interceptors[i].length == 0)
{
- joinpointsFound.add(new Integer(i));
+ joinpointsFound.add(Integer.valueOf(i));
}
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/annotation/compiler/MemberValuePopulate.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/annotation/compiler/MemberValuePopulate.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/annotation/compiler/MemberValuePopulate.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -63,7 +63,7 @@
public void visitBooleanMemberValue(BooleanMemberValue booleanMemberValue)
{
- Boolean bool = new Boolean(value);
+ Boolean bool = Boolean.valueOf(value);
booleanMemberValue.setValue(bool.booleanValue());
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ArrayRegistry.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ArrayRegistry.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ArrayRegistry.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -68,7 +68,7 @@
{
return;
}
- addReference(owner, new Integer(index), array, ELEMENT_ARRAY_REGISTRY_ENTRY_FACTORY);
+ addReference(owner, Integer.valueOf(index), array, ELEMENT_ARRAY_REGISTRY_ENTRY_FACTORY);
}
public void addReference(Object owner, Object qualifier, Object array, ArrayRegistryEntryFactory factory)
@@ -126,7 +126,7 @@
return;
}
- removeReference(owner, new Integer(index), array);
+ removeReference(owner, Integer.valueOf(index), array);
}
public void removeReference(Object owner, Object qualifier, Object array)
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/BooleanArrayElementReadInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/BooleanArrayElementReadInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/BooleanArrayElementReadInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -41,6 +41,6 @@
public Object invokeTarget()
{
- return new Boolean(array[index]);
+ return Boolean.valueOf(array[index]);
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/BooleanArrayElementWriteInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/BooleanArrayElementWriteInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/BooleanArrayElementWriteInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -51,7 +51,7 @@
@Override
public Object getValue()
{
- return new Boolean(value);
+ return Boolean.valueOf(value);
}
public boolean getBooleanValue()
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ByteArrayElementReadInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ByteArrayElementReadInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ByteArrayElementReadInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -41,6 +41,6 @@
public Object invokeTarget()
{
- return new Byte(array[index]);
+ return Byte.valueOf(array[index]);
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ByteArrayElementWriteInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ByteArrayElementWriteInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ByteArrayElementWriteInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -51,7 +51,7 @@
@Override
public Object getValue()
{
- return new Byte(value);
+ return Byte.valueOf(value);
}
public byte getByteValue()
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/CharArrayElementReadInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/CharArrayElementReadInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/CharArrayElementReadInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -41,6 +41,6 @@
public Object invokeTarget()
{
- return new Character(array[index]);
+ return Character.valueOf(array[index]);
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/CharArrayElementWriteInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/CharArrayElementWriteInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/CharArrayElementWriteInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -51,7 +51,7 @@
@Override
public Object getValue()
{
- return new Character(value);
+ return Character.valueOf(value);
}
public char getCharValue()
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/DoubleArrayElementReadInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/DoubleArrayElementReadInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/DoubleArrayElementReadInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -41,6 +41,6 @@
public Object invokeTarget()
{
- return new Double(array[index]);
+ return Double.valueOf(array[index]);
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/DoubleArrayElementWriteInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/DoubleArrayElementWriteInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/DoubleArrayElementWriteInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -51,7 +51,7 @@
@Override
public Object getValue()
{
- return new Double(value);
+ return Double.valueOf(value);
}
public double getDoubleValue()
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/FloatArrayElementReadInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/FloatArrayElementReadInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/FloatArrayElementReadInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -41,6 +41,6 @@
public Object invokeTarget()
{
- return new Float(array[index]);
+ return Float.valueOf(array[index]);
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/FloatArrayElementWriteInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/FloatArrayElementWriteInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/FloatArrayElementWriteInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -51,7 +51,7 @@
@Override
public Object getValue()
{
- return new Float(value);
+ return Float.valueOf(value);
}
public float getFloatValue()
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/IntArrayElementReadInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/IntArrayElementReadInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/IntArrayElementReadInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -41,6 +41,6 @@
public Object invokeTarget()
{
- return new Integer(array[index]);
+ return Integer.valueOf(array[index]);
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/IntArrayElementWriteInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/IntArrayElementWriteInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/IntArrayElementWriteInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -51,7 +51,7 @@
@Override
public Object getValue()
{
- return new Integer(value);
+ return Integer.valueOf(value);
}
public int getIntValue()
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/LongArrayElementReadInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/LongArrayElementReadInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/LongArrayElementReadInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -41,6 +41,6 @@
public Object invokeTarget()
{
- return new Long(array[index]);
+ return Long.valueOf(array[index]);
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/LongArrayElementWriteInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/LongArrayElementWriteInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/LongArrayElementWriteInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -51,7 +51,7 @@
@Override
public Object getValue()
{
- return new Long(value);
+ return Long.valueOf(value);
}
public long getLongValue()
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ShortArrayElementReadInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ShortArrayElementReadInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ShortArrayElementReadInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -41,6 +41,6 @@
public Object invokeTarget()
{
- return new Short(array[index]);
+ return Short.valueOf(array[index]);
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ShortArrayElementWriteInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ShortArrayElementWriteInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/array/ShortArrayElementWriteInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -51,7 +51,7 @@
@Override
public Object getValue()
{
- return new Short(value);
+ return Short.valueOf(value);
}
public short getShortValue()
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/expressions/ParameterExpression.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/expressions/ParameterExpression.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/expressions/ParameterExpression.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -58,13 +58,13 @@
if (ret.isArray())
{
Class<?> arr = ret;
- String array = "";
+ StringBuilder array = new StringBuilder("");
while (arr.isArray())
{
- array += "[]";
+ array.append("[]");
arr = arr.getComponentType();
}
- return arr.getName() + array;
+ return arr.getName() + array.toString();
}
return ret.getName();
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorMethodExecutionTransformer.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -242,14 +242,14 @@
String methodInfoField = addMethodInfoFieldToGenAdvisor(trans);
//delegate = genadvisor.getSuperclass().getSuperclass().getDeclaredMethod("invokeMethod");
- String body = "{ return ((org.jboss.aop.ClassAdvisor)this._getAdvisor()).invokeMethod($1, ";
- body += trans.getHash() + "L";
+ StringBuilder body = new StringBuilder("{ return ((org.jboss.aop.ClassAdvisor)this._getAdvisor()).invokeMethod($1, ");
+ body.append(trans.getHash() + "L");
for (int i = 0; i < mixinMethod.getParameterTypes().length; i++)
{
- body += "$" + (i + 2);
+ body.append("$" + (i + 2));
}
- body += ");}";
- addMethodToGeneratedAdvisor(trans, methodInfoField, body);
+ body.append(");}");
+ addMethodToGeneratedAdvisor(trans, methodInfoField, body.toString());
// CtMethod newMethod = CtNewMethod.wrapped(trans.getWMethod().getReturnType(),
// getAdvisorMethodName(trans),
// addTargetToParamsForNonStaticMethod(trans.getClazz(), trans.getWMethod()),
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinPointGenerator.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinPointGenerator.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -614,7 +614,7 @@
Integer useCFlowIndex = cflows.get(setup.getCFlowString());
if (useCFlowIndex == null)
{
- useCFlowIndex = new Integer(setup.getIndex());
+ useCFlowIndex = Integer.valueOf(setup.getIndex());
cflows.put(setup.getCFlowString(), useCFlowIndex);
CtField cflowX = new CtField(
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -195,7 +195,7 @@
{
CtMethod copyTemplate = invocation.getSuperclass().getDeclaredMethod("copy");
- String copyCode = "{ "
+ StringBuilder copyCode = new StringBuilder("{ "
+ " "
+ invocation.getName()
+ " wrapper = new "
@@ -206,13 +206,13 @@
+ " wrapper.instanceResolver = this.instanceResolver; "
+ " wrapper.targetObject = this.targetObject; "
+ " wrapper.responseContextInfo = this.responseContextInfo; "
- + copyText;
+ + copyText);
for (int i = 0; i < paramsLength; i++)
{
- copyCode += " wrapper.arg" + i + " = this.arg" + i + "; ";
+ copyCode.append(" wrapper.arg" + i + " = this.arg" + i + "; ");
}
- copyCode += " return wrapper; }";
+ copyCode.append(" return wrapper; }");
CtMethod copy = null;
try
@@ -222,12 +222,12 @@
"copy",
copyTemplate.getParameterTypes(),
copyTemplate.getExceptionTypes(),
- copyCode,
+ copyCode.toString(),
invocation);
}
catch (CannotCompileException e)
{
- logger.error(copyCode);
+ logger.error(copyCode.toString());
throw e;
}
copy.setModifiers(copyTemplate.getModifiers());
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/AnnotationMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/AnnotationMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/AnnotationMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -106,14 +106,14 @@
{
Node andChild = node.jjtGetChild(0); // should only have one child
boolean val = ((Boolean) left).booleanValue();
- return new Boolean(val && ((Boolean) andChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
+ return Boolean.valueOf(val && ((Boolean) andChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
}
public Object visit(ASTOr node, Object left)
{
Node orChild = node.jjtGetChild(0); // should only have one child
boolean val = ((Boolean) left).booleanValue();
- return new Boolean(val || ((Boolean) orChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
+ return Boolean.valueOf(val || ((Boolean) orChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
}
@@ -148,11 +148,11 @@
CtClass clazz = getDeclaringClass();
if (n instanceof ASTMethod)
{
- return new Boolean(Util.has(clazz, (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(clazz, (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(clazz, (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(clazz, (ASTConstructor) n, advisor));
}
}
else
@@ -160,11 +160,11 @@
Class<?> clazz = getJavaDeclaringClass();
if (n instanceof ASTMethod)
{
- return new Boolean(Util.has(clazz, (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(clazz, (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(clazz, (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(clazz, (ASTConstructor) n, advisor));
}
}
@@ -176,13 +176,13 @@
{
CtClass clazz = getDeclaringClass();
ASTField f = (ASTField) node.jjtGetChild(0);
- return new Boolean(Util.has(clazz, f, advisor));
+ return Boolean.valueOf(Util.has(clazz, f, advisor));
}
else
{
Class<?> clazz = getJavaDeclaringClass();
ASTField f = (ASTField) node.jjtGetChild(0);
- return new Boolean(Util.has(clazz, f, advisor));
+ return Boolean.valueOf(Util.has(clazz, f, advisor));
}
}
@@ -192,12 +192,12 @@
if (element instanceof CtClass)
{
CtClass clazz = (CtClass) element;
- return new Boolean(Util.matchesClassExpr(node.getClazz(), clazz, advisor));
+ return Boolean.valueOf(Util.matchesClassExpr(node.getClazz(), clazz, advisor));
}
else
{
Class<?> clazz = (Class<?>) element;
- return new Boolean(Util.matchesClassExpr(node.getClazz(), clazz, advisor));
+ return Boolean.valueOf(Util.matchesClassExpr(node.getClazz(), clazz, advisor));
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/CFlowMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/CFlowMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/CFlowMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -103,14 +103,14 @@
{
Node andChild = node.jjtGetChild(0); // should only have one child
boolean val = ((Boolean) left).booleanValue();
- return new Boolean(val && ((Boolean) andChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
+ return Boolean.valueOf(val && ((Boolean) andChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
}
public Object visit(ASTOrCFlow node, Object left)
{
Node orChild = node.jjtGetChild(0); // should only have one child
boolean val = ((Boolean) left).booleanValue();
- return new Boolean(val || ((Boolean) orChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
+ return Boolean.valueOf(val || ((Boolean) orChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
}
public Object visit(ASTCFlow node, Object data)
@@ -130,9 +130,9 @@
cl = SecurityActions.getContextClassLoader();
}
- if (cflow != null) return new Boolean(cflow.matches(getStack(), cl));
+ if (cflow != null) return Boolean.valueOf(cflow.matches(getStack(), cl));
DynamicCFlow dcflow = manager.getDynamicCFlow(node.getPointcutName(), cl);
- return new Boolean(dcflow.shouldExecute(invocation));
+ return Boolean.valueOf(dcflow.shouldExecute(invocation));
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/CallMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/CallMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/CallMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -81,18 +81,18 @@
Node n = node.jjtGetChild(0);
if (n instanceof ASTMethod)
{
- return new Boolean(Util.has(calledClass, (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(calledClass, (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(calledClass, (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(calledClass, (ASTConstructor) n, advisor));
}
}
public Object visit(ASTHasField node, Object data)
{
ASTField f = (ASTField) node.jjtGetChild(0);
- return new Boolean(Util.has(calledClass, f, advisor));
+ return Boolean.valueOf(Util.has(calledClass, f, advisor));
}
public Object visit(ASTWithin node, Object data)
@@ -109,7 +109,7 @@
protected Boolean resolvePointcut(Pointcut p)
{
- return new Boolean(p.matchesCall(advisor, within, calledClass, calledMethod));
+ return Boolean.valueOf(p.matchesCall(advisor, within, calledClass, calledMethod));
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ConstructionMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ConstructionMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ConstructionMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -64,11 +64,11 @@
{
if (ctCon != null)
{
- return new Boolean(Util.has(ctCon.getDeclaringClass(), (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(ctCon.getDeclaringClass(), (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(refCon.getDeclaringClass(), (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(refCon.getDeclaringClass(), (ASTMethod) n, advisor));
}
}
@@ -76,11 +76,11 @@
{
if (ctCon != null)
{
- return new Boolean(Util.has(ctCon.getDeclaringClass(), (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(ctCon.getDeclaringClass(), (ASTConstructor) n, advisor));
}
else
{
- return new Boolean(Util.has(refCon.getDeclaringClass(), (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(refCon.getDeclaringClass(), (ASTConstructor) n, advisor));
}
}
@@ -91,11 +91,11 @@
ASTField f = (ASTField) node.jjtGetChild(0);
if (ctCon != null)
{
- return new Boolean(Util.has(ctCon.getDeclaringClass(), f, advisor));
+ return Boolean.valueOf(Util.has(ctCon.getDeclaringClass(), f, advisor));
}
else
{
- return new Boolean(Util.has(refCon.getDeclaringClass(), f, advisor));
+ return Boolean.valueOf(Util.has(refCon.getDeclaringClass(), f, advisor));
}
}
@@ -104,8 +104,8 @@
{
try
{
- if (refCon != null) return new Boolean(p.matchesConstruction(advisor, refCon));
- return new Boolean(p.matchesConstruction(advisor, ctCon));
+ if (refCon != null) return Boolean.valueOf(p.matchesConstruction(advisor, refCon));
+ return Boolean.valueOf(p.matchesConstruction(advisor, ctCon));
}
catch (NotFoundException e)
{
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ConstructorCallMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ConstructorCallMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ConstructorCallMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -80,18 +80,18 @@
Node n = node.jjtGetChild(0);
if (n instanceof ASTMethod)
{
- return new Boolean(Util.has(calledClass, (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(calledClass, (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(calledClass, (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(calledClass, (ASTConstructor) n, advisor));
}
}
public Object visit(ASTHasField node, Object data)
{
ASTField f = (ASTField) node.jjtGetChild(0);
- return new Boolean(Util.has(calledClass, f, advisor));
+ return Boolean.valueOf(Util.has(calledClass, f, advisor));
}
public Object visit(ASTWithin node, Object data)
@@ -108,7 +108,7 @@
protected Boolean resolvePointcut(Pointcut p)
{
- return new Boolean(p.matchesCall(advisor, within, calledClass, calledConstructor));
+ return Boolean.valueOf(p.matchesCall(advisor, within, calledClass, calledConstructor));
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/DeclareTypeMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/DeclareTypeMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/DeclareTypeMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -57,14 +57,14 @@
if (n instanceof ASTMethod)
{
boolean checkSuper = false;
- if (clazz != null) return new Boolean(Util.has(clazz, (ASTMethod) n, advisor, checkSuper));
- if (ctClass != null) return new Boolean(Util.has(ctClass, (ASTMethod) n, advisor, checkSuper));
+ if (clazz != null) return Boolean.valueOf(Util.has(clazz, (ASTMethod) n, advisor, checkSuper));
+ if (ctClass != null) return Boolean.valueOf(Util.has(ctClass, (ASTMethod) n, advisor, checkSuper));
}
else
{
//Constructors only get checked on the class itself
- if (clazz != null) return new Boolean(Util.has(clazz, (ASTConstructor) n, advisor));
- if (ctClass != null) return new Boolean(Util.has(ctClass, (ASTConstructor) n, advisor));
+ if (clazz != null) return Boolean.valueOf(Util.has(clazz, (ASTConstructor) n, advisor));
+ if (ctClass != null) return Boolean.valueOf(Util.has(ctClass, (ASTConstructor) n, advisor));
}
return Boolean.FALSE;
}
@@ -74,9 +74,9 @@
boolean checkSuper = false;
ASTField f = (ASTField) node.jjtGetChild(0);
if (clazz != null)
- return new Boolean(Util.has(clazz, f, advisor, checkSuper));
+ return Boolean.valueOf(Util.has(clazz, f, advisor, checkSuper));
else
- return new Boolean(Util.has(ctClass, f, advisor, checkSuper));
+ return Boolean.valueOf(Util.has(ctClass, f, advisor, checkSuper));
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ExecutionConstructorMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ExecutionConstructorMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ExecutionConstructorMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -65,11 +65,11 @@
{
if (ctCon != null)
{
- return new Boolean(Util.has(ctCon.getDeclaringClass(), (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(ctCon.getDeclaringClass(), (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(refCon.getDeclaringClass(), (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(refCon.getDeclaringClass(), (ASTMethod) n, advisor));
}
}
@@ -77,11 +77,11 @@
{
if (ctCon != null)
{
- return new Boolean(Util.has(ctCon.getDeclaringClass(), (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(ctCon.getDeclaringClass(), (ASTConstructor) n, advisor));
}
else
{
- return new Boolean(Util.has(refCon.getDeclaringClass(), (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(refCon.getDeclaringClass(), (ASTConstructor) n, advisor));
}
}
@@ -92,11 +92,11 @@
ASTField f = (ASTField) node.jjtGetChild(0);
if (ctCon != null)
{
- return new Boolean(Util.has(ctCon.getDeclaringClass(), f, advisor));
+ return Boolean.valueOf(Util.has(ctCon.getDeclaringClass(), f, advisor));
}
else
{
- return new Boolean(Util.has(refCon.getDeclaringClass(), f, advisor));
+ return Boolean.valueOf(Util.has(refCon.getDeclaringClass(), f, advisor));
}
}
@@ -105,8 +105,8 @@
{
try
{
- if (refCon != null) return new Boolean(p.matchesExecution(advisor, refCon));
- return new Boolean(p.matchesExecution(advisor, ctCon));
+ if (refCon != null) return Boolean.valueOf(p.matchesExecution(advisor, refCon));
+ return Boolean.valueOf(p.matchesExecution(advisor, ctCon));
}
catch (NotFoundException e)
{
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ExecutionMethodMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ExecutionMethodMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/ExecutionMethodMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -74,7 +74,7 @@
}
return Boolean.FALSE;
}
- return new Boolean(p.matchesExecution(advisor, ctMethod));
+ return Boolean.valueOf(p.matchesExecution(advisor, ctMethod));
}
catch (NotFoundException e)
{
@@ -89,11 +89,11 @@
{
if (ctMethod != null)
{
- return new Boolean(Util.has(ctMethod.getDeclaringClass(), (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(ctMethod.getDeclaringClass(), (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(refMethod.getDeclaringClass(), (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(refMethod.getDeclaringClass(), (ASTMethod) n, advisor));
}
}
@@ -101,11 +101,11 @@
{
if (ctMethod != null)
{
- return new Boolean(Util.has(ctMethod.getDeclaringClass(), (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(ctMethod.getDeclaringClass(), (ASTConstructor) n, advisor));
}
else
{
- return new Boolean(Util.has(refMethod.getDeclaringClass(), (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(refMethod.getDeclaringClass(), (ASTConstructor) n, advisor));
}
}
@@ -116,11 +116,11 @@
ASTField f = (ASTField) node.jjtGetChild(0);
if (ctMethod != null)
{
- return new Boolean(Util.has(ctMethod.getDeclaringClass(), f, advisor));
+ return Boolean.valueOf(Util.has(ctMethod.getDeclaringClass(), f, advisor));
}
else
{
- return new Boolean(Util.has(refMethod.getDeclaringClass(), f, advisor));
+ return Boolean.valueOf(Util.has(refMethod.getDeclaringClass(), f, advisor));
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldGetMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldGetMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldGetMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -63,7 +63,7 @@
{
try
{
- return new Boolean(p.matchesGet(advisor, ctField));
+ return Boolean.valueOf(p.matchesGet(advisor, ctField));
}
catch (NotFoundException e)
{
@@ -72,7 +72,7 @@
}
else
{
- return new Boolean(p.matchesGet(advisor, field));
+ return Boolean.valueOf(p.matchesGet(advisor, field));
}
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -220,9 +220,9 @@
{
ASTField f = (ASTField) node.jjtGetChild(0);
if (ctField != null)
- return new Boolean(Util.has(ctField.getDeclaringClass(), f, advisor));
+ return Boolean.valueOf(Util.has(ctField.getDeclaringClass(), f, advisor));
else
- return new Boolean(Util.has(refField.getDeclaringClass(), f, advisor));
+ return Boolean.valueOf(Util.has(refField.getDeclaringClass(), f, advisor));
}
public Object visit(ASTHas node, Object data)
@@ -232,11 +232,11 @@
{
if (ctField != null)
{
- return new Boolean(Util.has(ctField.getDeclaringClass(), (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(ctField.getDeclaringClass(), (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(refField.getDeclaringClass(), (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(refField.getDeclaringClass(), (ASTMethod) n, advisor));
}
}
@@ -244,11 +244,11 @@
{
if (refField != null)
{
- return new Boolean(Util.has(refField.getDeclaringClass(), (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(refField.getDeclaringClass(), (ASTConstructor) n, advisor));
}
else
{
- return new Boolean(Util.has(ctField.getDeclaringClass(), (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(ctField.getDeclaringClass(), (ASTConstructor) n, advisor));
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldSetMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldSetMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/FieldSetMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -63,7 +63,7 @@
{
try
{
- return new Boolean(p.matchesSet(advisor, ctField));
+ return Boolean.valueOf(p.matchesSet(advisor, ctField));
}
catch (NotFoundException e)
{
@@ -72,7 +72,7 @@
}
else
{
- return new Boolean(p.matchesSet(advisor, field));
+ return Boolean.valueOf(p.matchesSet(advisor, field));
}
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MatcherHelper.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MatcherHelper.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MatcherHelper.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -125,14 +125,14 @@
{
Node andChild = node.jjtGetChild(0); // should only have one child
boolean val = ((Boolean) left).booleanValue();
- return new Boolean(val && ((Boolean) andChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
+ return Boolean.valueOf(val && ((Boolean) andChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
}
public Object visit(ASTOr node, Object left)
{
Node orChild = node.jjtGetChild(0); // should only have one child
boolean val = ((Boolean) left).booleanValue();
- return new Boolean(val || ((Boolean) orChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
+ return Boolean.valueOf(val || ((Boolean) orChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
}
protected abstract Boolean resolvePointcut(Pointcut p);
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MethodCallMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MethodCallMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MethodCallMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -91,11 +91,11 @@
CtMethod method = call.getMethod();
if (n instanceof ASTMethod)
{
- return new Boolean(Util.has(method.getDeclaringClass(), (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(method.getDeclaringClass(), (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(method.getDeclaringClass(), (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(method.getDeclaringClass(), (ASTConstructor) n, advisor));
}
}
catch (NotFoundException e)
@@ -116,7 +116,7 @@
{
throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
}
- return new Boolean(Util.has(method.getDeclaringClass(), f, advisor));
+ return Boolean.valueOf(Util.has(method.getDeclaringClass(), f, advisor));
}
public Object visit(ASTWithin node, Object data)
@@ -151,7 +151,7 @@
{
try
{
- return new Boolean(p.matchesCall(advisor, call));
+ return Boolean.valueOf(p.matchesCall(advisor, call));
}
catch (NotFoundException e)
{
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/NewExprMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/NewExprMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/NewExprMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -111,7 +111,7 @@
{
try
{
- return new Boolean(p.matchesCall(advisor, call));
+ return Boolean.valueOf(p.matchesCall(advisor, call));
}
catch (NotFoundException e)
{
@@ -127,11 +127,11 @@
CtConstructor con = call.getConstructor();
if (n instanceof ASTMethod)
{
- return new Boolean(Util.has(con.getDeclaringClass(), (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(con.getDeclaringClass(), (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(con.getDeclaringClass(), (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(con.getDeclaringClass(), (ASTConstructor) n, advisor));
}
}
catch (NotFoundException e)
@@ -152,6 +152,6 @@
{
throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
}
- return new Boolean(Util.has(con.getDeclaringClass(), f, advisor));
+ return Boolean.valueOf(Util.has(con.getDeclaringClass(), f, advisor));
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/SoftClassMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/SoftClassMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/SoftClassMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -76,7 +76,7 @@
protected Boolean resolvePointcut(Pointcut p)
{
- return new Boolean(p.softMatch(advisor));
+ return Boolean.valueOf(p.softMatch(advisor));
}
public Object visit(ASTCall node, Object data)
@@ -175,7 +175,7 @@
{
String sub = classExpression.getOriginal().substring(1);
if (advisor.getClassMetaData().hasTag(sub)) return Boolean.TRUE;
- return new Boolean(advisor.hasAnnotation(clazz, sub));
+ return Boolean.valueOf(advisor.hasAnnotation(clazz, sub));
}
else if (classExpression.isInstanceOf())
{
@@ -188,7 +188,7 @@
}
else
{
- return new Boolean(classExpression.matches(this.classname));
+ return Boolean.valueOf(classExpression.matches(this.classname));
}
return Boolean.FALSE;
}
@@ -212,11 +212,11 @@
Node n = node.jjtGetChild(0);
if (n instanceof ASTMethod)
{
- return new Boolean(Util.has(clazz, (ASTMethod) n, advisor));
+ return Boolean.valueOf(Util.has(clazz, (ASTMethod) n, advisor));
}
else
{
- return new Boolean(Util.has(clazz, (ASTConstructor) n, advisor));
+ return Boolean.valueOf(Util.has(clazz, (ASTConstructor) n, advisor));
}
}
@@ -224,7 +224,7 @@
{
if (clazz == null) return Boolean.TRUE;
ASTField f = (ASTField) node.jjtGetChild(0);
- return new Boolean(Util.has(clazz, f, advisor));
+ return Boolean.valueOf(Util.has(clazz, f, advisor));
}
//----- NOT VISITED -----
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/TypeMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/TypeMatcher.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/TypeMatcher.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -104,14 +104,14 @@
{
Node andChild = node.jjtGetChild(0); // should only have one child
boolean val = ((Boolean) left).booleanValue();
- return new Boolean(val && ((Boolean) andChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
+ return Boolean.valueOf(val && ((Boolean) andChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
}
public Object visit(ASTOr node, Object left)
{
Node orChild = node.jjtGetChild(0); // should only have one child
boolean val = ((Boolean) left).booleanValue();
- return new Boolean(val || ((Boolean) orChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
+ return Boolean.valueOf(val || ((Boolean) orChild.jjtAccept(this, Boolean.FALSE)).booleanValue());
}
@@ -126,13 +126,13 @@
Node n = node.jjtGetChild(0);
if (n instanceof ASTMethod)
{
- if (clazz != null) return new Boolean(Util.has(clazz, (ASTMethod) n, advisor));
- if (ctClass != null) return new Boolean(Util.has(ctClass, (ASTMethod) n, advisor));
+ if (clazz != null) return Boolean.valueOf(Util.has(clazz, (ASTMethod) n, advisor));
+ if (ctClass != null) return Boolean.valueOf(Util.has(ctClass, (ASTMethod) n, advisor));
}
else
{
- if (clazz != null) return new Boolean(Util.has(clazz, (ASTConstructor) n, advisor));
- if (ctClass != null) return new Boolean(Util.has(ctClass, (ASTConstructor) n, advisor));
+ if (clazz != null) return Boolean.valueOf(Util.has(clazz, (ASTConstructor) n, advisor));
+ if (ctClass != null) return Boolean.valueOf(Util.has(ctClass, (ASTConstructor) n, advisor));
}
return Boolean.FALSE;
}
@@ -141,20 +141,20 @@
{
ASTField f = (ASTField) node.jjtGetChild(0);
if (clazz != null)
- return new Boolean(Util.has(clazz, f, advisor));
+ return Boolean.valueOf(Util.has(clazz, f, advisor));
else
- return new Boolean(Util.has(ctClass, f, advisor));
+ return Boolean.valueOf(Util.has(ctClass, f, advisor));
}
public Object visit(ASTClass node, Object data)
{
if (clazz != null)
{
- return new Boolean(Util.matchesClassExpr(node.getClazz(), clazz, advisor));
+ return Boolean.valueOf(Util.matchesClassExpr(node.getClazz(), clazz, advisor));
}
else
{
- return new Boolean(Util.matchesClassExpr(node.getClazz(), ctClass, advisor));
+ return Boolean.valueOf(Util.matchesClassExpr(node.getClazz(), ctClass, advisor));
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/Util.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/Util.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/Util.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -295,7 +295,7 @@
private static boolean classHasMethod(CtClass clazz, long hash, boolean exactSuper)throws Exception
{
HashMap<Long, CtMethod> methods = JavassistMethodHashing.getMethodMap(clazz);
- CtMethod m = methods.get(new Long(hash));
+ CtMethod m = methods.get(hash);
if (m != null)
{
if (exactSuper)
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ClassProxyFactory.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -293,7 +293,7 @@
for (int m = 0; m < methods.length; m++)
{
if (methods[m].getDeclaringClass().getName().equals("java.lang.Object")) continue;
- Long hash = new Long(JavassistMethodHashing.methodHash(methods[m]));
+ Long hash = Long.valueOf(JavassistMethodHashing.methodHash(methods[m]));
if (mixinMethods.contains(hash)) continue;
if (addedMethods.contains(hash)) throw new Exception("More than one mixin has same method");
mixinMethods.add(hash);
@@ -376,13 +376,13 @@
if(!java.lang.reflect.Modifier.isVolatile( declaredMethods[i].getModifiers()))
{
long hash = org.jboss.aop.util.MethodHashing.methodHash(declaredMethods[i]);
- if(!ignoredHash.contains(new Long(hash)))
- advised.put(new Long(hash), new MethodPersistentReference(declaredMethods[i], PersistentReference.REFERENCE_WEAK));
+ if(!ignoredHash.contains(Long.valueOf(hash)))
+ advised.put(Long.valueOf(hash), new MethodPersistentReference(declaredMethods[i], PersistentReference.REFERENCE_WEAK));
}
else
{
long hash = org.jboss.aop.util.MethodHashing.methodHash(declaredMethods[i]);
- ignoredHash.add(new Long(hash));
+ ignoredHash.add(Long.valueOf(hash));
}
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ProxyFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ProxyFactory.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ProxyFactory.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -219,7 +219,7 @@
for (int m = 0; m < methods.length; m++)
{
if (methods[m].getDeclaringClass().getName().equals("java.lang.Object")) continue;
- Long hash = new Long(JavassistMethodHashing.methodHash(methods[m]));
+ Long hash = Long.valueOf(JavassistMethodHashing.methodHash(methods[m]));
if (addedMethods.contains(hash)) continue;
addedMethods.add(hash);
String aopReturnStr = (methods[m].getReturnType().equals(CtClass.voidType)) ? "" : "return ($r)";
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ProxyMethodInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ProxyMethodInvocation.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/ProxyMethodInvocation.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -59,7 +59,7 @@
public Method getMethod()
{
- MethodPersistentReference ref = proxy.getMethodMap().get(new Long(methodHash));
+ MethodPersistentReference ref = proxy.getMethodMap().get(Long.valueOf(methodHash));
return (Method)ref.get();
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerProxyFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerProxyFactory.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerProxyFactory.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -639,7 +639,7 @@
for (int m = 0; m < methods.length; m++)
{
if (methods[m].getDeclaringClass().getName().equals("java.lang.Object")) continue;
- Long hash = new Long(JavassistMethodHashing.methodHash(methods[m]));
+ Long hash = Long.valueOf(JavassistMethodHashing.methodHash(methods[m]));
if (mixinMethods.contains(hash)) continue;
if (addedMethods.contains(hash)) throw new Exception("More than one mixin has same method");
mixinMethods.add(hash);
@@ -759,7 +759,7 @@
{
if (methods[m].getDeclaringClass().getName().equals("java.lang.Object")) continue;
- Long hash = new Long(JavassistMethodHashing.methodHash(methods[m]));
+ Long hash = Long.valueOf(JavassistMethodHashing.methodHash(methods[m]));
if (mixinMethods.contains(hash)) continue;
if (addedMethods.contains(hash)) continue;
@@ -1057,7 +1057,7 @@
{
throw new RuntimeException("cannot have an IntroductionInterface that introduces several mixins with the same interfaces " + mixin.getInterfaces()[i]);
}
- mixinInterfaces.put(mixin.getInterfaces()[i], new Integer(idx));
+ mixinInterfaces.put(mixin.getInterfaces()[i], Integer.valueOf(idx));
}
mixes.add(new MixinInfo(mixin));
}
@@ -1076,7 +1076,7 @@
}
else
{
- intfs.put(intro.getInterfaces()[i], new Integer(idx));
+ intfs.put(intro.getInterfaces()[i], Integer.valueOf(idx));
}
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -59,8 +59,8 @@
new Class[]{String.class, byte[].class,
int.class, int.class});
SecurityActions.setAccessible(method);
- Object[] args = new Object[]{ctClass.getName(), b, new Integer(0),
- new Integer(b.length)};
+ Object[] args = new Object[]{ctClass.getName(), b, Integer.valueOf(0),
+ Integer.valueOf(b.length)};
Class<?> clazz = (Class<?>) method.invoke(getClassLoader(), args);
return clazz;
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/ClassInfoMethodHashing.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/ClassInfoMethodHashing.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/ClassInfoMethodHashing.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -167,7 +167,7 @@
if (superclass.isInterface() || Advisable.isAdvisableMethod(declaredMethods[i].getModifiers(), declaredMethods[i].getName()))
{
long hash = methodHash(declaredMethods[i]);
- advised.put(new Long(hash), declaredMethods[i]);
+ advised.put(Long.valueOf(hash), declaredMethods[i]);
}
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/JavassistMethodHashing.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/JavassistMethodHashing.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/JavassistMethodHashing.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -155,7 +155,7 @@
}
else
{
- advised.put(new Long(hash), declaredMethods[i]);
+ advised.put(Long.valueOf(hash), declaredMethods[i]);
}
}
}
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/MethodHashing.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/MethodHashing.java 2009-11-13 17:20:05 UTC (rev 96366)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/MethodHashing.java 2009-11-13 17:56:26 UTC (rev 96367)
@@ -53,7 +53,7 @@
public static Method findMethodByHash(Class<?> clazz, long hash) throws Exception
{
- return findMethodByHash(clazz, new Long(hash));
+ return findMethodByHash(clazz, Long.valueOf(hash));
}
public static Method findMethodByHash(Class<?> clazz, Long hash) throws Exception
@@ -87,7 +87,7 @@
public static Constructor<?> findConstructorByHash(Class<?> clazz, long hash) throws Exception
{
- return findConstructorByHash(clazz, new Long(hash));
+ return findConstructorByHash(clazz, Long.valueOf(hash));
}
public static Constructor<?> findConstructorByHash(Class<?> clazz, Long hash) throws Exception
@@ -240,7 +240,7 @@
try
{
long hash = methodHash(method);
- map.put(method.toString(), new Long(hash));
+ map.put(method.toString(), Long.valueOf(hash));
}
catch (Exception ignore)
{
@@ -272,7 +272,7 @@
{
long hash = methodHash(methods[i]);
//Use Clebert's Persistent References so we don't get memory leaks
- map.put(new Long(hash), new MethodPersistentReference(methods[i], PersistentReference.REFERENCE_SOFT));
+ map.put(Long.valueOf(hash), new MethodPersistentReference(methods[i], PersistentReference.REFERENCE_SOFT));
}
catch (Exception ignore)
{
@@ -304,7 +304,7 @@
{
long hash = constructorHash(constructors[i]);
//Use Clebert's Persistent References so we don't get memory leaks
- map.put(new Long(hash), new ConstructorPersistentReference(constructors[i], PersistentReference.REFERENCE_SOFT));
+ map.put(Long.valueOf(hash), new ConstructorPersistentReference(constructors[i], PersistentReference.REFERENCE_SOFT));
}
catch (Exception ignore)
{
More information about the jboss-cvs-commits
mailing list