Author: dmaliarevich Date: 2008-12-19 09:53:25 -0500 (Fri, 19 Dec 2008) New Revision: 12716 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesExtendedDataTableTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-883, code adjustment. getColumnsWithFacet method was replaced to utility class. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-19 14:36:18 UTC (rev 12715) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-19 14:53:25 UTC (rev 12716) @@ -919,5 +919,23 @@ } return null; } - + + + /** + * Returns columns with facet. + * @param columns + * @param facetName + * @return list of columns with facet + */ + public static ArrayList<Element> getColumnsWithFacet( + ArrayList<Element> columns, String facetName) { + ArrayList<Element> columnsWithFacet = new ArrayList<Element>(); + for (Element column : columns) { + Element body = getFacet(column, facetName); + if (body != null) { + columnsWithFacet.add(column); + } + } + return columnsWithFacet; + } } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesExtendedDataTableTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesExtendedDataTableTemplate.java 2008-12-19 14:36:18 UTC (rev 12715) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesExtendedDataTableTemplate.java 2008-12-19 14:53:25 UTC (rev 12716) @@ -415,24 +415,6 @@ } /** - * - * @param columns - * @param facetName - * @return list of columns with facet - */ - public static ArrayList<Element> getColumnsWithFacet( - ArrayList<Element> columns, String facetName) { - ArrayList<Element> columnsWithFacet = new ArrayList<Element>(); - for (Element column : columns) { - Element body = ComponentUtil.getFacet(column, facetName); - if (body != null) { - columnsWithFacet.add(column); - } - } - return columnsWithFacet; - } - - /** * Checks, whether it is necessary to re-create an element at change of * attribute * Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-12-19 14:36:18 UTC (rev 12715) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-12-19 14:53:25 UTC (rev 12716) @@ -453,7 +453,7 @@ // ---------- HEADER ----------- // Encode Header Element header = ComponentUtil.getFacet(sourceElement, HEADER); - ArrayList<Element> columnsHeaders = getColumnsWithFacet(columns, HEADER); + ArrayList<Element> columnsHeaders = ComponentUtil.getColumnsWithFacet(columns, HEADER); if (header != null || !columnsHeaders.isEmpty()) { String headerClass = (String) sourceElement .getAttribute(HEADER_CLASS); @@ -487,7 +487,7 @@ // Encode Footer /* Element footer = ComponentUtil.getFacet(sourceElement, FOOTER); - ArrayList<Element> columnsFooters = getColumnsWithFacet(columns, FOOTER); + ArrayList<Element> columnsFooters = ComponentUtil.getColumnsWithFacet(columns, FOOTER); if (footer != null || !columnsFooters.isEmpty()) { String footerClass = (String) sourceElement .getAttribute(FOOTER_CLASS); @@ -762,24 +762,6 @@ /** * - * @param columns - * @param facetName - * @return list of columns with facet - */ - private static ArrayList<Element> getColumnsWithFacet( - ArrayList<Element> columns, String facetName) { - ArrayList<Element> columnsWithFacet = new ArrayList<Element>(); - for (Element column : columns) { - Element body = ComponentUtil.getFacet(column, facetName); - if (body != null) { - columnsWithFacet.add(column); - } - } - return columnsWithFacet; - } - - /** - * * @param sourceElement * @param columns * @return Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-12-19 14:36:18 UTC (rev 12715) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-12-19 14:53:25 UTC (rev 12716) @@ -135,7 +135,7 @@ // Encode Header Element header = ComponentUtil.getFacet(sourceElement, RichFaces.NAME_FACET_HEADER); - ArrayList<Element> columnsHeaders = getColumnsWithFacet(columns, RichFaces.NAME_FACET_HEADER); + ArrayList<Element> columnsHeaders = ComponentUtil.getColumnsWithFacet(columns, RichFaces.NAME_FACET_HEADER); if (header != null || !columnsHeaders.isEmpty()) { nsIDOMElement thead = visualDocument .createElement(HTML.TAG_THEAD); @@ -171,7 +171,7 @@ // Encode Footer Element footer = ComponentUtil.getFacet(sourceElement, RichFaces.NAME_FACET_FOOTER); - ArrayList<Element> columnsFooters = getColumnsWithFacet(columns, RichFaces.NAME_FACET_FOOTER); + ArrayList<Element> columnsFooters = ComponentUtil.getColumnsWithFacet(columns, RichFaces.NAME_FACET_FOOTER); if (footer != null || !columnsFooters.isEmpty()) { nsIDOMElement tfoot = visualDocument .createElement(HTML.TAG_TFOOT); @@ -382,24 +382,6 @@ /** * - * @param columns - * @param facetName - * @return list of columns with facet - */ - public static ArrayList<Element> getColumnsWithFacet( - ArrayList<Element> columns, String facetName) { - ArrayList<Element> columnsWithFacet = new ArrayList<Element>(); - for (Element column : columns) { - Element body = ComponentUtil.getFacet(column, facetName); - if (body != null) { - columnsWithFacet.add(column); - } - } - return columnsWithFacet; - } - - /** - * * @param sourceElement * @param columns * @return 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 2008-12-19 14:36:18 UTC (rev 12715) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-12-19 14:53:25 UTC (rev 12716) @@ -193,18 +193,18 @@ } protected void encodeHeader(final VpePageContext pageContext, final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) { - encodeHeaderOrFooter(pageContext, creationData, sourceElement, visualDocument, parentVisualNode, "header", "dr-subtable-header rich-subtable-header", "dr-subtable-headercell rich-subtable-headercell"); + encodeHeaderOrFooter(pageContext, creationData, sourceElement, visualDocument, parentVisualNode, RichFaces.NAME_FACET_HEADER, "dr-subtable-header rich-subtable-header", "dr-subtable-headercell rich-subtable-headercell"); //$NON-NLS-1$ //$NON-NLS-2$ } protected void encodeFooter(final VpePageContext pageContext, final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) { - encodeHeaderOrFooter(pageContext, creationData, sourceElement, visualDocument, parentVisualNode, "footer", "dr-subtable-footer rich-subtable-footer", "dr-subtable-footercell rich-subtable-footercell"); + encodeHeaderOrFooter(pageContext, creationData, sourceElement, visualDocument, parentVisualNode, RichFaces.NAME_FACET_FOOTER, "dr-subtable-footer rich-subtable-footer", "dr-subtable-footercell rich-subtable-footercell"); //$NON-NLS-1$ //$NON-NLS-2$ } protected void encodeHeaderOrFooter(final VpePageContext pageContext, final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode, final String facetName, final String trClass, final String tdClass) { final ArrayList<Element> columns = RichFacesDataTableTemplate.getColumns(sourceElement); - //final ArrayList<Element> columnsHeaders = RichFacesDataTableTemplate.getColumnsWithFacet(columns, facetName); + //final ArrayList<Element> columnsHeaders = ComponentUtil.getColumnsWithFacet(columns, facetName); final boolean hasColumnWithFacet = RichFacesDataTableTemplate.hasColumnWithFacet(columns, facetName); if(hasColumnWithFacet) { final nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR); @@ -221,11 +221,11 @@ } private boolean isHeader(final Element sourceElement) { - return icludedInFacet(sourceElement, "header"); + return icludedInFacet(sourceElement, RichFaces.NAME_FACET_HEADER); } private boolean isFooter(final Element sourceElement) { - return icludedInFacet(sourceElement, "footer"); + return icludedInFacet(sourceElement, RichFaces.NAME_FACET_FOOTER); } private boolean icludedInFacet(final Element sourceElement, final String facetName) { @@ -234,19 +234,19 @@ } protected String getHeaderClass() { - return "dr-subtable-header rich-subtable-header"; + return "dr-subtable-header rich-subtable-header"; //$NON-NLS-1$ } protected String getHeaderContinueClass() { - return "dr-subtable-header-continue rich-subtable-header-continue"; + return "dr-subtable-header-continue rich-subtable-header-continue"; //$NON-NLS-1$ } protected String getFooterClass() { - return "dr-subtable-footer rich-subtable-footer"; + return "dr-subtable-footer rich-subtable-footer"; //$NON-NLS-1$ } protected String getFooterContinueClass() { - return "dr-subtable-footer-continue rich-subtable-footer-continue"; + return "dr-subtable-footer-continue rich-subtable-footer-continue"; //$NON-NLS-1$ } protected String getRowClass(final int row) {