aboutsummaryrefslogtreecommitdiffstats
path: root/loadtime
diff options
context:
space:
mode:
authorAndy Clement <aclement@gopivotal.com>2014-10-08 09:07:52 -0700
committerAndy Clement <aclement@gopivotal.com>2014-10-08 09:07:52 -0700
commitb6aec92d1ec73033130ecbb5552bf54ceb1cb85f (patch)
treecec50f9ea51317f76f132c01233c8446c58c046a /loadtime
parent170b1cef3f6f2c4792eb4c07c76ab19bee9daca7 (diff)
downloadaspectj-b6aec92d1ec73033130ecbb5552bf54ceb1cb85f.tar.gz
aspectj-b6aec92d1ec73033130ecbb5552bf54ceb1cb85f.zip
Use generics
Diffstat (limited to 'loadtime')
-rw-r--r--loadtime/src/org/aspectj/weaver/loadtime/Aj.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
index 03715b6a3..0654e4cba 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/Aj.java
@@ -200,9 +200,9 @@ public class Aj implements ClassPreProcessor {
synchronized (WeaverContainer.weavingAdaptors) {
if (displayProgress) {
System.err.println("Weaver adaptors before queue processing:");
- Map m = WeaverContainer.weavingAdaptors;
- Set keys = m.keySet();
- for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
+ Map<AdaptorKey,ExplicitlyInitializedClassLoaderWeavingAdaptor> m = WeaverContainer.weavingAdaptors;
+ Set<AdaptorKey> keys = m.keySet();
+ for (Iterator<AdaptorKey> iterator = keys.iterator(); iterator.hasNext();) {
Object object = iterator.next();
System.err.println(object + " = " + WeaverContainer.weavingAdaptors.get(object));
}
@@ -224,9 +224,9 @@ public class Aj implements ClassPreProcessor {
}
if (displayProgress) {
System.err.println("Weaver adaptors after queue processing:");
- Map m = WeaverContainer.weavingAdaptors;
- Set keys = m.keySet();
- for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
+ Map<AdaptorKey,ExplicitlyInitializedClassLoaderWeavingAdaptor> m = WeaverContainer.weavingAdaptors;
+ Set<AdaptorKey> keys = m.keySet();
+ for (Iterator<AdaptorKey> iterator = keys.iterator(); iterator.hasNext();) {
Object object = iterator.next();
System.err.println(object + " = " + WeaverContainer.weavingAdaptors.get(object));
}
@@ -287,7 +287,8 @@ public class Aj implements ClassPreProcessor {
*/
static class WeaverContainer {
- final static Map weavingAdaptors = Collections.synchronizedMap(new HashMap());
+ final static Map<AdaptorKey,ExplicitlyInitializedClassLoaderWeavingAdaptor> weavingAdaptors =
+ Collections.synchronizedMap(new HashMap<AdaptorKey,ExplicitlyInitializedClassLoaderWeavingAdaptor>());
static WeavingAdaptor getWeaver(ClassLoader loader, IWeavingContext weavingContext) {
ExplicitlyInitializedClassLoaderWeavingAdaptor adaptor = null;