fix tests

This commit is contained in:
Dennis Ushakov
2013-10-22 13:52:14 +04:00
parent 0fc685da6b
commit fe1985e821
3 changed files with 9 additions and 13 deletions
@@ -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);
}
}
@@ -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]));
}
}
}
@@ -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) {