From fe1985e821a311fec6bff4ae8294016abc778d5b Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@jetbrains.com>
Date: Tue, 22 Oct 2013 13:45:31 +0400
Subject: [PATCH] fix tests

---
 .../plugins/javaFX/fxml/JavaFxXmlExtension.java          | 9 ---------
 .../src/com/intellij/psi/impl/source/xml/XmlTagImpl.java | 5 +++--
 xml/xml-psi-impl/src/com/intellij/xml/XmlExtension.java  | 8 ++++++--
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxXmlExtension.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxXmlExtension.java
index 1b4a8851a236..d727660a220a 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxXmlExtension.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxXmlExtension.java
@@ -3,10 +3,7 @@ package org.jetbrains.plugins.javaFX.fxml;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.source.xml.TagNameReference;
-import com.intellij.psi.xml.XmlDocument;
 import com.intellij.xml.DefaultXmlExtension;
-import com.intellij.xml.util.XmlUtil;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.javaFX.fxml.refs.JavaFxTagNameReference;
 
 public class JavaFxXmlExtension extends DefaultXmlExtension {
@@ -17,10 +14,4 @@ public class JavaFxXmlExtension extends DefaultXmlExtension {
   public TagNameReference createTagNameReference(final ASTNode nameElement, final boolean startTagFlag) {
     return new JavaFxTagNameReference(nameElement, startTagFlag);
   }
-
-  @Nullable
-  @Override
-  public String[][] getNamespacesFromDocument(XmlDocument parent, boolean declarationsExist) {
-    return XmlUtil.getDefaultNamespaces(parent);
-  }
 }
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
index c129a3225435..748e71bccf38 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
@@ -897,8 +897,9 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag {
             map = new BidirectionalMap<String, String>();
           }
           for (final String[] prefix2ns : defaultNamespace) {
-            if (!map.containsKey(prefix2ns[0])) {
-              map.put(prefix2ns[0], getRealNs(prefix2ns[1]));
+            final String prefix = prefix2ns[0];
+            if (!map.containsKey(prefix) || extension.canOverrideNamespace(prefix)) {
+              map.put(prefix, getRealNs(prefix2ns[1]));
             }
           }
         }
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/XmlExtension.java b/xml/xml-psi-impl/src/com/intellij/xml/XmlExtension.java
index 0ac5c8524d66..cd132fc88713 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/XmlExtension.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/XmlExtension.java
@@ -93,12 +93,16 @@ public abstract class XmlExtension {
   @Deprecated
   @Nullable
   public String[][] getNamespacesFromDocument(final XmlDocument parent, boolean declarationsExist) {
-    return getNamespacesFromDocument(parent);
+    return XmlUtil.getDefaultNamespaces(parent);
   }
 
   @Nullable
   public String[][] getNamespacesFromDocument(final XmlDocument parent) {
-    return XmlUtil.getDefaultNamespaces(parent);
+    return getNamespacesFromDocument(parent, false);
+  }
+
+  public boolean canOverrideNamespace(final String prefix) {
+    return false;
   }
 
   public boolean canBeDuplicated(XmlAttribute attribute) {