You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/02/11 14:24:01 UTC
cvs commit: incubator-myfaces/webapps/examples/web calendar.jsp
mmarinschek 2005/02/11 05:24:01
Modified: src/components/org/apache/myfaces/custom/calendar
HtmlCalendarRenderer.java
src/components/org/apache/myfaces/renderkit/html/ext
HtmlMessageRenderer.java
webapps/examples/src/org/apache/myfaces/examples/calendarexample
DateHolder.java
webapps/examples/web calendar.jsp
Log:
fix jira 60, showing fix in examples
Revision Changes Path
1.19 +7 -2 incubator-myfaces/src/components/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
Index: HtmlCalendarRenderer.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- HtmlCalendarRenderer.java 17 Jan 2005 10:08:44 -0000 1.18
+++ HtmlCalendarRenderer.java 11 Feb 2005 13:24:01 -0000 1.19
@@ -46,6 +46,9 @@
/**
* $Log$
+ * Revision 1.19 2005/02/11 13:24:01 mmarinschek
+ * fix jira 60, showing fix in examples
+ *
* Revision 1.18 2005/01/17 10:08:44 mmarinschek
* trying to fix problem with added resources to header; css and js was not changeable by the user anymore...
*
@@ -173,7 +176,9 @@
inputCalendar.getChildren().add(inputText);
RendererUtils.renderChild(facesContext, inputText);
-
+
+ inputCalendar.getChildren().remove(inputText);
+
ResponseWriter writer = facesContext.getResponseWriter();
writer.startElement(HTML.SCRIPT_ELEM,null);
1.10 +8 -7 incubator-myfaces/src/components/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java
Index: HtmlMessageRenderer.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/components/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- HtmlMessageRenderer.java 26 Jan 2005 17:48:22 -0000 1.9
+++ HtmlMessageRenderer.java 11 Feb 2005 13:24:01 -0000 1.10
@@ -15,18 +15,16 @@
*/
package org.apache.myfaces.renderkit.html.ext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.component.html.ext.HtmlMessage;
import org.apache.myfaces.component.html.ext.HtmlMessages;
import org.apache.myfaces.renderkit.RendererUtils;
import org.apache.myfaces.renderkit.html.HtmlMessageRendererBase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
import javax.faces.component.UIColumn;
-import javax.faces.component.UIInput;
+import javax.faces.component.UIComponent;
import javax.faces.component.ValueHolder;
import javax.faces.component.html.HtmlOutputLabel;
import javax.faces.component.html.HtmlOutputText;
@@ -35,13 +33,16 @@
import java.text.MessageFormat;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
* $Log$
+ * Revision 1.10 2005/02/11 13:24:01 mmarinschek
+ * fix jira 60, showing fix in examples
+ *
* Revision 1.9 2005/01/26 17:48:22 mmarinschek
* small changes
*
1.2 +25 -3 incubator-myfaces/webapps/examples/src/org/apache/myfaces/examples/calendarexample/DateHolder.java
Index: DateHolder.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/webapps/examples/src/org/apache/myfaces/examples/calendarexample/DateHolder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DateHolder.java 20 Oct 2004 07:46:39 -0000 1.1
+++ DateHolder.java 11 Feb 2005 13:24:01 -0000 1.2
@@ -16,15 +16,19 @@
package org.apache.myfaces.examples.calendarexample;
import java.util.Date;
+import java.util.List;
+import java.util.ArrayList;
+import java.io.Serializable;
/**
* DOCUMENT ME!
* @author Martin Marinschek (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class DateHolder
+public class DateHolder implements Serializable
{
private Date _date = new Date();
+ private transient List _dates;
public Date getDate()
{
@@ -35,4 +39,22 @@
{
_date = date;
}
+
+ public List getDates()
+ {
+ if(_dates == null)
+ {
+ _dates = new ArrayList();
+
+ for(int i=0; i<3; i++)
+ _dates.add(new DateHolder());
+ }
+
+ return _dates;
+ }
+
+ public void setDates(List dates)
+ {
+ _dates = dates;
+ }
}
1.17 +21 -0 incubator-myfaces/webapps/examples/web/calendar.jsp
Index: calendar.jsp
===================================================================
RCS file: /home/cvs/incubator-myfaces/webapps/examples/web/calendar.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- calendar.jsp 24 Nov 2004 09:53:47 -0000 1.16
+++ calendar.jsp 11 Feb 2005 13:24:01 -0000 1.17
@@ -85,6 +85,27 @@
</h:form>
<h:outputText value="#{calendar.date}" />
+
+ <h:form id="calendarForm3">
+
+ <x:dataTable id="data"
+ styleClass="standardTable"
+ headerClass="standardTable_Header"
+ rowClasses="standardTable_Row1,standardTable_Row2"
+ columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column"
+ var="dateHolder"
+ value="#{calendar.dates}"
+ preserveDataModel="true">
+ <h:column>
+ <x:inputCalendar monthYearRowClass="yearMonthHeader" weekRowClass="weekHeader"
+ currentDayCellClass="currentDayCell" value="#{dateHolder.date}" renderAsPopup="true"
+ popupTodayString="#{example_messages['popup_today_string']}" popupWeekString="#{example_messages['popup_week_string']}" />
+ </h:column>
+ </x:dataTable>
+
+ <h:commandButton value="#{example_messages['js_submit']}"/>
+
+ </h:form>
</h:panelGroup>
</f:facet>