platform.core.impl — remove dependency on intellij.platform.util.ui and intellij...
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 15 Sep 2020 14:41:21 +0000 (16:41 +0200)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Mon, 21 Sep 2020 13:40:47 +0000 (13:40 +0000)
java.psi.iml — remove dependency on intellij.platform.core.ui

GitOrigin-RevId: c1d4feb04c0471c7d17b5331b86738ee54a97f80

32 files changed:
adt-branding/intellij.android.adt.branding.iml
adt-ui/intellij.android.adt.ui.iml
android-adb/intellij.android.adb.iml
android-debuggers/intellij.android.debuggers.iml
android-debuggers/intellij.android.debuggers.tests.iml
android-kotlin/android-extensions-idea-common/intellij.android.kotlin.extensions.common.iml
android-layout-inspector/intellij.android.android-layout-inspector.iml
android-test-framework/intellij.android.testFramework.iml
android-transport/intellij.android.transport.iml
android/intellij.android.core.iml
android/intellij.android.core.tests.iml
android/src/org/jetbrains/android/augment/AndroidLightField.kt
apkanalyzer/intellij.android.apkanalyzer.iml
app-inspection/ide/intellij.android.app-inspection.ide.iml
assistant/intellij.android.assistant.iml
build-attribution/intellij.android.build-attribution.iml
compose-designer/intellij.android.compose-designer.iml
deploy/intellij.android.deploy.iml
designer/customview/intellij.android.designer.customview.iml
designer/intellij.android.designer.iml
designer/intellij.android.designer.tests.iml
layout-inspector/intellij.android.layout-inspector.iml
layout-ui/intellij.android.layout-ui.iml
lint/intellij.android.lint.iml
mlkit/intellij.android.mlkit.iml
naveditor/intellij.android.naveditor.iml
observable-ui/intellij.android.observable.ui.iml
profilers-android/intellij.android.profilersAndroid.iml
profilers-ui/intellij.android.profilers.ui.iml
room/intellij.android.room.iml
sdk-updates/intellij.android.sdkUpdates.iml
ultimate/intellij.android.ultimate.iml

index d0baef42f673a58686048229ea0049d061d2cf42..566185a792167d40418b5ae7be0475f323b12566 100644 (file)
@@ -21,5 +21,6 @@
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Guava" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index db478f0293058d3c5582f7ef05aae8a908be1f07..393a77cf270def0ec889e3d574f0ad89dc168589 100644 (file)
@@ -31,5 +31,6 @@
     <orderEntry type="library" name="Java Compatibility" level="project" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="intellij.webp" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 82b594fdf48dfea3ae4ff60bb1ef1d343c3c1df7..02039737fb4c3fb9870e204e384bf9db4b37dd6f 100644 (file)
@@ -14,5 +14,6 @@
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 3a9c2a80899bae9e0a1f093efa9e68eaee7b999a..e8b4dfdab846b459730137b281e7cf3ef5f1123a 100644 (file)
@@ -27,5 +27,6 @@
     <orderEntry type="module" module-name="intellij.android.app-inspection.ide" />
     <orderEntry type="module" module-name="intellij.android.transport" />
     <orderEntry type="library" name="live-sql-proto" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 25040d66be41ccd4745ec41560d096724da2f316..97c4a2c70b21de880eb34c7f751ed0149b728b93 100644 (file)
@@ -26,5 +26,6 @@
     <orderEntry type="module" module-name="intellij.android.app-inspection" />
     <orderEntry type="module" module-name="intellij.android.transport" />
     <orderEntry type="library" name="live-sql-proto" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 2448a813ac08fa149d14d7ef481713e30f6514d0..d3b28e104c3b7e4fb6e7004e17b1e4dd9acb2013 100644 (file)
@@ -20,5 +20,6 @@
     <orderEntry type="library" name="Gradle" level="project" />
     <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="kotlin-plugin-android-compile-deps" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 6b99c7d5190817cdb6c68e8038bace8b523b9b77..d36681cb8c8aae577250d89f495202e8bee8683f 100644 (file)
@@ -29,5 +29,6 @@
     <orderEntry type="library" name="protobuf" level="project" />
     <orderEntry type="library" name="studio-analytics-proto" level="project" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index fb35f4154ac65de8bf5f392939b138f7d10dab27..a671e180f0d11e016041758b6b36e4c37a892698 100644 (file)
@@ -30,5 +30,6 @@
     <orderEntry type="module" module-name="intellij.android.plugin" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.android.projectSystem.gradle" />
     <orderEntry type="module" module-name="intellij.android.projectSystem" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index b53cf08a17fd363842aa7d5cd0c478f3af4ac5be..b68b7251f575be0eaedbbec9e640428387bc477a 100644 (file)
@@ -35,5 +35,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="library" scope="TEST" name="jsr305" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 73b400cacf3d4d2e5030b099e029911c8f30cb91..705e71cde86ee80ae550359edbd34b64e4a31b0d 100755 (executable)
     <orderEntry type="library" scope="PROVIDED" name="jaxb-runtime" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="library" name="javax.activation" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 3347718e6057a6416883d4a585f9ac9a6a5035d2..cf0123a92dc8ccd50ecf39e6466de68ddef6599b 100644 (file)
     <orderEntry type="module" module-name="intellij.android.lint" scope="TEST" />
     <orderEntry type="module" module-name="intellij.webp" scope="TEST" />
     <orderEntry type="module" module-name="intellij.android.gradle-tooling.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index e7a7d2329815839700a863ade7e88c8f9b3c2d26..31338fa595a3c2e3907c9dbc8841498ffb73f30f 100644 (file)
@@ -1,3 +1,4 @@
+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.android.augment
 
 import com.android.ide.common.rendering.api.ResourceReference
@@ -6,15 +7,7 @@ import com.google.common.base.MoreObjects
 import com.intellij.lang.java.JavaLanguage
 import com.intellij.navigation.NavigationItem
 import com.intellij.openapi.util.TextRange
-import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiExpression
-import com.intellij.psi.PsiField
-import com.intellij.psi.PsiFile
-import com.intellij.psi.PsiModifier
-import com.intellij.psi.PsiType
-import com.intellij.psi.PsiTypeElement
-import com.intellij.psi.PsiVariable
+import com.intellij.psi.*
 import com.intellij.psi.impl.ElementPresentationUtil
 import com.intellij.psi.impl.PsiClassImplUtil
 import com.intellij.psi.impl.PsiVariableEx
@@ -22,6 +15,7 @@ import com.intellij.psi.impl.light.LightElement
 import com.intellij.psi.impl.light.LightIdentifier
 import com.intellij.psi.impl.light.LightModifierList
 import com.intellij.psi.javadoc.PsiDocComment
+import com.intellij.ui.IconManager
 import com.intellij.util.PlatformIcons
 import org.jetbrains.annotations.NonNls
 import javax.swing.Icon
@@ -80,7 +74,7 @@ open class AndroidLightField(
   }
 
   public override fun getElementIcon(flags: Int): Icon? {
-    val baseIcon = ElementPresentationUtil.createLayeredIcon(PlatformIcons.FIELD_ICON, this, false)
+    val baseIcon = IconManager.getInstance().createLayeredIcon(this, PlatformIcons.FIELD_ICON, ElementPresentationUtil.getFlags(this, false))
     return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon)
   }
 }
index 63a85914a3b05f1ed5fc195a96628bf1cbbeb44d..da43cb4cc444a6a5687c51dc8c9f851f73627839 100644 (file)
@@ -32,5 +32,6 @@
     <orderEntry type="library" name="protobuf" level="project" />
     <orderEntry type="library" name="studio-analytics-proto" level="project" />
     <orderEntry type="module" module-name="android.sdktools.flags" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index d91b0c66a24bc640ed318861b8385d609f43ce52..da9fb10f8be1698b059c7342356e677621be028b 100644 (file)
@@ -29,5 +29,6 @@
     <orderEntry type="library" scope="TEST" name="studio-grpc" level="project" />
     <orderEntry type="module" module-name="intellij.android.adt.ui" />
     <orderEntry type="library" scope="TEST" name="truth" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index baba2ddd29340c1ab8eee8f8c1191c99a4ccf634..e2026662d82e5d53b6e1c7a7a902e63311b0bd13 100644 (file)
@@ -19,5 +19,6 @@
     <orderEntry type="module" module-name="intellij.xml.dom" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="library" name="jaxb-api" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 7e71c1ace51137baa669083a2313e2067bb9e78d..6b9025f4b9e675d827b3bf4502af7ece99189ac9 100644 (file)
@@ -18,5 +18,6 @@
     <orderEntry type="module" module-name="android.sdktools.analytics-tracker" />
     <orderEntry type="module" module-name="intellij.android.common" />
     <orderEntry type="module" module-name="android.sdktools.flags" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 3def5b5788c4e6d456189473259c3e86e65bd673..f57708838210c8b00a09f579bb3e591d6700c6c1 100644 (file)
@@ -27,5 +27,6 @@
     <orderEntry type="library" name="protobuf" level="project" />
     <orderEntry type="module" module-name="intellij.android.artwork" />
     <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 714a1095fdf08a26f4dacc782dff8d16f861bd35..ed99f7ded57231b0449a8e9a90dbdad4c8cab86c 100644 (file)
@@ -31,5 +31,6 @@
     <orderEntry type="module" module-name="intellij.java.execution" />
     <orderEntry type="module" module-name="intellij.android.buildCommon" />
     <orderEntry type="library" name="studio-proto" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 2592f7ff7642c1a3d123dba2540cdc1c2ee3b38e..9acc7962a791422a4202cca91e6dd43b90e0c8c4 100644 (file)
@@ -25,5 +25,6 @@
     <orderEntry type="module" module-name="intellij.android.layout-ui" />
     <orderEntry type="library" name="studio-analytics-proto" level="project" />
     <orderEntry type="library" name="protobuf" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index e35382a7284224e6ee20edf3aa971110de33f157..3dc72775edf64fbcd38a58023d1d9f0b349cc153 100644 (file)
@@ -50,5 +50,6 @@
     <orderEntry type="library" name="jaxb-api" level="project" />
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.android.lint" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index f090f3c0482f3dc32a1450e69afde866a332b5bd..d43c9668f3a801066b52ed0018289ddcf3aa4887 100644 (file)
@@ -55,5 +55,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="intellij.android.lint" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index da150cadb01c3165878c28d6b1eaa198d0ba09f9..c78f5c72b2101676588c7f394135ef335d3ce0a4 100644 (file)
@@ -37,5 +37,6 @@
     <orderEntry type="module" module-name="android.sdktools.analytics-tracker" />
     <orderEntry type="library" name="studio-analytics-proto" level="project" />
     <orderEntry type="library" name="protobuf" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 53aa0d86cadc65a271502656061f0bfdc525ba22..b13f6695109de57cd0e36fa6c15a12cfda643d71 100644 (file)
@@ -23,5 +23,6 @@
     <orderEntry type="library" name="fastutil-min" level="project" />
     <orderEntry type="module" module-name="intellij.android.adt.testutils" scope="TEST" />
     <orderEntry type="module" module-name="android.sdktools.testutils" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index b67899b6672f36c3ff0373702fd8e36da8b6fbeb..b6dc44f374cc6b8d2e4e34ffc63319a700eb95e2 100644 (file)
@@ -29,5 +29,6 @@
     <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="module" module-name="intellij.properties.psi" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 27d8c7e9d35184770692ca218a63537c4e7fa0fc..d6e3e9f6066676542ca52647fee4dd99ac25ca02 100644 (file)
@@ -16,5 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.xml.dom" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
   </component>
 </module>
\ No newline at end of file
index 6627ee61a4d906a53d0cb1a98618334efb648328..986965c524b226bed7d3e96d280f9fefccbd2340 100644 (file)
@@ -39,5 +39,6 @@
     <orderEntry type="library" name="protobuf" level="project" />
     <orderEntry type="module" module-name="intellij.android.adt.ui.model" />
     <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 1827fd7b9043e7ace3f872a166153e5afd34011f..3aab9ca8f93060888f14a6551d8145b334a6b035 100644 (file)
@@ -16,5 +16,6 @@
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="truth" level="project" />
     <orderEntry type="library" scope="TEST" name="Guava" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 07703f3748b7fd90ee91f15c8e14a0c59a6c6840..c1b13c609e55623ee30caef78b13e9e469688711 100644 (file)
@@ -46,5 +46,6 @@
     <orderEntry type="library" name="transport-proto" level="project" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
     <orderEntry type="library" name="fastutil-min" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 2f1e9d65614f7e78662bade2c01a2e80906ff12c..d9471cf688d6ac73e58f7134259ee26b1443fdfe 100644 (file)
@@ -30,5 +30,6 @@
     <orderEntry type="library" name="studio-proto" level="project" />
     <orderEntry type="library" name="transport-proto" level="project" />
     <orderEntry type="library" name="studio-grpc" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 740486704b6dc94dd61d0ccd3e4b4e4cc1892020..84b8beb1af5885016db71fa1842ed869ca91b411 100644 (file)
@@ -18,5 +18,6 @@
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.android.projectSystem" />
     <orderEntry type="library" scope="PROVIDED" name="kotlin-plugin-android-compile-deps" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 710b0ef33e413f36445d2308726e40594bb9d145..c2b7234a68494388c26750e8bd9f04b66c715ccd 100644 (file)
@@ -20,5 +20,6 @@
     <orderEntry type="module" module-name="intellij.android.observable.ui" />
     <orderEntry type="library" name="protobuf" level="project" />
     <orderEntry type="library" name="studio-analytics-proto" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file
index 98865559739fa756e285bc0c8c5d592e94a481d6..fb46521e6ecd0284e494c3de5b5d2e32026226b8 100644 (file)
@@ -17,5 +17,6 @@
     <orderEntry type="module" module-name="intellij.android.core" />
     <orderEntry type="module" module-name="android.sdktools.ddmlib" />
     <orderEntry type="module" module-name="intellij.android.common" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
   </component>
 </module>
\ No newline at end of file