[richfaces-svn-commits] JBoss Rich Faces SVN: r19755 - in sandbox/trunk/ui/calendar: api/src/main/java/org/richfaces/event and 6 other directories.

Author: amarkhel Date: 2010-10-29 07:14:51 -0400 (Fri, 29 Oct 2010) New Revision: 19755 Removed: sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/events/ Modified: sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/event/CurrentDateChangeEvent.java sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/model/CalendarDataModel.java sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/model/CalendarDataModelItem.java sandbox/trunk/ui/calendar/pom.xml sandbox/trunk/ui/calendar/ui/pom.xml sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/taglib/CalendarHandler.java sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/taglib/MethodExpressionCurrentDateChangeListener.java Log: use events classes from api Modified: sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/event/CurrentDateChangeEvent.java =================================================================== --- sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/event/CurrentDateChangeEvent.java 2010-10-29 09:58:54 UTC (rev 19754) +++ sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/event/CurrentDateChangeEvent.java 2010-10-29 11:14:51 UTC (rev 19755) @@ -28,42 +28,34 @@ public class CurrentDateChangeEvent extends FacesEvent { - - private static final long serialVersionUID = -8169207286087810907L; - private Date currentDate = null; - private String currentDateString = null; + private static final long serialVersionUID = -8169207286087810907L; + private Date currentDate = null; + private String currentDateString = null; - @Deprecated - public CurrentDateChangeEvent(UIComponent component, Date curentDate) { - super(component); - this.currentDate = curentDate; + public CurrentDateChangeEvent(UIComponent component, String curentDateString) { + super(component); + this.currentDateString = curentDateString; + } - } - - public CurrentDateChangeEvent(UIComponent component, String curentDateString) { - super(component); - this.currentDateString = curentDateString; - } + public boolean isAppropriateListener(FacesListener listener) { + return false; + } - public boolean isAppropriateListener(FacesListener listener) { - return false; - } + public void processListener(FacesListener listener) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException(); + } - public void processListener(FacesListener listener) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException(); - } + public Date getCurrentDate() { + return currentDate; + } - public Date getCurrentDate() { - return currentDate; - } + public void setCurrentDate(Date currentDate) { + this.currentDate = currentDate; + } - public void setCurrentDate(Date currentDate) { - this.currentDate = currentDate; - } - - public String getCurrentDateString() { - return currentDateString; - } + public String getCurrentDateString() { + return currentDateString; + } } Modified: sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/model/CalendarDataModel.java =================================================================== --- sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/model/CalendarDataModel.java 2010-10-29 09:58:54 UTC (rev 19754) +++ sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/model/CalendarDataModel.java 2010-10-29 11:14:51 UTC (rev 19755) @@ -21,24 +21,26 @@ package org.richfaces.model; import java.util.Date; + /** - * @author Alexej Kushunin - * created 19.06.2007 - * + * @author Alexej Kushunin created 19.06.2007 + * */ public interface CalendarDataModel { - - /** - * @return array of CalendarDataModelItems for selected dates. - * This method will be called every time when components will need next block of CalendarDataItems. - * That may happens when calendar rendered, or when user navigate to next(previous) month or in any other case when calendar renders. - * This method will be called in Ajax mode when Calendar renders new page. - * */ - public CalendarDataModelItem[] getData(Date[] dateArray); - - /** - * @return tool tip when it's used in "single" mode - * This method used when tool tips are displayed in "single" mode - * */ - public Object getToolTip(Date date); + + /** + * @return array of CalendarDataModelItems for selected dates. This method + * will be called every time when components will need next block of + * CalendarDataItems. That may happens when calendar rendered, or + * when user navigate to next(previous) month or in any other case + * when calendar renders. This method will be called in Ajax mode + * when Calendar renders new page. + * */ + public CalendarDataModelItem[] getData(Date[] dateArray); + + /** + * @return tool tip when it's used in "single" mode This method used when + * tool tips are displayed in "single" mode + * */ + public Object getToolTip(Date date); } Modified: sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/model/CalendarDataModelItem.java =================================================================== --- sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/model/CalendarDataModelItem.java 2010-10-29 09:58:54 UTC (rev 19754) +++ sandbox/trunk/ui/calendar/api/src/main/java/org/richfaces/model/CalendarDataModelItem.java 2010-10-29 11:14:51 UTC (rev 19755) @@ -20,49 +20,49 @@ */ package org.richfaces.model; - - /** - * @author Alexej Kushunin - * created 19.06.2007 - * + * @author Alexej Kushunin created 19.06.2007 + * */ public interface CalendarDataModelItem { - - /** - *@return true if date is �selectable� on calendar, default implementation return true - **/ - public boolean isEnabled(); - - /** - * @return String that will be appended to style class for that date span. - * For example it may be �relevant holyday� � that mean class will be like �rich-cal-day relevant holyday�. - * Default implementation return empty string. - * */ - public String getStyleClass(); - - /** - * @return any additional payload that must be JSON-serialazable object. - * May be used in custom date representation on calendar (inside custom facet).*/ - public Object getData(); - - /** - * @return true if given date has an associated with it tooltip data. - * Default implementation return false.*/ - public boolean hasToolTip(); - - /** - *@return tool tip data that will be used in �batch� tooltip loading mode. - **/ - public Object getToolTip(); - - /** - *@return day of the month on which data must be shown. - **/ - public int getDay(); - -} + /** + * @return true if date is �selectable� on calendar, default + * implementation return true + **/ + public boolean isEnabled(); + /** + * @return String that will be appended to style class for that date span. + * For example it may be �relevant holyday� � that mean class + * will be like �rich-cal-day relevant holyday�. Default + * implementation return empty string. + * */ + public String getStyleClass(); + /** + * @return any additional payload that must be JSON-serialazable object. May + * be used in custom date representation on calendar (inside custom + * facet). + */ + public Object getData(); + + /** + * @return true if given date has an associated with it tooltip data. + * Default implementation return false. + */ + public boolean hasToolTip(); + + /** + * @return tool tip data that will be used in �batch� tooltip loading + * mode. + **/ + public Object getToolTip(); + + /** + * @return day of the month on which data must be shown. + **/ + public int getDay(); + +} Modified: sandbox/trunk/ui/calendar/pom.xml =================================================================== --- sandbox/trunk/ui/calendar/pom.xml 2010-10-29 09:58:54 UTC (rev 19754) +++ sandbox/trunk/ui/calendar/pom.xml 2010-10-29 11:14:51 UTC (rev 19755) @@ -35,6 +35,7 @@ <name>Richfaces UI Components: Calendar Aggregator</name> <modules> + <module>api</module> <module>ui</module> </modules> </project> Modified: sandbox/trunk/ui/calendar/ui/pom.xml =================================================================== --- sandbox/trunk/ui/calendar/ui/pom.xml 2010-10-29 09:58:54 UTC (rev 19754) +++ sandbox/trunk/ui/calendar/ui/pom.xml 2010-10-29 11:14:51 UTC (rev 19755) @@ -63,5 +63,10 @@ <groupId>org.richfaces.ui.input</groupId> <artifactId>richfaces-ui-input-ui</artifactId> </dependency> + <dependency> + <groupId>org.richfaces.ui.calendar</groupId> + <artifactId>richfaces-ui-calendar-api</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> Modified: sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java =================================================================== --- sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-10-29 09:58:54 UTC (rev 19754) +++ sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-10-29 11:14:51 UTC (rev 19755) @@ -43,12 +43,14 @@ import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; -import org.richfaces.events.CurrentDateChangeEvent; -import org.richfaces.events.CurrentDateChangeListener; import org.richfaces.log.Logger; import org.richfaces.log.RichfacesLogger; import org.richfaces.utils.CalendarHelper; +import org.richfaces.event.CurrentDateChangeEvent; +import org.richfaces.event.CurrentDateChangeListener; + + /** * @author amarkhel * Modified: sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-10-29 09:58:54 UTC (rev 19754) +++ sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-10-29 11:14:51 UTC (rev 19755) @@ -52,7 +52,7 @@ import org.richfaces.component.util.MessageUtil; import org.richfaces.component.util.SelectUtils; import org.richfaces.component.util.ViewUtil; -import org.richfaces.events.CurrentDateChangeEvent; +import org.richfaces.event.CurrentDateChangeEvent; import org.richfaces.utils.CalendarHelper; /** Modified: sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/taglib/CalendarHandler.java =================================================================== --- sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/taglib/CalendarHandler.java 2010-10-29 09:58:54 UTC (rev 19754) +++ sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/taglib/CalendarHandler.java 2010-10-29 11:14:51 UTC (rev 19755) @@ -11,11 +11,10 @@ import org.richfaces.component.AbstractCalendar; -public class CalendarHandler extends ComponentHandler{ - +public class CalendarHandler extends ComponentHandler { + private static final CalendarHandlerMetaRule METARULE = new CalendarHandlerMetaRule(); - public CalendarHandler(ComponentConfig config) { super(config); } @@ -39,7 +38,7 @@ static class CalendarMapper extends Metadata { - private static final Class[] SIGNATURE = new Class[] { org.richfaces.events.CurrentDateChangeListener.class }; + private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.CurrentDateChangeListener.class }; private final TagAttribute attribute; @@ -48,7 +47,8 @@ } public void applyMetadata(FaceletContext ctx, Object instance) { - ((AbstractCalendar) instance).addCurrentDateChangeListener((new MethodExpressionCurrentDateChangeListener(this.attribute.getMethodExpression(ctx, null, SIGNATURE)))); + ((AbstractCalendar) instance).addCurrentDateChangeListener((new MethodExpressionCurrentDateChangeListener( + this.attribute.getMethodExpression(ctx, null, SIGNATURE)))); } } } Modified: sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/taglib/MethodExpressionCurrentDateChangeListener.java =================================================================== --- sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/taglib/MethodExpressionCurrentDateChangeListener.java 2010-10-29 09:58:54 UTC (rev 19754) +++ sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/taglib/MethodExpressionCurrentDateChangeListener.java 2010-10-29 11:14:51 UTC (rev 19755) @@ -25,8 +25,8 @@ import javax.el.MethodExpression; import javax.faces.context.FacesContext; -import org.richfaces.events.CurrentDateChangeEvent; -import org.richfaces.events.CurrentDateChangeListener; +import org.richfaces.event.CurrentDateChangeEvent; +import org.richfaces.event.CurrentDateChangeListener; public class MethodExpressionCurrentDateChangeListener implements CurrentDateChangeListener {