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

cleanup

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-08-23 09:32:34 +02:00
parent 35221218fe
commit fd35d06988
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/xmlb/JDOMXIncluder.java
+11 -14
View File
@@ -46,9 +46,7 @@ public class JDOMXIncluder {
@NonNls private static final String HREF = "href";
@NonNls private static final String BASE = "base";
@NonNls private static final String PARSE = "parse";
@NonNls private static final String TEXT = "text";
@NonNls private static final String XML = "xml";
@NonNls private static final String ENCODING = "encoding";
@NonNls private static final String XPOINTER = "xpointer";
public static final Namespace XINCLUDE_NAMESPACE = Namespace.getNamespace(XI, HTTP_WWW_W3_ORG_2001_XINCLUDE);
@@ -263,7 +261,8 @@ public class JDOMXIncluder {
remoteParsed = extractNeededChildren(element, remoteParsed);
}
for (int i = 0; i < remoteParsed.size(); i++) {
int i = 0;
for (; i < remoteParsed.size(); i++) {
Content o = remoteParsed.get(i);
if (o instanceof Element) {
Element e = (Element)o;
@@ -312,19 +311,17 @@ public class JDOMXIncluder {
assert remoteElements.get(0) instanceof Element;
Element e = (Element)remoteElements.get(0);
if (e.getName().equals(rootTagName)) {
String subTagName = matcher.group(2);
if (subTagName != null) {
// cut off the slash
e = e.getChild(subTagName.substring(1));
}
assert e != null;
return new ArrayList<Content>(e.getContent());
}
else {
if (!e.getName().equals(rootTagName)) {
return Collections.emptyList();
}
String subTagName = matcher.group(2);
if (subTagName != null) {
// cut off the slash
e = e.getChild(subTagName.substring(1));
}
assert e != null;
return new ArrayList<Content>(e.getContent());
}
@NotNull