Factoring out MarkupDesignBean refs.
1.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/css2/CssBox.java Tue Jan 30 22:13:55 2007 +0000
1.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/css2/CssBox.java Wed Jan 31 00:16:13 2007 +0000
1.3 @@ -1189,13 +1189,22 @@
1.4 }
1.5
1.6 protected void paintDebugPositioning(Graphics g) {
1.7 - MarkupDesignBean bean = getMarkupDesignBeanForCssBox(this);
1.8 +// MarkupDesignBean bean = getMarkupDesignBeanForCssBox(this);
1.9 +//// if ((bean == null) || !boxType.isPositioned() || (FacesSupport.getFacesBean(bean) == null) ||
1.10 +//// FacesSupport.isFormBean(webform, bean)) {
1.11 +// if ((bean == null) || !boxType.isPositioned()
1.12 +//// || (Util.getFacesBean(bean) == null) || Util.isFormBean(webform.getModel(), bean)) {
1.13 +// || !WebForm.getHtmlDomProviderService().isFacesBean(bean)
1.14 +// || webform.isFormBean(bean)) {
1.15 +// return;
1.16 +// }
1.17 + Element componentRootElement = getElementForComponentRootCssBox(this);
1.18 // if ((bean == null) || !boxType.isPositioned() || (FacesSupport.getFacesBean(bean) == null) ||
1.19 // FacesSupport.isFormBean(webform, bean)) {
1.20 - if ((bean == null) || !boxType.isPositioned()
1.21 + if ((componentRootElement == null) || !boxType.isPositioned()
1.22 // || (Util.getFacesBean(bean) == null) || Util.isFormBean(webform.getModel(), bean)) {
1.23 - || !WebForm.getHtmlDomProviderService().isFacesBean(bean)
1.24 - || webform.isFormBean(bean)) {
1.25 + || !WebForm.getHtmlDomProviderService().isFacesComponent(componentRootElement)
1.26 + || webform.isFormComponent(componentRootElement)) {
1.27 return;
1.28 }
1.29
2.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/WebForm.java Tue Jan 30 22:13:55 2007 +0000
2.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/WebForm.java Wed Jan 31 00:16:13 2007 +0000
2.3 @@ -1955,6 +1955,10 @@
2.4 void paintVirtualForms(Graphics2D g, HtmlDomProvider.RenderContext renderContext) {
2.5 htmlDomProvider.paintVirtualForms(g, renderContext);
2.6 }
2.7 +
2.8 + public boolean isFormComponent(Element componentRootElement) {
2.9 + return htmlDomProvider.isFormComponent(componentRootElement);
2.10 + }
2.11
2.12
2.13 private static class HtmlDomProviderListener implements HtmlDomProvider.HtmlDomProviderListener {
2.14 @@ -2249,6 +2253,10 @@
2.15 public boolean isEscapedDesignBean(DesignBean bean) {
2.16 return false;
2.17 }
2.18 +
2.19 + public boolean isFacesComponent(Element componentRootElement) {
2.20 + return false;
2.21 + }
2.22 } // End of DummyHtmlDomProviderService.
2.23
2.24