Merge pull request #236 from psamim/pr-weekviewevent

Accept subclasses of WeekViewEvent through MonthChangeListener interface

Author: Jens Claes

library/src/main/java/com/alamkanak/weekview/MonthLoader.java

@@ -17,7 +17,7 @@ public double toWeekViewPeriodIndex(Calendar instance){
     }
 
     @Override
-    public List<WeekViewEvent> onLoad(int periodIndex){
+    public List<? extends WeekViewEvent> onLoad(int periodIndex){
         return mOnMonthChangeListener.onMonthChange(periodIndex / 12, periodIndex % 12 + 1);
     }
 
@@ -34,10 +34,10 @@ public interface MonthChangeListener {
          * Very important interface, it's the base to load events in the calendar.
          * This method is called three times: once to load the previous month, once to load the next month and once to load the current month.<br/>
          * <strong>That's why you can have three times the same event at the same place if you mess up with the configuration</strong>
-         * @param newYear: year of the events required by the view.
-         * @param newMonth: month of the events required by the view <br/><strong>1 based (not like JAVA API) --> January = 1 and December = 12</strong>.
+         * @param newYear : year of the events required by the view.
+         * @param newMonth : month of the events required by the view <br/><strong>1 based (not like JAVA API) --> January = 1 and December = 12</strong>.
          * @return a list of the events happening <strong>during the specified month</strong>.
          */
-        List<WeekViewEvent> onMonthChange(int newYear, int newMonth);
+        List<? extends WeekViewEvent> onMonthChange(int newYear, int newMonth);
     }
 }

library/src/main/java/com/alamkanak/weekview/WeekView.java

@@ -73,9 +73,9 @@ public class WeekView extends View {
     private Paint mEventBackgroundPaint;
     private float mHeaderColumnWidth;
     private List<EventRect> mEventRects;
-    private List<WeekViewEvent> mPreviousPeriodEvents;
-    private List<WeekViewEvent> mCurrentPeriodEvents;
-    private List<WeekViewEvent> mNextPeriodEvents;
+    private List<? extends WeekViewEvent> mPreviousPeriodEvents;
+    private List<? extends WeekViewEvent> mCurrentPeriodEvents;
+    private List<? extends WeekViewEvent> mNextPeriodEvents;
     private TextPaint mEventTextPaint;
     private Paint mHeaderColumnBackgroundPaint;
     private int mFetchedPeriod = -1; // the middle period the calendar has fetched.
@@ -853,9 +853,9 @@ private void getMoreEvents(Calendar day) {
         if (mWeekViewLoader != null){
             int periodToFetch = (int) mWeekViewLoader.toWeekViewPeriodIndex(day);
             if (!isInEditMode() && (mFetchedPeriod < 0 || mFetchedPeriod != periodToFetch || mRefreshEvents)) {
-                List<WeekViewEvent> previousPeriodEvents = null;
-                List<WeekViewEvent> currentPeriodEvents = null;
-                List<WeekViewEvent> nextPeriodEvents = null;
+                List<? extends WeekViewEvent> previousPeriodEvents = null;
+                List<? extends WeekViewEvent> currentPeriodEvents = null;
+                List<? extends WeekViewEvent> nextPeriodEvents = null;
 
                 if (mPreviousPeriodEvents != null && mCurrentPeriodEvents != null && mNextPeriodEvents != null){
                     if (periodToFetch == mFetchedPeriod-1){
@@ -971,7 +971,7 @@ private void cacheEvent(WeekViewEvent event) {
      * Sort and cache events.
      * @param events The events to be sorted and cached.
      */
-    private void sortAndCacheEvents(List<WeekViewEvent> events) {
+    private void sortAndCacheEvents(List<? extends WeekViewEvent> events) {
         sortEvents(events);
         for (WeekViewEvent event : events) {
             cacheEvent(event);
@@ -982,7 +982,7 @@ private void sortAndCacheEvents(List<WeekViewEvent> events) {
      * Sorts the events in ascending order.
      * @param events The events to be sorted.
      */
-    private void sortEvents(List<WeekViewEvent> events) {
+    private void sortEvents(List<? extends WeekViewEvent> events) {
         Collections.sort(events, new Comparator<WeekViewEvent>() {
             @Override
             public int compare(WeekViewEvent event1, WeekViewEvent event2) {

library/src/main/java/com/alamkanak/weekview/WeekViewLoader.java

@@ -20,5 +20,5 @@ public interface WeekViewLoader {
      * @param periodIndex the period to load
      * @return A list with the events of this period
      */
-    List<WeekViewEvent> onLoad(int periodIndex);
+    List<? extends WeekViewEvent> onLoad(int periodIndex);
 }