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

some validity assertions (EA-30084)

Browse Source
This commit is contained in:
peter
2011-11-03 20:10:41 +01:00
parent a062413ecc
commit fbfc407229
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomElementDescriptorHolder.java
+3
View File
@@ -18,6 +18,7 @@ package org.jetbrains.idea.maven.dom;
import com.intellij.javaee.ExternalResourceManager;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -36,6 +37,7 @@ import java.net.URL;
import java.util.Map;
public class MavenDomElementDescriptorHolder {
private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.maven.dom.MavenDomElementDescriptorHolder");
private enum FileKind {
PROJECT_FILE {
public String getSchemaUrl() {
@@ -77,6 +79,7 @@ public class MavenDomElementDescriptorHolder {
desc = tryGetOrCreateDescriptor(kind);
if (desc == null) return null;
}
LOG.assertTrue(tag.isValid());
return desc.getElementDescriptor(tag.getName(), desc.getDefaultNamespace());
}
xml/impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java
+6 -2
View File
@@ -17,6 +17,7 @@ package com.intellij.xml.impl.schema;
import com.intellij.codeInsight.daemon.Validator;
import com.intellij.javaee.ExternalResourceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
@@ -50,6 +51,7 @@ import java.util.*;
*/
@SuppressWarnings({"HardCodedStringLiteral"})
public class XmlNSDescriptorImpl implements XmlNSDescriptor,Validator<XmlDocument>, DumbAware, XmlNSTypeDescriptorProvider {
private static final Logger LOG = Logger.getInstance("#com.intellij.xml.impl.schema.XmlNSDescriptorImpl");
@NonNls private static final Set<String> STD_TYPES = new HashSet<String>();
private static final Set<String> UNDECLARED_STD_TYPES = new HashSet<String>();
private XmlFile myFile;
@@ -170,6 +172,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptor,Validator<XmlDocumen
XmlTag[] tags = rootTag.getSubTags();
visited.add( this );
LOG.assertTrue(rootTag.isValid());
for (final XmlTag tag : tags) {
if (equalsToSchemaName(tag, ELEMENT_TAG_NAME)) {
String name = tag.getAttributeValue("name");
@@ -385,9 +388,10 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptor,Validator<XmlDocumen
XmlUtil.XML_SCHEMA_URI3.equals(namespace);
}
public static boolean checkSchemaNamespace(XmlTag context){
public static boolean checkSchemaNamespace(XmlTag context) {
LOG.assertTrue(context.isValid());
final String namespace = context.getNamespace();
if(namespace.length() > 0){
if (namespace.length() > 0) {
return checkSchemaNamespace(namespace);
}
return StringUtil.startsWithConcatenationOf(context.getName(), XSD_PREFIX, ":");