Author: ppitonak(a)redhat.com
Date: 2011-04-07 08:42:38 -0400 (Thu, 07 Apr 2011)
New Revision: 22389
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsiblePanel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richPanel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richPopupPanel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richTabPanel.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/templates/richTogglePanel.xhtml
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
Log:
https://issues.jboss.org/browse/RFPL-945
added new templates - rich:popupPanel, rich:tabPanel, rich:panel, rich:togglePanel,
rich:collapsiblePanel
Modified:
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java
===================================================================
---
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-07
09:17:28 UTC (rev 22388)
+++
modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/Template.java 2011-04-07
12:42:38 UTC (rev 22389)
@@ -34,13 +34,18 @@
REDDIV("redDiv", "Red div", ""),
BLUEDIV("blueDiv", "Blue div", ""),
RICHACCORDION("richAccordion", "Rich Accordion", ""),
+ RICHCOLLAPSIBLEPANEL("richCollapsiblePanel", "Rich Collapsible
Panel", ""),
RICHCOLLAPSIBLESUBTABLE("richCollapsibleSubTable", "Rich Collapsible
Sub Table", "containerRichCollapsibleSubTable:2:"),
RICHDATATABLE("richDataTable", "Rich Data Table",
"containerRichDataTable:2:"),
RICHDATAGRID("richDataGrid", "Rich Data Grid",
"containerRichDataGrid:1:"),
RICHEXTENDEDDATATABLE("richExtendedDataTable", "Rich Extended Data
Table", "containerRichExtendedDataTable:2:"),
RICHLIST("richList", "Rich List",
"containerRichList:2:"),
+ RICHPANEL("richPanel", "Rich Panel", ""),
+ RICHPOPUPPANEL("richPopupPanel", "Rich Popup Panel",
""),
+ RICHTABPANEL("richTabPanel", "Rich Tab Panel", ""),
+ RICHTOGGLEPANEL("richTogglePanel", "Rich Toggle Panel",
""),
HDATATABLE("hDataTable", "JSF Data Table",
"containerHDataTable:2:"),
- HPANELGRID ("hPanelGrid", "JSF Panel Grid",
"containerHPanelGrid:"),
+ HPANELGRID("hPanelGrid", "JSF Panel Grid",
"containerHPanelGrid:"),
UIREPEAT("uiRepeat", "UI Repeat",
"containerUiRepeat:1:"),
A4JREPEAT("a4jRepeat", "A4J Repeat",
"containerA4JRepeat:1:");
/**
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsiblePanel.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsiblePanel.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richCollapsiblePanel.xhtml 2011-04-07
12:42:38 UTC (rev 22389)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <rich:collapsiblePanel id="containerRichCollapsiblePanel">
+
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml"
/>
+
+ </rich:collapsiblePanel>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added: modules/tests/metamer/trunk/application/src/main/webapp/templates/richPanel.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richPanel.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richPanel.xhtml 2011-04-07
12:42:38 UTC (rev 22389)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <rich:panel id="containerRichPanel" header="Rich
Panel">
+
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml"
/>
+
+ </rich:panel>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richPopupPanel.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/richPopupPanel.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richPopupPanel.xhtml 2011-04-07
12:42:38 UTC (rev 22389)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:rich="http://richfaces.org/rich"
+
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <h:commandButton id="containerOpenPanelButton" value="Call the
popup">
+ <rich:componentControl target="containerPopupPanel"
operation="show" />
+ </h:commandButton>
+
+ <rich:popupPanel id="containerPopupPanel"
domElementAttachment="parent" header="Popup panel"
+ minHeight="400" minWidth="700"
moveable="true" resizeable="true" show="true" >
+ <f:facet name="controls">
+ <h:outputLink value="#"
onclick="#{rich:component('popupPanel')}.hide(); return
false;">X</h:outputLink>
+ </f:facet>
+
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml"
/>
+
+ </rich:popupPanel>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richTabPanel.xhtml
===================================================================
--- modules/tests/metamer/trunk/application/src/main/webapp/templates/richTabPanel.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richTabPanel.xhtml 2011-04-07
12:42:38 UTC (rev 22389)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <rich:tabPanel id="containerRichTabPanel"
activeItem="containerItem3">
+
+ <rich:tab id="containerItem1" name="containerItem1"
header="Item 1">
+ content of item 1
+ </rich:tab>
+ <rich:tab id="containerItem2" name="containerItem2"
header="Item 2">
+ content of item 2
+ </rich:tab>
+ <rich:tab id="containerItem3" name="containerItem3"
header="Item 3">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml"
/>
+ </rich:tab>
+ <rich:tab id="containerItem4" name="containerItem4"
header="Item 4" disabled="true">
+ content of item 4
+ </rich:tab>
+ <rich:tab id="containerItem5" name="containerItem5"
header="Item 5">
+ content of item 5
+ </rich:tab>
+
+ </rich:tabPanel>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Added:
modules/tests/metamer/trunk/application/src/main/webapp/templates/richTogglePanel.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/richTogglePanel.xhtml
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/richTogglePanel.xhtml 2011-04-07
12:42:38 UTC (rev 22389)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:rich="http://richfaces.org/rich">
+
+ <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ -->
+
+ <ui:composition>
+ <h:commandLink id="tcLink1" value="Item 1">
+ <rich:toggleControl targetPanel="containerRichTogglePanel"
targetItem="containerItem1" />
+ </h:commandLink>
+ <h:outputText value=" | " />
+ <h:commandLink id="tcLink2" value="Item 2">
+ <rich:toggleControl targetPanel="containerRichTogglePanel"
targetItem="containerItem2" />
+ </h:commandLink>
+ <h:outputText value=" | " />
+ <h:commandLink id="tcLink3" value="Item 3">
+ <rich:toggleControl targetPanel="containerRichTogglePanel"
targetItem="containerItem3" />
+ </h:commandLink>
+ <h:outputText value=" | " />
+ <h:commandLink id="tcLink4" value="Item 4">
+ <rich:toggleControl targetPanel="containerRichTogglePanel"
targetItem="containerItem4" />
+ </h:commandLink>
+ <h:outputText value=" | " />
+ <h:commandLink id="tcLink5" value="Item 5">
+ <rich:toggleControl targetPanel="containerRichTogglePanel"
targetItem="containerItem5" />
+ </h:commandLink>
+ <br/><br/>
+
+ <rich:togglePanel id="containerRichTogglePanel"
activeItem="containerItem3">
+
+ <rich:togglePanelItem id="containerItem1"
name="containerItem1">
+ content of item 1
+ </rich:togglePanelItem>
+ <rich:togglePanelItem id="containerItem2"
name="containerItem2">
+ content of item 2
+ </rich:togglePanelItem>
+ <rich:togglePanelItem id="containerItem3"
name="containerItem3">
+ <ui:decorate template="#{templateBean.nextTemplate}.xhtml"
/>
+ </rich:togglePanelItem>
+ <rich:togglePanelItem id="containerItem4"
name="containerItem4">
+ content of item 4
+ </rich:togglePanelItem>
+ <rich:togglePanelItem id="containerItem5"
name="containerItem5">
+ content of item 5
+ </rich:togglePanelItem>
+
+ </rich:togglePanel>
+
+ </ui:composition>
+</html>
\ No newline at end of file
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-07
09:17:28 UTC (rev 22388)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-04-07
12:42:38 UTC (rev 22389)
@@ -95,8 +95,9 @@
*/
public static final long TIMEOUT = 5000;
@Inject
- @Templates({"plain", "richAccordion", "richDataTable",
"richCollapsibleSubTable", "richExtendedDataTable",
"richDataGrid", "richList",
- "a4jRepeat", "hDataTable", "hPanelGrid",
"uiRepeat"})
+ @Templates({"plain", "richAccordion", "richDataTable",
"richCollapsibleSubTable", "richExtendedDataTable",
+ "richDataGrid", "richList", "richCollapsiblePanel",
"richPanel", "richTabPanel", "richTogglePanel",
+ "richPopupPanel", "a4jRepeat", "hDataTable",
"hPanelGrid", "uiRepeat"})
private TemplatesList template;
/**