[gwt-contrib] [google-web-toolkit commit] r4159 - branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client

[codesite-noreply]

Author: [EMAIL PROTECTED]
Date: Fri Nov 21 10:43:22 2008
New Revision: 4159

Modified:
     
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/CalendarView.java
     
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DatePicker.java
     
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DefaultCalendarView.java

Log:
emergency commit, Ray, you're it

Modified:  
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/CalendarView.java
==============================================================================
---  
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/CalendarView.java
         
(original)
+++  
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/CalendarView.java
         
Fri Nov 21 10:43:22 2008
@@ -81,7 +81,7 @@
     * @param enabled true for enabled, false for disabled
     * @param date date to enable or disable
     */
-  public abstract void setDateEnabled(boolean enabled, Date date);
+  public abstract void setEnabledOnDate(boolean enabled, Date date);

    /**
     * Allows the calendar view to update the date picker's highlighted date.

Modified:  
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DatePicker.java
==============================================================================
---  
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DatePicker.java
   
(original)
+++  
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DatePicker.java
   
Fri Nov 21 10:43:22 2008
@@ -179,6 +179,7 @@
        }
      }

+    @SuppressWarnings("deprecation")
      private String genKey(Date d) {
        return d.getYear() + "/" + d.getMonth() + "/" + d.getDate();
      }
@@ -268,10 +269,18 @@
     * the next time the DatePicker is refreshed.
     *
     * @param styleName style name
-   * @param visibleDate current visible date
+   * @param date visible date
+   * @param moreDates optional visible dates
     */
-  public final void addStyleToVisibleDate(String styleName, Date  
visibleDate) {
-    getView().addStyleToDate(styleName, visibleDate);
+  public final void addStyleToVisibleDates(String styleName, Date date,
+      Date... moreDates) {
+    assert (assertVisible(date, moreDates));
+    getView().addStyleToDate(styleName, date);
+    if (moreDates != null) {
+      for (Date d : moreDates) {
+        getView().addStyleToDate(styleName, d);
+      }
+    }
    }

    /**
@@ -395,6 +404,22 @@
     * Removes a style name from multiple visible dates.
     *
     * @param styleName style name to remove
+   * @param date a visible date
+   * @param moreDates optional additional visible dates
+   */
+  public final void removeStyleFromVisibleDates(String styleName, Date  
date,
+      Date... moreDates) {
+    assert (isDateVisible(date)) : date + " should be visible";
+    getView().removeStyleFromDate(styleName, date);
+    for (Date d : moreDates) {
+      getView().removeStyleFromDate(styleName, date);
+    }
+  }
+
+  /**
+   * Removes a style name from multiple visible dates.
+   *
+   * @param styleName style name to remove
     * @param dates dates that will have the supplied style removed
     */
    public final void removeStyleFromVisibleDates(String styleName,
@@ -428,11 +453,17 @@
     *
     * @param enabled is enabled
     * @param date the date
+   * @param moreDates optional dates
     */
-  public final void setEnabledOnVisibleDate(boolean enabled, Date date) {
-    assert isDateVisible(date) : date
-        + " cannot be enabled or disabled as it is not visible";
-    getView().setDateEnabled(enabled, date);
+  public final void setEnabledOnVisibleDates(boolean enabled, Date date,
+      Date... moreDates) {
+    assert assertVisible(date, moreDates);
+    getView().setEnabledOnDate(enabled, date);
+    if (moreDates != null) {
+      for (Date d : moreDates) {
+        getView().setEnabledOnDate(enabled, d);
+      }
+    }
    }

    /**
@@ -448,7 +479,7 @@
      for (Date date : dates) {
        assert isDateVisible(date) : date
            + " cannot be enabled or disabled as it is not visible";
-      r.setDateEnabled(enabled, date);
+      r.setEnabledOnDate(enabled, date);
      }
    }

@@ -555,9 +586,19 @@
     *
     * @param highlighted highlighted date
     */
-  void setHighlightedDate(Date highlightedDate) {
-    this.highlighted = highlightedDate;
-    HighlightEvent.fire(this, highlightedDate);
+  void setHighlightedDate(Date highlighted) {
+    this.highlighted = highlighted;
+    HighlightEvent.fire(this, highlighted);
+  }
+
+  private boolean assertVisible(Date date, Date... moreDates) {
+    assert isDateVisible(date) : date + " must be visible";
+    if (moreDates != null) {
+      for (Date d : moreDates) {
+        assert isDateVisible(d) : d + " must be visible";
+      }
+    }
+    return true;
    }

  }

Modified:  
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DefaultCalendarView.java
==============================================================================
---  
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DefaultCalendarView.java
  
(original)
+++  
branches/1_6_datepicker/user/src/com/google/gwt/user/datepicker/client/DefaultCalendarView.java
  
Fri Nov 21 10:43:22 2008
@@ -197,7 +197,7 @@
    }

    @Override
-  public void setDateEnabled(boolean enabled, Date date) {
+  public void setEnabledOnDate(boolean enabled, Date date) {
      getCell(date).setEnabled(enabled);
    }


--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---