JBoss Rich Faces SVN: r3224 - in trunk/ui/calendar/src/main: java/org/richfaces/component and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-10-03 09:05:34 -0400 (Wed, 03 Oct 2007)
New Revision: 3224
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
RF-933
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-10-03 12:24:54 UTC (rev 3223)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-10-03 13:05:34 UTC (rev 3224)
@@ -86,9 +86,9 @@
</description>
<defaultvalue>getDefaultTimeZone()</defaultvalue>
</property>
- <property elonly="true">
+ <property>
<name>preloadDateRangeBegin</name>
- <classname>java.util.Date</classname>
+ <classname>java.lang.Object</classname>
<description>
Define the initial range of date which will be loaded to
client from dataModel under rendering
@@ -97,9 +97,9 @@
getDefaultPreloadBegin(getCurrentDateOrDefault())
</defaultvalue>
</property>
- <property elonly="true">
+ <property>
<name>preloadDateRangeEnd</name>
- <classname>java.util.Date</classname>
+ <classname>java.lang.Object</classname>
<description>
Defines the last range of date which will be loaded to
client from dataModel under rendering
@@ -108,9 +108,9 @@
getDefaultPreloadEnd(getCurrentDateOrDefault())
</defaultvalue>
</property>
- <property elonly="true">
+ <property >
<name>currentDate</name>
- <classname>java.util.Date</classname>
+ <classname>java.lang.Object</classname>
<description>Defines current date</description>
</property>
<property>
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-10-03 12:24:54 UTC (rev 3223)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-10-03 13:05:34 UTC (rev 3224)
@@ -79,17 +79,17 @@
public abstract void setTimeZone(TimeZone timeZone);
- public abstract Date getPreloadDateRangeBegin();
+ public abstract Object getPreloadDateRangeBegin();
- public abstract void setPreloadDateRangeBegin(Date date);
+ public abstract void setPreloadDateRangeBegin(Object date);
- public abstract Date getPreloadDateRangeEnd();
+ public abstract Object getPreloadDateRangeEnd();
- public abstract void setPreloadDateRangeEnd(Date date);
+ public abstract void setPreloadDateRangeEnd(Object date);
- public abstract Date getCurrentDate();
+ public abstract Object getCurrentDate();
- public abstract void setCurrentDate(Date date);
+ public abstract void setCurrentDate(Object date);
public abstract CalendarDataModel getDataModel();
@@ -222,7 +222,7 @@
public Date getCurrentDateOrDefault() {
- Date date = getCurrentDate();
+ Date date = getAsDate(getCurrentDate());
if (date != null) {
return date;
@@ -405,7 +405,7 @@
} else {
Date currentDate1 = dateChangeEvent.getCurrentDate();
- Date currentDate2 = getCurrentDate();
+ Date currentDate2 = getAsDate(getCurrentDate());
if (!currentDate1.equals(currentDate2)) {
updateCurrentDate(facesContext, currentDate1);
ValueChangeEvent changeEvent = new ValueChangeEvent(
@@ -443,8 +443,8 @@
}
public Date[] getPreloadDateRange() {
- Date dateRangeBegin = this.getPreloadDateRangeBegin();
- Date dateRangeEnd = this.getPreloadDateRangeEnd();
+ Date dateRangeBegin = getAsDate(this.getPreloadDateRangeBegin());
+ Date dateRangeEnd = getAsDate(this.getPreloadDateRangeEnd());
if (dateRangeBegin == null && dateRangeEnd == null) {
return null;
Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-10-03 12:24:54 UTC (rev 3223)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-10-03 13:05:34 UTC (rev 3224)
@@ -232,31 +232,19 @@
UICalendar input = (UICalendar) component;
// XXX nick - nick - can contain either Date or String instance
- Object value = input.getSubmittedValue();
- Object curVal = input.getValue();
- if (value == null) {
+ Date value = input.getAsDate(input.getSubmittedValue());
+ Date curVal = input.getAsDate(input.getValue());
+
DateTimeConverter converter = new DateTimeConverter();
converter.setPattern(input.getDatePattern());
converter.setLocale(input.getLocale());
converter.setTimeZone(input.getTimeZone());
+ if (value == null) {
return converter.getAsString(context, input, curVal);
+ }else{
+ return converter.getAsString(context, input, value);
}
- if (value instanceof Date) {
-
- DateTimeConverter converter = new DateTimeConverter();
- converter.setPattern(input.getDatePattern());
- converter.setLocale(input.getLocale());
- return converter.getAsString(context, input, value);
- }
- if (value instanceof String) {
-
- Converter converter = SelectUtils.getConverterForProperty(context,
- input, "value");
- return converter.getAsString(context, input, value);
-
- }
- return null;
}
public void writeSymbols(FacesContext facesContext, UICalendar calendar)
@@ -358,18 +346,13 @@
public String getSelectedDate(FacesContext context, UICalendar calendar)
throws IOException {
- Object submittedValue = calendar.getSubmittedValue();
+ Date submittedValue = calendar.getAsDate(calendar.getSubmittedValue());
Date date;
- if (submittedValue instanceof String) {
- Converter converter = SelectUtils.getConverterForProperty(context,
- calendar, "value");
- date = (Date) converter.getAsObject(context, calendar,
- (String) submittedValue);
- } else if (submittedValue != null) {
- date = (Date) submittedValue;
+ if (submittedValue != null) {
+ date = submittedValue;
} else {
- date = (Date) calendar.getValue();
+ date = calendar.getAsDate(calendar.getValue());
}
if (date != null) {
16 years, 9 months
JBoss Rich Faces SVN: r3223 - in branches/3.1.x/ui/scrollableDataTable/src/main/config: resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-10-03 08:24:54 -0400 (Wed, 03 Oct 2007)
New Revision: 3223
Added:
branches/3.1.x/ui/scrollableDataTable/src/main/config/resources/
branches/3.1.x/ui/scrollableDataTable/src/main/config/resources/resources-config.xml
Log:
http://jira.jboss.com/jira/browse/RF-1055
Added: branches/3.1.x/ui/scrollableDataTable/src/main/config/resources/resources-config.xml
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/config/resources/resources-config.xml (rev 0)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/config/resources/resources-config.xml 2007-10-03 12:24:54 UTC (rev 3223)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+ <resource class="org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSortAsc">
+ <name>org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSortAsc</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSortDesc">
+ <name>org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSortDesc</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSplit">
+ <name>org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSplit</name>
+ </resource>
+</resource-config>
16 years, 9 months
JBoss Rich Faces SVN: r3222 - trunk/test-applications/jsp/src/main/webapp/pages/RichMenu.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-10-03 07:53:55 -0400 (Wed, 03 Oct 2007)
New Revision: 3222
Modified:
trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
Log:
fix path DragAndDrop
Modified: trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-10-03 11:32:18 UTC (rev 3221)
+++ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-10-03 11:53:55 UTC (rev 3222)
@@ -16,7 +16,7 @@
<f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" />
<f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" />
<f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" />
- <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" />
+ <f:selectItem itemValue="/DragAndDrop/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" />
16 years, 9 months
JBoss Rich Faces SVN: r3221 - branches/3.1.x/test-applications.
by richfaces-svn-commits＠lists.jboss.org
Author: viktor_volkov
Date: 2007-10-03 07:32:18 -0400 (Wed, 03 Oct 2007)
New Revision: 3221
Modified:
branches/3.1.x/test-applications/pom.xml
Log:
Modified: branches/3.1.x/test-applications/pom.xml
===================================================================
--- branches/3.1.x/test-applications/pom.xml 2007-10-03 11:19:48 UTC (rev 3220)
+++ branches/3.1.x/test-applications/pom.xml 2007-10-03 11:32:18 UTC (rev 3221)
@@ -7,7 +7,7 @@
</parent>
<repositories>
- <repository>
+ <!--repository>
<releases>
<enabled>true</enabled>
</releases>
@@ -21,7 +21,7 @@
<name>Exadel Repository for Maven Snapshots</name>
<url>http://maven.exadel.com/</url>
<layout>default</layout>
- </repository>
+ </repository-->
<repository>
<releases>
<enabled>true</enabled>
16 years, 9 months
JBoss Rich Faces SVN: r3220 - trunk/samples/tabPanelDemo/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-10-03 07:19:48 -0400 (Wed, 03 Oct 2007)
New Revision: 3220
Added:
trunk/samples/tabPanelDemo/src/main/webapp/pages/test.jsp
trunk/samples/tabPanelDemo/src/main/webapp/pages/test2.jsp
Log:
Added: trunk/samples/tabPanelDemo/src/main/webapp/pages/test.jsp
===================================================================
--- trunk/samples/tabPanelDemo/src/main/webapp/pages/test.jsp (rev 0)
+++ trunk/samples/tabPanelDemo/src/main/webapp/pages/test.jsp 2007-10-03 11:19:48 UTC (rev 3220)
@@ -0,0 +1,29 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+
+<%@ 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://labs.jboss.com/jbossrichfaces/ui/tabPanel" prefix="rich" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/message" prefix="msg" %>
+
+<html>
+ <head>
+ <title>RF-843</title>
+ </head>
+ <body>
+ <f:view>
+ <h:form>
+ <rich:tabPanel switchType="ajax" immediate="false">
+ <rich:tab label="test 1" immediate="false">
+ <h:inputText value="value 1" ></h:inputText>
+ </rich:tab>
+ <rich:tab label="Sample 2" immediate="true">
+ <h:inputText required="true"></h:inputText>
+ </rich:tab>
+ </rich:tabPanel>
+ <msg:messages/>
+ </h:form>
+ <a4j:log popup="false"></a4j:log>
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
Added: trunk/samples/tabPanelDemo/src/main/webapp/pages/test2.jsp
===================================================================
--- trunk/samples/tabPanelDemo/src/main/webapp/pages/test2.jsp (rev 0)
+++ trunk/samples/tabPanelDemo/src/main/webapp/pages/test2.jsp 2007-10-03 11:19:48 UTC (rev 3220)
@@ -0,0 +1,50 @@
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tabPanel" prefix="rich" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/message" prefix="msg" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/panel" prefix="panel" %>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+
+<html>
+<head>
+ <title>repeater</title>
+</head>
+
+<body>
+ <f:view>
+
+ <h:form id="form">
+
+ <panel:panel header="Errors">
+ <msg:messages/>
+ </panel:panel>
+
+ <panel:panel header="Simple Echo">
+ <h:inputText id="in0" size="50" value="#{bean.value1}">
+ <a4j:support event="onkeyup" reRender="rep"/>
+ </h:inputText>
+
+ <h:outputText value="#{bean.value1}" id="rep"/>
+ </panel:panel>
+
+ <panel:panel header="Simple Echoless">
+ <h:inputText id="in1" size="50" value="#{bean.value2}" required="true"/><br/>
+ <msg:message for="in1"/><br/>
+
+ <h:outputText value="#{bean.value2}" id="nonrep"/>
+ <h:commandButton value="Submit"/>
+ </panel:panel>
+
+ <rich:tabPanel id="tabPanel" selectedTab="t2" switchType="server" immediate="true">
+ <rich:tab id="t1" label="TabOne">
+ <h:outputText value="Content1"/>
+ </rich:tab>
+ <rich:tab id="t2" label="TabTwo">
+ <h:outputText value="Content2"/>
+ </rich:tab>
+ </rich:tabPanel>
+ </h:form>
+ </f:view>
+</body>
+</html>
\ No newline at end of file
16 years, 9 months
JBoss Rich Faces SVN: r3219 - trunk/samples/rich-message-demo/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-10-03 07:19:12 -0400 (Wed, 03 Oct 2007)
New Revision: 3219
Modified:
trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo-test.xhtml
Log:
Modified: trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo-test.xhtml
===================================================================
--- trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo-test.xhtml 2007-10-03 11:18:46 UTC (rev 3218)
+++ trunk/samples/rich-message-demo/src/main/webapp/pages/message-demo-test.xhtml 2007-10-03 11:19:12 UTC (rev 3219)
@@ -13,11 +13,12 @@
<h:panelGrid columns="3">
<h:outputText value="Name:" />
+ <a4j:region>
+ <h:inputText label="Name" id="name" required="true" value="#{userBean.name}">
+ <a4j:support event="onblur" ajaxSingle="true" />
+ </h:inputText>
+ </a4j:region>
- <h:inputText label="Name" id="name" required="true" value="#{userBean.name}">
- <a4j:support event="onblur" ajaxSingle="true" />
- </h:inputText>
-
<rich:message for="name">
<f:facet name="passedMarker">
<h:outputText value="V" />
@@ -29,9 +30,11 @@
<h:outputText value="Job:" />
- <h:inputText label="Job" id="job" required="true" value="#{userBean.job}">
- <a4j:support event="onblur" ajaxSingle="true"/>
- </h:inputText>
+ <a4j:region>
+ <h:inputText label="Job" id="job" required="true" value="#{userBean.job}">
+ <a4j:support event="onblur" ajaxSingle="true"/>
+ </h:inputText>
+ </a4j:region>
<rich:message for="job">
<f:facet name="passedMarker">
@@ -44,9 +47,11 @@
<h:outputText value="Address:" />
- <h:inputText label="Address" id="address" required="true" value="#{userBean.address}">
- <a4j:support event="onblur" ajaxSingle="true"/>
- </h:inputText>
+ <a4j:region>
+ <h:inputText label="Address" id="address" required="true" value="#{userBean.address}">
+ <a4j:support event="onblur" ajaxSingle="true"/>
+ </h:inputText>
+ </a4j:region>
<rich:message for="address">
<f:facet name="passedMarker">
16 years, 9 months
JBoss Rich Faces SVN: r3218 - trunk/samples/rich-message-demo/src/main/java/org/richfaces/demo.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-10-03 07:18:46 -0400 (Wed, 03 Oct 2007)
New Revision: 3218
Modified:
trunk/samples/rich-message-demo/src/main/java/org/richfaces/demo/UserBean.java
Log:
Modified: trunk/samples/rich-message-demo/src/main/java/org/richfaces/demo/UserBean.java
===================================================================
--- trunk/samples/rich-message-demo/src/main/java/org/richfaces/demo/UserBean.java 2007-10-03 11:08:34 UTC (rev 3217)
+++ trunk/samples/rich-message-demo/src/main/java/org/richfaces/demo/UserBean.java 2007-10-03 11:18:46 UTC (rev 3218)
@@ -15,6 +15,8 @@
private String job;
+ public UserBean(){
+ }
public String getAddress() {
return address;
16 years, 9 months
JBoss Rich Faces SVN: r3217 - trunk/test-applications/jsp/src/main/webapp/Effect.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-10-03 07:08:34 -0400 (Wed, 03 Oct 2007)
New Revision: 3217
Modified:
trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp
Log:
http://jira.jboss.com/jira/browse/RF-1034
Modified: trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-10-03 11:08:28 UTC (rev 3216)
+++ trunk/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-10-03 11:08:34 UTC (rev 3217)
@@ -49,7 +49,7 @@
<h:inputText value="#{effect.time}" />
<f:verbatim>
- <span onclick="hidePanel1(), hedeImage1()"><font color="blue">Hide Panel</font>
+ <span onclick="hidePanel1(), hideImage1()"><font color="blue">Hide Panel</font>
</span>
</f:verbatim>
<h:graphicImage value="/pics/fatal.gif"
16 years, 9 months
JBoss Rich Faces SVN: r3216 - trunk/test-applications/facelets/src/main/webapp/Effect.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-10-03 07:08:28 -0400 (Wed, 03 Oct 2007)
New Revision: 3216
Modified:
trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-1034
Modified: trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2007-10-03 11:02:34 UTC (rev 3215)
+++ trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2007-10-03 11:08:28 UTC (rev 3216)
@@ -52,7 +52,7 @@
<h:inputText value="#{effect.time}" />
<f:verbatim>
- <span onclick="hidePanel1(), hedeImage1()"><font color="blue">Hide Panel</font>
+ <span onclick="hidePanel1(), hideImage1()"><font color="blue">Hide Panel</font>
</span>
</f:verbatim>
<h:graphicImage value="/pics/fatal.gif"
16 years, 9 months
JBoss Rich Faces SVN: r3215 - in trunk/ui/scrollableDataTable/src/main/config: resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-10-03 07:02:34 -0400 (Wed, 03 Oct 2007)
New Revision: 3215
Added:
trunk/ui/scrollableDataTable/src/main/config/resources/
trunk/ui/scrollableDataTable/src/main/config/resources/resources-config.xml
Log:
http://jira.jboss.com/jira/browse/RF-1055
Added: trunk/ui/scrollableDataTable/src/main/config/resources/resources-config.xml
===================================================================
--- trunk/ui/scrollableDataTable/src/main/config/resources/resources-config.xml (rev 0)
+++ trunk/ui/scrollableDataTable/src/main/config/resources/resources-config.xml 2007-10-03 11:02:34 UTC (rev 3215)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource-config>
+ <resource class="org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSortAsc">
+ <name>org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSortAsc</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSortDesc">
+ <name>org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSortDesc</name>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSplit">
+ <name>org.richfaces.renderkit.html.iconimages.ScrollableDataTableIconSplit</name>
+ </resource>
+</resource-config>
16 years, 9 months