JBoss Rich Faces SVN: r2417 - trunk/ui/dataTable/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: dbiatenia
Date: 2007-08-22 15:59:16 -0400 (Wed, 22 Aug 2007)
New Revision: 2417
Modified:
trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
Log:
new attribute 'beforeupdate' added, js-function will be invoked before updating DOM-tree on the page
Modified: trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
===================================================================
--- trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-08-22 19:59:12 UTC (rev 2416)
+++ trunk/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-08-22 19:59:16 UTC (rev 2417)
@@ -199,6 +199,16 @@
// TODO Auto-generated method stub
}
+
+ public String getBeforeUpdate() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setBeforeUpdate(String beforeUpdate) {
+ // TODO Auto-generated method stub
+
+ }
}
private UIDataTable dataTable;
18 years, 8 months
JBoss Rich Faces SVN: r2416 - trunk/ui/tabPanel/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: dbiatenia
Date: 2007-08-22 15:59:12 -0400 (Wed, 22 Aug 2007)
New Revision: 2416
Modified:
trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java
Log:
new attribute 'beforeupdate' added, js-function will be invoked before updating DOM-tree on the page
Modified: trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java
===================================================================
--- trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java 2007-08-22 19:59:08 UTC (rev 2415)
+++ trunk/ui/tabPanel/src/test/java/org/richfaces/component/UITabTest.java 2007-08-22 19:59:12 UTC (rev 2416)
@@ -268,5 +268,12 @@
public void setSwitchType(String newvalue) {
}
+
+ public String getBeforeUpdate() {
+ return null;
+ }
+
+ public void setBeforeUpdate(String beforeUpdate) {
+ }
}
}
18 years, 8 months
JBoss Rich Faces SVN: r2415 - trunk/framework/api/src/main/java/org/ajax4jsf/component.
by richfaces-svn-commits＠lists.jboss.org
Author: dbiatenia
Date: 2007-08-22 15:59:08 -0400 (Wed, 22 Aug 2007)
New Revision: 2415
Modified:
trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java
Log:
new attribute 'beforeupdate' added, js-function will be invoked before updating DOM-tree on the page
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java 2007-08-22 19:59:04 UTC (rev 2414)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java 2007-08-22 19:59:08 UTC (rev 2415)
@@ -77,9 +77,22 @@
* @return value or result of valueBinding of Name of JavaScript function, called on complete Ajax request
*/
public abstract String getOncomplete();
+
+
+
+ /**
+ * @return value or result of valueBinding of Name of JavaScript function, called before updating DOM
+ */
+ public abstract String getBeforeUpdate();
/**
* setter method for property
+ * @param new value of Name of JavaScript function, called before updating DOM to set
+ */
+ public abstract void setBeforeUpdate(String beforeUpdate);
+
+ /**
+ * setter method for property
* @param new value of custom data translated to oncomplete function by AJAX
*/
public abstract void setData(Object data);
18 years, 8 months
JBoss Rich Faces SVN: r2414 - in trunk/framework/impl/src/main: javascript/ajaxjsf and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: dbiatenia
Date: 2007-08-22 15:59:04 -0400 (Wed, 22 Aug 2007)
New Revision: 2414
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
new attribute 'beforeupdate' added, js-function will be invoked before updating DOM-tree on the page
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2007-08-22 19:47:53 UTC (rev 2413)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2007-08-22 19:59:04 UTC (rev 2414)
@@ -77,10 +77,17 @@
public static final String STATUS_ATTR_NAME = "status";
/**
- * Attribute for keep JavaScript funtion name for call after complete
+ * Attribute for keep JavaScript function name for call after complete
* request.
*/
public static final String ONCOMPLETE_ATTR_NAME = "oncomplete";
+
+ /**
+ * Attribute for keep JavaScript function name for call before updating
+ * DOM tree.
+ */
+ public static final String BEFOREUPDATE_ATTR_NAME = "beforeupdate";
+
/**
* Attribute to keep
@@ -292,6 +299,19 @@
options.put("oncomplete", function);
}
+
+ String beforeupdate = getAjaxBeforeUpdate(uiComponent);
+ if (null != beforeupdate) {
+ JSFunctionDefinition function = new JSFunctionDefinition();
+ function.addParameter("request");
+ function.addParameter("event");
+ function.addParameter("data");
+ function.addToBody(beforeupdate);
+
+ options.put("beforeupdate", function);
+ }
+
+
String status = getAjaxStatus(uiComponent);
if (null != status) {
options.put("status", status);
@@ -561,6 +581,22 @@
}
/**
+ * Get function name for call before update DOM.
+ *
+ * @param component
+ * for wich calculate function name
+ * @return name of JavaScript function or <code>null</code>
+ */
+ public static String getAjaxBeforeUpdate(UIComponent component) {
+ if (component instanceof AjaxComponent) {
+ return ((AjaxComponent) component).getBeforeUpdate();
+
+ }
+ return (String) component.getAttributes().get(ONCOMPLETE_ATTR_NAME);
+ }
+
+
+ /**
* Calculate, must be component render only given areas, or all sended from
* server.
*
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-22 19:47:53 UTC (rev 2413)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-22 19:59:04 UTC (rev 2414)
@@ -672,6 +672,13 @@
}
} else {
if(req.getParserStatus() == Sarissa.PARSED_OK){
+
+ // perform beforeupdate if exists
+ if(options.beforeupdate){
+ LOG.debug( "Call request beforeupdate function before replacing elemements" );
+ options.beforeupdate(req, req.domEvt, req.getJSON('_ajax:data'));
+ }
+
var idsFromResponse = req.getResponseHeader("Ajax-Update-Ids");
// 3 strategy for replace :
// if setted affected parameters - replace its
18 years, 8 months
JBoss Rich Faces SVN: r2413 - in trunk/test-applications/jsp/src/main: java/div and 31 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-08-22 15:47:53 -0400 (Wed, 22 Aug 2007)
New Revision: 2413
Added:
trunk/test-applications/jsp/src/main/java/div/
trunk/test-applications/jsp/src/main/java/div/DivBean.java
trunk/test-applications/jsp/src/main/webapp/Div/
trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml
Modified:
trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp
trunk/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp
trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp
trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp
trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp
trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp
trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp
trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp
trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp
trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp
trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp
trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp
trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp
trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp
trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp
trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp
trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp
trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp
trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp
trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp
trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp
trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp
trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp
trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp
trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp
trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/jsp/src/main/webapp/pages/main.jsp
Log:
add <div/> test
Added: trunk/test-applications/jsp/src/main/java/div/DivBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/div/DivBean.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/div/DivBean.java 2007-08-22 19:47:53 UTC (rev 2413)
@@ -0,0 +1,35 @@
+package div;
+
+public class DivBean {
+ private String src;
+ private String [] left = {"500px", "-480px"};
+ private String [] top = {"300px", "-280px"};
+
+ public DivBean() {
+ src = "/Calendar/Calendar.xhtml";
+ }
+
+ public String getSrc() {
+ return src;
+ }
+
+ public void setSrc(String src) {
+ this.src = src;
+ }
+
+ public String[] getLeft() {
+ return left;
+ }
+
+ public void setLeft(String[] left) {
+ this.left = left;
+ }
+
+ public String[] getTop() {
+ return top;
+ }
+
+ public void setTop(String[] top) {
+ this.top = top;
+ }
+}
Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -21,8 +21,7 @@
}
</style>
</head>
-<body>
-<f:view>
+<f:subview id="Calendar">
<a4j:outputPanel ajaxRendered="true">
<h:messages />
</a4j:outputPanel>
@@ -117,6 +116,5 @@
<h:form>
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
-</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -53,7 +53,7 @@
</style>
</head>
-<body>
+<f:subview id="dfsID">
<f:view>
<a4j:form id="form1" reRender="list-body" ajaxSubmit="true"
@@ -141,6 +141,6 @@
</a4j:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -6,7 +6,7 @@
<head>
<title></title>
</head>
-<body>
+<f:subview id="dataScrollerID">
<f:view>
<h:form dir="DSform">
@@ -28,5 +28,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -6,7 +6,7 @@
<head>
<title></title>
</head>
-<body>
+<f:subview id="dtID">
<f:view>
<h:form>
<rich:dataTable value="#{dataScroller.dataTable}" var="dG" id="dGid">
@@ -70,5 +70,5 @@
` <h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Added: trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -0,0 +1,82 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+<f:view>
+ <html>
+ <head>
+ <title></title>
+ </head>
+
+ <body>
+ <h:form id="divTestID">
+ <div id="div_1_ID" style="position: relative; left:#{divBean.left[0]}; top:#{divBean.top[0]}">
+ <div id="div_2_ID" style="position: absolute; left:#{divBean.left[1]}; top:#{divBean.top[1]}">
+ <jsp:include page="${divBean.src}" />
+ </div>
+ </div>
+ </h:form>
+ <h:form id="forvDivOpthID">
+ <div id="divOpthID" style="position:relative" align="right">
+ <h:panelGrid columns="2">
+ <h:outputText value="Select component:" />
+ <h:selectOneMenu value="#{divBean.src}">
+ <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" />
+ <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" />
+ <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" />
+ <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" />
+ <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" />
+ <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" />
+ <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" />
+ <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" />
+ <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" />
+ <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" />
+ <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" />
+ <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" />
+ <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" />
+ <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" />
+ <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" />
+ <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" />
+ <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" />
+ <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" />
+ <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" />
+ <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" />
+ <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" />
+ <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" />
+ <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" />
+ <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" />
+ <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" />
+ <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" />
+ <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" />
+ </h:selectOneMenu>
+
+ <h:commandLink value="Submit" action="submit();"></h:commandLink>
+ <f:verbatim></f:verbatim>
+
+ <h:outputText value="div 1 left:" />
+ <h:inputText value="#{divBean.left[0]}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="div 1 top:" />
+ <h:inputText value="#{divBean.top[0]}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="div 2 left:" />
+ <h:inputText value="#{divBean.left[1]}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+
+
+ <h:outputText value="div 2 top:" />
+ <h:inputText value="#{divBean.top[1]}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+ </h:panelGrid>
+ <h:commandLink value="Back" action="main"></h:commandLink>
+ </div>
+ </h:form>
+ </body>
+ </html>
+</f:view>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -21,7 +21,7 @@
}
</style>
</head>
-<body>
+<f:subview id="dndID">
<f:view>
<h:form id="form">
<h:panelGroup id="dragValueText">
@@ -186,5 +186,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -6,7 +6,7 @@
<head>
<title></title>
</head>
-<body>
+<f:subview id="ddMenuID">
<f:view>
<h:form>
<h:panelGrid columns="3">
@@ -142,5 +142,5 @@
</h:panelGrid>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -8,7 +8,9 @@
<head>
<title></title>
</head>
+
<body onload="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()">
+ <f:subview id="effectID">
<h:messages />
<h:form id="indexID">
<h:outputText value="Menu:" />
@@ -287,6 +289,7 @@
<h:form id="backFrmID">
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
+ </f:subview>
</body>
</html>
</f:view>
Modified: trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -7,7 +7,7 @@
<head>
<title></title>
</head>
- <body>
+ <f:subview id="gmapID">
<h:form>
<rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map"
gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA"
@@ -112,6 +112,6 @@
<h:form>
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
- </body>
+ </f:subview>
</html>
</f:view>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -7,7 +7,7 @@
<link rel="stylesheet"
href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
</head>
-<body>
+<f:subview id="inputNumgerSliderID">
<f:view>
<h:messages></h:messages>
<h:form>
@@ -115,5 +115,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -7,7 +7,7 @@
<title></title>
<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
</head>
- <body>
+ <f:subview id="inputNumgerSpinnerID">
<f:view>
<h:form>
<h:messages></h:messages>
@@ -80,5 +80,5 @@
</h:panelGrid> <h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
- </body>
+ </f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Insert/Insert.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -8,7 +8,7 @@
<title></title>
</head>
- <body>
+ <f:subview id="insertID">
<h:form>
<h:messages />
@@ -51,6 +51,6 @@
</h:panelGrid>
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
- </body>
+ </f:subview>
</html>
</f:view>
\ No newline at end of file
Modified: trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Message/Message.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -8,7 +8,7 @@
<link rel="stylesheet" type="text/css" href="/styles/app.css" />
<title></title>
</head>
- <body>
+ <f:subview id="messageID">
<h:form>
<rich:panel>
<h:panelGrid columns="2">
@@ -169,7 +169,7 @@
<h:form>
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
- </body>
+ </f:subview>
</html>
</f:view>
Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -8,7 +8,7 @@
<link rel="stylesheet"
href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
</head>
-<body>
+<f:subview id="modalPanel">
<f:view>
<h:form id="MPform">
@@ -76,5 +76,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -7,7 +7,7 @@
<title></title>
<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
</head>
-<body>
+<f:subview id="paint2D">
<f:view>
<h:form>
<rich:paint2D id="paint2d" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}" align="#{paint2D.align}"
@@ -89,5 +89,5 @@
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -6,7 +6,7 @@
<head>
<title></title>
</head>
- <body>
+ <f:subview id="panelID">
<f:view>
<h:form>
<h:messages></h:messages>
@@ -64,5 +64,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
- </body>
+ </f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -50,7 +50,7 @@
</style>
</head>
-<body>
+<f:subview id="Panel2ID">
<f:view>
<h:panelGrid columnClasses="panel" border="0" columns="3">
@@ -150,5 +150,5 @@
<h:commandLink value="Back to Panel" action="BackP"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -7,7 +7,7 @@
<title></title>
<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
</head>
-<body>
+<f:subview id="panelBarID">
<f:view>
<h:messages></h:messages>
<h:form>
@@ -67,5 +67,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -18,7 +18,7 @@
}
</style>
</head>
-<body>
+<f:subview id="panelMenuID">
<f:view>
<h:form>
<rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild"
@@ -463,5 +463,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -7,7 +7,7 @@
<title></title>
<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
</head>
-<body>
+<f:subview id="separatorID">
<f:view>
<h:form>
<h:messages></h:messages>
@@ -69,5 +69,5 @@
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -18,7 +18,7 @@
</style>
<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
</head>
-<body>
+<f:subview id="simpleTogglePanelID">
<f:view>
<h:messages></h:messages>
<h:form>
@@ -101,5 +101,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -16,7 +16,7 @@
}
</style>
</head>
-<body>
+<f:subview id="spacerID">
<f:view>
<h:messages></h:messages>
@@ -59,5 +59,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -3,7 +3,7 @@
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<html>
-<body>
+<f:subview id="suggestionBoxID">
<f:view>
<h:form id="suggestionbox_form">
@@ -127,5 +127,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -10,7 +10,7 @@
</style>
<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
</head>
-<body>
+<f:subview id="tabPanelID">
<f:view>
<h:form>
<rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" height="#{tabPanel.height}"
@@ -110,5 +110,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -6,7 +6,7 @@
<head>
<title></title>
</head>
-<body>
+<f:subview id="togglePanel">
<f:view>
<h:messages></h:messages>
<h:form id="tooggleTest">
@@ -173,5 +173,5 @@
<ui:debug hotkey="L"></ui:debug>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -7,7 +7,7 @@
<title></title>
<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" />
</head>
-<body>
+<f:subview id="toolBarID">
<f:view>
<h:form>
<rich:toolBar id="toolBarId" width="#{toolBar.width}"
@@ -62,5 +62,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -7,7 +7,7 @@
<head>
<title></title>
</head>
- <body>
+ <f:subview id="tooltipID">
<h:form>
<h:messages />
@@ -145,6 +145,6 @@
<h:form>
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
- </body>
+ </f:subview>
</html>
</f:view>
Modified: trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -6,7 +6,7 @@
<head>
<title></title>
</head>
-<body>
+<f:subview id="treeID">
<f:view>
<h:form>
<rich:tree id="tree" switchType="#{bean.switchType}"
@@ -119,5 +119,5 @@
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
</f:view>
-</body>
+</f:subview>
</html>
Modified: trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -7,7 +7,7 @@
<head>
<title></title>
</head>
- <body>
+ <f:subview id="virtualEarth">
<h:form>
<h:panelGrid columns="2">
<rich:virtualEarth style="width:800px;" id="gm" lat="37.97"
@@ -80,6 +80,6 @@
<h:form>
<h:commandLink value="Back" action="main"></h:commandLink>
</h:form>
- </body>
+ </f:subview>
</html>
</f:view>
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-08-22 19:47:53 UTC (rev 2413)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>divBean</managed-bean-name>
+ <managed-bean-class>div.DivBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-08-22 19:47:53 UTC (rev 2413)
@@ -112,6 +112,10 @@
<from-outcome>Insert</from-outcome>
<to-view-id>/Insert/Insert.jsp</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>TestDiv</from-outcome>
+ <to-view-id>/Div/Div.jsp</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>*</from-view-id>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-08-22 19:47:53 UTC (rev 2413)
@@ -12,7 +12,7 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Message!
.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml</param-value>
+ <param-value>/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Message!
.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-Div.xml</param-value>
</context-param>
<filter>
<display-name>Ajax4jsf Filter</display-name>
Modified: trunk/test-applications/jsp/src/main/webapp/pages/main.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-08-22 19:41:52 UTC (rev 2412)
+++ trunk/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-08-22 19:47:53 UTC (rev 2413)
@@ -46,6 +46,7 @@
<h:commandLink value="Message" action="Message"></h:commandLink>
<h:commandLink value="Effect" action="Effect"></h:commandLink>
<h:commandLink value="Insert" action="Insert"></h:commandLink>
+ <h:commandLink value="Test Div" action="TestDiv"></h:commandLink>
</h:panelGrid>
</rich:panel>
</h:form>
18 years, 8 months
JBoss Rich Faces SVN: r2412 - trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-22 15:41:52 -0400 (Wed, 22 Aug 2007)
New Revision: 2412
Modified:
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java
Log:
<[[CDATA ]]> removed
Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-08-22 18:59:06 UTC (rev 2411)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-08-22 19:41:52 UTC (rev 2412)
@@ -126,9 +126,6 @@
throws IOException {
ResponseWriter responseWriter = context.getResponseWriter();
- //surround by CDATAs
- responseWriter.write("/*<![CDATA[*/");
-
for (Iterator iterator = MARKERS_PREDEFINED.iterator(); iterator.hasNext();) {
String markerName = (String) iterator.next();
@@ -151,9 +148,6 @@
responseWriter.write(" DefaultDragIndicatorView;");
}
}
-
- //surround by CDATAs
- responseWriter.write("/*]]>*/");
}
public void encodeNamespace(FacesContext context, UIDragIndicator component) throws IOException {
18 years, 8 months
JBoss Rich Faces SVN: r2411 - trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-22 14:59:06 -0400 (Wed, 22 Aug 2007)
New Revision: 2411
Modified:
trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java
Log:
http://jira.jboss.com/jira/browse/RF-665 sample for TabStripeImage
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java 2007-08-22 18:54:21 UTC (rev 2410)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/images/TabStripeImage.java 2007-08-22 18:59:06 UTC (rev 2411)
@@ -63,9 +63,13 @@
String color = (String) skin.getParameter(context, colorParameterName);
if (color == null || color.length() == 0) {
Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
- return new Integer(HtmlColor.decode(
- (String) defaultSkin.getParameter(context, colorParameterName)).getRGB());
+ color = (String) defaultSkin.getParameter(context, colorParameterName);
}
+
+ if (color == null) {
+ return null;
+ }
+
byte[] ret = new byte[3];
Zipper.zip(ret,HtmlColor.decode(color).getRGB(),0);
return ret;
@@ -79,6 +83,13 @@
return new Dimension(width, height);
}
+ protected Object deserializeData(byte[] objectArray) {
+ if (objectArray == null) {
+ return null;
+ }
+ return new Integer(Zipper.unzip(objectArray, 0));
+ }
+
protected void paint(ResourceContext context, Graphics2D graphics2D) {
super.paint(context, graphics2D);
@@ -89,12 +100,13 @@
graphics2D.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING,
RenderingHints.VALUE_COLOR_RENDER_QUALITY);
- Integer tabData = new Integer(Zipper.unzip((byte[])restoreData(context),0));
+ Integer tabData = (Integer) restoreData(context);
+ if (tabData != null) {
+ Dimension dimension = getDimensions(context);
+ Rectangle2D region = new Rectangle2D.Double(0, 1, dimension.getWidth(), dimension.getHeight() - 1);
- Dimension dimension = getDimensions(context);
- Rectangle2D region = new Rectangle2D.Double(0, 1, dimension.getWidth(), dimension.getHeight() - 1);
-
- graphics2D.setColor(new Color(tabData.intValue()));
- graphics2D.fill(region);
+ graphics2D.setColor(new Color(tabData.intValue()));
+ graphics2D.fill(region);
+ }
}
}
18 years, 8 months
JBoss Rich Faces SVN: r2410 - in trunk/test-applications/facelets/src/main: java/div and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-08-22 14:54:21 -0400 (Wed, 22 Aug 2007)
New Revision: 2410
Added:
trunk/test-applications/facelets/src/main/java/div/
trunk/test-applications/facelets/src/main/java/div/DivBean.java
trunk/test-applications/facelets/src/main/webapp/Div/
trunk/test-applications/facelets/src/main/webapp/Div/Div.xhtml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml
Modified:
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml
Log:
add <div/> test
Added: trunk/test-applications/facelets/src/main/java/div/DivBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/div/DivBean.java (rev 0)
+++ trunk/test-applications/facelets/src/main/java/div/DivBean.java 2007-08-22 18:54:21 UTC (rev 2410)
@@ -0,0 +1,35 @@
+package div;
+
+public class DivBean {
+ private String src;
+ private String [] left = {"500px", "-480px"};
+ private String [] top = {"300px", "-280px"};
+
+ public DivBean() {
+ src = "/Calendar/Calendar.xhtml";
+ }
+
+ public String getSrc() {
+ return src;
+ }
+
+ public void setSrc(String src) {
+ this.src = src;
+ }
+
+ public String[] getLeft() {
+ return left;
+ }
+
+ public void setLeft(String[] left) {
+ this.left = left;
+ }
+
+ public String[] getTop() {
+ return top;
+ }
+
+ public void setTop(String[] top) {
+ this.top = top;
+ }
+}
Added: trunk/test-applications/facelets/src/main/webapp/Div/Div.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Div/Div.xhtml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/Div/Div.xhtml 2007-08-22 18:54:21 UTC (rev 2410)
@@ -0,0 +1,83 @@
+<!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:a4j="http://richfaces.org/a4j"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+<f:view>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <h:form id="divTestID">
+ <div id="div_1_ID" style="position: relative; left:#{divBean.left[0]}; top:#{divBean.top[0]}">
+ <div id="div_2_ID" style="position: absolute; left:#{divBean.left[1]}; top:#{divBean.top[1]}">
+ <ui:include src="#{divBean.src}" />
+ </div>
+ </div>
+ </h:form>
+ <h:form id="forvDivOpthID">
+ <div id="divOpthID" style="position:relative" align="right">
+ <h:panelGrid columns="2">
+ <h:outputText value="Select component:" />
+ <h:selectOneMenu value="#{divBean.src}">
+ <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" />
+ <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" />
+ <f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" />
+ <f:selectItem itemValue="/DradAndDrop/DragAndDrop.xhtml" itemLabel="Drag And Drop" />
+ <f:selectItem itemValue="/DropDownMenu/DDMenu.xhtml" itemLabel="Drop Down Menu" />
+ <f:selectItem itemValue="/Effect/Effect.xhtml" itemLabel="Effect" />
+ <f:selectItem itemValue="/Gmap/Gmap.xhtml" itemLabel="Gmap" />
+ <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.xhtml" itemLabel="Input Number Slider" />
+ <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.xhtml" itemLabel="Input Number Spinner" />
+ <f:selectItem itemValue="/Insert/Insert.xhtml" itemLabel="Insert" />
+ <f:selectItem itemValue="/Message/Message.xhtml" itemLabel="Message" />
+ <f:selectItem itemValue="/ModalPanel/ModalPanel.xhtml" itemLabel="Modal Panel" />
+ <f:selectItem itemValue="/Paint2D/Paint2D.xhtml" itemLabel="Paint2D" />
+ <f:selectItem itemValue="/Panel/Panel.xhtml" itemLabel="Panel" />
+ <f:selectItem itemValue="/Panel/panel2.xhtml" itemLabel="Panel2" />
+ <f:selectItem itemValue="/PanelBar/PanelBar.xhtml" itemLabel="Panel Bar" />
+ <f:selectItem itemValue="/PanelMenu/PanelMenu.xhtml" itemLabel="Panel Menu" />
+ <f:selectItem itemValue="/Separator/Separator.xhtml" itemLabel="Separator" />
+ <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.xhtml" itemLabel="Simple Toggle Panel" />
+ <f:selectItem itemValue="/Spacer/Spacer.xhtml" itemLabel="Spacer" />
+ <f:selectItem itemValue="/SuggestionBox/SuggestionBox.xhtml" itemLabel="Suggestion Box" />
+ <f:selectItem itemValue="/TabPanel/TabPanel.xhtml" itemLabel="Tab Panel" />
+ <f:selectItem itemValue="/TogglePanel/TogglePanel.xhtml" itemLabel="Toggle Panel" />
+ <f:selectItem itemValue="/ToolBar/ToolBar.xhtml" itemLabel="Tool Bar" />
+ <f:selectItem itemValue="/Tooltip/Tooltip.xhtml" itemLabel="Tooltip" />
+ <f:selectItem itemValue="/Tree/Tree.xhtml" itemLabel="Tree" />
+ <f:selectItem itemValue="/VirtualEarth/VirtualEarth.xhtml" itemLabel="Virtual Earth" />
+ </h:selectOneMenu>
+
+ <h:commandLink value="Submit" action="submit();"></h:commandLink>
+ <f:verbatim></f:verbatim>
+
+ <h:outputText value="div 1 left:" />
+ <h:inputText value="#{divBean.left[0]}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="div 1 top:" />
+ <h:inputText value="#{divBean.top[0]}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+
+ <h:outputText value="div 2 left:" />
+ <h:inputText value="#{divBean.left[1]}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+
+
+ <h:outputText value="div 2 top:" />
+ <h:inputText value="#{divBean.top[1]}" >
+ <a4j:support event="onchange" action="submit();"></a4j:support>
+ </h:inputText>
+ </h:panelGrid>
+ <h:commandLink value="Back" action="main"></h:commandLink>
+ </div>
+ </h:form>
+ </body>
+</f:view>
+</html>
\ No newline at end of file
Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-08-22 18:54:21 UTC (rev 2410)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>divBean</managed-bean-name>
+ <managed-bean-class>div.DivBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-08-22 18:18:01 UTC (rev 2409)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-08-22 18:54:21 UTC (rev 2410)
@@ -108,6 +108,10 @@
<from-outcome>Insert</from-outcome>
<to-view-id>/Insert/Insert.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>TestDiv</from-outcome>
+ <to-view-id>/Div/Div.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/Panel/Panel.xhtml</from-view-id>
Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-08-22 18:18:01 UTC (rev 2409)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-08-22 18:54:21 UTC (rev 2410)
@@ -33,7 +33,7 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DradAbdDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml</param-va!
lue>
+ <param-value>/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DradAbdDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/!
faces-config-Div.xml</param-value>
</context-param>
<filter>
<display-name>Ajax4jsf Filter</display-name>
Modified: trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-08-22 18:18:01 UTC (rev 2409)
+++ trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-08-22 18:54:21 UTC (rev 2410)
@@ -45,6 +45,7 @@
<h:commandLink value="Message" action="Message"></h:commandLink>
<h:commandLink value="Effect" action="Effect"></h:commandLink>
<h:commandLink value="Insert" action="Insert"></h:commandLink>
+ <h:commandLink value="Test Div" action="TestDiv"></h:commandLink>
</h:panelGrid>
</rich:panel>
</h:form>
18 years, 8 months
JBoss Rich Faces SVN: r2409 - trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-22 14:18:01 -0400 (Wed, 22 Aug 2007)
New Revision: 2409
Modified:
trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java
trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java
Log:
TabPanel:
- illegal symbol fixed
- illegal "null;" CSS declaration
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2007-08-22 17:22:37 UTC (rev 2408)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabHeaderRendererBase.java 2007-08-22 18:18:01 UTC (rev 2409)
@@ -67,7 +67,8 @@
//String style = "position:relative; top:1px;" + (String) tab.getAttributes().get("style");
String defShift = tab.isActive() ? "position:relative; top:1px;" : "position:relative;";
- String style = defShift + (String) tab.getAttributes().get("style");
+ String componentStyle = (String) tab.getAttributes().get("style");
+ String style = defShift + (componentStyle != null ? componentStyle : "");
if (!disabled) {
if (clientSide) {
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java 2007-08-22 17:22:37 UTC (rev 2408)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabRendererBase.java 2007-08-22 18:18:01 UTC (rev 2409)
@@ -113,7 +113,7 @@
renderChildren(context, component);
} else {
ResponseWriter out = context.getResponseWriter();
- out.write('\u0160');
+ out.writeText(" ", null);
}
}
}
18 years, 8 months
JBoss Rich Faces SVN: r2408 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-22 13:22:37 -0400 (Wed, 22 Aug 2007)
New Revision: 2408
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/imagecache.js
Log:
Richfaces global var declaration fixed
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/imagecache.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/imagecache.js 2007-08-22 17:20:24 UTC (rev 2407)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/imagecache.js 2007-08-22 17:22:37 UTC (rev 2408)
@@ -1,4 +1,4 @@
-if (!window.Richfaces) var RichFaces = {};
+if (!window.Richfaces) window.RichFaces = {};
Richfaces.setImages =
function (element, images) {
18 years, 8 months