From 9a2b142e88e80cc42f0e06dacd785f2227faa1ca Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 26 Sep 2018 10:19:50 +0200 Subject: [PATCH] move xpath resources to resources root --- plugins/xpath/xpath-lang/gen/icons/XpathIcons.java | 1 + .../fileTemplates/XSLT Stylesheet.xsl.ft | 0 .../src => xpath-lang/resources}/icons/xml.png | Bin .../src => xpath-lang/resources}/icons/xml_dark.png | Bin .../inspectionDescriptions/CheckNodeTest.html | 0 .../HardwiredNamespacePrefix.html | 0 .../ImplicitTypeConversion.html | 0 .../inspectionDescriptions/IndexZeroUsage.html | 0 .../RedundantTypeConversion.html | 0 .../inspectionDescriptions/XsltDeclarations.html | 0 .../XsltTemplateInvocation.html | 0 .../XsltUnusedDeclaration.html | 0 .../XsltVariableShadowing.html | 0 .../after.xml.template | 0 .../before.xml.template | 0 .../AddOptionalArgumentsIntention/description.html | 0 .../ConvertIfToChooseIntention/after.xml.template | 0 .../ConvertIfToChooseIntention/before.xml.template | 0 .../ConvertIfToChooseIntention/description.html | 0 .../InlineXslAttribute/after.xml.template | 0 .../InlineXslAttribute/before.xml.template | 0 .../InlineXslAttribute/description.html | 0 .../ReplaceWithXslAttribute/after.xml.template | 0 .../ReplaceWithXslAttribute/before.xml.template | 0 .../ReplaceWithXslAttribute/description.html | 0 .../{src => resources}/liveTemplates/xsl.xml | 0 .../intellij/plugins/xpathView/XPathEvalAction.java | 6 ++---- 27 files changed, 3 insertions(+), 4 deletions(-) rename plugins/xpath/xpath-lang/{src => resources}/fileTemplates/XSLT Stylesheet.xsl.ft (100%) rename plugins/xpath/{xpath-view/src => xpath-lang/resources}/icons/xml.png (100%) rename plugins/xpath/{xpath-view/src => xpath-lang/resources}/icons/xml_dark.png (100%) rename plugins/xpath/xpath-lang/{src => resources}/inspectionDescriptions/CheckNodeTest.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/inspectionDescriptions/HardwiredNamespacePrefix.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/inspectionDescriptions/ImplicitTypeConversion.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/inspectionDescriptions/IndexZeroUsage.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/inspectionDescriptions/RedundantTypeConversion.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/inspectionDescriptions/XsltDeclarations.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/inspectionDescriptions/XsltTemplateInvocation.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/inspectionDescriptions/XsltUnusedDeclaration.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/inspectionDescriptions/XsltVariableShadowing.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/AddOptionalArgumentsIntention/after.xml.template (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/AddOptionalArgumentsIntention/before.xml.template (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/AddOptionalArgumentsIntention/description.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/ConvertIfToChooseIntention/after.xml.template (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/ConvertIfToChooseIntention/before.xml.template (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/ConvertIfToChooseIntention/description.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/InlineXslAttribute/after.xml.template (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/InlineXslAttribute/before.xml.template (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/InlineXslAttribute/description.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/ReplaceWithXslAttribute/after.xml.template (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/ReplaceWithXslAttribute/before.xml.template (100%) rename plugins/xpath/xpath-lang/{src => resources}/intentionDescriptions/ReplaceWithXslAttribute/description.html (100%) rename plugins/xpath/xpath-lang/{src => resources}/liveTemplates/xsl.xml (100%) diff --git a/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java b/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java index 48b52cadb38f..795bc89c2c24 100644 --- a/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java +++ b/plugins/xpath/xpath-lang/gen/icons/XpathIcons.java @@ -19,6 +19,7 @@ public class XpathIcons { public static final Icon Function = load("/icons/function.png"); // 18x18 public static final Icon Namespace = load("/icons/namespace.png"); // 21x21 public static final Icon Template = load("/icons/template.png"); // 18x18 + public static final Icon Xml = load("/icons/xml.png"); // 16x16 public static final Icon Xpath = load("/icons/xpath.png"); // 12x16 public static final Icon Xslt_filetype_overlay = load("/icons/xslt-filetype-overlay.png"); // 11x16 public static final Icon Xslt = load("/icons/xslt.png"); // 16x16 diff --git a/plugins/xpath/xpath-lang/src/fileTemplates/XSLT Stylesheet.xsl.ft b/plugins/xpath/xpath-lang/resources/fileTemplates/XSLT Stylesheet.xsl.ft similarity index 100% rename from plugins/xpath/xpath-lang/src/fileTemplates/XSLT Stylesheet.xsl.ft rename to plugins/xpath/xpath-lang/resources/fileTemplates/XSLT Stylesheet.xsl.ft diff --git a/plugins/xpath/xpath-view/src/icons/xml.png b/plugins/xpath/xpath-lang/resources/icons/xml.png similarity index 100% rename from plugins/xpath/xpath-view/src/icons/xml.png rename to plugins/xpath/xpath-lang/resources/icons/xml.png diff --git a/plugins/xpath/xpath-view/src/icons/xml_dark.png b/plugins/xpath/xpath-lang/resources/icons/xml_dark.png similarity index 100% rename from plugins/xpath/xpath-view/src/icons/xml_dark.png rename to plugins/xpath/xpath-lang/resources/icons/xml_dark.png diff --git a/plugins/xpath/xpath-lang/src/inspectionDescriptions/CheckNodeTest.html b/plugins/xpath/xpath-lang/resources/inspectionDescriptions/CheckNodeTest.html similarity index 100% rename from plugins/xpath/xpath-lang/src/inspectionDescriptions/CheckNodeTest.html rename to plugins/xpath/xpath-lang/resources/inspectionDescriptions/CheckNodeTest.html diff --git a/plugins/xpath/xpath-lang/src/inspectionDescriptions/HardwiredNamespacePrefix.html b/plugins/xpath/xpath-lang/resources/inspectionDescriptions/HardwiredNamespacePrefix.html similarity index 100% rename from plugins/xpath/xpath-lang/src/inspectionDescriptions/HardwiredNamespacePrefix.html rename to plugins/xpath/xpath-lang/resources/inspectionDescriptions/HardwiredNamespacePrefix.html diff --git a/plugins/xpath/xpath-lang/src/inspectionDescriptions/ImplicitTypeConversion.html b/plugins/xpath/xpath-lang/resources/inspectionDescriptions/ImplicitTypeConversion.html similarity index 100% rename from plugins/xpath/xpath-lang/src/inspectionDescriptions/ImplicitTypeConversion.html rename to plugins/xpath/xpath-lang/resources/inspectionDescriptions/ImplicitTypeConversion.html diff --git a/plugins/xpath/xpath-lang/src/inspectionDescriptions/IndexZeroUsage.html b/plugins/xpath/xpath-lang/resources/inspectionDescriptions/IndexZeroUsage.html similarity index 100% rename from plugins/xpath/xpath-lang/src/inspectionDescriptions/IndexZeroUsage.html rename to plugins/xpath/xpath-lang/resources/inspectionDescriptions/IndexZeroUsage.html diff --git a/plugins/xpath/xpath-lang/src/inspectionDescriptions/RedundantTypeConversion.html b/plugins/xpath/xpath-lang/resources/inspectionDescriptions/RedundantTypeConversion.html similarity index 100% rename from plugins/xpath/xpath-lang/src/inspectionDescriptions/RedundantTypeConversion.html rename to plugins/xpath/xpath-lang/resources/inspectionDescriptions/RedundantTypeConversion.html diff --git a/plugins/xpath/xpath-lang/src/inspectionDescriptions/XsltDeclarations.html b/plugins/xpath/xpath-lang/resources/inspectionDescriptions/XsltDeclarations.html similarity index 100% rename from plugins/xpath/xpath-lang/src/inspectionDescriptions/XsltDeclarations.html rename to plugins/xpath/xpath-lang/resources/inspectionDescriptions/XsltDeclarations.html diff --git a/plugins/xpath/xpath-lang/src/inspectionDescriptions/XsltTemplateInvocation.html b/plugins/xpath/xpath-lang/resources/inspectionDescriptions/XsltTemplateInvocation.html similarity index 100% rename from plugins/xpath/xpath-lang/src/inspectionDescriptions/XsltTemplateInvocation.html rename to plugins/xpath/xpath-lang/resources/inspectionDescriptions/XsltTemplateInvocation.html diff --git a/plugins/xpath/xpath-lang/src/inspectionDescriptions/XsltUnusedDeclaration.html b/plugins/xpath/xpath-lang/resources/inspectionDescriptions/XsltUnusedDeclaration.html similarity index 100% rename from plugins/xpath/xpath-lang/src/inspectionDescriptions/XsltUnusedDeclaration.html rename to plugins/xpath/xpath-lang/resources/inspectionDescriptions/XsltUnusedDeclaration.html diff --git a/plugins/xpath/xpath-lang/src/inspectionDescriptions/XsltVariableShadowing.html b/plugins/xpath/xpath-lang/resources/inspectionDescriptions/XsltVariableShadowing.html similarity index 100% rename from plugins/xpath/xpath-lang/src/inspectionDescriptions/XsltVariableShadowing.html rename to plugins/xpath/xpath-lang/resources/inspectionDescriptions/XsltVariableShadowing.html diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/AddOptionalArgumentsIntention/after.xml.template b/plugins/xpath/xpath-lang/resources/intentionDescriptions/AddOptionalArgumentsIntention/after.xml.template similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/AddOptionalArgumentsIntention/after.xml.template rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/AddOptionalArgumentsIntention/after.xml.template diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/AddOptionalArgumentsIntention/before.xml.template b/plugins/xpath/xpath-lang/resources/intentionDescriptions/AddOptionalArgumentsIntention/before.xml.template similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/AddOptionalArgumentsIntention/before.xml.template rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/AddOptionalArgumentsIntention/before.xml.template diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/AddOptionalArgumentsIntention/description.html b/plugins/xpath/xpath-lang/resources/intentionDescriptions/AddOptionalArgumentsIntention/description.html similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/AddOptionalArgumentsIntention/description.html rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/AddOptionalArgumentsIntention/description.html diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/ConvertIfToChooseIntention/after.xml.template b/plugins/xpath/xpath-lang/resources/intentionDescriptions/ConvertIfToChooseIntention/after.xml.template similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/ConvertIfToChooseIntention/after.xml.template rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/ConvertIfToChooseIntention/after.xml.template diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/ConvertIfToChooseIntention/before.xml.template b/plugins/xpath/xpath-lang/resources/intentionDescriptions/ConvertIfToChooseIntention/before.xml.template similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/ConvertIfToChooseIntention/before.xml.template rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/ConvertIfToChooseIntention/before.xml.template diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/ConvertIfToChooseIntention/description.html b/plugins/xpath/xpath-lang/resources/intentionDescriptions/ConvertIfToChooseIntention/description.html similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/ConvertIfToChooseIntention/description.html rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/ConvertIfToChooseIntention/description.html diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/InlineXslAttribute/after.xml.template b/plugins/xpath/xpath-lang/resources/intentionDescriptions/InlineXslAttribute/after.xml.template similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/InlineXslAttribute/after.xml.template rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/InlineXslAttribute/after.xml.template diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/InlineXslAttribute/before.xml.template b/plugins/xpath/xpath-lang/resources/intentionDescriptions/InlineXslAttribute/before.xml.template similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/InlineXslAttribute/before.xml.template rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/InlineXslAttribute/before.xml.template diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/InlineXslAttribute/description.html b/plugins/xpath/xpath-lang/resources/intentionDescriptions/InlineXslAttribute/description.html similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/InlineXslAttribute/description.html rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/InlineXslAttribute/description.html diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/ReplaceWithXslAttribute/after.xml.template b/plugins/xpath/xpath-lang/resources/intentionDescriptions/ReplaceWithXslAttribute/after.xml.template similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/ReplaceWithXslAttribute/after.xml.template rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/ReplaceWithXslAttribute/after.xml.template diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/ReplaceWithXslAttribute/before.xml.template b/plugins/xpath/xpath-lang/resources/intentionDescriptions/ReplaceWithXslAttribute/before.xml.template similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/ReplaceWithXslAttribute/before.xml.template rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/ReplaceWithXslAttribute/before.xml.template diff --git a/plugins/xpath/xpath-lang/src/intentionDescriptions/ReplaceWithXslAttribute/description.html b/plugins/xpath/xpath-lang/resources/intentionDescriptions/ReplaceWithXslAttribute/description.html similarity index 100% rename from plugins/xpath/xpath-lang/src/intentionDescriptions/ReplaceWithXslAttribute/description.html rename to plugins/xpath/xpath-lang/resources/intentionDescriptions/ReplaceWithXslAttribute/description.html diff --git a/plugins/xpath/xpath-lang/src/liveTemplates/xsl.xml b/plugins/xpath/xpath-lang/resources/liveTemplates/xsl.xml similarity index 100% rename from plugins/xpath/xpath-lang/src/liveTemplates/xsl.xml rename to plugins/xpath/xpath-lang/resources/liveTemplates/xsl.xml diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java index e4b4dde9bb23..638436681f3a 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathEvalAction.java @@ -124,10 +124,8 @@ public class XPathEvalAction extends XPathAction { @Override protected void updateToolbar(AnActionEvent event) { super.updateToolbar(event); - if (XpathIcons.Xml != null) { - event.getPresentation().setIcon(XpathIcons.Xml); - } - } + event.getPresentation().setIcon(XpathIcons.Xml); + } @Override protected boolean isEnabledAt(XmlFile xmlFile, int offset) {