Author: dmaliarevich Date: 2009-05-29 10:17:49 -0400 (Fri, 29 May 2009) New Revision: 15601 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/bkg-footer.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/bkg-header.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-theme-simple.css trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutPanelTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4381, templates for rich:layout, rich:layoutPanel, rich:page were added, code adjustment. Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/bkg-footer.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/bkg-footer.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/bkg-header.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/bkg-header.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css 2009-05-29 14:17:49 UTC (rev 15601) @@ -0,0 +1,56 @@ +.rich-page { + font-size: 11px; + margin: auto 10px; + width: auto; + min-width: 750px; + text-align: left; +} + +.rich-page-header { + +} + +.rich-page-header-content { + +} + +.rich-page-subheader { + +} + +.rich-page-content { + +} + +.rich-page-sidebar { + float: left; + position: relative; + width: 12.3077em; +} + +.rich-page-main { + float: right; + margin-left: -30em; + width: 100%; +} + +.rich-page-body { + float: none; + width: auto; + position: static; + margin-left: 13.3077em; +} + +.rich-page-footer { + clear: both; +} + +.rich-page-footer-content { + +} + +.rich-page-sidebar,.rich-page-body,.rich-page-footer { + color: #000000; + font-family: Arial, Verdana, sans-serif; + font-size: 11px; +} \ No newline at end of file Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css ___________________________________________________________________ Name: svn:mime-type + text/css Name: svn:eol-style + native Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-theme-simple.css =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-theme-simple.css (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-theme-simple.css 2009-05-29 14:17:49 UTC (rev 15601) @@ -0,0 +1,50 @@ +.rich-page-header { + min-height: 40px; + padding: 0 20px; + background-color: #EDEAE6; + background-image: url(bkg-header.png); + background-position: left top; + background-repeat: repeat-x; + border-bottom: 1px solid #FFFFFF; + color: #DFDCD5; +} + +.rich-page-header-content { + color: #000000; + font-family: Arial, Verdana, sans-serif; + font-size: 11px; +} + +.rich-page-subheader { + padding: 0 20px; + background-color: #EDEAE6; + border-bottom: 1px solid #FFFFFF; + color: #DFDCD5; +} + +.rich-page-sidebar { + vertical-align: top; +} + +.rich-page-content { + background-color: #FFFFFF; + border: 2px solid #C4C0B9; +} + +.rich-page-main { + border-top: 2px solid #C4C0B9; +} + +.rich-page-body { + vertical-align: top; +} + +.rich-page-footer { + background-color: #C4C0B9; + background-image: url(bkg-footer.png); + background-position: left center; + background-repeat: repeat-x; + border-top: 1px solid #FFFFFF; + padding: 20px 0; + text-align: center; +} \ No newline at end of file Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-theme-simple.css ___________________________________________________________________ Name: svn:mime-type + text/css Name: svn:eol-style + native Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java 2009-05-29 14:04:37 UTC (rev 15600) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnTemplate.java 2009-05-29 14:17:49 UTC (rev 15601) @@ -147,7 +147,7 @@ public static nsIDOMElement getHeaderIcon(VpePageContext pageContext, Element column, nsIDOMDocument visualDocument) { String sortable = ComponentUtil.getAttribute(column, RichFaces.ATTR_SORTABLE); String sortBy = column.getAttribute(RichFaces.ATTR_SORT_BY); - if (RichFaces.VAL_TRUE.equals(sortable) || sortBy != null) { + if (RichFaces.VALUE_TRUE.equals(sortable) || sortBy != null) { nsIDOMElement img = visualDocument.createElement(HTML.TAG_IMG); String sortIcon = column.getAttribute(RichFaces.ATTR_SORT_ICON); if (sortIcon != null) { @@ -166,7 +166,7 @@ public static boolean isBreakBefore(Node child) { String breakBeforeVal = ((Element)child).getAttribute(RichFaces.ATTR_BREAK_BEFORE); - boolean breakBefore = breakBeforeVal != null && breakBeforeVal.equalsIgnoreCase(RichFaces.VAL_TRUE); + boolean breakBefore = breakBeforeVal != null && breakBeforeVal.equalsIgnoreCase(RichFaces.VALUE_TRUE); return breakBefore; } @@ -176,6 +176,6 @@ * @param column should be not {@code null} */ public static boolean isVisible(Element column) { - return !RichFaces.VAL_FALSE.equals(column.getAttribute(RichFaces.ATTR_VISIBLE)); + return !RichFaces.VALUE_FALSE.equals(column.getAttribute(RichFaces.ATTR_VISIBLE)); } } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java 2009-05-29 14:04:37 UTC (rev 15600) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java 2009-05-29 14:17:49 UTC (rev 15601) @@ -252,7 +252,7 @@ private String uploadListClass = "rich-fileupload-list-overflow"; //$NON-NLS-1$ public StyleClasses(final Element sourceElement) { - final boolean disabled = RichFaces.VAL_TRUE + final boolean disabled = RichFaces.VALUE_TRUE .equalsIgnoreCase(sourceElement.getAttribute(RichFaces.ATTR_DISABLED)); final String styleAttrPostfix = disabled ? POSTFIX_DISABLED : POSTFIX_ENABLED; Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutPanelTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutPanelTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutPanelTemplate.java 2009-05-29 14:17:49 UTC (rev 15601) @@ -0,0 +1,56 @@ +package org.jboss.tools.jsf.vpe.richfaces.template; + +import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.HTML; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +public class RichFacesLayoutPanelTemplate extends VpeAbstractTemplate { + + private static final String FLOAT_LEFT_STYLE = ";float: left;"; //$NON-NLS-1$ + private static final String FLOAT_RIGHT_STYLE = ";float: right;"; //$NON-NLS-1$ + + /** + * Constructor + */ + public RichFacesLayoutPanelTemplate() { + super(); + } + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + VpeCreationData creationData = null; + Element sourceElement = (Element)sourceNode; + nsIDOMElement mainDiv = visualDocument.createElement(HTML.TAG_DIV); + String style = sourceElement.getAttribute(HTML.ATTR_STYLE); + String width = sourceElement.getAttribute(HTML.ATTR_WIDTH); + String position = sourceElement.getAttribute(RichFaces.ATTR_POSITION); + if (ComponentUtil.isNotBlank(width)) { + mainDiv.setAttribute(HTML.ATTR_WIDTH, width); + style += ";width: " + width + ";"; //$NON-NLS-1$ //$NON-NLS-2$ + } + if (RichFaces.VALUE_LEFT.equalsIgnoreCase(position) + || RichFaces.VALUE_CENTER.equalsIgnoreCase(position)) { + style += FLOAT_LEFT_STYLE; + } else if (RichFaces.VALUE_RIGHT.equalsIgnoreCase(position)) { + style += FLOAT_RIGHT_STYLE; + } else if (RichFaces.VALUE_BOTTOM.equalsIgnoreCase(position)) { + nsIDOMElement bottomDiv = visualDocument.createElement(HTML.TAG_DIV); + bottomDiv.setAttribute(HTML.ATTR_STYLE, "display: block; height: 0; clear: both; visibility: hidden;"); //$NON-NLS-1$ + bottomDiv.appendChild(visualDocument.createTextNode(".")); //$NON-NLS-1$ + mainDiv.appendChild(bottomDiv); + } + if (ComponentUtil.isNotBlank(style)) { + mainDiv.setAttribute(HTML.ATTR_STYLE, style); + } + creationData = new VpeCreationData(mainDiv); + return creationData; + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutPanelTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutTemplate.java 2009-05-29 14:17:49 UTC (rev 15601) @@ -0,0 +1,35 @@ +package org.jboss.tools.jsf.vpe.richfaces.template; + +import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.HTML; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +public class RichFacesLayoutTemplate extends VpeAbstractTemplate { + + /** + * Constructor + */ + public RichFacesLayoutTemplate() { + super(); + } + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + VpeCreationData creationData = null; + Element sourceElement = (Element)sourceNode; + nsIDOMElement mainDiv = visualDocument.createElement(HTML.TAG_DIV); + String style = sourceElement.getAttribute(HTML.ATTR_STYLE); + if (ComponentUtil.isNotBlank(style)) { + mainDiv.setAttribute(HTML.ATTR_STYLE, style); + } + creationData = new VpeCreationData(mainDiv); + return creationData; + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesLayoutTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java 2009-05-29 14:17:49 UTC (rev 15601) @@ -0,0 +1,302 @@ +package org.jboss.tools.jsf.vpe.richfaces.template; + +import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.HTML; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +public class RichFacesPageTemplate extends VpeAbstractTemplate { + + private static final String CSS_BASIC_STYLE_PATH = "page/page-basic.css"; //$NON-NLS-1$ + private static final String CSS_SIMPLE_THEME_STYLE_PATH = "page/page-theme_simple.css"; //$NON-NLS-1$ + private static final String COMPONENT_NAME = "richFacesPage"; //$NON-NLS-1$ + +// private static final String FACET_NAME_PAGE_HEADER = "pageHeader"; //$NON-NLS-1$ + private static final String FACET_NAME_SUBHEADER = "subheader"; //$NON-NLS-1$ + private static final String FACET_NAME_SIDEBAR = "sidebar"; //$NON-NLS-1$ + + private static final String CSS_PAGE = "rich-page"; //$NON-NLS-1$ + private static final String CSS_PAGE_HEADER = "rich-page-header"; //$NON-NLS-1$ + private static final String CSS_PAGE_HEADER_CONTENT = "rich-page-header-content"; //$NON-NLS-1$ + private static final String CSS_PAGE_SUBHEADER = "rich-page-subheader"; //$NON-NLS-1$ + private static final String CSS_PAGE_CONTENT = "rich-page-content"; //$NON-NLS-1$ + private static final String CSS_PAGE_SIDEBAR = "rich-page-sidebar"; //$NON-NLS-1$ + private static final String CSS_PAGE_MAIN = "rich-page-main"; //$NON-NLS-1$ + private static final String CSS_PAGE_BODY = "rich-page-body"; //$NON-NLS-1$ + private static final String CSS_PAGE_FOOTER = "rich-page-footer"; //$NON-NLS-1$ + private static final String CSS_PAGE_FOOTER_CONTENT = "rich-page-footer-content"; //$NON-NLS-1$ + + /** + * Constructor + */ + public RichFacesPageTemplate() { + super(); + } + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + VpeCreationData creationData = null; + Element sourceElement = (Element)sourceNode; + + /* + * Adding default css file for rich:page component + */ + ComponentUtil.setCSSLink(pageContext, CSS_BASIC_STYLE_PATH, COMPONENT_NAME); + + /* + * Read rich:page's attributes + */ + Attributes attrs = new Attributes(sourceElement); + + /* + * Create divs' structure. + */ + nsIDOMElement pageDiv = visualDocument.createElement(HTML.TAG_DIV); + nsIDOMElement pageContentDiv = visualDocument.createElement(HTML.TAG_DIV); + nsIDOMElement pageMainDiv = visualDocument.createElement(HTML.TAG_DIV); + nsIDOMElement pageBodyDiv = visualDocument.createElement(HTML.TAG_DIV); + nsIDOMElement pageHeaderDiv; + nsIDOMElement pageHeaderContentDiv; + nsIDOMElement pageSubHeaderDiv; + nsIDOMElement pageSidebarDiv; + nsIDOMElement pageFooterDiv; + nsIDOMElement pageFooterContentDiv; + creationData = new VpeCreationData(pageDiv); + + /* + * Add basic style classes. + */ + String styleClass = CSS_PAGE; + if (ComponentUtil.isNotBlank(attrs.getStyleClass())) { + styleClass += attrs.getStyleClass(); + } + if (ComponentUtil.isNotBlank(attrs.getStyle())) { + pageDiv.setAttribute(HTML.ATTR_STYLE, attrs.getStyle()); + } + pageDiv.setAttribute(HTML.ATTR_CLASS, styleClass); + pageContentDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_CONTENT); + pageMainDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_MAIN); + pageBodyDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_BODY); + + /* + * 1) + * Encode page header facet, + * add header divs and classes + */ + Element headerFacet = ComponentUtil.getFacet(sourceElement, RichFaces.NAME_FACET_HEADER); + if(headerFacet != null) { + pageHeaderDiv = visualDocument.createElement(HTML.TAG_DIV); + pageHeaderContentDiv = visualDocument.createElement(HTML.TAG_DIV); + + pageHeaderDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_HEADER); + pageHeaderContentDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_HEADER_CONTENT); + + pageHeaderDiv.appendChild(pageHeaderContentDiv); + pageDiv.appendChild(pageHeaderDiv); + + VpeChildrenInfo headerInfo = new VpeChildrenInfo(pageHeaderContentDiv); + headerInfo.addSourceChild(headerFacet); + creationData.addChildrenInfo(headerInfo); + } + + /* + * 2) + * Encode page subheader facet, + * add subheader divs and classes + */ + Element subHeaderFacet = ComponentUtil.getFacet(sourceElement, FACET_NAME_SUBHEADER); + if(subHeaderFacet != null) { + pageSubHeaderDiv = visualDocument.createElement(HTML.TAG_DIV); + pageSubHeaderDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_SUBHEADER); + pageDiv.appendChild(pageSubHeaderDiv); + + VpeChildrenInfo subHeaderInfo = new VpeChildrenInfo(pageSubHeaderDiv); + subHeaderInfo.addSourceChild(subHeaderFacet); + creationData.addChildrenInfo(subHeaderInfo); + } + + /* + * 3) + * Nesting page content div. + */ + pageDiv.appendChild(pageContentDiv); + + /* + * 4) + * Encode page sidebar facet, + * add sidebar divs and classes + */ + Element sidebarFacet = ComponentUtil.getFacet(sourceElement, FACET_NAME_SIDEBAR); + if(sidebarFacet != null) { + pageSidebarDiv = visualDocument.createElement(HTML.TAG_DIV); + pageSidebarDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_SIDEBAR); + pageContentDiv.appendChild(pageSidebarDiv); + + VpeChildrenInfo sidebarInfo = new VpeChildrenInfo(pageSidebarDiv); + sidebarInfo.addSourceChild(sidebarFacet); + creationData.addChildrenInfo(sidebarInfo); + } + + /* + * 5) + * Nesting page's main and body divs. + * Encode all children into page body div. + */ + pageContentDiv.appendChild(pageMainDiv); + pageMainDiv.appendChild(pageBodyDiv); + VpeChildrenInfo pageBodyDivInfo = new VpeChildrenInfo(pageBodyDiv); + for (Node child : ComponentUtil.getChildren(sourceElement, true)) { + pageBodyDivInfo.addSourceChild(child); + } + creationData.addChildrenInfo(pageBodyDivInfo); + + /* + * 6) + * Encode page footer facet, + * add footer divs and classes + */ + Element footerFacet = ComponentUtil.getFacet(sourceElement, RichFaces.NAME_FACET_FOOTER); + if(footerFacet != null) { + pageFooterDiv = visualDocument.createElement(HTML.TAG_DIV); + pageFooterContentDiv = visualDocument.createElement(HTML.TAG_DIV); + + pageFooterDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_FOOTER); + pageFooterContentDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_FOOTER_CONTENT); + + pageFooterDiv.appendChild(pageFooterContentDiv); + pageDiv.appendChild(pageFooterDiv); + + VpeChildrenInfo footerInfo = new VpeChildrenInfo(pageFooterContentDiv); + footerInfo.addSourceChild(footerFacet); + creationData.addChildrenInfo(footerInfo); + } + + return creationData; + } + + class Attributes { + + /* + * rich:page attributes for groups + */ + private final String BODY_CLASS = "bodyClass"; //$NON-NLS-1$ + private final String CONTENT_CLASS = "contentClass"; //$NON-NLS-1$ + private final String FOOTER_CLASS = "footerClass"; //$NON-NLS-1$ + private final String HEADER_CLASS = "headerClass"; //$NON-NLS-1$ + private final String LANG = "lang"; //$NON-NLS-1$ + private final String MARKUP_TYPE = "markupType"; //$NON-NLS-1$ + private final String NAMESPACE = "namespace"; //$NON-NLS-1$ + private final String PAGE_TITLE = "pageTitle"; //$NON-NLS-1$ + private final String SIDERBAR_CLASS = "siderbarClass"; //$NON-NLS-1$ + private final String SIDERBAR_POSITION = "siderbarPosition"; //$NON-NLS-1$ + private final String SIDERBAR_WIDTH = "siderbarWidth"; //$NON-NLS-1$ + private final String THEME = "theme"; //$NON-NLS-1$ + + private String bodyClass; + private String contentClass; + private String footerClass; + private String headerClass; + private String lang; + private String markupType; + private String namespace; + private String pageTitle; + private String siderbarClass; + private String siderbarPosition; + private String siderbarWidth; + private String style; + private String styleClass; + private String theme; + private String width; + + public Attributes(final Element sourceElement) { + bodyClass = sourceElement.getAttribute(BODY_CLASS); + contentClass = sourceElement.getAttribute(CONTENT_CLASS); + footerClass = sourceElement.getAttribute(FOOTER_CLASS); + headerClass = sourceElement.getAttribute(HEADER_CLASS); + lang = sourceElement.getAttribute(LANG); + markupType = sourceElement.getAttribute(MARKUP_TYPE); + namespace = sourceElement.getAttribute(NAMESPACE); + pageTitle = sourceElement.getAttribute(PAGE_TITLE); + siderbarClass = sourceElement.getAttribute(SIDERBAR_CLASS); + siderbarPosition = sourceElement.getAttribute(SIDERBAR_POSITION); + siderbarWidth = sourceElement.getAttribute(SIDERBAR_WIDTH); + style = sourceElement.getAttribute(HTML.ATTR_STYLE); + styleClass = sourceElement.getAttribute(RichFaces.ATTR_STYLE_CLASS); + theme = sourceElement.getAttribute(THEME); + width = sourceElement.getAttribute(HTML.ATTR_WIDTH); + } + + + public String getLang() { + return lang; + } + + public void setLang(String lang) { + this.lang = lang; + } + + public String getBodyClass() { + return bodyClass; + } + + public String getContentClass() { + return contentClass; + } + + public String getFooterClass() { + return footerClass; + } + + public String getHeaderClass() { + return headerClass; + } + + public String getMarkupType() { + return markupType; + } + + public String getNamespace() { + return namespace; + } + + public String getPageTitle() { + return pageTitle; + } + + public String getSiderbarClass() { + return siderbarClass; + } + + public String getSiderbarPosition() { + return siderbarPosition; + } + + public String getSiderbarWidth() { + return siderbarWidth; + } + + public String getStyle() { + return style; + } + + public String getStyleClass() { + return styleClass; + } + + public String getTheme() { + return theme; + } + + public String getWidth() { + return width; + } + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2009-05-29 14:04:37 UTC (rev 15600) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2009-05-29 14:17:49 UTC (rev 15601) @@ -99,7 +99,7 @@ String nodeName = child.getNodeName(); if (nodeName.endsWith(':' + RichFaces.TAG_COLUMN) || nodeName.endsWith(':' + RichFaces.TAG_COLUMNS)) { - final boolean breakBefore = RichFaces.VAL_TRUE.equals( ((Element)child).getAttribute(RichFaces.ATTR_BREAK_BEFORE) ); + final boolean breakBefore = RichFaces.VALUE_TRUE.equals( ((Element)child).getAttribute(RichFaces.ATTR_BREAK_BEFORE) ); if (breakBefore) { curRow++; curColumn = 0; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2009-05-29 14:04:37 UTC (rev 15600) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/util/RichFaces.java 2009-05-29 14:17:49 UTC (rev 15601) @@ -27,27 +27,20 @@ private RichFaces() { } - /** The Constant ATTR_ADD_CONTROL_LABEL. */ public static final String ATTR_ADD_CONTROL_LABEL = "addControlLabel"; //$NON-NLS-1$ public static final String ATTR_ALIGN = "align"; //$NON-NLS-1$ public static final String ATTR_BREAK_BEFORE = "breakBefore"; //$NON-NLS-1$ - public static final String ATTR_CAPTION_CLASS = "captionClass"; //$NON-NLS-1$ public static final String ATTR_CAPTION_STYLE = "captionStyle"; //$NON-NLS-1$ - /** The Constant ATTR_COLUMN_CLASSES. */ public static final String ATTR_COLUMN_CLASSES = "columnClasses"; //$NON-NLS-1$ public static final String ATTR_COLUMNS = "columns"; //$NON-NLS-1$ public static final String ATTR_COLUMNS_WIDTH = "columnsWidth"; //$NON-NLS-1$ - public static final String ATTR_BUTTON_ICON = "buttonIcon"; //$NON-NLS-1$ public static final String ATTR_BUTTON_ICON_DISABLED = "buttonIconDisabled"; //$NON-NLS-1$ public static final String ATTR_BUTTON_CLASS = "buttonClass"; //$NON-NLS-1$ public static final String ATTR_SHOW_INPUT = "showInput"; //$NON-NLS-1$ public static final String ATTR_LOCALE = "locale"; //$NON-NLS-1$ - - /** The Constant ATTR_CONTROLS_TYPE. */ public static final String ATTR_CONTROLS_TYPE = "controlsType"; //$NON-NLS-1$ - /** The Constant ATTR_DEFAULT_LABEL. */ public static final String ATTR_DEFAULT_LABEL = "defaultLabel"; //$NON-NLS-1$ public static final String ATTR_DIRECTION = "direction"; //$NON-NLS-1$ public static final String ATTR_JOINT_POINT = "jointPoint"; //$NON-NLS-1$ @@ -55,40 +48,31 @@ public static final String ATTR_ELEMENTS = "elements"; //$NON-NLS-1$ public static final String ATTR_FOOTER_CLASS = "footerClass"; //$NON-NLS-1$ public static final String ATTR_HEADER_CLASS = "headerClass"; //$NON-NLS-1$ - /** The Constant ATTR_INPUT_CLASS. */ public static final String ATTR_INPUT_CLASS = "inputClass"; //$NON-NLS-1$ - /** The Constant ATTR_INPUT_SIZE. */ public static final String ATTR_INPUT_SIZE = "inputSize"; //$NON-NLS-1$ - /** The Constant ATTR_INPUT_STYLE. */ public static final String ATTR_INPUT_STYLE = "inputStyle"; //$NON-NLS-1$ public static final String ATTR_LIST_HEIGHT = "listHeight"; //$NON-NLS-1$ public static final String ATTR_LIST_WIDTH = "listWidth"; //$NON-NLS-1$ - /** The Constant ATTR_NAME. */ public static final String ATTR_NAME = "name"; //$NON-NLS-1$ public static final String ATTR_POPUP = "popup";//$NON-NLS-1$ public static final String ATTR_ROWS = "rows"; //$NON-NLS-1$ public static final String ATTR_ROW_CLASSES = "rowClasses"; //$NON-NLS-1$ public static final String ATTR_SELECT_ITEM_LABEL = "itemLabel"; //$NON-NLS-1$ public static final String ATTR_SELECT_ITEM_VALUE = "itemValue"; //$NON-NLS-1$ - /** The Constant ATTR_SHOW_BUTTON_LABELS. */ public static final String ATTR_SHOW_BUTTON_LABELS = "showButtonLabels"; //$NON-NLS-1$ public static final String ATTR_SORT_BY = "sortBy"; //$NON-NLS-1$ public static final String ATTR_SORT_ICON = "sortIcon"; //$NON-NLS-1$ public static final String ATTR_SORTABLE = "sortable"; //$NON-NLS-1$ - /** The Constant ATTR_STYLE. */ public static final String ATTR_STYLE = "style"; //$NON-NLS-1$ - /** The Constant ATTR_STYLE_CLASS. */ public static final String ATTR_STYLE_CLASS = "styleClass"; //$NON-NLS-1$ - /** The Constant ATTR_VALUE. */ public static final String ATTR_VALUE = "value"; //$NON-NLS-1$ public static final String ATTR_VISIBLE = "visible"; //$NON-NLS-1$ - /** The Constant ATTR_WIDTH. */ public static final String ATTR_WIDTH = "width"; //$NON-NLS-1$ public static final String ATTR_HEIGHT = "height"; //$NON-NLS-1$ - public static final String ATTR_HORIZONTAL_OFFSET = "horizontalOffset"; //$NON-NLS-1$ public static final String ATTR_VERTICAL_OFFSET = "verticalOffset"; //$NON-NLS-1$ public static final String ATTR_ZINDEX = "zindex"; //$NON-NLS-1$ + public static final String ATTR_POSITION = "position"; //$NON-NLS-1$ /** FACETS NAMES **/ public static final String NAME_FACET_CAPTION = "caption"; //$NON-NLS-1$ @@ -99,12 +83,16 @@ public static final String TAG_COLUMN = "column"; //$NON-NLS-1$ public static final String TAG_COLUMN_GROUP = "columnGroup"; //$NON-NLS-1$ public static final String TAG_COLUMNS = "columns"; //$NON-NLS-1$ - /** The Constant TAG_FACET. */ public static final String TAG_FACET = "facet"; //$NON-NLS-1$ public static final String TAG_SUB_TABLE = "subTable"; //$NON-NLS-1$ - public static final String VAL_TRUE = "true"; //$NON-NLS-1$ - public static final String VAL_FALSE = "false"; //$NON-NLS-1$ + public static final String VALUE_TRUE = "true"; //$NON-NLS-1$ + public static final String VALUE_FALSE = "false"; //$NON-NLS-1$ + public static final String VALUE_LEFT = "left"; //$NON-NLS-1$ + public static final String VALUE_RIGHT = "right"; //$NON-NLS-1$ + public static final String VALUE_TOP = "top"; //$NON-NLS-1$ + public static final String VALUE_BOTTOM = "bottom"; //$NON-NLS-1$ + public static final String VALUE_CENTER = "center"; //$NON-NLS-1$ private static VpeExpression exprColumnClasses = null; /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2009-05-29 14:04:37 UTC (rev 15600) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2009-05-29 14:17:49 UTC (rev 15601) @@ -755,4 +755,24 @@ </vpe:template> </vpe:if> </vpe:tag> + + <!-- Since RichFaces 3.3.1 --> + <vpe:tag name="rich:page" case-sensitive="yes"> + <vpe:template children="yes" modify="no" + class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesPageTemplate"> + </vpe:template> + </vpe:tag> + + <vpe:tag name="rich:layout" case-sensitive="yes"> + <vpe:template children="yes" modify="no" + class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesLayoutTemplate"> + </vpe:template> + </vpe:tag> + + <vpe:tag name="rich:layoutPanel" case-sensitive="yes"> + <vpe:template children="yes" modify="no" + class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesLayoutPanelTemplate"> + </vpe:template> + </vpe:tag> + </vpe:templates>