Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoritrimble2011-01-20 15:20:18 -0500
committeritrimble2011-01-20 15:20:18 -0500
commit390a446a801065590596e5dc88af4c1b1b5d31a3 (patch)
treef58df397e109b71592387173fc131c1d5dcf19c9
parentceca621c21b5107cf802498cef6718d8b0402c4a (diff)
downloadwebtools.jsf-390a446a801065590596e5dc88af4c1b1b5d31a3.tar.gz
webtools.jsf-390a446a801065590596e5dc88af4c1b1b5d31a3.tar.xz
webtools.jsf-390a446a801065590596e5dc88af4c1b1b5d31a3.zip
PMC_APPROVED:
Bug 328402 - [WPE] Tag libraries that don't provide display-label MD will break skinning functionality Bug 328661 - [WPE] Too many "Drag and drop Web page content here" areas on design page
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterUtil.java4
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/SkinsMenuItemBuilder.java3
2 files changed, 7 insertions, 0 deletions
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterUtil.java
index 3b037107e..7f4dd8b7f 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterUtil.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterUtil.java
@@ -67,6 +67,10 @@ public class ConverterUtil {
* @return true if hostElement represents an empty container
*/
public static boolean isEmptyContainer(Element hostElement) {
+ String hostElementString = hostElement.toString();
+ if (hostElementString != null && hostElementString.startsWith("/")) { //$NON-NLS-1$
+ return false;
+ }
NodeList nl = hostElement.getChildNodes();
if (nl == null || nl.getLength() == 0) {
return true;
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/SkinsMenuItemBuilder.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/SkinsMenuItemBuilder.java
index 78ea5b1b6..680871148 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/SkinsMenuItemBuilder.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/SkinsMenuItemBuilder.java
@@ -155,6 +155,9 @@ public class SkinsMenuItemBuilder {
return nsURI;
}
public String getName() {
+ if (name == null) {
+ return nsURI;
+ }
return name;
}
/*

Back to the top