8:31 a.m.
Author: viktor_volkov
Date: 2007-11-21 09:31:23 -0500 (Wed, 21 Nov 2007)
New Revision: 4136
Added:
branches/3.1.x/test-applications/facelets/src/main/java/richPanels/MapComponent.java
Modified:
branches/3.1.x/test-applications/facelets/src/main/java/richPanels/RichPanelsBean.java
branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanels/RichPanels.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanelsMenu/RichPanelsMenu.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml
Log:
Refactoring RichPanels application
Added:
branches/3.1.x/test-applications/facelets/src/main/java/richPanels/MapComponent.java
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/java/richPanels/MapComponent.java
(rev 0)
+++
branches/3.1.x/test-applications/facelets/src/main/java/richPanels/MapComponent.java 2007-11-21
14:31:23 UTC (rev 4136)
@@ -0,0 +1,21 @@
+package richPanels;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MapComponent {
+ private Map<String, ArrayList<String>> m;
+
+ public MapComponent() {
+ m = new HashMap<String, ArrayList<String>>();
+ }
+
+ public void add(String component, ArrayList<String> path) {
+ m.put(component, path);
+ }
+
+ public ArrayList<String> get(String key){
+ return m.get(key);
+ }
+}
Modified:
branches/3.1.x/test-applications/facelets/src/main/java/richPanels/RichPanelsBean.java
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/java/richPanels/RichPanelsBean.java 2007-11-21
13:54:42 UTC (rev 4135)
+++
branches/3.1.x/test-applications/facelets/src/main/java/richPanels/RichPanelsBean.java 2007-11-21
14:31:23 UTC (rev 4136)
@@ -1,17 +1,75 @@
package richPanels;
+import java.util.ArrayList;
+
public class RichPanelsBean {
private String src;
-
+ private MapComponent map;
+
public RichPanelsBean() {
- src = "/RichPanels/Panel/Panel.xhtml";
+ src = "Blank";
+ map = new MapComponent();
+ // map.add( value, add( pages_path/name_pages, array<boolean>(Property,
Straightforward) );
+ map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true,
true}));
+ map.add("Calendar", add("/Calendar/Calendar", new boolean [] {true,
true}));
+ map.add("DataFilterSlider",
add("/DataFilterSlider/DataFilterSlider", new boolean [] {true, false}));
+ map.add("DataScroller", add("/DataScroller/DataScroller", new
boolean [] {true, true}));
+ map.add("DataTable", add("/DataTable/DataTable", new boolean []
{true, true}));
+ map.add("DragAndDrop", add("/DragAndDrop/DragAndDrop", new boolean
[] {false, false}));
+ map.add("DropDownMenu", add("/DropDownMenu/DropDownMenu", new
boolean [] {true, true}));
+ map.add("Effect", add("/Effect/Effect", new boolean [] {false,
false}));
+ map.add("Gmap", add("/Gmap/Gmap", new boolean [] {true, false}));
+ map.add("InputNumberSlider",
add("/InputNumberSlider/InputNumberSlider", new boolean [] {true, true}));
+ map.add("InputNumberSpinner",
add("/InputNumberSpinner/InputNumberSpinner", new boolean [] {true, true}));
+ map.add("Insert", add("/Insert/Insert", new boolean [] {true,
false}));
+ map.add("Message", add("/Message/Message", new boolean [] {true,
true}));
+ map.add("ModalPanel", add("/RichPanels/ModalPanel/ModalPanel", new
boolean [] {false, false}));
+ map.add("Paint2D", add("/Paint2D/Paint2D", new boolean [] {true,
true}));
+ map.add("Panel", add("/RichPanels/Panel/Panel", new boolean []
{false, false}));
+ map.add("Panel2", add("/Panel/Panel2", new boolean [] {false,
false}));
+ map.add("PanelBar", add("/RichPanels/PanelBar/PanelBar", new
boolean [] {false, false}));
+ map.add("PanelMenu", add("/PanelMenu/PanelMenu", new boolean []
{true, true}));
+ map.add("Separator", add("/Separator/Separator", new boolean []
{true, true}));
+ map.add("SimpleTogglePanel",
add("/RichPanels/SimpleTogglePanel/SimpleTogglePanel", new boolean [] {false,
false}));
+ map.add("Spacer", add("/Spacer/Spacer", new boolean [] {true,
true}));
+ map.add("SuggestionBox", add("/SuggestionBox/SuggestionBox", new
boolean [] {true, true}));
+ map.add("TabPanel", add("/RichPanels/TabPanel/TabPanel", new
boolean [] {false, false}));
+ map.add("TogglePanel", add("/RichPanels/TogglePanel/TogglePanel",
new boolean [] {false, false}));
+ map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {true,
false}));
+ map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {true,
true}));
+ map.add("Tree", add("/Tree/Tree", new boolean [] {true, false}));
+ map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new
boolean [] {true, true}));
+ map.add("ScrollableDataTable",
add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {true, false}));
+ map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false,
false}));
+ map.add("OrderingList", add("/OrderingList/OrderingList", new
boolean [] {true, false}));
}
public String getSrc() {
return src;
}
+ public String getPathComponent() {
+ return map.get(src).get(0);
+ }
+
+ public String getPathProperty() {
+ return map.get(src).get(1);
+ }
+
+ public String getPathStraightforward() {
+ return map.get(src).get(2);
+ }
+
public void setSrc(String src) {
this.src = src;
}
+
+ private ArrayList<String> add(String path, boolean [] arr){
+ ArrayList<String> list = new ArrayList<String>();
+ list.add(path + ".xhtml");
+ if(arr[0]) list.add(path + "Property.xhtml"); else
list.add("/pages/Blank/BlankProperty.xhtml");
+ if(arr[1]) list.add(path + "Straightforward.xhtml"); else
list.add("/pages/Blank/BlankStraightforward.xhtml");
+ return list;
+ }
}
+
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml 2007-11-21
13:54:42 UTC (rev 4135)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml 2007-11-21
14:31:23 UTC (rev 4136)
@@ -1,20 +1,11 @@
-<h:form xmlns:rich="http://richfaces.org/rich"
+<f:subview id="PanelsModalPanelSubviewID"
xmlns:rich="http://richfaces.org/rich"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:c="http://java.sun.com/jstl/core"
xmlns:ui="http://java.sun.com/jsf/facelets">
-
- <rich:panel rendered="true" id="Panel"
- style="width:500px;height:700px;overflow:auto;">
- <f:facet name="header">
- <h:outputText value="rich:panel"></h:outputText>
- </f:facet>
- <ui:include src="/Panel/Panel.xhtml" />
- </rich:panel>
-
- <rich:spacer width="10" height="50"></rich:spacer>
-
+<h:messages showDetail="true"></h:messages>
+
<rich:panel rendered="true" id="Calendar"
style="width:900px;height:850px;overflow:auto;">
<f:facet name="header">
@@ -40,7 +31,7 @@
<f:facet name="header">
<h:outputText value="rich:datascroller"></h:outputText>
</f:facet>
- <ui:include src="/DataScroller/DS.xhtml" />
+ <ui:include src="/DataScroller/DataScroller.xhtml" />
</rich:panel>
<rich:spacer width="10" height="50"></rich:spacer>
@@ -50,7 +41,7 @@
<f:facet name="header">
<h:outputText value="rich:dataTable"></h:outputText>
</f:facet>
- <ui:include src="/DataTable/DT.xhtml" />
+ <ui:include src="/DataTable/DataTable.xhtml" />
</rich:panel>
<rich:spacer width="10" height="50"></rich:spacer>
@@ -70,7 +61,7 @@
<f:facet name="header">
<h:outputText value="rich:dropDownMenu"></h:outputText>
</f:facet>
- <ui:include src="/DropDownMenu/DDMenu.xhtml" />
+ <ui:include src="/DropDownMenu/DropDownMenu.xhtml" />
</rich:panel>
<rich:spacer width="10" height="50"></rich:spacer>
@@ -100,7 +91,7 @@
<f:facet name="header">
<h:outputText value="rich:inputNumberSlider"></h:outputText>
</f:facet>
- <ui:include src="/inputNumberSlider/inputNumberSlider.xhtml" />
+ <ui:include src="/InputNumberSlider/InputNumberSlider.xhtml" />
</rich:panel>
<rich:spacer width="10" height="50"></rich:spacer>
@@ -110,7 +101,7 @@
<f:facet name="header">
<h:outputText value="rich:inputNumberSpinner"></h:outputText>
</f:facet>
- <ui:include src="/inputNumberSpinner/inputNumberSpinner.xhtml" />
+ <ui:include src="/InputNumberSpinner/InputNumberSpinner.xhtml" />
</rich:panel>
<rich:spacer width="10" height="50"></rich:spacer>
@@ -293,6 +284,6 @@
<ui:include src="/VirtualEarth/VirtualEarth.xhtml" />
</rich:panel>
-</h:form>
+</f:subview>
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-11-21
13:54:42 UTC (rev 4135)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-11-21
14:31:23 UTC (rev 4136)
@@ -133,6 +133,10 @@
<to-view-id>/CustomizePage/CustomizePage.xhtml</to-view-id>
</navigation-case>
<navigation-case>
+ <from-outcome>RichPanels</from-outcome>
+ <to-view-id>/pages/RichPanels/RichPanels.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
<from-outcome>jQuery</from-outcome>
<to-view-id>/jQuery/jQuery.xhtml</to-view-id>
</navigation-case>
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanels/RichPanels.xhtml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanels/RichPanels.xhtml 2007-11-21
13:54:42 UTC (rev 4135)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanels/RichPanels.xhtml 2007-11-21
14:31:23 UTC (rev 4136)
@@ -8,6 +8,23 @@
<f:view>
<head>
<title></title>
+
+ <script type="text/javascript">
+ function print(elementID, value) {
+ var oldObject = window.document.getElementById(elementID);
+ var newObject = window.document.createElement('input');
+ newObject.type = "text";
+ newObject.size = oldObject.size;
+ newObject.value = value;
+ newObject.id = oldObject.id;
+ //if(oldObject.size) newObject.size = oldObject.size;
+ //if(oldObject.value) newObject.value = value;
+ //if(oldObject.id) newObject.id = oldObject.id;
+ //if(oldObject.name) newObject.name = oldObject.name;
+ //if(oldObject.className) newObject.className = oldObject.className;
+ oldObject.parentNode.replaceChild(newObject,oldObject);
+ }
+ </script>
<link rel="stylesheet"
href="#{facesContext.externalContext.requestContextPath}/styles/styles.css"
type="text/css" />
@@ -16,13 +33,23 @@
<div id="divOpthID" align="right" style="z-index:
200">
<ui:include src="/pages/RichPanelsMenu/RichPanelsMenu.xhtml"/>
</div>
-
- <ui:include src="${richPanelsBean.src}" />
+ <h:form>
+ <ui:include src="${richPanelsBean.pathComponent}" />
+ <ui:include src="${richPanelsBean.pathStraightforward}" />
+ <ui:include src="${richPanelsBean.pathProperty}" />
+ </h:form>
+ <rich:modalPanel id="eventInfoID" autosize="true"
minHeight="550" minWidth="200" moveable="true"
resizeable="true" style="overflow: true;">
+ <f:facet name="header">
+ <h:outputText value="Events ..." />
+ </f:facet>
+ <f:facet name="controls">
+ <h:graphicImage value="/pics/error.gif"
onclick="Richfaces.hideModalPanel('eventInfoID');"/>
+ </f:facet>
+
+ <ui:include src="/pages/Action/EventInfo.xhtml" />
+
+ </rich:modalPanel>
+ <a4j:commandButton value="Show event"
onclick="Richfaces.showModalPanel('eventInfoID');return
false;"></a4j:commandButton>
</body>
</f:view>
-</html>
-
-
-
-
-
+</html>
\ No newline at end of file
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanelsMenu/RichPanelsMenu.xhtml
===================================================================
---
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanelsMenu/RichPanelsMenu.xhtml 2007-11-21
13:54:42 UTC (rev 4135)
+++
branches/3.1.x/test-applications/facelets/src/main/webapp/pages/RichPanelsMenu/RichPanelsMenu.xhtml 2007-11-21
14:31:23 UTC (rev 4136)
@@ -1,23 +1,30 @@
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:rich="http://richfaces.org/rich">
+<h:form id="forvDivOpthID" xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
xmlns:a4j="http://richfaces.org/a4j">
+ <rich:toolBar itemSeparator="none" >
+ <rich:toolBarGroup location="right">
+ <h:panelGrid columns="1">
+ <h:outputText value="Select skin: " />
+ <h:selectOneMenu binding="#{skinBean.component}"
onblur="submit();">
+ <a4j:support action="#{skinBean.change}"
event="onchange"/>
+ </h:selectOneMenu>
+ </h:panelGrid>
+ </rich:toolBarGroup>
-<h:form id="forvDivOpthID2">
- <h:panelGrid columns="2">
- <h:selectOneMenu
binding="#{skinBean.component}"></h:selectOneMenu>
- <h:commandLink action="#{skinBean.change}" value="set skin"
/>
-
- <h:outputText value="Select component:" />
- <h:selectOneMenu value="#{richPanelsBean.src}"
onchange="submit();">
- <f:selectItem itemValue="/RichPanels/Panel/Panel.xhtml"
itemLabel="Panel" />
- <f:selectItem itemValue="/RichPanels/ModalPanel/ModalPanel.xhtml"
itemLabel="Modal Panel" />
- <f:selectItem itemValue="/RichPanels/PanelBar/PanelBar.xhtml"
itemLabel="Panel Bar" />
- <f:selectItem
itemValue="/RichPanels/SimpleTogglePanel/SimpleTogglePanel.xhtml" itemLabel="Simple
Toggle Panel" />
- <f:selectItem itemValue="/RichPanels/TogglePanel/TogglePanel.xhtml"
itemLabel="Toggle Panel" />
- <f:selectItem itemValue="/RichPanels/TabPanel/TabPanel.xhtml"
itemLabel="Tab Panel" />
- </h:selectOneMenu>
- </h:panelGrid>
+ <rich:toolBarGroup location="right">
+ <h:panelGrid columns="1">
+ <h:outputText value="Select component:" />
+ <h:selectOneMenu value="#{richPanelsBean.src}"
onchange="submit();">
+ <f:selectItem itemValue="Blank" itemLabel="Blank" />
+ <f:selectItem itemValue="ModalPanel" itemLabel="Modal Panel"
/>
+ <f:selectItem itemValue="Panel" itemLabel="Panel" />
+ <f:selectItem itemValue="PanelBar" itemLabel="Panel Bar"
/>
+ <f:selectItem itemValue="SimpleTogglePanel" itemLabel="Simple
Toggle Panel" />
+ <f:selectItem itemValue="TabPanel" itemLabel="Tab Panel"
/>
+ <f:selectItem itemValue="TogglePanel" itemLabel="Toggle
Panel" />
+ </h:selectOneMenu>
+ </h:panelGrid>
+ </rich:toolBarGroup>
+ </rich:toolBar>
<h:commandLink value="Back"
action="main"></h:commandLink>
</h:form>
-</html>
\ No newline at end of file
+
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-11-21
13:54:42 UTC (rev 4135)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-11-21
14:31:23 UTC (rev 4136)
@@ -20,6 +20,7 @@
<h:commandLink value="Div"
action="TestDiv"></h:commandLink>
<h:commandLink value="Select"
action="Map"></h:commandLink>
<h:commandLink value="Customize page"
action="CustomizePage"></h:commandLink>
+ <h:commandLink value="RichPanels"
action="RichPanels"></h:commandLink>
</h:panelGrid>
</rich:panel>
<rich:spacer></rich:spacer>