Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfullbright2012-03-27 14:51:17 -0400
committerpfullbright2012-03-27 14:51:17 -0400
commit5109e484b34b4695f30f6cb245aa693580004232 (patch)
treec44e01992d3ac7ccf2c540f7b2a4f48c9050d20e
parent9f87d360e67d47a8f7741c4a90082927dacfe8b5 (diff)
downloadwebtools.dali-5109e484b34b4695f30f6cb245aa693580004232.tar.gz
webtools.dali-5109e484b34b4695f30f6cb245aa693580004232.tar.xz
webtools.dali-5109e484b34b4695f30f6cb245aa693580004232.zip
fixes for namespaces of local attribute/elements
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java
index b7baeda7b7..c451848dbe 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/xpath/java/XPath.java
@@ -384,7 +384,7 @@ public class XPath {
protected String resolveNamespace(Context context) {
JaxbPackage pkg = context.getJaxbPackage();
if (this.nsPrefix == null) {
- return pkg.getNamespace();
+ return "";
}
else {
JaxbPackageInfo pkgInfo = pkg.getPackageInfo();
@@ -520,7 +520,7 @@ public class XPath {
};
}
}),
- new TransformationIterable<String, String>(xsdType.getAttributeNames(context.getJaxbPackage().getNamespace())) {
+ new TransformationIterable<String, String>(xsdType.getAttributeNames("")) {
@Override
protected String transform(String o) {
return StringTools.concatenate(ATT_PREFIX, o);
@@ -542,7 +542,7 @@ public class XPath {
};
}
}),
- xsdType.getElementNames(context.getJaxbPackage().getNamespace(), false));
+ xsdType.getElementNames("", false));
}
protected Iterable<XmlNs> getXmlNsInfos(Context context) {

Back to the top