From fb4f029c098428303fefd9a092086aa96972f8e0 Mon Sep 17 00:00:00 2001
From: Peter Gromov <peter@jetbrains.com>
Date: Mon, 21 Sep 2009 22:23:28 +0400
Subject: [PATCH] make dom validity checks closer to sem contributor logic

---
 .../util/xml/impl/CollectionElementInvocationHandler.java      |  7 +------
 .../util/xml/impl/IndexedElementInvocationHandler.java         | 10 ----------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/CollectionElementInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/CollectionElementInvocationHandler.java
index 3da32934f3..9505b14d90 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/CollectionElementInvocationHandler.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/CollectionElementInvocationHandler.java
@@ -18,13 +18,11 @@ import java.util.List;
  * @author peter
  */
 public class CollectionElementInvocationHandler extends DomInvocationHandler<AbstractDomChildDescriptionImpl>{
-  private final String myTagQName;
 
   public CollectionElementInvocationHandler(final Type type, @NotNull final XmlTag tag,
                                             final AbstractCollectionChildDescription description,
                                             final DomInvocationHandler parent) {
     super(type, new PhysicalDomParentStrategy(tag, parent.getManager()), description.createEvaluatedXmlName(parent, tag), (AbstractDomChildDescriptionImpl)description, parent.getManager(), true);
-    myTagQName = tag.getName();
   }
 
   protected Type narrowType(@NotNull final Type nominalType) {
@@ -39,10 +37,7 @@ public class CollectionElementInvocationHandler extends DomInvocationHandler<Abs
 
   @Override
   public boolean isValid() {
-    if (!super.isValid()) return false;
-    final XmlTag tag = getXmlTag();
-    if (tag == null || !myTagQName.equals(tag.getName())) return false;
-    return true;
+    return super.isValid() && getXmlTag() != null;
   }
 
   public final void undefineInternal() {
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/IndexedElementInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/IndexedElementInvocationHandler.java
index 9d7af0f48e..ff926d1313 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/IndexedElementInvocationHandler.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/IndexedElementInvocationHandler.java
@@ -36,16 +36,6 @@ public class IndexedElementInvocationHandler extends DomInvocationHandler<FixedC
     myNamespace = namespace;
   }
 
-  @Override
-  public boolean isValid() {
-    final XmlTag tag = getXmlTag();
-    if (!super.isValid()) return false;
-    if (tag == null) return true;
-    final String localName = getXmlElementName();
-    if (localName.indexOf(':') > 0 && localName.equals(tag.getName())) return true;
-    return localName.equals(tag.getLocalName()) && myNamespace.equals(tag.getNamespace());
-  }
-
   @SuppressWarnings({"EqualsWhichDoesntCheckParameterClass"})
   public boolean equals(final Object obj) {
     return super.equals(obj) && myIndex == ((IndexedElementInvocationHandler)obj).myIndex;
-- 
2.11.4.GIT