diff --git a/RegExpSupport/gen/icons/RegExpSupportIcons.java b/RegExpSupport/gen/icons/RegExpSupportIcons.java deleted file mode 100644 index e03dcfd291d2..000000000000 --- a/RegExpSupport/gen/icons/RegExpSupportIcons.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2000-2018 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 icons; - -import com.intellij.openapi.util.IconLoader; - -import javax.swing.*; - -/** - * NOTE THIS FILE IS AUTO-GENERATED - * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead - */ -public final class RegExpSupportIcons { - private static Icon load(String path) { - return IconLoader.getIcon(path, RegExpSupportIcons.class); - } - - public static final Icon Regexp_filetype_icon = load("/org/intellij/lang/regexp/regexp-filetype-icon.png"); // 11x16 -} diff --git a/RegExpSupport/resources/org/intellij/lang/regexp/regexp-filetype-icon.png b/RegExpSupport/resources/org/intellij/lang/regexp/regexp-filetype-icon.png deleted file mode 100644 index f3cd301d7932..000000000000 Binary files a/RegExpSupport/resources/org/intellij/lang/regexp/regexp-filetype-icon.png and /dev/null differ diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java index e0e480035bd2..eef174312c43 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java @@ -18,9 +18,6 @@ package org.intellij.lang.regexp; import com.intellij.icons.AllIcons; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.LanguageFileType; -import com.intellij.openapi.util.IconLoader; -import com.intellij.ui.LayeredIcon; -import icons.RegExpSupportIcons; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,12 +31,7 @@ public class RegExpFileType extends LanguageFileType { private RegExpFileType() { super(RegExpLanguage.INSTANCE); - myIcon = new IconLoader.LazyIcon() { - @Override - protected Icon compute() { - return new LayeredIcon(AllIcons.FileTypes.Text, RegExpSupportIcons.Regexp_filetype_icon); - } - }; + myIcon = AllIcons.FileTypes.Regexp; } public RegExpFileType(@NotNull Language language) { diff --git a/images/resources/META-INF/ImagesPlugin.xml b/images/resources/META-INF/ImagesPlugin.xml index 35020fd46be4..37e0aeae75df 100644 --- a/images/resources/META-INF/ImagesPlugin.xml +++ b/images/resources/META-INF/ImagesPlugin.xml @@ -29,7 +29,6 @@ diff --git a/images/resources/org/intellij/images/icons/EditExternally.png b/images/resources/org/intellij/images/icons/EditExternally.png deleted file mode 100644 index 12200439d052..000000000000 Binary files a/images/resources/org/intellij/images/icons/EditExternally.png and /dev/null differ diff --git a/images/src/icons/ImagesIcons.java b/images/src/icons/ImagesIcons.java index 8ccbc8882aa3..7b155d6d2d32 100644 --- a/images/src/icons/ImagesIcons.java +++ b/images/src/icons/ImagesIcons.java @@ -14,7 +14,6 @@ public final class ImagesIcons { return IconLoader.getIcon(path, ImagesIcons.class); } - public static final Icon EditExternally = load("/org/intellij/images/icons/EditExternally.png"); // 16x16 public static final Icon ImagesFileType = load("/org/intellij/images/icons/ImagesFileType.svg"); // 16x16 public static final Icon ThumbnailBlank = load("/org/intellij/images/icons/ThumbnailBlank.png"); // 75x86 public static final Icon ThumbnailDirectory = load("/org/intellij/images/icons/ThumbnailDirectory.png"); // 75x82 diff --git a/platform/icons/src/fileTypes/regexp.svg b/platform/icons/src/fileTypes/regexp.svg new file mode 100644 index 000000000000..b33b835daa61 --- /dev/null +++ b/platform/icons/src/fileTypes/regexp.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/plugins/editorconfig/resources/icons/editorconfig.svg b/platform/icons/src/nodes/editorconfig.svg similarity index 100% rename from plugins/editorconfig/resources/icons/editorconfig.svg rename to platform/icons/src/nodes/editorconfig.svg diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 3e5d9c1f5916..c8f905926604 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -796,6 +796,7 @@ public class AllIcons { public static final Icon Jspx = IconLoader.getIcon("/fileTypes/jspx.svg"); // 16x16 public static final Icon Manifest = IconLoader.getIcon("/fileTypes/manifest.svg"); // 16x16 public static final Icon Properties = IconLoader.getIcon("/fileTypes/properties.svg"); // 16x16 + public static final Icon Regexp = IconLoader.getIcon("/fileTypes/regexp.svg"); // 16x16 public static final Icon Text = IconLoader.getIcon("/fileTypes/text.svg"); // 16x16 public static final Icon UiForm = IconLoader.getIcon("/fileTypes/uiForm.svg"); // 16x16 public static final Icon Unknown = IconLoader.getIcon("/fileTypes/unknown.svg"); // 16x16 @@ -1859,6 +1860,7 @@ public class AllIcons { public static final Icon DataView = IconLoader.getIcon("/nodes/dataView.svg"); // 16x16 public static final Icon Deploy = IconLoader.getIcon("/nodes/deploy.svg"); // 16x16 public static final Icon Desktop = IconLoader.getIcon("/nodes/desktop.svg"); // 16x16 + public static final Icon Editorconfig = IconLoader.getIcon("/nodes/editorconfig.svg"); // 16x16 public static final Icon Ejb = IconLoader.getIcon("/nodes/ejb.svg"); // 16x16 public static final Icon EjbBusinessMethod = IconLoader.getIcon("/nodes/ejbBusinessMethod.svg"); // 16x16 public static final Icon EjbCmpField = IconLoader.getIcon("/nodes/ejbCmpField.svg"); // 16x16 diff --git a/plugins/editorconfig/src/icons/EditorconfigIcons.java b/plugins/editorconfig/src/icons/EditorconfigIcons.java index f32159ef3317..ce34b33c448a 100644 --- a/plugins/editorconfig/src/icons/EditorconfigIcons.java +++ b/plugins/editorconfig/src/icons/EditorconfigIcons.java @@ -14,7 +14,6 @@ public final class EditorconfigIcons { return IconLoader.getIcon(path, EditorconfigIcons.class); } - public static final Icon Editorconfig = load("/icons/editorconfig.svg"); // 16x16 public static final Icon PartiallyOverridden = load("/icons/partiallyOverridden.svg"); // 12x12 public static final Icon PartiallyOverriding = load("/icons/partiallyOverriding.svg"); // 12x12 } diff --git a/plugins/editorconfig/src/org/editorconfig/language/codeinsight/actions/CreateEditorConfigFileAction.kt b/plugins/editorconfig/src/org/editorconfig/language/codeinsight/actions/CreateEditorConfigFileAction.kt index c8840ba315c7..95e07f4b3b7e 100644 --- a/plugins/editorconfig/src/org/editorconfig/language/codeinsight/actions/CreateEditorConfigFileAction.kt +++ b/plugins/editorconfig/src/org/editorconfig/language/codeinsight/actions/CreateEditorConfigFileAction.kt @@ -1,20 +1,20 @@ // Copyright 2000-2018 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.editorconfig.language.codeinsight.actions +import com.intellij.icons.AllIcons import com.intellij.ide.actions.CreateInDirectoryActionBase import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.LangDataKeys import com.intellij.openapi.application.runWriteAction import com.intellij.psi.PsiDirectory import com.intellij.psi.PsiFile -import icons.EditorconfigIcons import org.editorconfig.language.filetype.EditorConfigFileConstants import org.editorconfig.language.messages.EditorConfigBundle class CreateEditorConfigFileAction : CreateInDirectoryActionBase( EditorConfigBundle["create.file.title"], EditorConfigBundle["create.file.description"], - EditorconfigIcons.Editorconfig + AllIcons.Nodes.Editorconfig ) { @Suppress("UsePropertyAccessSyntax") override fun actionPerformed(event: AnActionEvent) { diff --git a/plugins/editorconfig/src/org/editorconfig/language/filetype/EditorConfigFileType.kt b/plugins/editorconfig/src/org/editorconfig/language/filetype/EditorConfigFileType.kt index 12248836a761..d100f368e0ff 100644 --- a/plugins/editorconfig/src/org/editorconfig/language/filetype/EditorConfigFileType.kt +++ b/plugins/editorconfig/src/org/editorconfig/language/filetype/EditorConfigFileType.kt @@ -1,8 +1,8 @@ // Copyright 2000-2018 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.editorconfig.language.filetype +import com.intellij.icons.AllIcons import com.intellij.openapi.fileTypes.LanguageFileType -import icons.EditorconfigIcons import org.editorconfig.language.EditorConfigLanguage import org.editorconfig.language.messages.EditorConfigBundle import javax.swing.Icon @@ -11,5 +11,5 @@ object EditorConfigFileType : LanguageFileType(EditorConfigLanguage) { override fun getName() = EditorConfigFileConstants.FILETYPE_NAME override fun getDescription() = EditorConfigBundle["file.type.description"] override fun getDefaultExtension() = EditorConfigFileConstants.FILE_EXTENSION - override fun getIcon(): Icon? = EditorconfigIcons.Editorconfig + override fun getIcon(): Icon? = AllIcons.Nodes.Editorconfig } diff --git a/plugins/editorconfig/src/org/editorconfig/language/highlighting/EditorConfigColorSettingsPage.kt b/plugins/editorconfig/src/org/editorconfig/language/highlighting/EditorConfigColorSettingsPage.kt index d52077db1b89..20d258dd76f0 100644 --- a/plugins/editorconfig/src/org/editorconfig/language/highlighting/EditorConfigColorSettingsPage.kt +++ b/plugins/editorconfig/src/org/editorconfig/language/highlighting/EditorConfigColorSettingsPage.kt @@ -1,6 +1,7 @@ // Copyright 2000-2018 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.editorconfig.language.highlighting +import com.intellij.icons.AllIcons import com.intellij.openapi.editor.colors.TextAttributesKey import com.intellij.openapi.fileTypes.SyntaxHighlighter import com.intellij.openapi.options.colors.AttributesDescriptor @@ -8,13 +9,12 @@ import com.intellij.openapi.options.colors.ColorDescriptor import com.intellij.openapi.options.colors.ColorSettingsPage import com.intellij.psi.codeStyle.DisplayPriority import com.intellij.psi.codeStyle.DisplayPrioritySortable -import icons.EditorconfigIcons import org.editorconfig.language.filetype.EditorConfigFileConstants import org.editorconfig.language.messages.EditorConfigBundle.get import javax.swing.Icon class EditorConfigColorSettingsPage : ColorSettingsPage, DisplayPrioritySortable { - override fun getIcon(): Icon = EditorconfigIcons.Editorconfig + override fun getIcon(): Icon = AllIcons.Nodes.Editorconfig override fun getHighlighter(): SyntaxHighlighter = EditorConfigSyntaxHighlighter override fun getDemoText() = """root = true diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java index cf9cecbd893a..ce0aa3d289df 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java @@ -25,7 +25,6 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.impl.PsiFileEx; import com.intellij.psi.util.*; import com.intellij.psi.xml.*; -import com.intellij.ui.LayeredIcon; import com.intellij.util.SmartList; import com.intellij.util.xml.NanoXmlUtil; import gnu.trove.THashMap; @@ -349,7 +348,7 @@ public class XsltSupport { } public static Icon createXsltIcon(Icon icon) { - return LayeredIcon.create(icon, XpathIcons.Xslt_filetype_overlay); + return XpathIcons.Xslt_filetype_overlay; } private static class XsltSupportProvider implements ParameterizedCachedValueProvider {