diff options
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | gnu/java/lang/InstrumentationImpl.java (renamed from java/lang/InstrumentationImpl.java) | 10 | ||||
-rw-r--r-- | vm/reference/gnu/java/lang/VMInstrumentationImpl.java (renamed from vm/reference/java/lang/VMInstrumentationImpl.java) | 2 | ||||
-rw-r--r-- | vm/reference/java/lang/VMClassLoader.java | 3 |
4 files changed, 21 insertions, 7 deletions
@@ -1,5 +1,18 @@ 2006-04-17 Andrew John Hughes <gnu_andrew@member.fsf.org> + * gnu/java/lang/InstrumentationImpl.java: + Moved from java.lang. + * java/lang/InstrumentationImpl.java: + Removed. + * vm/reference/gnu/java/lang/VMInstrumentationImpl.java: + Moved from java.lang. + * vm/reference/java/lang/VMClassLoader.java: + Corrected reference to InstrumentationImpl. + * vm/reference/java/lang/VMInstrumentationImpl.java: + Removed. + +2006-04-17 Andrew John Hughes <gnu_andrew@member.fsf.org> + * java/lang/annotation/Annotation.java: Documented. diff --git a/java/lang/InstrumentationImpl.java b/gnu/java/lang/InstrumentationImpl.java index 36ae16869..3192683ef 100644 --- a/java/lang/InstrumentationImpl.java +++ b/gnu/java/lang/InstrumentationImpl.java @@ -37,7 +37,7 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -package java.lang; +package gnu.java.lang; import java.lang.instrument.Instrumentation; import java.lang.instrument.ClassFileTransformer; @@ -59,7 +59,7 @@ import java.util.Iterator; * @author Nicolas Geoffray (nicolas.geoffray@menlina.com) * @since 1.5 */ -final class InstrumentationImpl implements Instrumentation +public final class InstrumentationImpl implements Instrumentation { /* List of transformers */ @@ -210,9 +210,9 @@ final class InstrumentationImpl implements Instrumentation * * @return the new class file */ - protected byte[] callTransformers(ClassLoader loader, String className, - Class<?> classBeingRedefined, ProtectionDomain protectionDomain, - byte[] classfileBuffer) + public byte[] callTransformers(ClassLoader loader, String className, + Class<?> classBeingRedefined, ProtectionDomain protectionDomain, + byte[] classfileBuffer) { byte[] newBuffer = null; byte[] oldBuffer = classfileBuffer; diff --git a/vm/reference/java/lang/VMInstrumentationImpl.java b/vm/reference/gnu/java/lang/VMInstrumentationImpl.java index 5ea6a1d08..eee94702d 100644 --- a/vm/reference/java/lang/VMInstrumentationImpl.java +++ b/vm/reference/gnu/java/lang/VMInstrumentationImpl.java @@ -37,7 +37,7 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -package java.lang; +package gnu.java.lang; import java.lang.instrument.ClassDefinition; import java.lang.instrument.Instrumentation; diff --git a/vm/reference/java/lang/VMClassLoader.java b/vm/reference/java/lang/VMClassLoader.java index 4a99c6dc1..218d60971 100644 --- a/vm/reference/java/lang/VMClassLoader.java +++ b/vm/reference/java/lang/VMClassLoader.java @@ -42,9 +42,10 @@ package java.lang; import gnu.classpath.SystemProperties; import gnu.classpath.Configuration; +import gnu.java.lang.InstrumentationImpl; + import java.io.File; import java.io.IOException; -import java.lang.InstrumentationImpl; import java.lang.instrument.Instrumentation; import java.net.MalformedURLException; import java.net.URL; |