diff --git a/plugins/lint/lint-api/src/com/android/tools/klint/client/api/AsmVisitor.java b/plugins/lint/lint-api/src/com/android/tools/klint/client/api/AsmVisitor.java index 4053c6c54ff..33d83b3c836 100644 --- a/plugins/lint/lint-api/src/com/android/tools/klint/client/api/AsmVisitor.java +++ b/plugins/lint/lint-api/src/com/android/tools/klint/client/api/AsmVisitor.java @@ -21,7 +21,7 @@ import com.android.tools.klint.detector.api.ClassContext; import com.android.tools.klint.detector.api.Detector; import com.android.tools.klint.detector.api.Detector.ClassScanner; import com.google.common.annotations.Beta; -import org.objectweb.asm.tree.*; +import org.jetbrains.org.objectweb.asm.tree.*; import java.util.*; diff --git a/plugins/lint/lint-api/src/com/android/tools/klint/client/api/ClassEntry.java b/plugins/lint/lint-api/src/com/android/tools/klint/client/api/ClassEntry.java index 5126d1b5b12..2479f236dc4 100644 --- a/plugins/lint/lint-api/src/com/android/tools/klint/client/api/ClassEntry.java +++ b/plugins/lint/lint-api/src/com/android/tools/klint/client/api/ClassEntry.java @@ -22,8 +22,8 @@ import com.android.annotations.VisibleForTesting; import com.google.common.collect.Maps; import com.google.common.io.ByteStreams; import com.google.common.io.Closeables; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; +import org.jetbrains.org.objectweb.asm.ClassReader; +import org.jetbrains.org.objectweb.asm.ClassVisitor; import java.io.File; import java.io.FileInputStream; @@ -37,7 +37,7 @@ import java.util.zip.ZipInputStream; import static com.android.SdkConstants.DOT_CLASS; import static com.android.SdkConstants.DOT_JAR; -import static org.objectweb.asm.Opcodes.ASM5; +import static org.jetbrains.org.objectweb.asm.Opcodes.ASM5; /** A class, present either as a .class file on disk, or inside a .jar file. */ @VisibleForTesting diff --git a/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java b/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java index 7a42fe41050..00cb8640f29 100644 --- a/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java +++ b/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java @@ -45,9 +45,9 @@ import org.jetbrains.uast.*; import org.jetbrains.uast.check.UastChecker; import org.jetbrains.uast.check.UastScanner; import org.jetbrains.uast.visitor.UastVisitor; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.*; +import org.jetbrains.org.objectweb.asm.ClassReader; +import org.jetbrains.org.objectweb.asm.Opcodes; +import org.jetbrains.org.objectweb.asm.tree.*; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/ClassContext.java b/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/ClassContext.java index 15c1f0de690..14cecdbf612 100644 --- a/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/ClassContext.java +++ b/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/ClassContext.java @@ -21,8 +21,8 @@ import com.android.annotations.Nullable; import com.android.tools.klint.client.api.LintDriver; import com.google.common.annotations.Beta; import com.google.common.base.Splitter; -import org.objectweb.asm.Type; -import org.objectweb.asm.tree.*; +import org.jetbrains.org.objectweb.asm.Type; +import org.jetbrains.org.objectweb.asm.tree.*; import java.io.File; import java.util.List; @@ -269,8 +269,8 @@ public class ClassContext extends Context { * Detectors should only call this method if an error applies to the whole class * scope and there is no specific method or field that applies to the error. * If so, use - * {@link #report(Issue, org.objectweb.asm.tree.MethodNode, org.objectweb.asm.tree.AbstractInsnNode, Location, String)} or - * {@link #report(Issue, org.objectweb.asm.tree.FieldNode, Location, String)}, such that + * {@link #report(Issue, org.jetbrains.org.objectweb.asm.tree.MethodNode, org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode, Location, String)} or + * {@link #report(Issue, org.jetbrains.org.objectweb.asm.tree.FieldNode, Location, String)}, such that * suppress annotations are checked. * * @param issue the issue to report diff --git a/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/Detector.java b/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/Detector.java index f385e30a287..1ffd3f62b70 100644 --- a/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/Detector.java +++ b/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/Detector.java @@ -27,10 +27,10 @@ import org.jetbrains.uast.UFunction; import org.jetbrains.uast.check.UastAndroidContext; import org.jetbrains.uast.visitor.AbstractUastVisitor; import org.jetbrains.uast.visitor.UastVisitor; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.MethodInsnNode; -import org.objectweb.asm.tree.MethodNode; +import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode; +import org.jetbrains.org.objectweb.asm.tree.ClassNode; +import org.jetbrains.org.objectweb.asm.tree.MethodInsnNode; +import org.jetbrains.org.objectweb.asm.tree.MethodNode; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/LintUtils.java b/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/LintUtils.java index be3ea2663ff..03996e935c9 100755 --- a/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/LintUtils.java +++ b/plugins/lint/lint-api/src/com/android/tools/klint/detector/api/LintUtils.java @@ -44,10 +44,10 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.jetbrains.uast.UFile; import org.jetbrains.uast.UImportStatement; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.FieldNode; +import org.jetbrains.org.objectweb.asm.Opcodes; +import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode; +import org.jetbrains.org.objectweb.asm.tree.ClassNode; +import org.jetbrains.org.objectweb.asm.tree.FieldNode; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiLookup.java b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiLookup.java index 5de0963b948..f3bc7832083 100644 --- a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiLookup.java +++ b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiLookup.java @@ -708,7 +708,7 @@ public class ApiLookup { * fully qualified name (as returned by Class.getName(), but with * '.' replaced by '/'. * @param name the method's name - * @param desc the method's descriptor - see {@link org.objectweb.asm.Type} + * @param desc the method's descriptor - see {@link org.jetbrains.org.objectweb.asm.Type} * @return the minimum API version the method is supported for, or -1 if * it's unknown or version 1. */ diff --git a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ControlFlowGraph.java b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ControlFlowGraph.java index a48d4d0936d..349d3b1456a 100644 --- a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ControlFlowGraph.java +++ b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ControlFlowGraph.java @@ -21,24 +21,24 @@ import com.android.annotations.Nullable; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.FrameNode; -import org.objectweb.asm.tree.InsnList; -import org.objectweb.asm.tree.IntInsnNode; -import org.objectweb.asm.tree.JumpInsnNode; -import org.objectweb.asm.tree.LabelNode; -import org.objectweb.asm.tree.LdcInsnNode; -import org.objectweb.asm.tree.LineNumberNode; -import org.objectweb.asm.tree.MethodInsnNode; -import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.tree.TryCatchBlockNode; -import org.objectweb.asm.tree.TypeInsnNode; -import org.objectweb.asm.tree.analysis.Analyzer; -import org.objectweb.asm.tree.analysis.AnalyzerException; -import org.objectweb.asm.tree.analysis.BasicInterpreter; +import org.jetbrains.org.objectweb.asm.Opcodes; +import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode; +import org.jetbrains.org.objectweb.asm.tree.ClassNode; +import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode; +import org.jetbrains.org.objectweb.asm.tree.FrameNode; +import org.jetbrains.org.objectweb.asm.tree.InsnList; +import org.jetbrains.org.objectweb.asm.tree.IntInsnNode; +import org.jetbrains.org.objectweb.asm.tree.JumpInsnNode; +import org.jetbrains.org.objectweb.asm.tree.LabelNode; +import org.jetbrains.org.objectweb.asm.tree.LdcInsnNode; +import org.jetbrains.org.objectweb.asm.tree.LineNumberNode; +import org.jetbrains.org.objectweb.asm.tree.MethodInsnNode; +import org.jetbrains.org.objectweb.asm.tree.MethodNode; +import org.jetbrains.org.objectweb.asm.tree.TryCatchBlockNode; +import org.jetbrains.org.objectweb.asm.tree.TypeInsnNode; +import org.jetbrains.org.objectweb.asm.tree.analysis.Analyzer; +import org.jetbrains.org.objectweb.asm.tree.analysis.AnalyzerException; +import org.jetbrains.org.objectweb.asm.tree.analysis.BasicInterpreter; import java.lang.reflect.Field; import java.util.ArrayList; @@ -46,7 +46,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -//import org.objectweb.asm.util.Printer; +//import org.jetbrains.org.objectweb.asm.util.Printer; /** * A {@linkplain ControlFlowGraph} is a graph containing a node for each