MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-218345 Deadlock while loading AllIcons' subclasses because of circular references

Browse Source 
GitOrigin-RevId: 8349ce5d0aad5a41ccc000e573ec232189c4e5bd
This commit is contained in:
Vladimir Krivosheev
2019-07-15 23:02:59 +03:00
committed by intellij-monorepo-bot
parent 31ba5ca371
commit 0aead9b3bc
7 changed files with 237 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/ImageCollector.kt
+1 -1
View File
@@ -281,7 +281,7 @@ internal class ImageCollector(private val projectHome: Path, private val iconsOn
val replacement = replacementString?.substringAfter('@')?.trim()
val replacementContextClass = StringUtil.nullize(replacementString?.substringBefore('@', "")?.trim())
val deprecatedData = DeprecationData(comment, replacement, replacementContextClass, replacementReference = computeReplacementReference(comment))
val deprecatedData = DeprecationData(comment, replacement, replacementContextClass, replacementReference = null)
answer.deprecated.add(DeprecatedEntry(compilePattern(dir, root, pattern), deprecatedData))
if (!pattern.contains('*') && !pattern.startsWith('/')) {
platform/icons/src/actions/icon-robots.txt
+1 -1
View File
@@ -21,7 +21,7 @@ deprecated: filter_small.png -> /general/filter.svg; to be removed in IDEA 2020
deprecated: findPlain.png -> /actions/find.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Find
deprecated: findWhite.png; to be removed in IDEA 2020
deprecated: get.png -> /actions/download.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Download
deprecated: left.png -> /general/arrowLeft.png; to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft
deprecated: left.png -> /general/arrowLeft.svg; to be removed in IDEA 2020 - use AllIcons.General.ArrowLeft
deprecated: menu-find.png -> /actions/find.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Find
deprecated: menu-help.png -> /actions/help.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Help
deprecated: menu-replace.png -> /actions/replace.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Replace
platform/icons/src/general/icon-robots.txt
+1 -1
View File
@@ -73,7 +73,7 @@ deprecated: projectConfigurableSelected.png -> /general/projectConfigurable.svg;
deprecated: projectSettings.png -> /general/gearPlain.svg; to be removed in IDEA 2020 - use AllIcons.General.GearPlain
deprecated: readHelp.png -> /actions/help.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Help
deprecated: recursive.png -> /actions/showAsTree.svg; to be removed in IDEA 2020 - use AllIcons.Actions.ShowAsTree
deprecated: run.png -> /runConfigurations/testState/run.png; to be removed in IDEA 2020 - use AllIcons.RunConfigurations.TestState.Run
deprecated: run.png -> /runConfigurations/testState/run.svg; to be removed in IDEA 2020 - use AllIcons.RunConfigurations.TestState.Run
deprecated: safeMode.png -> /general/inspectionsTrafficOff.svg; to be removed in IDEA 2020 - use AllIcons.General.InspectionsTrafficOff
deprecated: searchEverywhereGear.png; to be removed in IDEA 2020
deprecated: secondaryGroup.png -> /general/gearPlain.svg; to be removed in IDEA 2020 - use AllIcons.General.GearPlain
platform/icons/src/modules/icon-robots.txt
+4 -4
View File
@@ -9,7 +9,7 @@ deprecated: sourceFolder.svg -> /nodes/package.svg; to be removed in IDEA 2020 -
deprecated: testSourceFolder.svg -> /nodes/testSourceFolder.svg; to be removed in IDEA 2020 - use AllIcons.Nodes.TestSourceFolder
deprecated: webRoot.svg -> /nodes/webFolder.svg; to be removed in IDEA 2020 - use AllIcons.Nodes.WebFolder
deprecated: sources.svg; to be removed in IDEA 2020
deprecated: deleteContentFolder.png -> /action/close.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Close
deprecated: deleteContentFolderRollover.png -> /action/closeHovered.svg; to be removed in IDEA 2020 - use AllIcons.Actions.CloseHovered
deprecated: deleteContentRoot.png -> /action/close.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Close
deprecated: deleteContentRootRollover.png -> /action/closeHovered.svg; to be removed in IDEA 2020 - use AllIcons.Actions.CloseHovered
deprecated: deleteContentFolder.png -> /actions/close.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Close
deprecated: deleteContentFolderRollover.png -> /actions/closeHovered.svg; to be removed in IDEA 2020 - use AllIcons.Actions.CloseHovered
deprecated: deleteContentRoot.png -> /actions/close.svg; to be removed in IDEA 2020 - use AllIcons.Actions.Close
deprecated: deleteContentRootRollover.png -> /actions/closeHovered.svg; to be removed in IDEA 2020 - use AllIcons.Actions.CloseHovered
platform/util/src/com/intellij/icons/AllIcons.java
+228 -228
View File
File diff suppressed because it is too large Load Diff
plugins/ant/src/icons/AntIcons.java
+1 -1
View File
@@ -32,7 +32,7 @@ public final class AntIcons {
@SuppressWarnings("unused")
@Deprecated
@ScheduledForRemoval(inVersion = "2020.1")
public static final Icon AntInstallation = AntIcons.Build;
/** 16x16 */ public static final Icon AntInstallation = load("/icons/build.svg");
/** @deprecated to be removed in IDEA 2020 - use AllIcons.General.Information */
@SuppressWarnings("unused")
plugins/gradle/src/icons/GradleIcons.java
+1 -1
View File
@@ -35,7 +35,7 @@ public final class GradleIcons {
@SuppressWarnings("unused")
@Deprecated
@ScheduledForRemoval(inVersion = "2020.1")
public static final Icon GradlePlugin = GradleIcons.Gradle;
/** 16x16 */ public static final Icon GradlePlugin = load("/icons/gradle.svg");
/** @deprecated to be removed in IDEA 2020 */
@SuppressWarnings("unused")