From b10073465cde5e6f4ad9c03c6a46495381c8f865 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 18 Oct 2016 20:35:12 +0200 Subject: [PATCH] fix compilation of new lint checks against IDEA 163 --- .../src/com/android/tools/klint/client/api/LintClient.java | 2 +- .../src/com/android/tools/klint/client/api/LintDriver.java | 2 +- .../com/android/tools/klint/detector/api/ClassContext.java | 3 +-- .../src/com/android/tools/klint/checks/ApiDetector.java | 7 ++----- .../src/com/android/tools/klint/checks/ApiLookup.java | 2 +- .../android/inspections/klint/IntellijLintClient.java | 6 +++--- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintClient.java b/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintClient.java index a24671bf619..0b3597f97ea 100644 --- a/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintClient.java +++ b/plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintClient.java @@ -42,7 +42,7 @@ import com.android.repository.api.ProgressIndicatorAdapter; import com.android.sdklib.BuildToolInfo; import com.android.sdklib.IAndroidTarget; import com.android.sdklib.SdkVersionInfo; -import com.android.sdklib.repositoryv2.AndroidSdkHandler; +import com.android.sdklib.repository.AndroidSdkHandler; import com.android.tools.klint.detector.api.Context; import com.android.tools.klint.detector.api.Detector; import com.android.tools.klint.detector.api.Issue; 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 7c1afe78a4d..1ef1cd35a82 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 @@ -42,7 +42,7 @@ import com.android.ide.common.res2.ResourceItem; import com.android.resources.ResourceFolderType; import com.android.sdklib.BuildToolInfo; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.repositoryv2.AndroidSdkHandler; +import com.android.sdklib.repository.AndroidSdkHandler; import com.android.tools.klint.client.api.LintListener.EventType; import com.android.tools.klint.detector.api.ClassContext; import com.android.tools.klint.detector.api.Context; 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 13fa4ad03a7..c1b587aec3d 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 @@ -28,7 +28,6 @@ import com.android.annotations.Nullable; import com.android.tools.klint.client.api.LintDriver; import com.android.tools.klint.detector.api.Location.SearchDirection; import com.android.tools.klint.detector.api.Location.SearchHints; -import com.android.utils.AsmUtils; import com.google.common.annotations.Beta; import com.google.common.base.Splitter; @@ -699,7 +698,7 @@ public class ClassContext extends Context { // If class name contains $, it's not an ambiguous inner class name. if (fqcn.indexOf('$') != -1) { - return AsmUtils.toInternalName(fqcn); + return fqcn.replace('.', '/'); } // Let's assume that components that start with Caps are class names. StringBuilder sb = new StringBuilder(fqcn.length()); diff --git a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.java b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.java index bffeff33a4c..81531cf8519 100644 --- a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.java +++ b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.java @@ -27,11 +27,8 @@ import com.android.resources.ResourceType; import com.android.sdklib.AndroidVersion; import com.android.sdklib.BuildToolInfo; import com.android.sdklib.SdkVersionInfo; -import com.android.sdklib.repositoryv2.AndroidSdkHandler; -import com.android.tools.klint.client.api.IssueRegistry; -import com.android.tools.klint.client.api.JavaEvaluator; -import com.android.tools.klint.client.api.LintDriver; -import com.android.tools.klint.client.api.UastLintUtils; +import com.android.sdklib.repository.AndroidSdkHandler; +import com.android.tools.klint.client.api.*; import com.android.tools.klint.detector.api.*; import com.android.tools.klint.detector.api.Detector.ClassScanner; import com.intellij.psi.*; 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 cdf36cd6062..619cf4f1b7c 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 @@ -25,7 +25,7 @@ import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.annotations.VisibleForTesting; import com.android.repository.api.LocalPackage; -import com.android.sdklib.repositoryv2.AndroidSdkHandler; +import com.android.sdklib.repository.AndroidSdkHandler; import com.android.tools.klint.client.api.LintClient; //import com.android.tools.klint.client.api.SdkWrapper; import com.android.tools.klint.detector.api.LintUtils; diff --git a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijLintClient.java b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijLintClient.java index 1f85f74075a..e4c79c6b830 100644 --- a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijLintClient.java +++ b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijLintClient.java @@ -7,10 +7,10 @@ import com.android.ide.common.repository.ResourceVisibilityLookup; import com.android.ide.common.res2.AbstractResourceRepository; import com.android.ide.common.res2.ResourceFile; import com.android.ide.common.res2.ResourceItem; -import com.android.sdklib.repositoryv2.AndroidSdkHandler; +import com.android.sdklib.repository.AndroidSdkHandler; import com.android.tools.idea.gradle.util.Projects; -import com.android.tools.idea.rendering.AppResourceRepository; -import com.android.tools.idea.rendering.LocalResourceRepository; +import com.android.tools.idea.res.AppResourceRepository; +import com.android.tools.idea.res.LocalResourceRepository; import com.android.tools.idea.sdk.IdeSdks; import com.android.tools.idea.welcome.install.AndroidSdk; import com.android.tools.klint.checks.ApiLookup;