From 32132a8b3eaf14e48d5ab291b475196451c69339 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 23 Apr 2014 15:55:46 +0400 Subject: [PATCH] Rename org.objectweb.asm to org.jetbrains.org.objectweb.asm --- .../src/org/jetbrains/eval4j/interpreter.kt | 26 +++++++++---------- .../org/jetbrains/eval4j/interpreterLoop.kt | 20 +++++++------- .../src/org/jetbrains/eval4j/jdi/jdiEval.kt | 2 +- .../src/org/jetbrains/eval4j/jdi/jdiValues.kt | 8 +++--- eval4j/src/org/jetbrains/eval4j/members.kt | 8 +++--- eval4j/src/org/jetbrains/eval4j/values.kt | 6 ++--- eval4j/test/org/jetbrains/eval4j/test/main.kt | 8 +++--- .../org/jetbrains/eval4j/test/suiteBuilder.kt | 10 +++---- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/eval4j/src/org/jetbrains/eval4j/interpreter.kt b/eval4j/src/org/jetbrains/eval4j/interpreter.kt index f70c76239e2..1b16ba3820a 100644 --- a/eval4j/src/org/jetbrains/eval4j/interpreter.kt +++ b/eval4j/src/org/jetbrains/eval4j/interpreter.kt @@ -1,18 +1,18 @@ package org.jetbrains.eval4j -import org.objectweb.asm.tree.analysis.* -import org.objectweb.asm.Handle -import org.objectweb.asm.Opcodes.* -import org.objectweb.asm.Type -import org.objectweb.asm.tree.AbstractInsnNode -import org.objectweb.asm.tree.FieldInsnNode -import org.objectweb.asm.tree.IntInsnNode -import org.objectweb.asm.tree.LdcInsnNode -import org.objectweb.asm.tree.MethodInsnNode -import org.objectweb.asm.tree.MultiANewArrayInsnNode -import org.objectweb.asm.tree.TypeInsnNode -import org.objectweb.asm.tree.JumpInsnNode -import org.objectweb.asm.tree.IincInsnNode +import org.jetbrains.org.objectweb.asm.tree.analysis.* +import org.jetbrains.org.objectweb.asm.Handle +import org.jetbrains.org.objectweb.asm.Opcodes.* +import org.jetbrains.org.objectweb.asm.Type +import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode +import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode +import org.jetbrains.org.objectweb.asm.tree.IntInsnNode +import org.jetbrains.org.objectweb.asm.tree.LdcInsnNode +import org.jetbrains.org.objectweb.asm.tree.MethodInsnNode +import org.jetbrains.org.objectweb.asm.tree.MultiANewArrayInsnNode +import org.jetbrains.org.objectweb.asm.tree.TypeInsnNode +import org.jetbrains.org.objectweb.asm.tree.JumpInsnNode +import org.jetbrains.org.objectweb.asm.tree.IincInsnNode class UnsupportedByteCodeException(message: String) : RuntimeException(message) diff --git a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt index b63d49a689c..626a8c955f1 100644 --- a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt +++ b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt @@ -1,14 +1,14 @@ package org.jetbrains.eval4j -import org.objectweb.asm.tree.AbstractInsnNode -import org.objectweb.asm.tree.analysis.Frame -import org.objectweb.asm.tree.MethodNode -import org.objectweb.asm.Type -import org.objectweb.asm.Opcodes.* -import org.objectweb.asm.tree.JumpInsnNode -import org.objectweb.asm.tree.VarInsnNode -import org.objectweb.asm.util.Printer -import org.objectweb.asm.tree.TryCatchBlockNode +import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode +import org.jetbrains.org.objectweb.asm.tree.analysis.Frame +import org.jetbrains.org.objectweb.asm.tree.MethodNode +import org.jetbrains.org.objectweb.asm.Type +import org.jetbrains.org.objectweb.asm.Opcodes.* +import org.jetbrains.org.objectweb.asm.tree.JumpInsnNode +import org.jetbrains.org.objectweb.asm.tree.VarInsnNode +import org.jetbrains.org.objectweb.asm.util.Printer +import org.jetbrains.org.objectweb.asm.tree.TryCatchBlockNode import java.util.ArrayList trait InterpreterResult { @@ -229,7 +229,7 @@ fun interpreterLoop( } } -// Copied from org.objectweb.asm.tree.analysis.Analyzer.analyze() +// Copied from org.jetbrains.org.objectweb.asm.tree.analysis.Analyzer.analyze() fun computeHandlers(m: MethodNode): Array?> { val insns = m.instructions val handlers = Array?>(insns.size()) {null} diff --git a/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt b/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt index dd927dc64a4..7652f17242a 100644 --- a/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt +++ b/eval4j/src/org/jetbrains/eval4j/jdi/jdiEval.kt @@ -1,7 +1,7 @@ package org.jetbrains.eval4j.jdi import org.jetbrains.eval4j.* -import org.objectweb.asm.Type +import org.jetbrains.org.objectweb.asm.Type import com.sun.jdi val CLASS = Type.getType(javaClass>()) diff --git a/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt b/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt index 519a645d85c..76e1c272495 100644 --- a/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt +++ b/eval4j/src/org/jetbrains/eval4j/jdi/jdiValues.kt @@ -1,10 +1,10 @@ package org.jetbrains.eval4j.jdi import org.jetbrains.eval4j.* -import org.objectweb.asm.tree.analysis.Frame -import org.objectweb.asm.tree.MethodNode -import org.objectweb.asm.Type -import org.objectweb.asm.Opcodes.* +import org.jetbrains.org.objectweb.asm.tree.analysis.Frame +import org.jetbrains.org.objectweb.asm.tree.MethodNode +import org.jetbrains.org.objectweb.asm.Type +import org.jetbrains.org.objectweb.asm.Opcodes.* import com.sun.jdi fun makeInitialFrame(methodNode: MethodNode, arguments: List): Frame { diff --git a/eval4j/src/org/jetbrains/eval4j/members.kt b/eval4j/src/org/jetbrains/eval4j/members.kt index 68bdbbccc4d..eb7d04a4f29 100644 --- a/eval4j/src/org/jetbrains/eval4j/members.kt +++ b/eval4j/src/org/jetbrains/eval4j/members.kt @@ -1,9 +1,9 @@ package org.jetbrains.eval4j -import org.objectweb.asm.tree.MethodInsnNode -import org.objectweb.asm.Opcodes.* -import org.objectweb.asm.* -import org.objectweb.asm.tree.FieldInsnNode +import org.jetbrains.org.objectweb.asm.tree.MethodInsnNode +import org.jetbrains.org.objectweb.asm.Opcodes.* +import org.jetbrains.org.objectweb.asm.* +import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode open data class MemberDescription( val ownerInternalName: String, diff --git a/eval4j/src/org/jetbrains/eval4j/values.kt b/eval4j/src/org/jetbrains/eval4j/values.kt index 445fd92fcae..49438ca315f 100644 --- a/eval4j/src/org/jetbrains/eval4j/values.kt +++ b/eval4j/src/org/jetbrains/eval4j/values.kt @@ -1,9 +1,9 @@ package org.jetbrains.eval4j -import org.objectweb.asm.Type -import org.objectweb.asm.tree.LabelNode +import org.jetbrains.org.objectweb.asm.Type +import org.jetbrains.org.objectweb.asm.tree.LabelNode -trait Value : org.objectweb.asm.tree.analysis.Value { +trait Value : org.jetbrains.org.objectweb.asm.tree.analysis.Value { val asmType: Type val valid: Boolean override fun getSize(): Int = asmType.getSize() diff --git a/eval4j/test/org/jetbrains/eval4j/test/main.kt b/eval4j/test/org/jetbrains/eval4j/test/main.kt index 0b48bcbcfed..ef23b6c6445 100644 --- a/eval4j/test/org/jetbrains/eval4j/test/main.kt +++ b/eval4j/test/org/jetbrains/eval4j/test/main.kt @@ -1,8 +1,8 @@ package org.jetbrains.eval4j.test -import org.objectweb.asm.* -import org.objectweb.asm.Opcodes.* -import org.objectweb.asm.tree.MethodNode +import org.jetbrains.org.objectweb.asm.* +import org.jetbrains.org.objectweb.asm.Opcodes.* +import org.jetbrains.org.objectweb.asm.tree.MethodNode import java.lang.reflect.Modifier import org.jetbrains.eval4j.* import org.junit.Assert.* @@ -13,7 +13,7 @@ import java.lang.reflect.Field import java.lang.reflect.Constructor import java.lang.reflect.InvocationTargetException import java.lang.reflect.Array as JArray -import org.objectweb.asm.tree.analysis.Frame +import org.jetbrains.org.objectweb.asm.tree.analysis.Frame fun suite(): TestSuite = buildTestSuite { methodNode, ownerClass, expected -> diff --git a/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt b/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt index 8b26aa120b8..946d4084333 100644 --- a/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt +++ b/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt @@ -1,8 +1,8 @@ package org.jetbrains.eval4j.test -import org.objectweb.asm.* -import org.objectweb.asm.Opcodes.* -import org.objectweb.asm.tree.MethodNode +import org.jetbrains.org.objectweb.asm.* +import org.jetbrains.org.objectweb.asm.Opcodes.* +import org.jetbrains.org.objectweb.asm.tree.MethodNode import java.lang.reflect.Modifier import org.jetbrains.eval4j.* import org.junit.Assert.* @@ -13,8 +13,8 @@ import java.lang.reflect.Field import java.lang.reflect.Constructor import java.lang.reflect.InvocationTargetException import java.lang.reflect.Array as JArray -import org.objectweb.asm.tree.analysis.Interpreter -import org.objectweb.asm.tree.analysis.Frame +import org.jetbrains.org.objectweb.asm.tree.analysis.Interpreter +import org.jetbrains.org.objectweb.asm.tree.analysis.Frame fun buildTestSuite( create: (MethodNode, Class<*>, InterpreterResult?) -> TestCase