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-129370 Support XML Schema (XSD) 1.1

Browse Source
This commit is contained in:
Dmitry Avdeev
2015-04-27 16:49:33 +03:00
parent ba50d34c3f
commit 73851fbb19
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java
+5 -3
View File
@@ -62,7 +62,9 @@ public class ExternalResourceManagerExImpl extends ExternalResourceManagerEx imp
@NonNls public static final String J2EE_1_2 = "http://java.sun.com/j2ee/dtds/";
@NonNls public static final String J2EE_NS = "http://java.sun.com/xml/ns/j2ee/";
@NonNls public static final String JAVAEE_NS = "http://java.sun.com/xml/ns/javaee/";
private static final String CATALOG_PROPERTIES_ELEMENT = "CATALOG_PROPERTIES";
private static final String XSD_1_1 = new Resource("/standardSchemas/XMLSchema-1_1/XMLSchema.xsd", ExternalResourceManagerExImpl.class, null).getResourceUrl();
private final Map<String, Map<String, String>> myResources = new THashMap<String, Map<String, String>>();
private final Set<String> myResourceLocations = new THashSet<String>();
@@ -219,9 +221,9 @@ public class ExternalResourceManagerExImpl extends ExternalResourceManagerEx imp
ExternalResourceManagerExImpl projectResources = getProjectResources(project);
String location = projectResources.getResourceLocation(url, version);
if (location == null || location.equals(url)) {
if (projectResources.myXMLSchemaVersion == XMLSchemaVersion.XMLSchema_1_1) { // substitute url
if (XmlUtil.XML_SCHEMA_URI.equals(url)) url = InternalResourceProvider.XML_SCHEMA_1_1;
if (InternalResourceProvider.XML_SCHEMA_URI_XSD.equals(url)) url = InternalResourceProvider.XML_SCHEMA_1_1_XSD;
if (projectResources.myXMLSchemaVersion == XMLSchemaVersion.XMLSchema_1_1) {
if (XmlUtil.XML_SCHEMA_URI.equals(url)) return XSD_1_1;
if ((XmlUtil.XML_SCHEMA_URI + ".xsd").equals(url)) return XSD_1_1;
}
return getResourceLocation(url, version);
}
xml/xml-psi-impl/src/com/intellij/javaee/InternalResourceProvider.java
+1 -8
View File
@@ -23,10 +23,6 @@ import com.intellij.xml.util.XmlUtil;
*/
public class InternalResourceProvider implements StandardResourceProvider{
public static final String XML_SCHEMA_1_1 = XmlUtil.XML_SCHEMA_URI + "-1.1";
public static final String XML_SCHEMA_1_1_XSD = XML_SCHEMA_1_1 + ".xsd";
public static final String XML_SCHEMA_URI_XSD = XmlUtil.XML_SCHEMA_URI + ".xsd";
@Override
public void registerResources(ResourceRegistrar registrar) {
ResourceRegistrarImpl impl = (ResourceRegistrarImpl)registrar;
@@ -36,10 +32,7 @@ public class InternalResourceProvider implements StandardResourceProvider{
impl.addInternalResource(XmlUtil.XINCLUDE_URI,"xinclude.xsd");
impl.addInternalResource(XmlUtil.XML_SCHEMA_URI, "XMLSchema.xsd");
impl.addInternalResource(XML_SCHEMA_URI_XSD, "XMLSchema.xsd");
//impl.addInternalResource(XML_SCHEMA_1_1, "1.1", "XMLSchema-1_1/XMLSchema.xsd");
//impl.addInternalResource(XML_SCHEMA_1_1_XSD, "1.1", "XMLSchema-1_1/XMLSchema.xsd");
impl.addInternalResource(XmlUtil.XML_SCHEMA_URI + ".xsd", "XMLSchema.xsd");
impl.addInternalResource("http://www.w3.org/2001/XMLSchema.dtd", "XMLSchema.dtd");
impl.addInternalResource(XmlUtil.XML_SCHEMA_INSTANCE_URI, "XMLSchema-instance.xsd");