[richfaces-svn-commits] JBoss Rich Faces SVN: r2561 - in trunk/ui/calendar/src: main/java/org/richfaces/component and 2 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Aug 29 07:41:29 EDT 2007
Author: akushunin
Date: 2007-08-29 07:41:29 -0400 (Wed, 29 Aug 2007)
New Revision: 2561
Added:
trunk/ui/calendar/src/main/config/component/listener.ent
Removed:
trunk/ui/calendar/src/main/java/org/richfaces/component/CurrentDateChangeEvent.java
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
trunk/ui/calendar/src/test/java/org/richfaces/component/CurrentDateEventTest.java
Log:
added CurrentDateChangeEvent
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2007-08-29 11:37:16 UTC (rev 2560)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2007-08-29 11:41:29 UTC (rev 2561)
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" >
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd"
+[
+<!ENTITY listeners SYSTEM "listener.ent">
+]
+>
<components>
<component>
<name>org.richfaces.Calendar</name>
@@ -37,7 +41,7 @@
org.ajax4jsf.tests.AbstractAjax4JsfTestCase
</superclassname>
</test>
- </tag>
+ </tag>
<!--
<taghandler>
<classname>org.ajax4jsf.tag.TestHandler</classname>
@@ -111,6 +115,11 @@
java.util.Calendar.getInstance(getTimeZone()).getTime()
</defaultvalue>
</property>
+ <!--property>
+ <name>currentDateChangeListener</name>
+ <classname>javax.faces.el.MethodBinding</classname>
+ <description>MethodBinding representing an action listener method that will be notified after date selection</description>
+ </property -->
<property>
<name>datePattern</name>
<classname>java.lang.String</classname>
@@ -413,4 +422,6 @@
</property>
</component>
+ &listeners;
</components>
+
Added: trunk/ui/calendar/src/main/config/component/listener.ent
===================================================================
--- trunk/ui/calendar/src/main/config/component/listener.ent (rev 0)
+++ trunk/ui/calendar/src/main/config/component/listener.ent 2007-08-29 11:41:29 UTC (rev 2561)
@@ -0,0 +1,17 @@
+<listener>
+ <name>currentDateChangeListener</name>
+ <listenerclass>
+ org.richfaces.event.CurrentDateChangeListener
+ </listenerclass>
+ <componentclass>
+ javax.faces.component.UIInput
+ </componentclass>
+ <eventclass>
+ org.richfaces.event.CurrentDateChangeEvent
+ </eventclass>
+ <taghandler generate="false">
+ <classname>
+ org.richfaces.taglib.CurrentDateChangeListenerTagHandler
+ </classname>
+ </taghandler>
+</listener>
\ No newline at end of file
Deleted: trunk/ui/calendar/src/main/java/org/richfaces/component/CurrentDateChangeEvent.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/CurrentDateChangeEvent.java 2007-08-29 11:37:16 UTC (rev 2560)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/CurrentDateChangeEvent.java 2007-08-29 11:41:29 UTC (rev 2561)
@@ -1,45 +0,0 @@
-package org.richfaces.component;
-
-import java.util.Date;
-
-import javax.faces.component.UIComponent;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
-
-public class CurrentDateChangeEvent extends FacesEvent {
-
- /**
- *
- */
- private static final long serialVersionUID = -8169207286087810907L;
- private Date currentDate = null;
- private String currentDateString = null;
-
- public CurrentDateChangeEvent(UIComponent component, Date curentDate) {
- super(component);
- this.currentDate = curentDate;
-
- }
- public CurrentDateChangeEvent(UIComponent component, String curentDateString) {
- super(component);
- this.currentDateString = curentDateString;
- }
-
- public boolean isAppropriateListener(FacesListener listener) {
- return false;
- }
-
- public void processListener(FacesListener listener) {
- // TODO Auto-generated method stub
- throw new UnsupportedOperationException();
- }
-
- public Date getCurrentDate() {
- return currentDate;
- }
-
- public String getCurrentDateString() {
- return currentDateString;
- }
-
-}
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-08-29 11:37:16 UTC (rev 2560)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-08-29 11:41:29 UTC (rev 2561)
@@ -46,10 +46,13 @@
import org.ajax4jsf.event.AjaxEvent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.richfaces.event.CurrentDateChangeEvent;
+import org.richfaces.event.CurrentDateChangeListener;
import org.richfaces.model.CalendarDataModel;
import org.richfaces.model.CalendarDataModelItem;
import org.richfaces.renderkit.CalendarDataModelItemAdaptor;
import org.richfaces.renderkit.CalendarRendererBase;
+//import org.richfaces.component.CurrentDateChangeListener;
// import org.richfaces.renderkit.html.BaseGradient.Data;
@@ -391,8 +394,19 @@
return (Date[]) dates.toArray(new Date[dates.size()]);
}
+
+ public void addCurrentDateChangeListener(CurrentDateChangeListener listener) {
+ addFacesListener(listener);
+ }
+ public CurrentDateChangeListener[] getCurrentDateChangeListener() {
+ return (CurrentDateChangeListener[]) getFacesListeners(CurrentDateChangeListener.class);
+ }
+ public void removeCurrentDateChangeListener(CurrentDateChangeListener listener) {
+ removeFacesListener(listener);
+ }
+
}
class AdaptingCollection extends AbstractCollection {
@@ -427,5 +441,7 @@
public int size() {
return this.items.length;
- }
+ }
+
+
}
Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-08-29 11:37:16 UTC (rev 2560)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-08-29 11:41:29 UTC (rev 2561)
@@ -46,7 +46,7 @@
import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.util.SelectUtils;
-import org.richfaces.component.CurrentDateChangeEvent;
+import org.richfaces.event.CurrentDateChangeEvent;
import org.richfaces.component.UICalendar;
import org.richfaces.component.util.ComponentUtil;
Modified: trunk/ui/calendar/src/test/java/org/richfaces/component/CurrentDateEventTest.java
===================================================================
--- trunk/ui/calendar/src/test/java/org/richfaces/component/CurrentDateEventTest.java 2007-08-29 11:37:16 UTC (rev 2560)
+++ trunk/ui/calendar/src/test/java/org/richfaces/component/CurrentDateEventTest.java 2007-08-29 11:41:29 UTC (rev 2561)
@@ -25,6 +25,7 @@
import org.ajax4jsf.event.AjaxEvent;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
+import org.richfaces.event.CurrentDateChangeEvent;
/**
* Unit test for CurrentDateChangeEvent.
More information about the richfaces-svn-commits
mailing list