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

EA-31702 don't create dom for second aspectj-autoproxy

Browse Source
This commit is contained in:
peter
2011-12-28 16:22:31 +01:00
parent f6ba04736b
commit 21384da781
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java
+20 -9
View File
@@ -76,24 +76,35 @@ public abstract class DomAnchorImpl<T extends DomElement> implements DomAnchor<T
final int index = values.indexOf(t);
if (index < 0) {
diagnoseNegativeIndex(t, parent, description, values);
diagnoseNegativeIndex2(t, parent, description, values);
}
return new IndexedAnchor<T>(parentAnchor, description, index);
}
private static <T extends DomElement> void diagnoseNegativeIndex(T t,
DomElement parent,
AbstractDomChildrenDescription description,
List<? extends DomElement> values) {
private static <T extends DomElement> void diagnoseNegativeIndex2(T t,
DomElement parent,
AbstractDomChildrenDescription description,
List<? extends DomElement> values) {
final XmlTag parentTag = parent.getXmlTag();
StringBuilder diag = new StringBuilder("Index<0: description=" + description + "\nparent=" + parent + "\nt=" + t + "\nvalues=" + values + "\n");
for (DomElement value : values) {
for (int i = 0, size = values.size(); i < size; i++) {
DomElement value = values.get(i);
if (value.toString().equals(t.toString())) {
diag.append(" hasSame, same=" + (value == t) +
final XmlElement tElement = t.getXmlElement();
final XmlElement valElement = value.getXmlElement();
diag.append(" hasSame, i=" + i +
"; same=" + (value == t) +
", equal=" + value.equals(t) +
", equal2=" + t.equals(value) +
", sameElements=" + (t.getXmlElement() == value.getXmlElement()) +
", t.physical=" + (tElement == null ? "null" : String.valueOf(tElement.isPhysical())) +
", value.physical=" + (valElement == null ? "null" : String.valueOf(valElement.isPhysical())) +
", sameElements=" + (tElement == value.getXmlElement()) +
"\n");
if (tElement != null && valElement != null) {
diag.append(" sameFile=" + (tElement.getContainingFile() == valElement.getContainingFile()) +
", sameParent=" + (tElement.getParent() == valElement.getParent()) +
"\n");
}
}
}
@@ -106,7 +117,7 @@ public abstract class DomAnchorImpl<T extends DomElement> implements DomAnchor<T
diag.append("\n");
} else {
for (XmlTag tag : parentTag.getSubTags()) {
diag.append(", subtag: ").append(tag.getName());
diag.append("\n subtag: ").append(tag.getName());
}
diag.append("\n");
}
xml/dom-impl/src/com/intellij/util/xml/impl/DomSemContributor.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class DomSemContributor extends SemContributor {
}
if (current instanceof XmlTag) {
final XmlTag xmlTag = (XmlTag)current;
if (localName.equals(xmlTag.getName()) && namespace.equals(xmlTag.getNamespace())) {
if (localName.equals(xmlTag.getLocalName()) && namespace.equals(xmlTag.getNamespace())) {
index++;
if (index >= totalCount) {
return null;