azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use reference to asm directly. Use asm from Idea instead.

Browse Source
This commit is contained in:
Nikolay Krasko
2016-05-19 21:19:41 +03:00
parent 4e0d4681ed
commit a801d8fa6f
8 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/lint/lint-api/src/com/android/tools/klint/client/api/AsmVisitor.java
+1 -1
View File
@@ -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;
import com.android.tools.klint.detector.api.Detector.ClassScanner; import com.android.tools.klint.detector.api.Detector.ClassScanner;
import com.google.common.annotations.Beta; import com.google.common.annotations.Beta;
import org.objectweb.asm.tree.*; import org.jetbrains.org.objectweb.asm.tree.*;
import java.util.*; import java.util.*;
plugins/lint/lint-api/src/com/android/tools/klint/client/api/ClassEntry.java
+3 -3
View File
@@ -22,8 +22,8 @@ import com.android.annotations.VisibleForTesting;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import com.google.common.io.Closeables; import com.google.common.io.Closeables;
import org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.ClassVisitor;
import java.io.File; import java.io.File;
import java.io.FileInputStream; 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_CLASS;
import static com.android.SdkConstants.DOT_JAR; 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. */ /** A class, present either as a .class file on disk, or inside a .jar file. */
@VisibleForTesting @VisibleForTesting
plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java
+3 -3
View File
@@ -45,9 +45,9 @@ import org.jetbrains.uast.*;
import org.jetbrains.uast.check.UastChecker; import org.jetbrains.uast.check.UastChecker;
import org.jetbrains.uast.check.UastScanner; import org.jetbrains.uast.check.UastScanner;
import org.jetbrains.uast.visitor.UastVisitor; import org.jetbrains.uast.visitor.UastVisitor;
import org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassReader;
import org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.*; import org.jetbrains.org.objectweb.asm.tree.*;
import org.w3c.dom.Attr; import org.w3c.dom.Attr;
import org.w3c.dom.Element; import org.w3c.dom.Element;
plugins/lint/lint-api/src/com/android/tools/klint/detector/api/ClassContext.java
+4 -4
View File
@@ -21,8 +21,8 @@ import com.android.annotations.Nullable;
import com.android.tools.klint.client.api.LintDriver; import com.android.tools.klint.client.api.LintDriver;
import com.google.common.annotations.Beta; import com.google.common.annotations.Beta;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.Type;
import org.objectweb.asm.tree.*; import org.jetbrains.org.objectweb.asm.tree.*;
import java.io.File; import java.io.File;
import java.util.List; 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 * 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. * scope and there is no specific method or field that applies to the error.
* If so, use * If so, use
* {@link #report(Issue, org.objectweb.asm.tree.MethodNode, org.objectweb.asm.tree.AbstractInsnNode, Location, String)} or * {@link #report(Issue, org.jetbrains.org.objectweb.asm.tree.MethodNode, org.jetbrains.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.FieldNode, Location, String)}, such that
* suppress annotations are checked. * suppress annotations are checked.
* *
* @param issue the issue to report * @param issue the issue to report
plugins/lint/lint-api/src/com/android/tools/klint/detector/api/Detector.java
+4 -4
View File
@@ -27,10 +27,10 @@ import org.jetbrains.uast.UFunction;
import org.jetbrains.uast.check.UastAndroidContext; import org.jetbrains.uast.check.UastAndroidContext;
import org.jetbrains.uast.visitor.AbstractUastVisitor; import org.jetbrains.uast.visitor.AbstractUastVisitor;
import org.jetbrains.uast.visitor.UastVisitor; import org.jetbrains.uast.visitor.UastVisitor;
import org.objectweb.asm.tree.AbstractInsnNode; import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode; import org.jetbrains.org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodInsnNode; import org.jetbrains.org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode; import org.jetbrains.org.objectweb.asm.tree.MethodNode;
import org.w3c.dom.Attr; import org.w3c.dom.Attr;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
plugins/lint/lint-api/src/com/android/tools/klint/detector/api/LintUtils.java
+4 -4
View File
@@ -44,10 +44,10 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.jetbrains.uast.UFile; import org.jetbrains.uast.UFile;
import org.jetbrains.uast.UImportStatement; import org.jetbrains.uast.UImportStatement;
import org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.AbstractInsnNode; import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode; import org.jetbrains.org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.FieldNode; import org.jetbrains.org.objectweb.asm.tree.FieldNode;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiLookup.java
+1 -1
View File
@@ -708,7 +708,7 @@ public class ApiLookup {
* fully qualified name (as returned by Class.getName(), but with * fully qualified name (as returned by Class.getName(), but with
* '.' replaced by '/'. * '.' replaced by '/'.
* @param name the method's name * @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 * @return the minimum API version the method is supported for, or -1 if
* it's unknown <b>or version 1</b>. * it's unknown <b>or version 1</b>.
*/ */
plugins/lint/lint-checks/src/com/android/tools/klint/checks/ControlFlowGraph.java
+19 -19
View File
@@ -21,24 +21,24 @@ import com.android.annotations.Nullable;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.AbstractInsnNode; import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode; import org.jetbrains.org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.FieldInsnNode; import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode;
import org.objectweb.asm.tree.FrameNode; import org.jetbrains.org.objectweb.asm.tree.FrameNode;
import org.objectweb.asm.tree.InsnList; import org.jetbrains.org.objectweb.asm.tree.InsnList;
import org.objectweb.asm.tree.IntInsnNode; import org.jetbrains.org.objectweb.asm.tree.IntInsnNode;
import org.objectweb.asm.tree.JumpInsnNode; import org.jetbrains.org.objectweb.asm.tree.JumpInsnNode;
import org.objectweb.asm.tree.LabelNode; import org.jetbrains.org.objectweb.asm.tree.LabelNode;
import org.objectweb.asm.tree.LdcInsnNode; import org.jetbrains.org.objectweb.asm.tree.LdcInsnNode;
import org.objectweb.asm.tree.LineNumberNode; import org.jetbrains.org.objectweb.asm.tree.LineNumberNode;
import org.objectweb.asm.tree.MethodInsnNode; import org.jetbrains.org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode; import org.jetbrains.org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode; import org.jetbrains.org.objectweb.asm.tree.TryCatchBlockNode;
import org.objectweb.asm.tree.TypeInsnNode; import org.jetbrains.org.objectweb.asm.tree.TypeInsnNode;
import org.objectweb.asm.tree.analysis.Analyzer; import org.jetbrains.org.objectweb.asm.tree.analysis.Analyzer;
import org.objectweb.asm.tree.analysis.AnalyzerException; import org.jetbrains.org.objectweb.asm.tree.analysis.AnalyzerException;
import org.objectweb.asm.tree.analysis.BasicInterpreter; import org.jetbrains.org.objectweb.asm.tree.analysis.BasicInterpreter;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
@@ -46,7 +46,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; 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 * A {@linkplain ControlFlowGraph} is a graph containing a node for each