From 71791d608095c151d80b772ee74a9af34996fdfa Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 13 May 2013 16:08:16 +0400 Subject: [PATCH] Annotations moved to a separate package --- .../preloading/instrumentation/InterceptionInstrumenter.java | 1 + .../preloading/instrumentation/{ => annotations}/AllArgs.java | 2 +- .../instrumentation/{ => annotations}/MethodDesc.java | 2 +- .../instrumentation/{ => annotations}/MethodInterceptor.java | 2 +- .../instrumentation/{ => annotations}/MethodName.java | 2 +- .../jet/preloading/instrumentation/{ => annotations}/This.java | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) rename compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/{ => annotations}/AllArgs.java (92%) rename compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/{ => annotations}/MethodDesc.java (92%) rename compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/{ => annotations}/MethodInterceptor.java (95%) rename compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/{ => annotations}/MethodName.java (92%) rename compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/{ => annotations}/This.java (92%) diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java index 8bbe961ae71..2e56fab08a7 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java @@ -20,6 +20,7 @@ import org.jetbrains.asm4.*; import org.jetbrains.asm4.commons.InstructionAdapter; import org.jetbrains.asm4.util.Textifier; import org.jetbrains.asm4.util.TraceMethodVisitor; +import org.jetbrains.jet.preloading.instrumentation.annotations.*; import java.io.PrintStream; import java.lang.annotation.Annotation; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/AllArgs.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/AllArgs.java similarity index 92% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/AllArgs.java rename to compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/AllArgs.java index 134da385b23..f78dee658c1 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/AllArgs.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/AllArgs.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.preloading.instrumentation; +package org.jetbrains.jet.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodDesc.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodDesc.java similarity index 92% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodDesc.java rename to compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodDesc.java index b0d7ba77786..bdee48cd17a 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodDesc.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodDesc.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.preloading.instrumentation; +package org.jetbrains.jet.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInterceptor.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodInterceptor.java similarity index 95% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInterceptor.java rename to compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodInterceptor.java index bdad692e2bb..20370f16514 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodInterceptor.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.preloading.instrumentation; +package org.jetbrains.jet.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodName.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodName.java similarity index 92% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodName.java rename to compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodName.java index 38c4bdbbca2..c2d24a351e2 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/MethodName.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/MethodName.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.preloading.instrumentation; +package org.jetbrains.jet.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/This.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/This.java similarity index 92% rename from compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/This.java rename to compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/This.java index 67f67c5585d..4776931816d 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/This.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/annotations/This.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.preloading.instrumentation; +package org.jetbrains.jet.preloading.instrumentation.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention;