Author: norman.richards(a)jboss.com Date: 2008-10-20 15:08:48 -0400 (Mon, 20 Oct 2008) New Revision: 9368 Modified: tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/components.xml tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/pages.xml tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/web.xml tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/css/Parser.java tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java Log: merge 9366 and 9367 into 2.1.0.GA Modified: tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/components.xml =================================================================== --- tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/components.xml 2008-10-20 18:54:38 UTC (rev 9367) +++ tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/components.xml 2008-10-20 19:08:48 UTC (rev 9368) @@ -25,9 +25,4 @@ <component name="sampleButton" class="javax.swing.JButton"> <property name="label">A JButton!</property> </component> - -<!-- - <web:rewrite-filter view-mapping="/test/*" /> ---> - <web:rewrite-filter view-mapping="*.seam" /> </components> Modified: tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/pages.xml =================================================================== --- tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/pages.xml 2008-10-20 18:54:38 UTC (rev 9367) +++ tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/pages.xml 2008-10-20 19:08:48 UTC (rev 9368) @@ -3,10 +3,4 @@ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> - <page view-id="/foo.xhtml"> - <rewrite pattern="/foo/{id}" /> - <rewrite pattern="/foo-{conversationId}" /> - <rewrite pattern="/foo" /> - </page> - </pages> Modified: tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/web.xml =================================================================== --- tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/web.xml 2008-10-20 18:54:38 UTC (rev 9367) +++ tags/JBoss_Seam_2_1_0_GA/examples/itext/resources/WEB-INF/web.xml 2008-10-20 19:08:48 UTC (rev 9368) @@ -68,7 +68,7 @@ <servlet-mapping> <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.z</url-pattern> + <url-pattern>*.seam</url-pattern> </servlet-mapping> <servlet> Modified: tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/css/Parser.java =================================================================== --- tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/css/Parser.java 2008-10-20 18:54:38 UTC (rev 9367) +++ tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/css/Parser.java 2008-10-20 19:08:48 UTC (rev 9368) @@ -193,6 +193,9 @@ if (firstBrace >= 0 && secondBrace >= 0 && firstBrace != secondBrace) { String styleName = css.substring(0, firstBrace).trim(); + if (styleName.startsWith(".")) { + styleName = styleName.substring(1); + } String styleString = css.substring(firstBrace + 1, secondBrace).trim(); StyleMap styleMap = parseStyleString(styleString); styleClasses.put(styleName, styleMap); Modified: tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java =================================================================== --- tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java 2008-10-20 18:54:38 UTC (rev 9367) +++ tags/JBoss_Seam_2_1_0_GA/src/excel/org/jboss/seam/excel/jxl/JXLExcelWorkbook.java 2008-10-20 19:08:48 UTC (rev 9368) @@ -9,6 +9,7 @@ import java.net.URL; import java.util.List; +import javax.faces.component.UIComponent; import javax.imageio.ImageIO; import jxl.CellView; @@ -504,6 +505,9 @@ */ public void addItem(WorksheetItem item) { + if (!((UIComponent)item).isRendered()) { + return; + } switch (item.getItemType()) { case cell: