1.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DesignerServiceHackImpl.java Wed Mar 07 00:32:49 2007 +0000
1.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/DesignerServiceHackImpl.java Wed Mar 07 00:46:37 2007 +0000
1.3 @@ -37,6 +37,7 @@
1.4 import java.util.Map;
1.5 import org.netbeans.api.project.FileOwnerQuery;
1.6 import org.netbeans.api.project.Project;
1.7 +import org.openide.ErrorManager;
1.8 import org.openide.filesystems.FileObject;
1.9 import org.openide.loaders.DataObject;
1.10 import org.openide.loaders.DataObjectNotFoundException;
1.11 @@ -616,7 +617,13 @@
1.12 // }
1.13 //
1.14 // return null;
1.15 - return DesignerServiceHackProvider.getTableInfo(bean);
1.16 + Element componentRootElement = JsfSupportUtilities.getComponentRootElementForDesignBean(bean);
1.17 + if (componentRootElement == null) {
1.18 + ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL,
1.19 + new NullPointerException("There is no element in markup design bean=" + bean)); // NOI18N
1.20 + return null;
1.21 + }
1.22 + return DesignerServiceHackProvider.getTableInfo(componentRootElement);
1.23 }
1.24
1.25 public Element getCellElement(Object tableInfo, int row, int column) {
1.26 @@ -644,7 +651,8 @@
1.27 // }
1.28 //
1.29 // return box.getDesignBean();
1.30 - return DesignerServiceHackProvider.getCellBean(tableInfo, row, column);
1.31 + Element componentRootElement = DesignerServiceHackProvider.getCellComponent(tableInfo, row, column);
1.32 + return MarkupUnit.getMarkupDesignBeanForElement(componentRootElement);
1.33 }
1.34
1.35 public int getColSpan(Object tableInfo, int row, int column) {
2.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/DesignerServiceHackProvider.java Wed Mar 07 00:32:49 2007 +0000
2.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/api/designer/DesignerServiceHackProvider.java Wed Mar 07 00:46:37 2007 +0000
2.3 @@ -73,16 +73,18 @@
2.4 return DesignerServiceHackProviderImpl.getCurrentFile();
2.5 }
2.6
2.7 - public static Object getTableInfo(MarkupDesignBean bean) {
2.8 - return DesignerServiceHackProviderImpl.getTableInfo(bean);
2.9 +// public static Object getTableInfo(MarkupDesignBean bean) {
2.10 + public static Object getTableInfo(Element componentRootElement) {
2.11 + return DesignerServiceHackProviderImpl.getTableInfo(componentRootElement);
2.12 }
2.13
2.14 public static Element getCellElement(Object tableInfo, int row, int column) {
2.15 return DesignerServiceHackProviderImpl.getCellElement(tableInfo, row, column);
2.16 }
2.17
2.18 - public static MarkupDesignBean getCellBean(Object tableInfo, int row, int column) {
2.19 - return DesignerServiceHackProviderImpl.getCellBean(tableInfo, row, column);
2.20 +// public static MarkupDesignBean getCellBean(Object tableInfo, int row, int column) {
2.21 + public static Element getCellComponent(Object tableInfo, int row, int column) {
2.22 + return DesignerServiceHackProviderImpl.getCellComponent(tableInfo, row, column);
2.23 }
2.24
2.25 public static int getColSpan(Object tableInfo, int row, int column) {
3.1 --- a/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerServiceHackProviderImpl.java Wed Mar 07 00:32:49 2007 +0000
3.2 +++ b/visualweb.designer/src/org/netbeans/modules/visualweb/designer/DesignerServiceHackProviderImpl.java Wed Mar 07 00:46:37 2007 +0000
3.3 @@ -626,23 +626,24 @@
3.4 private static class FakeDocument extends DocumentImpl {
3.5 } // End of FakeDocument.
3.6
3.7 - public static Object getTableInfo(MarkupDesignBean bean) {
3.8 +// public static Object getTableInfo(MarkupDesignBean bean) {
3.9 + public static Object getTableInfo(Element componentRootElement) {
3.10 // assert bean.getElement() != null;
3.11
3.12 - Element element = bean.getElement();
3.13 - if (element == null) {
3.14 - ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL,
3.15 - new NullPointerException("There is no element in markup design bean=" + bean)); // NOI18N
3.16 - return null;
3.17 - }
3.18 +// Element element = bean.getElement();
3.19 +// if (element == null) {
3.20 +// ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL,
3.21 +// new NullPointerException("There is no element in markup design bean=" + bean)); // NOI18N
3.22 +// return null;
3.23 +// }
3.24
3.25 - WebForm webForm = WebForm.findWebFormForElement(element);
3.26 + WebForm webForm = WebForm.findWebFormForElement(componentRootElement);
3.27 if (webForm == null) {
3.28 return null;
3.29 }
3.30
3.31 // CssBox box = CssBox.getBox(bean.getElement());
3.32 - CssBox box = webForm.findCssBoxForElement(element);
3.33 + CssBox box = webForm.findCssBoxForElement(componentRootElement);
3.34
3.35 if (box instanceof TableBox) {
3.36 return box;
3.37 @@ -664,7 +665,8 @@
3.38 return box.getElement();
3.39 }
3.40
3.41 - public static MarkupDesignBean getCellBean(Object tableInfo, int row, int column) {
3.42 +// public static MarkupDesignBean getCellBean(Object tableInfo, int row, int column) {
3.43 + public static Element getCellComponent(Object tableInfo, int row, int column) {
3.44 assert tableInfo instanceof TableBox;
3.45
3.46 TableBox table = (TableBox)tableInfo;
3.47 @@ -675,7 +677,8 @@
3.48 }
3.49
3.50 // return box.getDesignBean();
3.51 - return CssBox.getMarkupDesignBeanForCssBox(box);
3.52 +// return CssBox.getMarkupDesignBeanForCssBox(box);
3.53 + return CssBox.getElementForComponentRootCssBox(box);
3.54 }
3.55
3.56 public static int getColSpan(Object tableInfo, int row, int column) {