summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSalvador Zalapa2013-01-08 12:53:16 (EST)
committerNick Sandonato2013-01-08 14:42:18 (EST)
commit9ca0dde3940690240c62438c122151c78a6988f2 (patch)
tree87d6b3de9f5b2e4113d9500b104b2ea987fc76c7
parent52a54635772700f9379fa5b05dcd55c835cda55d (diff)
downloadwebtools.sourceediting-9ca0dde3940690240c62438c122151c78a6988f2.zip
webtools.sourceediting-9ca0dde3940690240c62438c122151c78a6988f2.tar.gz
webtools.sourceediting-9ca0dde3940690240c62438c122151c78a6988f2.tar.bz2
[bug389434]XML:Outline_view_does_not_show_namespace_when_addv201301082005
-rw-r--r--bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractNodeActionManager.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractNodeActionManager.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractNodeActionManager.java
index be7e202..4bffce6 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractNodeActionManager.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractNodeActionManager.java
@@ -569,7 +569,12 @@ public abstract class AbstractNodeActionManager extends BaseNodeActionManager {
String result = "?" + cmnode + "?"; //$NON-NLS-1$ //$NON-NLS-2$
if (cmnode != null) {
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=155800
- result = cmnode.getNodeName();
+ if (cmnode.getNodeType() == CMNode.ELEMENT_DECLARATION){
+ result = DOMNamespaceHelper.computeName(cmnode, parent, null);
+ }
+ else{
+ result = cmnode.getNodeName();
+ }
if(result == null) {
result = (String) cmnode.getProperty("description"); //$NON-NLS-1$
}
@@ -578,9 +583,6 @@ public abstract class AbstractNodeActionManager extends BaseNodeActionManager {
CMDescriptionBuilder descriptionBuilder = new CMDescriptionBuilder();
result = descriptionBuilder.buildDescription(cmnode);
}
- else {
- result = DOMNamespaceHelper.computeName(cmnode, parent, null);
- }
}
}
return result;