diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-12-10 20:25:39 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-12-10 20:25:39 +0000 |
| commit | da66af5951b18b6f5e8752cbbe11f5f842332a33 (patch) | |
| tree | a28e126d1415e3689be6c7b2c2d061ae51194195 /gnu/java/lang/InstrumentationImpl.java | |
| parent | ab90923ee693a17e2e0e37b6ba5a84794c9236de (diff) | |
| download | classpath-da66af5951b18b6f5e8752cbbe11f5f842332a33.tar.gz | |
2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of generics-branch to HEAD (woohoo!)
Diffstat (limited to 'gnu/java/lang/InstrumentationImpl.java')
| -rw-r--r-- | gnu/java/lang/InstrumentationImpl.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gnu/java/lang/InstrumentationImpl.java b/gnu/java/lang/InstrumentationImpl.java index acc6d50fb..2425b35c8 100644 --- a/gnu/java/lang/InstrumentationImpl.java +++ b/gnu/java/lang/InstrumentationImpl.java @@ -63,8 +63,8 @@ public final class InstrumentationImpl implements Instrumentation { /* List of transformers */ - /* FIXME[GENERICS]: Should be ClassFileTransformer list */ - private ArrayList transformers = new ArrayList(); + private ArrayList<ClassFileTransformer> transformers = + new ArrayList<ClassFileTransformer>(); InstrumentationImpl() @@ -210,9 +210,8 @@ public final class InstrumentationImpl implements Instrumentation * * @return the new class file */ - /* FIXME[GENERICS]: Should be Class<?> */ public byte[] callTransformers(ClassLoader loader, String className, - Class classBeingRedefined, ProtectionDomain protectionDomain, + Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) { byte[] newBuffer = null; @@ -220,11 +219,10 @@ public final class InstrumentationImpl implements Instrumentation ClassFileTransformer current; synchronized (transformers) { - Iterator i = transformers.iterator(); + Iterator<ClassFileTransformer> i = transformers.iterator(); while (i.hasNext()) { - /* FIXME[GENERICS]: Remove cast */ - current = (ClassFileTransformer) i.next(); + current = i.next(); try { newBuffer = current.transform(loader, className, |