html5 resolve problem in build

This commit is contained in:
Maxim.Mossienko
2010-05-21 11:08:23 -07:00
parent 96978c2fde
commit fd3ba040f2
3 changed files with 13 additions and 12 deletions
@@ -240,7 +240,7 @@ public class XmlDocumentImpl extends XmlElementImpl implements XmlDocument {
return null;
}
private XmlNSDescriptor getNsDescriptorFormDocType(final XmlDoctype doctype, final XmlFile containingFile) {
XmlNSDescriptor getNsDescriptorFormDocType(final XmlDoctype doctype, final XmlFile containingFile) {
XmlNSDescriptor descr = null;
if (doctype.getMarkupDecl() != null){
descr = (XmlNSDescriptor)doctype.getMarkupDecl().getMetaData();
@@ -191,11 +191,12 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag {
if (document == null) {
return null;
}
final String url = XmlUtil.getDtdUri(document);
if (url == null) {
return null;
XmlDoctype docType = XmlUtil.getDocType(document);
if (document instanceof XmlDocumentImpl && docType != null) {
return ((XmlDocumentImpl)document).getNsDescriptorFormDocType(docType, containingFile);
}
return document.getDefaultNSDescriptor(url, true);
return null;
}
public boolean isEmpty() {
@@ -945,13 +945,13 @@ public class XmlUtil {
@Nullable
public static String getDtdUri(XmlDocument document) {
if (document.getProlog() != null) {
final XmlDoctype doctype = document.getProlog().getDoctype();
if (doctype != null) {
return doctype.getDtdUri();
}
}
return null;
XmlDoctype docType = getDocType(document);
return docType != null ? docType.getDtdUri() : null;
}
public @Nullable static XmlDoctype getDocType(XmlDocument document) {
XmlProlog prolog = document.getProlog();
return prolog != null ? prolog.getDoctype():null;
}
private static void computeTag(XmlTag tag,