From 2463288813f7ce44d4da48f7a21aea5ec6e409fa Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Fri, 5 Jun 2015 14:30:10 +0300 Subject: [PATCH] standard constant --- .../src/com/intellij/xml/index/XmlTagNamesIndex.java | 3 ++- .../src/com/intellij/xml/index/XsdTagNameBuilder.java | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xml/xml-psi-impl/src/com/intellij/xml/index/XmlTagNamesIndex.java b/xml/xml-psi-impl/src/com/intellij/xml/index/XmlTagNamesIndex.java index 35c06198f3aa..36c3bc88727d 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/index/XmlTagNamesIndex.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/index/XmlTagNamesIndex.java @@ -22,6 +22,7 @@ import com.intellij.util.containers.HashMap; import com.intellij.util.indexing.*; import com.intellij.util.io.DataExternalizer; import com.intellij.util.text.CharArrayUtil; +import com.intellij.xml.util.XmlUtil; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -57,7 +58,7 @@ public class XmlTagNamesIndex extends XmlIndex { @NotNull public Map map(@NotNull final FileContent inputData) { CharSequence text = inputData.getContentAsText(); - if (StringUtil.indexOf(text, XsdTagNameBuilder.XML_SCHEMA_NS) == -1) return Collections.emptyMap(); + if (StringUtil.indexOf(text, XmlUtil.XML_SCHEMA_URI) == -1) return Collections.emptyMap(); Collection tags = XsdTagNameBuilder.computeTagNames(CharArrayUtil.readerFromCharSequence(text)); Map map = new HashMap(tags.size()); for (String tag : tags) { diff --git a/xml/xml-psi-impl/src/com/intellij/xml/index/XsdTagNameBuilder.java b/xml/xml-psi-impl/src/com/intellij/xml/index/XsdTagNameBuilder.java index 0d9e89c3c2b6..c250cfa92699 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/index/XsdTagNameBuilder.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/index/XsdTagNameBuilder.java @@ -16,6 +16,7 @@ package com.intellij.xml.index; import com.intellij.util.xml.NanoXmlUtil; +import com.intellij.xml.util.XmlUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -31,8 +32,6 @@ import java.util.Collection; */ public class XsdTagNameBuilder extends NanoXmlUtil.IXMLBuilderAdapter { - public static final String XML_SCHEMA_NS = "http://www.w3.org/2001/XMLSchema"; - @NotNull public static Collection computeTagNames(final InputStream is) { return computeTagNames(new InputStreamReader(is)); @@ -64,7 +63,7 @@ public class XsdTagNameBuilder extends NanoXmlUtil.IXMLBuilderAdapter { public void startElement(@NonNls final String name, @NonNls final String nsPrefix, @NonNls final String nsURI, final String systemID, final int lineNr) throws Exception { - myElementStarted = nsPrefix != null && nsURI.equals(XML_SCHEMA_NS) && name.equals("element"); + myElementStarted = nsPrefix != null && nsURI.equals(XmlUtil.XML_SCHEMA_URI) && name.equals("element"); } @Override