Rearranged class members using IntelliJ Idea plugin called Rearanger.

@@ -28,20 +28,21 @@ package org.richfaces.component;
  * @author Bernard Labno
  */
 public interface ScheduleCommonViewAttributes {
-
-    public String getTimeFormat();
-
-    public void setTimeFormat(String format);
+// -------------------------- OTHER METHODS --------------------------
 
     public String getColumnFormat();
 
-    public void setColumnFormat(String format);
+    public Double getDragOpacity();
 
-    public String getTitleFormat();
+    public String getTimeFormat();
 
-    public void setTitleFormat(String format);
+    public String getTitleFormat();
 
-    public Double getDragOpacity();
+    public void setColumnFormat(String format);
 
     public void setDragOpacity(Double dragOpacity);
+
+    public void setTimeFormat(String format);
+
+    public void setTitleFormat(String format);
 }

@@ -39,331 +39,313 @@ import java.util.Locale;
 import java.util.Map;
 
 public abstract class UISchedule extends UIComponentBase implements ScheduleCommonViewAttributes, ScheduleListenerEventsProducer, AjaxComponent {
-
-    public static final String COMPONENT_TYPE = "org.richfaces.Schedule";
+// ------------------------------ FIELDS ------------------------------
 
     public static final String COMPONENT_FAMILY = "org.richfaces.Schedule";
 
-    /**
-     * Values of view attribute.
-     */
-    public static final String VIEW_MONTH = "month";
+    public static final String COMPONENT_TYPE = "org.richfaces.Schedule";
 
-    public static final String VIEW_BASIC_WEEK = "basicWeek";
+    public static final boolean DEFAULT_ALL_DAY_DEFAULT = true;
 
-    public static final String VIEW_AGENDA_WEEK = "agendaWeek";
+    public static final boolean DEFAULT_ALL_DAY_SLOT = true;
 
-    public static final String VIEW_BASIC_DAY = "basicDay";
+    public static final double DEFAULT_ASPECT_RATIO = 1.35;
 
-    public static final String VIEW_AGENDA_DAY = "agendaDay";
+    public static final String DEFAULT_AXIS_FORMAT = "h(:mm)tt";
 
-    public static final String DEFAULT_VIEW = VIEW_MONTH;
+    public static final boolean DEFAULT_DISABLE_DRAGGING = false;
 
-    /**
-     * Values of switchType attribute
-     */
-    public static final String SWITCH_TYPE_AJAX = "ajax";
+    public static final boolean DEFAULT_DISABLE_RESIZING = false;
 
-    public static final String SWITCH_TYPE_SERVER = "server";
+    public static final double DEFAULT_DRAG_OPACITY = .3;
 
-    public static final String SWITCH_TYPE_CLIENT = "client";
+    public static final int DEFAULT_DRAG_REVERT_DURATION = 500;
 
-    public static final String DEFAULT_SWITCH_TYPE = SWITCH_TYPE_AJAX;
+    public static final boolean DEFAULT_EDITABLE = false;
 
-    /**
-     * Values of weekMode attribute.
-     */
-    public static final String WEEK_MODE_FIXED = "fixed";
+    public static final int DEFAULT_EVENT_MINUTES = 120;
 
-    public static final String WEEK_MODE_LIQUID = "liquid";
+    public static final int DEFAULT_FIRST_DAY = Calendar.SUNDAY;
 
-    public static final String WEEK_MODE_VARIABLE = "variable";
+    public static final int DEFAULT_FIRST_HOUR = 6;
 
-    public static final String DEFAULT_WEEK_MODE = WEEK_MODE_FIXED;
+    public static final String DEFAULT_MAX_TIME = "24";
 
-    public static final boolean DEFAULT_SHOW_WEEKENDS = true;
+    public static final String DEFAULT_MIN_TIME = "0";
 
     public static final boolean DEFAULT_RTL = false;
 
-    public static final int DEFAULT_FIRST_DAY = Calendar.SUNDAY;
-
-    public static final double DEFAULT_ASPECT_RATIO = 1.35;
+    public static final boolean DEFAULT_SELECTABLE = false;
 
-    public static final boolean DEFAULT_ALL_DAY_SLOT = true;
+    public static final boolean DEFAULT_SELECT_HELPER = false;
 
-    public static final String DEFAULT_AXIS_FORMAT = "h(:mm)tt";
+    public static final boolean DEFAULT_SHOW_WEEKENDS = true;
 
     public static final int DEFAULT_SLOT_MINUTES = 30;
 
-    public static final int DEFAULT_EVENT_MINUTES = 120;
-
-    public static final int DEFAULT_FIRST_HOUR = 6;
-
-    public static final String DEFAULT_MIN_TIME = "0";
-
-    public static final String DEFAULT_MAX_TIME = "24";
-
-    public static final boolean DEFAULT_EDITABLE = false;
-
-    public static final boolean DEFAULT_SELECTABLE = false;
-
-    public static final boolean DEFAULT_SELECT_HELPER = false;
+    public static final String DEFAULT_SWITCH_TYPE = SWITCH_TYPE_AJAX;
 
     public static final boolean DEFAULT_UNSELECT_AUTO = true;
 
     public static final String DEFAULT_UNSELECT_CANCEL = "";
 
-    public static final boolean DEFAULT_DISABLE_DRAGGING = false;
+    public static final String DEFAULT_VIEW = VIEW_MONTH;
 
-    public static final boolean DEFAULT_DISABLE_RESIZING = false;
+    public static final String DEFAULT_WEEK_MODE = WEEK_MODE_FIXED;
 
-    public static final int DEFAULT_DRAG_REVERT_DURATION = 500;
+    /**
+     * Values of switchType attribute
+     */
+    public static final String SWITCH_TYPE_AJAX = "ajax";
 
-    public static final double DEFAULT_DRAG_OPACITY = .3;
+    public static final String SWITCH_TYPE_CLIENT = "client";
 
-    public static final boolean DEFAULT_ALL_DAY_DEFAULT = true;
+    public static final String SWITCH_TYPE_SERVER = "server";
 
-    private DataModel model;
+    public static final String VIEW_AGENDA_DAY = "agendaDay";
 
-    public abstract Object getValue();
+    public static final String VIEW_AGENDA_WEEK = "agendaWeek";
 
-    public abstract void setValue(Object value);
+    public static final String VIEW_BASIC_DAY = "basicDay";
 
-    public abstract String getVar();
+    public static final String VIEW_BASIC_WEEK = "basicWeek";
 
-    public abstract void setVar(String value);
+    /**
+     * Values of view attribute.
+     */
+    public static final String VIEW_MONTH = "month";
 
-    public abstract Date getDate();
+    /**
+     * Values of weekMode attribute.
+     */
+    public static final String WEEK_MODE_FIXED = "fixed";
 
-    public abstract void setDate(Date date);
+    public static final String WEEK_MODE_LIQUID = "liquid";
 
-    public abstract String getSwitchType();
+    public static final String WEEK_MODE_VARIABLE = "variable";
 
-    public abstract void setSwitchType(String switchType);
+    private DataModel model;
 
-    public abstract String getView();
+// -------------------------- STATIC METHODS --------------------------
 
-    public abstract void setView(String defaultView);
+    public static int getFirstDay(UISchedule schedule) {
+        Integer firstDay = schedule.getFirstDay();
+        return firstDay == null ? UISchedule.DEFAULT_FIRST_DAY : firstDay;
+    }
 
-    public abstract String getHeaderLeft();
+    public static Date getFirstDisplayedDay(UISchedule schedule) {
+        Calendar calendar = Calendar.getInstance();
+        Date date = schedule.getDate();
+        if (date != null) {
+            calendar.setTime(date);
+        }
+        int firstDayOfWeek = getFirstDay(schedule);
+        calendar.setFirstDayOfWeek(firstDayOfWeek);
+        String view = getView(schedule);
+        boolean showWeekends = isShowWeekends(schedule);
+        if (VIEW_MONTH.equals(view)) {
+            calendar.set(Calendar.DATE, 1);
+            if (!showWeekends) {
+                int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+                if (dayOfWeek == Calendar.SUNDAY) {
+                    calendar.add(Calendar.DATE, 1);
+                } else if (dayOfWeek == Calendar.SATURDAY) {
+                    calendar.add(Calendar.DATE, 2);
+                }
+            }
+            if (!showWeekends && firstDayOfWeek == Calendar.SUNDAY) {
+                firstDayOfWeek++;
+            }
+            /**
+             * Following 1 line is a fix to what i believe is a bug of java.util.Calendar
+             */
+            calendar.get(Calendar.DAY_OF_WEEK);
+            calendar.set(Calendar.DAY_OF_WEEK, firstDayOfWeek);
+            return calendar.getTime();
+        } else if (VIEW_AGENDA_WEEK.equals(view) || VIEW_BASIC_WEEK.equals(view)) {
+            calendar.set(Calendar.DAY_OF_WEEK, firstDayOfWeek);
+            if (!showWeekends) {
+                int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+                if (dayOfWeek == Calendar.SUNDAY) {
+                    calendar.add(Calendar.DATE, 1);
+                } else if (dayOfWeek == Calendar.SATURDAY) {
+                    calendar.add(Calendar.DATE, 2);
+                }
+            }
+            return calendar.getTime();
+        } else if (VIEW_AGENDA_DAY.equals(view) || VIEW_BASIC_DAY.equals(view)) {
+            return calendar.getTime();
+        } else {
+            throw new IllegalStateException("Invalid view attribute: " + view);
+        }
+    }
 
-    public abstract void setHeaderLeft(String headerLeft);
+    public static Date getLastDisplayedDate(UISchedule schedule) {
+        Calendar calendar = Calendar.getInstance();
+        int firstDayOfWeek = getFirstDay(schedule);
+        String view = getView(schedule);
+        boolean showWeekends = isShowWeekends(schedule);
+        if (VIEW_MONTH.equals(view)) {
+            if (WEEK_MODE_FIXED.equals(getWeekMode(schedule))) {
+                calendar.setTime(getFirstDisplayedDay(schedule));
+                calendar.add(Calendar.DAY_OF_YEAR, 42);
+            } else {
+                Date date = schedule.getDate();
+                if (date != null) {
+                    calendar.setTime(date);
+                }
 
-    public abstract String getHeaderCenter();
+                if (!showWeekends && firstDayOfWeek == Calendar.SUNDAY) {
+                    firstDayOfWeek++;
+                }
+                calendar.setFirstDayOfWeek(firstDayOfWeek);
+                calendar.set(Calendar.DATE, calendar.getActualMaximum(Calendar.DATE));
+                int dayOfWeek = firstDayOfWeek + 6;
+                if (dayOfWeek > Calendar.SATURDAY) {
+                    dayOfWeek -= 7;
+                }
+                /**
+                 * Following 1 line is a fix to what i believe is a bug of java.util.Calendar
+                 */
+                calendar.get(Calendar.DAY_OF_WEEK);
+                calendar.set(Calendar.DAY_OF_WEEK, dayOfWeek);
+                calendar.add(Calendar.DATE, 1);
+            }
+            return calendar.getTime();
+        } else if (VIEW_AGENDA_WEEK.equals(view) || VIEW_BASIC_WEEK.equals(view)) {
+            calendar.setFirstDayOfWeek(firstDayOfWeek);
+            calendar.setTime(getFirstDisplayedDay(schedule));
+            calendar.add(Calendar.DATE, 7);
+            if (!showWeekends) {
+                int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+                if (dayOfWeek - 1 == Calendar.SUNDAY) {
+                    calendar.add(Calendar.DATE, -2);
+                } else if (dayOfWeek - 1 == Calendar.SATURDAY) {
+                    calendar.add(Calendar.DATE, -1);
+                }
+            }
+            return calendar.getTime();
+        } else if (VIEW_AGENDA_DAY.equals(view) || VIEW_BASIC_DAY.equals(view)) {
+            calendar.setTime(getFirstDisplayedDay(schedule));
+            calendar.add(Calendar.DATE, 1);
+            return calendar.getTime();
+        } else {
+            throw new IllegalStateException("Invalid view attribute: " + view);
+        }
+    }
 
-    public abstract void setHeaderCenter(String headerCenter);
+    public static String getView(UISchedule schedule) {
+        String view = schedule.getView();
+        return view == null ? UISchedule.DEFAULT_VIEW : view;
+    }
 
-    public abstract String getHeaderRight();
+    public static String getWeekMode(UISchedule schedule) {
+        String weekMode = schedule.getWeekMode();
+        return weekMode == null ? UISchedule.DEFAULT_WEEK_MODE : weekMode;
+    }
 
-    public abstract void setHeaderRight(String headerRight);
+    /**
+     * Here go static methods for getting value or default value of attributes.
+     */
+    /**
+     * @param schedule
+     * @return
+     */
+    public static boolean isShowWeekends(UISchedule schedule) {
+        Boolean showWeekends = schedule.getShowWeekends();
+        return showWeekends == null ? UISchedule.DEFAULT_SHOW_WEEKENDS : schedule.getShowWeekends();
+    }
 
-    public abstract Integer getFirstDay();
+// ------------------------ INTERFACE METHODS ------------------------
 
-    public abstract void setFirstDay(Integer firstDay);
 
-    public abstract Boolean getIsRTL();
+// --------------------- Interface ScheduleListenerEventsProducer ---------------------
 
-    public abstract void setIsRTL(Boolean isrtl);
+    public void addItemSelectListener(ScheduleItemSelectListener listener) {
+        addFacesListener(listener);
+    }
 
-    public abstract Boolean getShowWeekends();
+    public void removeItemSelectListener(ScheduleItemSelectListener listener) {
+        removeFacesListener(listener);
+    }
 
-    public abstract void setShowWeekends(Boolean showWeekends);
+    public ScheduleItemSelectListener[] getItemSelectListeners() {
+        return (ScheduleItemSelectListener[]) getFacesListeners(ScheduleItemSelectListener.class);
+    }
 
-    public abstract String getWeekMode();
+    public void addItemMoveListener(ScheduleItemMoveListener listener) {
+        addFacesListener(listener);
+    }
 
-    public abstract void setWeekMode(String weekMode);
+    public void removeItemMoveListener(ScheduleItemMoveListener listener) {
+        removeFacesListener(listener);
+    }
 
-    public abstract Integer getHeight();
+    public ScheduleItemMoveListener[] getItemMoveListeners() {
+        return (ScheduleItemMoveListener[]) getFacesListeners(ScheduleItemMoveListener.class);
+    }
 
-    public abstract void setHeight(Integer height);
-
-    public abstract Integer getContentHeight();
-
-    public abstract void setContentHeight(Integer contentHeight);
-
-    public abstract Double getAspectRatio();
-
-    public abstract void setAspectRatio(Double aspectRatio);
-
-    public abstract Boolean getAllDayByDefault();
-
-    public abstract void setAllDayByDefault(Boolean allDayByDefault);
-
-    public abstract Boolean getAllDaySlot();
-
-    public abstract void setAllDaySlot(Boolean allDaySlot);
-
-    public abstract String getAllDayText();
-
-    public abstract void setAllDayText(String allDayText);
-
-    public abstract String getAxisFormat();
-
-    public abstract void setAxisFormat(String axisFormat);
-
-    public abstract Integer getSlotMinutes();
-
-    public abstract void setSlotMinutes(Integer slotMinutes);
-
-    public abstract Integer getDefaultEventMinutes();
-
-    public abstract void setDefaultEventMinutes(Integer defaultEventMinutes);
-
-    public abstract Integer getFirstHour();
-
-    public abstract void setFirstHour(Integer firstHour);
-
-    public abstract String getMinTime();
-
-    public abstract void setMinTime(String minTime);
-
-    public abstract String getMaxTime();
-
-    public abstract void setMaxTime(String maxTime);
-
-    public abstract Boolean getEditable();
-
-    public abstract void setEditable(Boolean editable);
-
-    public abstract Boolean getSelectable();
-
-    public abstract void setSelectable(Boolean selectable);
-
-    public abstract Boolean getSelectHelper();
-
-    public abstract void setSelectHelper(Boolean selectHelper);
-
-    public abstract Boolean getUnselectAuto();
-
-    public abstract void setUnselectAuto(Boolean unselectAuto);
-
-    public abstract String getUnselectCancel();
-
-    public abstract void setUnselectCancel(String unselectCancel);
-
-    public abstract Boolean getDisableDragging();
-
-    public abstract void setDisableDragging(Boolean disableDragging);
-
-    public abstract Boolean getDisableResizing();
-
-    public abstract void setDisableResizing(Boolean disableResizing);
-
-    public abstract Integer getDragRevertDuration();
-
-    public abstract void setDragRevertDuration(Integer dragRevertDuration);
-
-    public abstract String getStyleClass();
-
-    public abstract void setStyleClass(String styleClass);
-
-    public abstract String getOnbeforeitemselect();
-
-    public abstract void setOnbeforeitemselect(String onbeforeitemselect);
-
-    public abstract String getOnitemselect();
-
-    public abstract void setOnitemselect(String onitemselect);
-
-    public abstract String getOnitemdragstart();
-
-    public abstract void setOnitemdragstart(String onitemdragstop);
-
-    public abstract String getOnitemdragstop();
-
-    public abstract void setOnitemdragstop(String onitemdragstop);
-
-    public abstract String getOnbeforeitemdrop();
-
-    public abstract void setOnbeforeitemdrop(String onbeforeitemdrop);
-
-    public abstract String getOnitemdrop();
-
-    public abstract void setOnitemdrop(String onitemdrop);
-
-    public abstract String getOnitemresizestart();
-
-    public abstract void setOnitemresizestart(String onitemresizestart);
-
-    public abstract String getOnitemresizestop();
-
-    public abstract void setOnitemresizestop(String onitemresizestop);
-
-    public abstract String getOnbeforeitemresize();
-
-    public abstract void setOnbeforeitemresize(String onbeforeitemresize);
-
-    public abstract String getOnitemresize();
-
-    public abstract void setOnitemresize(String onitemresize);
-
-    public abstract String getOnitemmouseover();
-
-    public abstract void setOnitemmouseover(String onitemmouseover);
-
-    public abstract String getOnitemmouseout();
-
-    public abstract void setOnitemmouseout(String onitemmouseout);
-
-    public abstract String getOnviewchange();
-
-    public abstract void setOnviewchange(String onviewchange);
-
-    public abstract String getOnbeforedateselect();
-
-    public abstract void setOnbeforedateselect(String onbeforedateselect);
-
-    public abstract String getOndateselect();
-
-    public abstract void setOndateselect(String ondateselect);
-
-    public abstract String getOnbeforedaterangeselect();
-
-    public abstract void setOnbeforedaterangeselect(String onbeforedaterangeselect);
-
-    public abstract String getOndaterangeselect();
-
-    public abstract void setOndaterangeselect(String ondaterangeselect);
-
-    public abstract String getOndaterangechange();
-
-    public abstract void setOndaterangechange(String ondaterangechange);
-
-    public abstract String getOnviewdisplay();
-
-    public abstract void setOnviewdisplay(String onviewdisplay);
-
-    public abstract MethodBinding getItemMoveListener();
+    public void addItemResizeListener(ScheduleItemResizeListener listener) {
+        addFacesListener(listener);
+    }
 
-    public abstract void setItemMoveListener(MethodBinding listener);
+    public void removeItemResizeListener(ScheduleItemResizeListener listener) {
+        removeFacesListener(listener);
+    }
 
-    public abstract MethodBinding getItemSelectListener();
+    public ScheduleItemResizeListener[] getItemResizeListeners() {
+        return (ScheduleItemResizeListener[]) getFacesListeners(ScheduleItemResizeListener.class);
+    }
 
-    public abstract void setItemSelectListener(MethodBinding listener);
+    public void addViewChangeListener(ScheduleViewChangeListener listener) {
+        addFacesListener(listener);
+    }
 
-    public abstract MethodBinding getItemResizeListener();
+    public void removeViewChangeListener(ScheduleViewChangeListener listener) {
+        removeFacesListener(listener);
+    }
 
-    public abstract void setItemResizeListener(MethodBinding listener);
+    public ScheduleViewChangeListener[] getViewChangeListeners() {
+        return (ScheduleViewChangeListener[]) getFacesListeners(ScheduleViewChangeListener.class);
+    }
 
-    public abstract MethodBinding getViewChangeListener();
+    public void addDateRangeChangeListener(ScheduleDateRangeChangeListener listener) {
+        addFacesListener(listener);
+    }
 
-    public abstract void setViewChangeListener(MethodBinding listener);
+    public void removeDateRangeChangeListener(ScheduleDateRangeChangeListener listener) {
+        removeFacesListener(listener);
+    }
 
-    public abstract MethodBinding getDateRangeChangeListener();
+    public ScheduleDateRangeChangeListener[] getDateRangeChangeListeners() {
+        return (ScheduleDateRangeChangeListener[]) getFacesListeners(ScheduleDateRangeChangeListener.class);
+    }
 
-    public abstract void setDateRangeChangeListener(MethodBinding listener);
+    public void addDateRangeSelectListener(ScheduleDateRangeSelectListener listener) {
+        addFacesListener(listener);
+    }
 
-    public abstract MethodBinding getDateRangeSelectListener();
+    public void removeDateRangeSelectListener(ScheduleDateRangeSelectListener listener) {
+        removeFacesListener(listener);
+    }
 
-    public abstract void setDateRangeSelectListener(MethodBinding listener);
+    public ScheduleDateRangeSelectListener[] getDateRangeSelectListeners() {
+        return (ScheduleDateRangeSelectListener[]) getFacesListeners(ScheduleDateRangeSelectListener.class);
+    }
 
-    public abstract MethodBinding getDateSelectListener();
+    public void addDateSelectListener(ScheduleDateSelectListener listener) {
+        addFacesListener(listener);
+    }
 
-    public abstract void setDateSelectListener(MethodBinding listener);
+    public void removeDateSelectListener(ScheduleDateSelectListener listener) {
+        removeFacesListener(listener);
+    }
 
-    public abstract String getWidgetVar();
+    public ScheduleDateSelectListener[] getDateSelectListeners() {
+        return (ScheduleDateSelectListener[]) getFacesListeners(ScheduleDateSelectListener.class);
+    }
 
-    public abstract void setWidgetVar(String widgetVar);
+// -------------------------- OTHER METHODS --------------------------
 
     /**
      * React on various events.
@@ -487,43 +469,135 @@ public abstract class UISchedule extends UIComponentBase implements ScheduleComm
         }
     }
 
-    /**
-     * Range is [startDate;endDate), which means that start date is inclusive
-     * and end date is exclusive.
-     *
-     * @param startDate
-     * @param endDate
-     * @return
-     * @throws IOException
-     */
-    public List<Map<String, Object>> getScheduleData(Date startDate, Date endDate) throws IOException {
-        /**
-         * Locale must be US because this is the format the javascript widget supports
-         */
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US);
-        format.setLenient(false);
-        DataModel dataModel = getDataModel();
-        if (dataModel instanceof ExtendedDataModel) {
-            DataVisitor visitor = new DataVisitor() {
-                //TODO Is this fine? or should we stack rowKeys and not use dataModel later on. I'don't know business rules of extendedDataModel, just used it once to do pagination with underlying EntityQuery from Seam
+    public abstract Boolean getAllDayByDefault();
 
-                public void process(FacesContext context, Object rowKey, Object argument) throws IOException {
-                }
-            };
-            ((ExtendedDataModel) dataModel).walk(getFacesContext(), visitor, new DateRange(startDate, endDate), null);
-        }
-        ELContext elContext = getFacesContext().getELContext();
-        ValueExpression valueExpression = getFacesContext().getApplication().getExpressionFactory().createValueExpression(getFacesContext().getELContext(), "#{" + getVar() + "}", Object.class);
-        List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
-        for (int i = 0; i < dataModel.getRowCount(); i++) {
-            dataModel.setRowIndex(i);
-            valueExpression.setValue(elContext, dataModel.getRowData());
-            Map<String, Object> firstDataElement = new HashMap<String, Object>();
-// TODO shouldn't we check earlier if there is at most one renderable UIScheduleItem child?
-            for (UIComponent child : getChildren()) {
-                if (child instanceof UIScheduleItem) {
-                    UIScheduleItem item = (UIScheduleItem) child;
-                    if (!item.isRendered()) {
+    public abstract Boolean getAllDaySlot();
+
+    public abstract String getAllDayText();
+
+    public abstract Double getAspectRatio();
+
+    public abstract String getAxisFormat();
+
+    public abstract Integer getContentHeight();
+
+    public abstract Date getDate();
+
+    public abstract MethodBinding getDateRangeChangeListener();
+
+    public abstract MethodBinding getDateRangeSelectListener();
+
+    public abstract MethodBinding getDateSelectListener();
+
+    public abstract Integer getDefaultEventMinutes();
+
+    public abstract Boolean getDisableDragging();
+
+    public abstract Boolean getDisableResizing();
+
+    public abstract Integer getDragRevertDuration();
+
+    public abstract Boolean getEditable();
+
+    public abstract Integer getFirstDay();
+
+    public abstract Integer getFirstHour();
+
+    public abstract String getHeaderCenter();
+
+    public abstract String getHeaderLeft();
+
+    public abstract String getHeaderRight();
+
+    public abstract Integer getHeight();
+
+    public abstract Boolean getIsRTL();
+
+    public abstract MethodBinding getItemMoveListener();
+
+    public abstract MethodBinding getItemResizeListener();
+
+    public abstract MethodBinding getItemSelectListener();
+
+    public abstract String getMaxTime();
+
+    public abstract String getMinTime();
+
+    public abstract String getOnbeforedaterangeselect();
+
+    public abstract String getOnbeforedateselect();
+
+    public abstract String getOnbeforeitemdrop();
+
+    public abstract String getOnbeforeitemresize();
+
+    public abstract String getOnbeforeitemselect();
+
+    public abstract String getOndaterangechange();
+
+    public abstract String getOndaterangeselect();
+
+    public abstract String getOndateselect();
+
+    public abstract String getOnitemdragstart();
+
+    public abstract String getOnitemdragstop();
+
+    public abstract String getOnitemdrop();
+
+    public abstract String getOnitemmouseout();
+
+    public abstract String getOnitemmouseover();
+
+    public abstract String getOnitemresize();
+
+    public abstract String getOnitemresizestart();
+
+    public abstract String getOnitemresizestop();
+
+    public abstract String getOnitemselect();
+
+    public abstract String getOnviewchange();
+
+    public abstract String getOnviewdisplay();
+
+    /**
+     * Range is [startDate;endDate), which means that start date is inclusive
+     * and end date is exclusive.
+     *
+     * @param startDate
+     * @param endDate
+     * @return
+     * @throws IOException
+     */
+    public List<Map<String, Object>> getScheduleData(Date startDate, Date endDate) throws IOException {
+        /**
+         * Locale must be US because this is the format the javascript widget supports
+         */
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US);
+        format.setLenient(false);
+        DataModel dataModel = getDataModel();
+        if (dataModel instanceof ExtendedDataModel) {
+            DataVisitor visitor = new DataVisitor() {
+                //TODO Is this fine? or should we stack rowKeys and not use dataModel later on. I'don't know business rules of extendedDataModel, just used it once to do pagination with underlying EntityQuery from Seam
+
+                public void process(FacesContext context, Object rowKey, Object argument) throws IOException {
+                }
+            };
+            ((ExtendedDataModel) dataModel).walk(getFacesContext(), visitor, new DateRange(startDate, endDate), null);
+        }
+        ELContext elContext = getFacesContext().getELContext();
+        ValueExpression valueExpression = getFacesContext().getApplication().getExpressionFactory().createValueExpression(getFacesContext().getELContext(), "#{" + getVar() + "}", Object.class);
+        List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+        for (int i = 0; i < dataModel.getRowCount(); i++) {
+            dataModel.setRowIndex(i);
+            valueExpression.setValue(elContext, dataModel.getRowData());
+            Map<String, Object> firstDataElement = new HashMap<String, Object>();
+// TODO shouldn't we check earlier if there is at most one renderable UIScheduleItem child?
+            for (UIComponent child : getChildren()) {
+                if (child instanceof UIScheduleItem) {
+                    UIScheduleItem item = (UIScheduleItem) child;
+                    if (!item.isRendered()) {
                         continue;
                     }
                     firstDataElement.put("id", item.getEventId());
@@ -555,247 +629,181 @@ public abstract class UISchedule extends UIComponentBase implements ScheduleComm
         return data;
     }
 
-    public static Date getFirstDisplayedDay(UISchedule schedule) {
-        Calendar calendar = Calendar.getInstance();
-        Date date = schedule.getDate();
-        if (date != null) {
-            calendar.setTime(date);
-        }
-        int firstDayOfWeek = getFirstDay(schedule);
-        calendar.setFirstDayOfWeek(firstDayOfWeek);
-        String view = getView(schedule);
-        boolean showWeekends = isShowWeekends(schedule);
-        if (VIEW_MONTH.equals(view)) {
-            calendar.set(Calendar.DATE, 1);
-            if (!showWeekends) {
-                int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
-                if (dayOfWeek == Calendar.SUNDAY) {
-                    calendar.add(Calendar.DATE, 1);
-                } else if (dayOfWeek == Calendar.SATURDAY) {
-                    calendar.add(Calendar.DATE, 2);
-                }
-            }
-            if (!showWeekends && firstDayOfWeek == Calendar.SUNDAY) {
-                firstDayOfWeek++;
-            }
-            /**
-             * Following 1 line is a fix to what i believe is a bug of java.util.Calendar
-             */
-            calendar.get(Calendar.DAY_OF_WEEK);
-            calendar.set(Calendar.DAY_OF_WEEK, firstDayOfWeek);
-            return calendar.getTime();
-        } else if (VIEW_AGENDA_WEEK.equals(view) || VIEW_BASIC_WEEK.equals(view)) {
-            calendar.set(Calendar.DAY_OF_WEEK, firstDayOfWeek);
-            if (!showWeekends) {
-                int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
-                if (dayOfWeek == Calendar.SUNDAY) {
-                    calendar.add(Calendar.DATE, 1);
-                } else if (dayOfWeek == Calendar.SATURDAY) {
-                    calendar.add(Calendar.DATE, 2);
-                }
-            }
-            return calendar.getTime();
-        } else if (VIEW_AGENDA_DAY.equals(view) || VIEW_BASIC_DAY.equals(view)) {
-            return calendar.getTime();
-        } else {
-            throw new IllegalStateException("Invalid view attribute: " + view);
-        }
-    }
+    public abstract Boolean getSelectHelper();
 
-    public static Date getLastDisplayedDate(UISchedule schedule) {
-        Calendar calendar = Calendar.getInstance();
-        int firstDayOfWeek = getFirstDay(schedule);
-        String view = getView(schedule);
-        boolean showWeekends = isShowWeekends(schedule);
-        if (VIEW_MONTH.equals(view)) {
-            if (WEEK_MODE_FIXED.equals(getWeekMode(schedule))) {
-                calendar.setTime(getFirstDisplayedDay(schedule));
-                calendar.add(Calendar.DAY_OF_YEAR, 42);
-            } else {
-                Date date = schedule.getDate();
-                if (date != null) {
-                    calendar.setTime(date);
-                }
+    public abstract Boolean getSelectable();
 
-                if (!showWeekends && firstDayOfWeek == Calendar.SUNDAY) {
-                    firstDayOfWeek++;
-                }
-                calendar.setFirstDayOfWeek(firstDayOfWeek);
-                calendar.set(Calendar.DATE, calendar.getActualMaximum(Calendar.DATE));
-                int dayOfWeek = firstDayOfWeek + 6;
-                if (dayOfWeek > Calendar.SATURDAY) {
-                    dayOfWeek -= 7;
-                }
-                /**
-                 * Following 1 line is a fix to what i believe is a bug of java.util.Calendar
-                 */
-                calendar.get(Calendar.DAY_OF_WEEK);
-                calendar.set(Calendar.DAY_OF_WEEK, dayOfWeek);
-                calendar.add(Calendar.DATE, 1);
-            }
-            return calendar.getTime();
-        } else if (VIEW_AGENDA_WEEK.equals(view) || VIEW_BASIC_WEEK.equals(view)) {
-            calendar.setFirstDayOfWeek(firstDayOfWeek);
-            calendar.setTime(getFirstDisplayedDay(schedule));
-            calendar.add(Calendar.DATE, 7);
-            if (!showWeekends) {
-                int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
-                if (dayOfWeek - 1 == Calendar.SUNDAY) {
-                    calendar.add(Calendar.DATE, -2);
-                } else if (dayOfWeek - 1 == Calendar.SATURDAY) {
-                    calendar.add(Calendar.DATE, -1);
-                }
-            }
-            return calendar.getTime();
-        } else if (VIEW_AGENDA_DAY.equals(view) || VIEW_BASIC_DAY.equals(view)) {
-            calendar.setTime(getFirstDisplayedDay(schedule));
-            calendar.add(Calendar.DATE, 1);
-            return calendar.getTime();
-        } else {
-            throw new IllegalStateException("Invalid view attribute: " + view);
-        }
+    public abstract Boolean getShowWeekends();
 
-    }
+    public abstract Integer getSlotMinutes();
 
-    /**
-     * Here go static methods for getting value or default value of attributes.
-     */
-    /**
-     * @param schedule
-     * @return
-     */
-    public static boolean isShowWeekends(UISchedule schedule) {
-        Boolean showWeekends = schedule.getShowWeekends();
-        return showWeekends == null ? UISchedule.DEFAULT_SHOW_WEEKENDS : schedule.getShowWeekends();
-    }
+    public abstract String getStyleClass();
 
-    public static int getFirstDay(UISchedule schedule) {
-        Integer firstDay = schedule.getFirstDay();
-        return firstDay == null ? UISchedule.DEFAULT_FIRST_DAY : firstDay;
-    }
+    public abstract String getSwitchType();
 
-    public static String getWeekMode(UISchedule schedule) {
-        String weekMode = schedule.getWeekMode();
-        return weekMode == null ? UISchedule.DEFAULT_WEEK_MODE : weekMode;
-    }
+    public abstract Boolean getUnselectAuto();
 
-    public static String getView(UISchedule schedule) {
-        String view = schedule.getView();
-        return view == null ? UISchedule.DEFAULT_VIEW : view;
-    }
+    public abstract String getUnselectCancel();
 
-    protected DataModel getDataModel() {
-        // Return any previously cached DataModel instance
-        if (this.model != null) {
-            return model;
-        }
+    public abstract Object getValue();
 
-        // Synthesize a DataModel around our current value if possible
-        Object current = getValue();
-        if (current == null) {
-            setDataModel(new ListDataModel(Collections.EMPTY_LIST));
-        } else if (current instanceof DataModel) {
-            setDataModel((DataModel) current);
-        } else if (current instanceof List) {
-            setDataModel(new ListDataModel((List) current));
-        } else if (Object[].class.isAssignableFrom(current.getClass())) {
-            setDataModel(new ArrayDataModel((Object[]) current));
-        } else if (current instanceof ResultSet) {
-            setDataModel(new ResultSetDataModel((ResultSet) current));
-        } else if (current instanceof Result) {
-            setDataModel(new ResultDataModel((Result) current));
-        } else {
-            setDataModel(new ScalarDataModel(current));
-        }
-        return model;
+    public abstract String getVar();
 
-    }
+    public abstract String getView();
+
+    public abstract MethodBinding getViewChangeListener();
+
+    public abstract String getWeekMode();
+
+    public abstract String getWidgetVar();
+
+    public abstract void setAllDayByDefault(Boolean allDayByDefault);
+
+    public abstract void setAllDaySlot(Boolean allDaySlot);
+
+    public abstract void setAllDayText(String allDayText);
+
+    public abstract void setAspectRatio(Double aspectRatio);
+
+    public abstract void setAxisFormat(String axisFormat);
+
+    public abstract void setContentHeight(Integer contentHeight);
 
     public void setDataModel(DataModel model) {
         this.model = model;
     }
 
-    public void addItemSelectListener(ScheduleItemSelectListener listener) {
-        addFacesListener(listener);
-    }
+    public abstract void setDate(Date date);
 
-    public void removeItemSelectListener(ScheduleItemSelectListener listener) {
-        removeFacesListener(listener);
-    }
+    public abstract void setDateRangeChangeListener(MethodBinding listener);
 
-    public ScheduleItemSelectListener[] getItemSelectListeners() {
-        return (ScheduleItemSelectListener[]) getFacesListeners(ScheduleItemSelectListener.class);
-    }
+    public abstract void setDateRangeSelectListener(MethodBinding listener);
 
-    public void addItemMoveListener(ScheduleItemMoveListener listener) {
-        addFacesListener(listener);
-    }
+    public abstract void setDateSelectListener(MethodBinding listener);
 
-    public void removeItemMoveListener(ScheduleItemMoveListener listener) {
-        removeFacesListener(listener);
-    }
+    public abstract void setDefaultEventMinutes(Integer defaultEventMinutes);
 
-    public ScheduleItemMoveListener[] getItemMoveListeners() {
-        return (ScheduleItemMoveListener[]) getFacesListeners(ScheduleItemMoveListener.class);
-    }
+    public abstract void setDisableDragging(Boolean disableDragging);
 
-    public void addItemResizeListener(ScheduleItemResizeListener listener) {
-        addFacesListener(listener);
-    }
+    public abstract void setDisableResizing(Boolean disableResizing);
 
-    public void removeItemResizeListener(ScheduleItemResizeListener listener) {
-        removeFacesListener(listener);
-    }
+    public abstract void setDragRevertDuration(Integer dragRevertDuration);
 
-    public ScheduleItemResizeListener[] getItemResizeListeners() {
-        return (ScheduleItemResizeListener[]) getFacesListeners(ScheduleItemResizeListener.class);
-    }
+    public abstract void setEditable(Boolean editable);
 
-    public void addViewChangeListener(ScheduleViewChangeListener listener) {
-        addFacesListener(listener);
-    }
+    public abstract void setFirstDay(Integer firstDay);
 
-    public void removeViewChangeListener(ScheduleViewChangeListener listener) {
-        removeFacesListener(listener);
-    }
+    public abstract void setFirstHour(Integer firstHour);
 
-    public ScheduleViewChangeListener[] getViewChangeListeners() {
-        return (ScheduleViewChangeListener[]) getFacesListeners(ScheduleViewChangeListener.class);
-    }
+    public abstract void setHeaderCenter(String headerCenter);
 
-    public void addDateRangeChangeListener(ScheduleDateRangeChangeListener listener) {
-        addFacesListener(listener);
-    }
+    public abstract void setHeaderLeft(String headerLeft);
 
-    public void removeDateRangeChangeListener(ScheduleDateRangeChangeListener listener) {
-        removeFacesListener(listener);
-    }
+    public abstract void setHeaderRight(String headerRight);
 
-    public ScheduleDateRangeChangeListener[] getDateRangeChangeListeners() {
-        return (ScheduleDateRangeChangeListener[]) getFacesListeners(ScheduleDateRangeChangeListener.class);
-    }
+    public abstract void setHeight(Integer height);
 
-    public void addDateRangeSelectListener(ScheduleDateRangeSelectListener listener) {
-        addFacesListener(listener);
-    }
+    public abstract void setIsRTL(Boolean isrtl);
 
-    public void removeDateRangeSelectListener(ScheduleDateRangeSelectListener listener) {
-        removeFacesListener(listener);
-    }
+    public abstract void setItemMoveListener(MethodBinding listener);
 
-    public ScheduleDateRangeSelectListener[] getDateRangeSelectListeners() {
-        return (ScheduleDateRangeSelectListener[]) getFacesListeners(ScheduleDateRangeSelectListener.class);
-    }
+    public abstract void setItemResizeListener(MethodBinding listener);
 
-    public void addDateSelectListener(ScheduleDateSelectListener listener) {
-        addFacesListener(listener);
-    }
+    public abstract void setItemSelectListener(MethodBinding listener);
 
-    public void removeDateSelectListener(ScheduleDateSelectListener listener) {
-        removeFacesListener(listener);
-    }
+    public abstract void setMaxTime(String maxTime);
 
-    public ScheduleDateSelectListener[] getDateSelectListeners() {
-        return (ScheduleDateSelectListener[]) getFacesListeners(ScheduleDateSelectListener.class);
+    public abstract void setMinTime(String minTime);
+
+    public abstract void setOnbeforedaterangeselect(String onbeforedaterangeselect);
+
+    public abstract void setOnbeforedateselect(String onbeforedateselect);
+
+    public abstract void setOnbeforeitemdrop(String onbeforeitemdrop);
+
+    public abstract void setOnbeforeitemresize(String onbeforeitemresize);
+
+    public abstract void setOnbeforeitemselect(String onbeforeitemselect);
+
+    public abstract void setOndaterangechange(String ondaterangechange);
+
+    public abstract void setOndaterangeselect(String ondaterangeselect);
+
+    public abstract void setOndateselect(String ondateselect);
+
+    public abstract void setOnitemdragstart(String onitemdragstop);
+
+    public abstract void setOnitemdragstop(String onitemdragstop);
+
+    public abstract void setOnitemdrop(String onitemdrop);
+
+    public abstract void setOnitemmouseout(String onitemmouseout);
+
+    public abstract void setOnitemmouseover(String onitemmouseover);
+
+    public abstract void setOnitemresize(String onitemresize);
+
+    public abstract void setOnitemresizestart(String onitemresizestart);
+
+    public abstract void setOnitemresizestop(String onitemresizestop);
+
+    public abstract void setOnitemselect(String onitemselect);
+
+    public abstract void setOnviewchange(String onviewchange);
+
+    public abstract void setOnviewdisplay(String onviewdisplay);
+
+    public abstract void setSelectHelper(Boolean selectHelper);
+
+    public abstract void setSelectable(Boolean selectable);
+
+    public abstract void setShowWeekends(Boolean showWeekends);
+
+    public abstract void setSlotMinutes(Integer slotMinutes);
+
+    public abstract void setStyleClass(String styleClass);
+
+    public abstract void setSwitchType(String switchType);
+
+    public abstract void setUnselectAuto(Boolean unselectAuto);
+
+    public abstract void setUnselectCancel(String unselectCancel);
+
+    public abstract void setValue(Object value);
+
+    public abstract void setVar(String value);
+
+    public abstract void setView(String defaultView);
+
+    public abstract void setViewChangeListener(MethodBinding listener);
+
+    public abstract void setWeekMode(String weekMode);
+
+    public abstract void setWidgetVar(String widgetVar);
+
+    protected DataModel getDataModel() {
+        // Return any previously cached DataModel instance
+        if (this.model != null) {
+            return model;
+        }
+
+        // Synthesize a DataModel around our current value if possible
+        Object current = getValue();
+        if (current == null) {
+            setDataModel(new ListDataModel(Collections.EMPTY_LIST));
+        } else if (current instanceof DataModel) {
+            setDataModel((DataModel) current);
+        } else if (current instanceof List) {
+            setDataModel(new ListDataModel((List) current));
+        } else if (Object[].class.isAssignableFrom(current.getClass())) {
+            setDataModel(new ArrayDataModel((Object[]) current));
+        } else if (current instanceof ResultSet) {
+            setDataModel(new ResultSetDataModel((ResultSet) current));
+        } else if (current instanceof Result) {
+            setDataModel(new ResultDataModel((Result) current));
+        } else {
+            setDataModel(new ScalarDataModel(current));
+        }
+        return model;
     }
 }

@@ -3,7 +3,9 @@ package org.richfaces.component;
 import javax.faces.component.UIComponentBase;
 
 public abstract class UIScheduleAgendaDayView extends UIComponentBase implements ScheduleCommonViewAttributes {
+// ------------------------------ FIELDS ------------------------------
 
-    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleAgendaDayView";
     public static final String COMPONENT_FAMILY = "org.richfaces.Schedule";
+
+    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleAgendaDayView";
 }

@@ -3,7 +3,9 @@ package org.richfaces.component;
 import javax.faces.component.UIComponentBase;
 
 public abstract class UIScheduleAgendaWeekView extends UIComponentBase implements ScheduleCommonViewAttributes {
+// ------------------------------ FIELDS ------------------------------
 
-    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleAgendaWeekView";
     public static final String COMPONENT_FAMILY = "org.richfaces.Schedule";
+
+    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleAgendaWeekView";
 }

@@ -3,7 +3,9 @@ package org.richfaces.component;
 import javax.faces.component.UIComponentBase;
 
 public abstract class UIScheduleBasicDayView extends UIComponentBase implements ScheduleCommonViewAttributes {
+// ------------------------------ FIELDS ------------------------------
 
-    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleBasicDayView";
     public static final String COMPONENT_FAMILY = "org.richfaces.Schedule";
+
+    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleBasicDayView";
 }

@@ -3,7 +3,9 @@ package org.richfaces.component;
 import javax.faces.component.UIComponentBase;
 
 public abstract class UIScheduleBasicWeekView extends UIComponentBase implements ScheduleCommonViewAttributes {
+// ------------------------------ FIELDS ------------------------------
 
-    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleBasicWeekView";
     public static final String COMPONENT_FAMILY = "org.richfaces.Schedule";
+
+    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleBasicWeekView";
 }

@@ -7,45 +7,51 @@ import java.util.Date;
  * JSF component class
  */
 public abstract class UIScheduleItem extends UIComponentBase {
+// ------------------------------ FIELDS ------------------------------
 
-    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleItem";
     public static final String COMPONENT_FAMILY = "org.richfaces.Schedule";
-    public static final boolean DEFAULT_ALL_DAY = true;
-    public static final boolean DEFAULT_EDITABLE = UISchedule.DEFAULT_EDITABLE;
 
-    public abstract String getStyleClass();
+    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleItem";
 
-    public abstract void setStyleClass(String styleClass);
+    public static final boolean DEFAULT_ALL_DAY = true;
 
-    public abstract String getTitle();
+    public static final boolean DEFAULT_EDITABLE = UISchedule.DEFAULT_EDITABLE;
 
-    public abstract void setTitle(String title);
+// -------------------------- OTHER METHODS --------------------------
 
-    public abstract Date getStartDate();
+    public abstract Boolean getAllDay();
 
-    public abstract void setStartDate(Date date);
+    public abstract Object getData();
 
-    public abstract Date getEndDate();
+    public abstract Boolean getEditable();
 
-    public abstract void setEndDate(Date date);
+    public abstract Date getEndDate();
 
     public abstract String getEventId();
 
-    public abstract void setEventId(String eventId);
+    public abstract Date getStartDate();
 
-    public abstract Boolean getAllDay();
+    public abstract String getStyleClass();
 
-    public abstract void setAllDay(Boolean isAllDay);
+    public abstract String getTitle();
 
     public abstract String getUrl();
 
-    public abstract void setUrl(String url);
+    public abstract void setAllDay(Boolean isAllDay);
 
-    public abstract Boolean getEditable();
+    public abstract void setData(Object data);
 
     public abstract void setEditable(Boolean editable);
 
-    public abstract Object getData();
+    public abstract void setEndDate(Date date);
 
-    public abstract void setData(Object data);
+    public abstract void setEventId(String eventId);
+
+    public abstract void setStartDate(Date date);
+
+    public abstract void setStyleClass(String styleClass);
+
+    public abstract void setTitle(String title);
+
+    public abstract void setUrl(String url);
 }

@@ -3,10 +3,14 @@ package org.richfaces.component;
 import javax.faces.component.UIComponentBase;
 
 public abstract class UIScheduleMonthView extends UIComponentBase implements ScheduleCommonViewAttributes {
+// ------------------------------ FIELDS ------------------------------
 
-    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleMonthView";
     public static final String COMPONENT_FAMILY = "org.richfaces.Schedule";
 
+    public static final String COMPONENT_TYPE = "org.richfaces.ScheduleMonthView";
+
+// -------------------------- OTHER METHODS --------------------------
+
     public abstract String getWeekMode();
 
     public abstract void setWeekMode(String mode);

@@ -6,29 +6,39 @@ import javax.faces.event.FacesListener;
 import java.util.Date;
 
 public class ScheduleDateRangeChangeEvent extends FacesEvent {
+// ------------------------------ FIELDS ------------------------------
 
-    private Date startDate;
     private Date endDate;
 
+    private Date startDate;
+
+// --------------------------- CONSTRUCTORS ---------------------------
+
     public ScheduleDateRangeChangeEvent(UIComponent component, Date startDate, Date endDate) {
         super(component);
         this.startDate = startDate;
         this.endDate = endDate;
     }
 
-    public Date getStartDate() {
-        return startDate;
-    }
+// --------------------- GETTER / SETTER METHODS ---------------------
 
     public Date getEndDate() {
         return endDate;
     }
 
+    public Date getStartDate() {
+        return startDate;
+    }
+
+// ------------------------ CANONICAL METHODS ------------------------
+
     @Override
     public String toString() {
         return getClass().getSimpleName() + "[startDate=" + startDate + ";endDate=" + endDate + "]";
     }
 
+// -------------------------- OTHER METHODS --------------------------
+
     @Override
     public boolean isAppropriateListener(FacesListener listener) {
         return listener instanceof ScheduleDateRangeChangeListener;

@@ -3,6 +3,7 @@ package org.richfaces.component.event;
 import javax.faces.event.FacesListener;
 
 public interface ScheduleDateRangeChangeListener extends FacesListener {
+// -------------------------- OTHER METHODS --------------------------
 
     void dateRangeChanged(ScheduleDateRangeChangeEvent event);
 }

@@ -6,11 +6,16 @@ import javax.faces.event.FacesListener;
 import java.util.Date;
 
 public class ScheduleDateRangeSelectEvent extends FacesEvent {
+// ------------------------------ FIELDS ------------------------------
 
-    private Date startDate;
-    private Date endDate;
     private boolean allDay;
 
+    private Date endDate;
+
+    private Date startDate;
+
+// --------------------------- CONSTRUCTORS ---------------------------
+
     public ScheduleDateRangeSelectEvent(UIComponent component, Date startDate, Date endDate, boolean allDay) {
         super(component);
         this.startDate = startDate;
@@ -18,28 +23,34 @@ public class ScheduleDateRangeSelectEvent extends FacesEvent {
         this.allDay = allDay;
     }
 
-    public boolean isAppropriateListener(FacesListener facesListener) {
-        return facesListener instanceof ScheduleDateSelectListener;
-    }
+// --------------------- GETTER / SETTER METHODS ---------------------
 
-    public void processListener(FacesListener facesListener) {
-        ((ScheduleDateRangeSelectListener) facesListener).dateRangeSelected(this);
+    public Date getEndDate() {
+        return endDate;
     }
 
     public Date getStartDate() {
         return startDate;
     }
 
-    public Date getEndDate() {
-        return endDate;
-    }
-
     public boolean isAllDay() {
         return allDay;
     }
 
+// ------------------------ CANONICAL METHODS ------------------------
+
     @Override
     public String toString() {
         return getClass().getSimpleName() + "[startDate=" + startDate + ";endDate=" + endDate + ";allDay=" + allDay + "]";
     }
+
+// -------------------------- OTHER METHODS --------------------------
+
+    public boolean isAppropriateListener(FacesListener facesListener) {
+        return facesListener instanceof ScheduleDateSelectListener;
+    }
+
+    public void processListener(FacesListener facesListener) {
+        ((ScheduleDateRangeSelectListener) facesListener).dateRangeSelected(this);
+    }
 }

@@ -3,6 +3,7 @@ package org.richfaces.component.event;
 import javax.faces.event.FacesListener;
 
 public interface ScheduleDateRangeSelectListener extends FacesListener {
+// -------------------------- OTHER METHODS --------------------------
 
     void dateRangeSelected(ScheduleDateRangeSelectEvent event);
 }

@@ -6,23 +6,21 @@ import javax.faces.event.FacesListener;
 import java.util.Date;
 
 public class ScheduleDateSelectEvent extends FacesEvent {
+// ------------------------------ FIELDS ------------------------------
 
-    private Date date;
     private boolean allDay;
 
+    private Date date;
+
+// --------------------------- CONSTRUCTORS ---------------------------
+
     public ScheduleDateSelectEvent(UIComponent component, Date date, boolean allDay) {
         super(component);
         this.date = date;
         this.allDay = allDay;
     }
 
-    public boolean isAppropriateListener(FacesListener facesListener) {
-        return facesListener instanceof ScheduleDateSelectListener;
-    }
-
-    public void processListener(FacesListener facesListener) {
-        ((ScheduleDateSelectListener) facesListener).dateSelected(this);
-    }
+// --------------------- GETTER / SETTER METHODS ---------------------
 
     public Date getDate() {
         return date;
@@ -32,8 +30,20 @@ public class ScheduleDateSelectEvent extends FacesEvent {
         return allDay;
     }
 
+// ------------------------ CANONICAL METHODS ------------------------
+
     @Override
     public String toString() {
         return getClass().getSimpleName() + "[date=" + date + ";allDay=" + allDay + "]";
     }
+
+// -------------------------- OTHER METHODS --------------------------
+
+    public boolean isAppropriateListener(FacesListener facesListener) {
+        return facesListener instanceof ScheduleDateSelectListener;
+    }
+
+    public void processListener(FacesListener facesListener) {
+        ((ScheduleDateSelectListener) facesListener).dateSelected(this);
+    }
 }

@@ -3,6 +3,7 @@ package org.richfaces.component.event;
 import javax.faces.event.FacesListener;
 
 public interface ScheduleDateSelectListener extends FacesListener {
+// -------------------------- OTHER METHODS --------------------------
 
     void dateSelected(ScheduleDateSelectEvent event);
 }

@@ -5,11 +5,17 @@ import javax.faces.event.FacesEvent;
 import javax.faces.event.FacesListener;
 
 public class ScheduleItemMoveEvent extends FacesEvent {
+// ------------------------------ FIELDS ------------------------------
+
+    private boolean allDay;
 
-    private String eventId;
     private int dayDelta;
+
+    private String eventId;
+
     private int minuteDelta;
-    private boolean allDay;
+
+// --------------------------- CONSTRUCTORS ---------------------------
 
     public ScheduleItemMoveEvent(UIComponent component, String eventId, int dayDelta, int minuteDelta, boolean allDay) {
         super(component);
@@ -19,22 +25,16 @@ public class ScheduleItemMoveEvent extends FacesEvent {
         this.allDay = allDay;
     }
 
-    public boolean isAppropriateListener(FacesListener facesListener) {
-        return facesListener instanceof ScheduleItemMoveListener;
-    }
+// --------------------- GETTER / SETTER METHODS ---------------------
 
-    public void processListener(FacesListener facesListener) {
-        ((ScheduleItemMoveListener) facesListener).itemMove(this);
+    public int getDayDelta() {
+        return dayDelta;
     }
 
     public String getEventId() {
         return eventId;
     }
 
-    public int getDayDelta() {
-        return dayDelta;
-    }
-
     public int getMinuteDelta() {
         return minuteDelta;
     }
@@ -43,9 +43,21 @@ public class ScheduleItemMoveEvent extends FacesEvent {
         return allDay;
     }
 
+// ------------------------ CANONICAL METHODS ------------------------
+
     @Override
     public String toString() {
         return getClass().getSimpleName() + "[eventId=" + eventId + ";dayDelta=" + dayDelta
             + ";minuteDelta=" + minuteDelta + ";allDay=" + allDay + "]";
     }
+
+// -------------------------- OTHER METHODS --------------------------
+
+    public boolean isAppropriateListener(FacesListener facesListener) {
+        return facesListener instanceof ScheduleItemMoveListener;
+    }
+
+    public void processListener(FacesListener facesListener) {
+        ((ScheduleItemMoveListener) facesListener).itemMove(this);
+    }
 }

@@ -3,6 +3,7 @@ package org.richfaces.component.event;
 import javax.faces.event.FacesListener;
 
 public interface ScheduleItemMoveListener extends FacesListener {
+// -------------------------- OTHER METHODS --------------------------
 
     void itemMove(ScheduleItemMoveEvent event);
 }

@@ -5,11 +5,16 @@ import javax.faces.event.FacesEvent;
 import javax.faces.event.FacesListener;
 
 public class ScheduleItemResizeEvent extends FacesEvent {
+// ------------------------------ FIELDS ------------------------------
 
-    private String eventId;
     private int dayDelta;
+
+    private String eventId;
+
     private int minuteDelta;
 
+// --------------------------- CONSTRUCTORS ---------------------------
+
     public ScheduleItemResizeEvent(UIComponent component, String eventId, int dayDelta, int minuteDelta) {
         super(component);
         this.eventId = eventId;
@@ -17,29 +22,35 @@ public class ScheduleItemResizeEvent extends FacesEvent {
         this.minuteDelta = minuteDelta;
     }
 
-    public boolean isAppropriateListener(FacesListener facesListener) {
-        return facesListener instanceof ScheduleItemResizeListener;
-    }
+// --------------------- GETTER / SETTER METHODS ---------------------
 
-    public void processListener(FacesListener facesListener) {
-        ((ScheduleItemResizeListener) facesListener).itemResize(this);
+    public int getDayDelta() {
+        return dayDelta;
     }
 
     public String getEventId() {
         return eventId;
     }
 
-    public int getDayDelta() {
-        return dayDelta;
-    }
-
     public int getMinuteDelta() {
         return minuteDelta;
     }
 
+// ------------------------ CANONICAL METHODS ------------------------
+
     @Override
     public String toString() {
         return getClass().getSimpleName() + "[eventId=" + eventId + ";dayDelta=" + dayDelta
             + ";minuteDelta=" + minuteDelta + "]";
     }
+
+// -------------------------- OTHER METHODS --------------------------
+
+    public boolean isAppropriateListener(FacesListener facesListener) {
+        return facesListener instanceof ScheduleItemResizeListener;
+    }
+
+    public void processListener(FacesListener facesListener) {
+        ((ScheduleItemResizeListener) facesListener).itemResize(this);
+    }
 }

@@ -3,6 +3,7 @@ package org.richfaces.component.event;
 import javax.faces.event.FacesListener;
 
 public interface ScheduleItemResizeListener extends FacesListener {
+// -------------------------- OTHER METHODS --------------------------
 
     void itemResize(ScheduleItemResizeEvent event);
 }

@@ -5,28 +5,37 @@ import javax.faces.event.FacesEvent;
 import javax.faces.event.FacesListener;
 
 public class ScheduleItemSelectEvent extends FacesEvent {
+// ------------------------------ FIELDS ------------------------------
 
     private String eventId;
 
+// --------------------------- CONSTRUCTORS ---------------------------
+
     public ScheduleItemSelectEvent(UIComponent component, String eventId) {
         super(component);
         this.eventId = eventId;
     }
 
-    public boolean isAppropriateListener(FacesListener facesListener) {
-        return facesListener instanceof ScheduleItemSelectListener;
-    }
-
-    public void processListener(FacesListener facesListener) {
-        ((ScheduleItemSelectListener) facesListener).itemSelected(this);
-    }
+// --------------------- GETTER / SETTER METHODS ---------------------
 
     public String getEventId() {
         return eventId;
     }
 
+// ------------------------ CANONICAL METHODS ------------------------
+
     @Override
     public String toString() {
         return getClass().getSimpleName() + "[eventId=" + eventId + "]";
     }
+
+// -------------------------- OTHER METHODS --------------------------
+
+    public boolean isAppropriateListener(FacesListener facesListener) {
+        return facesListener instanceof ScheduleItemSelectListener;
+    }
+
+    public void processListener(FacesListener facesListener) {
+        ((ScheduleItemSelectListener) facesListener).itemSelected(this);
+    }
 }

@@ -3,6 +3,7 @@ package org.richfaces.component.event;
 import javax.faces.event.FacesListener;
 
 public interface ScheduleItemSelectListener extends FacesListener {
+// -------------------------- OTHER METHODS --------------------------
 
     public void itemSelected(ScheduleItemSelectEvent event);
 }

 package org.richfaces.component.event;
 
 public interface ScheduleListenerEventsProducer {
+// -------------------------- OTHER METHODS --------------------------
 
-    void addItemSelectListener(ScheduleItemSelectListener listener);
+    void addDateRangeChangeListener(ScheduleDateRangeChangeListener listener);
 
-    void removeItemSelectListener(ScheduleItemSelectListener listener);
+    void addDateRangeSelectListener(ScheduleDateRangeSelectListener listener);
 
-    ScheduleItemSelectListener[] getItemSelectListeners();
+    void addDateSelectListener(ScheduleDateSelectListener listener);
 
     void addItemMoveListener(ScheduleItemMoveListener listener);
 
-    void removeItemMoveListener(ScheduleItemMoveListener listener);
-
-    ScheduleItemMoveListener[] getItemMoveListeners();
-
     void addItemResizeListener(ScheduleItemResizeListener listener);
 
-    void removeItemResizeListener(ScheduleItemResizeListener listener);
-
-    ScheduleItemResizeListener[] getItemResizeListeners();
+    void addItemSelectListener(ScheduleItemSelectListener listener);
 
     void addViewChangeListener(ScheduleViewChangeListener listener);
 
-    void removeViewChangeListener(ScheduleViewChangeListener listener);
+    ScheduleDateRangeChangeListener[] getDateRangeChangeListeners();
 
-    ScheduleViewChangeListener[] getViewChangeListeners();
+    ScheduleDateRangeSelectListener[] getDateRangeSelectListeners();
 
-    void addDateRangeChangeListener(ScheduleDateRangeChangeListener listener);
+    ScheduleDateSelectListener[] getDateSelectListeners();
 
-    void removeDateRangeChangeListener(ScheduleDateRangeChangeListener listener);
+    ScheduleItemMoveListener[] getItemMoveListeners();
 
-    ScheduleDateRangeChangeListener[] getDateRangeChangeListeners();
+    ScheduleItemResizeListener[] getItemResizeListeners();
 
-    void addDateRangeSelectListener(ScheduleDateRangeSelectListener listener);
+    ScheduleItemSelectListener[] getItemSelectListeners();
 
-    void removeDateRangeSelectListener(ScheduleDateRangeSelectListener listener);
+    ScheduleViewChangeListener[] getViewChangeListeners();
 
-    ScheduleDateRangeSelectListener[] getDateRangeSelectListeners();
+    void removeDateRangeChangeListener(ScheduleDateRangeChangeListener listener);
 
-    void addDateSelectListener(ScheduleDateSelectListener listener);
+    void removeDateRangeSelectListener(ScheduleDateRangeSelectListener listener);
 
     void removeDateSelectListener(ScheduleDateSelectListener listener);
 
-    ScheduleDateSelectListener[] getDateSelectListeners();
+    void removeItemMoveListener(ScheduleItemMoveListener listener);
+
+    void removeItemResizeListener(ScheduleItemResizeListener listener);
+
+    void removeItemSelectListener(ScheduleItemSelectListener listener);
+
+    void removeViewChangeListener(ScheduleViewChangeListener listener);
 }

@@ -5,28 +5,37 @@ import javax.faces.event.FacesEvent;
 import javax.faces.event.FacesListener;
 
 public class ScheduleViewChangeEvent extends FacesEvent {
+// ------------------------------ FIELDS ------------------------------
 
     private String view;
 
+// --------------------------- CONSTRUCTORS ---------------------------
+
     public ScheduleViewChangeEvent(UIComponent component, String view) {
         super(component);
         this.view = view;
     }
 
-    public boolean isAppropriateListener(FacesListener facesListener) {
-        return facesListener instanceof ScheduleViewChangeListener;
-    }
-
-    public void processListener(FacesListener facesListener) {
-        ((ScheduleViewChangeListener) facesListener).viewChanged(this);
-    }
+// --------------------- GETTER / SETTER METHODS ---------------------
 
     public String getView() {
         return view;
     }
 
+// ------------------------ CANONICAL METHODS ------------------------
+
     @Override
     public String toString() {
         return getClass().getSimpleName() + "[view=" + view + "]";
     }
+
+// -------------------------- OTHER METHODS --------------------------
+
+    public boolean isAppropriateListener(FacesListener facesListener) {
+        return facesListener instanceof ScheduleViewChangeListener;
+    }
+
+    public void processListener(FacesListener facesListener) {
+        ((ScheduleViewChangeListener) facesListener).viewChanged(this);
+    }
 }

@@ -3,6 +3,7 @@ package org.richfaces.component.event;
 import javax.faces.event.FacesListener;
 
 public interface ScheduleViewChangeListener extends FacesListener {
+// -------------------------- OTHER METHODS --------------------------
 
     void viewChanged(ScheduleViewChangeEvent event);
 }

@@ -5,10 +5,14 @@ import org.ajax4jsf.model.Range;
 import java.util.Date;
 
 public class DateRange implements Range {
+// ------------------------------ FIELDS ------------------------------
 
-    private Date startDate;
     private Date endDate;
 
+    private Date startDate;
+
+// --------------------------- CONSTRUCTORS ---------------------------
+
     public DateRange() {
     }
 
@@ -17,13 +21,7 @@ public class DateRange implements Range {
         setEndDate(endDate);
     }
 
-    public Date getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(Date startDate) {
-        this.startDate = startDate;
-    }
+// --------------------- GETTER / SETTER METHODS ---------------------
 
     public Date getEndDate() {
         return endDate;
@@ -32,4 +30,12 @@ public class DateRange implements Range {
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
 }

@@ -35,6 +35,13 @@ import java.util.Locale;
 import java.util.Map;
 
 public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
+// ------------------------------ FIELDS ------------------------------
+
+    public static final String DATE_RANGE_CHANGE_EVENT = "dateRangeChange";
+
+    public static final String DATE_RANGE_SELECT_EVENT = "dateRangeSelect";
+
+    public static final String DATE_SELECT_EVENT = "dateSelect";
 
     public static final String ITEM_MOVE_EVENT = "itemMove";
 
@@ -42,33 +49,29 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
 
     public static final String ITEM_SELECT_EVENT = "itemSelect";
 
-    public static final String DATE_RANGE_CHANGE_EVENT = "dateRangeChange";
-
     public static final String VIEW_CHANGE_EVENT = "viewChange";
 
-    public static final String DATE_SELECT_EVENT = "dateSelect";
-
-    public static final String DATE_RANGE_SELECT_EVENT = "dateRangeSelect";
+    private static final String ALL_DAY_PARAM = "allDay";
 
     private static final String CALLBACK = "callback";
 
+    private static final String DAY_DELTA_PARAM = "dayDelta";
+
+    private static final Map<String, Object> DEFAULTS;
+
     private static final String END_DATE_PARAM = "endDate";
 
-    private static final String START_DATE_PARAM = "startDate";
+    private static final String EVENT_TYPE_PARAM = "eventType";
 
     private static final String ITEM_ID_PARAM = "itemId";
 
-    private static final String DAY_DELTA_PARAM = "dayDelta";
-
     private static final String MINUTE_DELTA_PARAM = "minuteDelta";
 
-    private static final String ALL_DAY_PARAM = "allDay";
-
-    private static final String EVENT_TYPE_PARAM = "eventType";
+    private static final String START_DATE_PARAM = "startDate";
 
     private static final String VIEW_PARAM = "view";
 
-    private static final Map<String, Object> DEFAULTS;
+// -------------------------- STATIC METHODS --------------------------
 
     /**
      * Following defaults are be used by addOptionIfSetAndNotDefault
@@ -119,6 +122,15 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
         DEFAULTS = Collections.unmodifiableMap(defaults);
     }
 
+    private static void copyAttribute(String attribute, String suffix, UIComponent source, UIComponent target) {
+        Object value = source.getAttributes().get(attribute);
+        if (value != null) {
+            target.getAttributes().put(attribute + suffix, value);
+        }
+    }
+
+// -------------------------- OTHER METHODS --------------------------
+
     @Override
     public void decode(FacesContext context, UIComponent component) {
         if (!component.isRendered()) {
@@ -198,6 +210,26 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
             null);
     }
 
+    private void addOptionHash(String attribute, UIComponent source, Map<String, Object> options) {
+        Map<String, Object> hash = new HashMap<String, Object>(3);
+        Map<String, Object> attributes = source.getAttributes();
+        addOptionIfSetAndNotDefault("month", attributes.get(attribute + "Month"), hash);
+        addOptionIfSetAndNotDefault("basicWeek", attributes.get(attribute + "BasicWeek"), hash);
+        addOptionIfSetAndNotDefault("agendaWeek", attributes.get(attribute + "AgendaWeek"), hash);
+        addOptionIfSetAndNotDefault("basicDay", attributes.get(attribute + "BasicDay"), hash);
+        addOptionIfSetAndNotDefault("agendaDay", attributes.get(attribute + "AgendaDay"), hash);
+        addOptionIfSetAndNotDefault("", attributes.get(attribute), hash);
+        if (hash.size() > 0) {
+            options.put(attribute, hash);
+        }
+    }
+
+    protected void addOptionIfSetAndNotDefault(String optionName, Object value, Map<String, Object> options) {
+        if (value != null && !"".equals(value) && !value.equals(DEFAULTS.get(optionName))) {
+            options.put(optionName, value);
+        }
+    }
+
     protected Object createSubmitEventFunction(FacesContext context, UISchedule component) {
         JSFunction jsFunction;
         Map<String, Object> params = new HashMap<String, Object>();
@@ -229,6 +261,10 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
             END_DATE_PARAM, DAY_DELTA_PARAM, MINUTE_DELTA_PARAM, ALL_DAY_PARAM, CALLBACK).addToBody(jsFunction);
     }
 
+    protected String getFieldId(FacesContext context, UISchedule component, String attribute) {
+        return getUtils().clientId(context, component) + NamingContainer.SEPARATOR_CHAR + attribute;
+    }
+
     protected Map<String, Object> getOptions(UISchedule schedule) throws IOException {
         /**
          * Copy attributes from child view components
@@ -355,16 +391,6 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
         return options;
     }
 
-    protected void addOptionIfSetAndNotDefault(String optionName, Object value, Map<String, Object> options) {
-        if (value != null && !"".equals(value) && !value.equals(DEFAULTS.get(optionName))) {
-            options.put(optionName, value);
-        }
-    }
-
-    protected String getFieldId(FacesContext context, UISchedule component, String attribute) {
-        return getUtils().clientId(context, component) + NamingContainer.SEPARATOR_CHAR + attribute;
-    }
-
     protected boolean isAjaxMode(UISchedule component) {
         String mode = component.getSwitchType();
         return UISchedule.SWITCH_TYPE_AJAX.equals(mode) || "".equals(mode) || null == mode;
@@ -374,25 +400,4 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
         String mode = component.getSwitchType();
         return UISchedule.SWITCH_TYPE_CLIENT.equals(mode);
     }
-
-    private void addOptionHash(String attribute, UIComponent source, Map<String, Object> options) {
-        Map<String, Object> hash = new HashMap<String, Object>(3);
-        Map<String, Object> attributes = source.getAttributes();
-        addOptionIfSetAndNotDefault("month", attributes.get(attribute + "Month"), hash);
-        addOptionIfSetAndNotDefault("basicWeek", attributes.get(attribute + "BasicWeek"), hash);
-        addOptionIfSetAndNotDefault("agendaWeek", attributes.get(attribute + "AgendaWeek"), hash);
-        addOptionIfSetAndNotDefault("basicDay", attributes.get(attribute + "BasicDay"), hash);
-        addOptionIfSetAndNotDefault("agendaDay", attributes.get(attribute + "AgendaDay"), hash);
-        addOptionIfSetAndNotDefault("", attributes.get(attribute), hash);
-        if (hash.size() > 0) {
-            options.put(attribute, hash);
-        }
-    }
-
-    private static void copyAttribute(String attribute, String suffix, UIComponent source, UIComponent target) {
-        Object value = source.getAttributes().get(attribute);
-        if (value != null) {
-            target.getAttributes().put(attribute + suffix, value);
-        }
-    }
 }

@@ -16,11 +16,19 @@ import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 public class ScheduleMessages extends ClientScript {
+// ------------------------------ FIELDS ------------------------------
 
     public static final String BUNDLE_NAME = "org.richfaces.component.UIScheduleMessages";
-    private static final String MESSAGE_KEY_BASE = "org.richfaces.component.UISchedule.";
+
     private static final Log LOG = LogFactory.getLog(ScheduleMessages.class);
 
+    private static final String MESSAGE_KEY_BASE = "org.richfaces.component.UISchedule.";
+
+// ------------------------ INTERFACE METHODS ------------------------
+
+
+// --------------------- Interface InternetResource ---------------------
+
     @Override
     public InputStream getResourceAsStream(ResourceContext context) {
 //TODO how to access messages from here if user keeps them somewhere else?
@@ -63,6 +71,18 @@ public class ScheduleMessages extends ClientScript {
         }
     }
 
+    @Override
+    public boolean requireFacesContext() {
+        return true;
+    }
+
+// -------------------------- OTHER METHODS --------------------------
+
+    @Override
+    public String getJavaScript() {
+        return getClass().getCanonicalName();
+    }
+
     private void appendArray(StringBuilder out, ResourceBundle applicationBundle, ResourceBundle stockBundle,
                              String jsPropertyName, String prefix, String[] keys) {
         String key;
@@ -93,6 +113,10 @@ public class ScheduleMessages extends ClientScript {
         out.append("}");
     }
 
+    private String escape(String message) {
+        return message.replaceAll("'", "\\\\'");
+    }
+
     private String getMessageFromBundle(String key, ResourceBundle applicationBundle, ResourceBundle stockBundle) {
         try {
             return applicationBundle.getString(key);
@@ -107,18 +131,4 @@ public class ScheduleMessages extends ClientScript {
             }
         }
     }
-
-    private String escape(String message) {
-        return message.replaceAll("'", "\\\\'");
-    }
-
-    @Override
-    public String getJavaScript() {
-        return getClass().getCanonicalName();
-    }
-
-    @Override
-    public boolean requireFacesContext() {
-        return true;
-    }
 }

@@ -15,14 +15,22 @@ import javax.faces.component.UIComponent;
 import javax.faces.el.MethodBinding;
 
 public class ScheduleTagHandlerBase extends ComponentHandler {
+// ------------------------------ FIELDS ------------------------------
 
     private final static String DATE_RANGE_CHANGED_LISTENER = "dateRangeChangeListener";
+
     private final static String DATE_SELECTED_LISTENER = "dateSelectListener";
-    private final static String ITEM_RESIZE_LISTENER = "itemResizeListener";
+
     private final static String ITEM_MOVE_LISTENER = "itemMoveListener";
+
+    private final static String ITEM_RESIZE_LISTENER = "itemResizeListener";
+
     private final static String ITEM_SELECTED_LISTENER = "itemSelectListener";
+
     private final static String VIEW_CHANGED_LISTENER = "viewChangeListener";
 
+// --------------------------- CONSTRUCTORS ---------------------------
+
     public ScheduleTagHandlerBase(ComponentConfig config) {
         super(config);
     }
@@ -32,11 +40,9 @@ public class ScheduleTagHandlerBase extends ComponentHandler {
         MetaRuleset ruleset = super.createMetaRuleset(clazz);
 
         ruleset.addRule(new MetaRule() {
-
             public Metadata applyRule(String name, final TagAttribute attribute, MetadataTarget metadataTarget) {
                 if (DATE_RANGE_CHANGED_LISTENER.equals(name)) {
                     return new Metadata() {
-
                         public void applyMetadata(FaceletContext context, Object object) {
                             MethodBinding binding = context.getFacesContext().getApplication().createMethodBinding(attribute.getValue(), new Class[]{NodeExpandedEvent.class});
                             ((UIComponent) object).getAttributes().put(DATE_RANGE_CHANGED_LISTENER, binding);
@@ -44,7 +50,6 @@ public class ScheduleTagHandlerBase extends ComponentHandler {
                     };
                 } else if (DATE_SELECTED_LISTENER.equals(name)) {
                     return new Metadata() {
-
                         public void applyMetadata(FaceletContext context, Object object) {
                             MethodBinding binding = context.getFacesContext().getApplication().createMethodBinding(attribute.getValue(), new Class[]{NodeSelectedEvent.class});
                             ((UIComponent) object).getAttributes().put(DATE_SELECTED_LISTENER, binding);
@@ -52,7 +57,6 @@ public class ScheduleTagHandlerBase extends ComponentHandler {
                     };
                 } else if (ITEM_RESIZE_LISTENER.equals(name)) {
                     return new Metadata() {
-
                         public void applyMetadata(FaceletContext context, Object object) {
                             MethodBinding binding = context.getFacesContext().getApplication().createMethodBinding(attribute.getValue(), new Class[]{NodeSelectedEvent.class});
                             ((UIComponent) object).getAttributes().put(ITEM_RESIZE_LISTENER, binding);
@@ -60,7 +64,6 @@ public class ScheduleTagHandlerBase extends ComponentHandler {
                     };
                 } else if (ITEM_MOVE_LISTENER.equals(name)) {
                     return new Metadata() {
-
                         public void applyMetadata(FaceletContext context, Object object) {
                             MethodBinding binding = context.getFacesContext().getApplication().createMethodBinding(attribute.getValue(), new Class[]{NodeSelectedEvent.class});
                             ((UIComponent) object).getAttributes().put(ITEM_MOVE_LISTENER, binding);
@@ -68,7 +71,6 @@ public class ScheduleTagHandlerBase extends ComponentHandler {
                     };
                 } else if (ITEM_SELECTED_LISTENER.equals(name)) {
                     return new Metadata() {
-
                         public void applyMetadata(FaceletContext context, Object object) {
                             MethodBinding binding = context.getFacesContext().getApplication().createMethodBinding(attribute.getValue(), new Class[]{NodeSelectedEvent.class});
                             ((UIComponent) object).getAttributes().put(ITEM_SELECTED_LISTENER, binding);
@@ -76,7 +78,6 @@ public class ScheduleTagHandlerBase extends ComponentHandler {
                     };
                 } else if (VIEW_CHANGED_LISTENER.equals(name)) {
                     return new Metadata() {
-
                         public void applyMetadata(FaceletContext context, Object object) {
                             MethodBinding binding = context.getFacesContext().getApplication().createMethodBinding(attribute.getValue(), new Class[]{NodeSelectedEvent.class});
                             ((UIComponent) object).getAttributes().put(VIEW_CHANGED_LISTENER, binding);