summaryrefslogtreecommitdiffstats
path: root/weaver/src/org/aspectj
diff options
context:
space:
mode:
authoraclement <aclement>2010-06-07 18:28:53 +0000
committeraclement <aclement>2010-06-07 18:28:53 +0000
commitb0921a5df52e81596dd64a011c62bbe8458d4d3a (patch)
tree083edcb4ee6879bff4c62f8230073c6309e8e1ad /weaver/src/org/aspectj
parente67b60892fdf1014ab067feba3083a44772d333f (diff)
downloadaspectj-b0921a5df52e81596dd64a011c62bbe8458d4d3a.tar.gz
aspectj-b0921a5df52e81596dd64a011c62bbe8458d4d3a.zip
PushIn
Diffstat (limited to 'weaver/src/org/aspectj')
-rw-r--r--weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java
index 4a64bd5c7..ef102adbc 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelAdvice.java
@@ -371,12 +371,12 @@ class BcelAdvice extends Advice {
// ---- implementations
- private Collection collectCheckedExceptions(UnresolvedType[] excs) {
+ private Collection<ResolvedType> collectCheckedExceptions(UnresolvedType[] excs) {
if (excs == null || excs.length == 0) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
- Collection ret = new ArrayList();
+ Collection<ResolvedType> ret = new ArrayList<ResolvedType>();
World world = concreteAspect.getWorld();
ResolvedType runtimeException = world.getCoreType(UnresolvedType.RUNTIME_EXCEPTION);
ResolvedType error = world.getCoreType(UnresolvedType.ERROR);
@@ -399,10 +399,10 @@ class BcelAdvice extends Advice {
return ret;
}
- private Collection thrownExceptions = null;
+ private Collection<ResolvedType> thrownExceptions = null;
@Override
- public Collection getThrownExceptions() {
+ public Collection<ResolvedType> getThrownExceptions() {
if (thrownExceptions == null) {
// ??? can we really lump in Around here, how does this interact with Throwable
if (concreteAspect != null && concreteAspect.getWorld() != null && // null tests for test harness
@@ -410,12 +410,12 @@ class BcelAdvice extends Advice {
World world = concreteAspect.getWorld();
ResolvedMember m = world.resolve(signature);
if (m == null) {
- thrownExceptions = Collections.EMPTY_LIST;
+ thrownExceptions = Collections.emptyList();
} else {
thrownExceptions = collectCheckedExceptions(m.getExceptions());
}
} else {
- thrownExceptions = Collections.EMPTY_LIST;
+ thrownExceptions = Collections.emptyList();
}
}
return thrownExceptions;
@@ -751,7 +751,7 @@ class BcelAdvice extends Advice {
ISourceContext sourceContext, ResolvedType concreteAspect) {
this(new AjAttribute.AdviceAttribute(kind, pointcut, extraArgumentFlags, start, end, sourceContext), pointcut, signature,
concreteAspect);
- thrownExceptions = Collections.EMPTY_LIST; // !!! interaction with unit tests
+ thrownExceptions = Collections.emptyList(); // !!! interaction with unit tests
}
} \ No newline at end of file