removed CalendarPicker2 and refactored LocalDatePicker to extend Cale…

…ndarPicker fixed a bug
oedemis · Apr 21, 2013 · 076ff68 · 076ff68
1 parent f8486d1
commit 076ff68
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 1,258 deletions.
diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/CalendarPickerControlSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/CalendarPickerControlSkin.java
@@ -410,8 +410,8 @@ private void toggle(ToggleButton toggleButton, boolean shiftIsPressed)
 
 		// select or deselect
 		List<Calendar> lCalendars = getSkinnable().calendars();
-		boolean lSelect = !contains(lCalendars, lToggledCalendar);  
-		if (lSelect) 
+		Calendar lFoundCalendar = find(lCalendars, lToggledCalendar); // find solely on YMD not HMS 
+		if (lFoundCalendar == null) // if not found 
 		{
 			// only add if not present
 			lCalendars.add(lToggledCalendar);
@@ -468,7 +468,7 @@ private void toggle(ToggleButton toggleButton, boolean shiftIsPressed)
 		else 
 		{
 			// remove
-			lCalendars.remove(lToggledCalendar);
+			lCalendars.remove(lFoundCalendar);
 			iLastSelected = null;
 		}
 
@@ -661,7 +661,7 @@ private void refreshDayButtonToggleState()
 				int lIdx = lFirstOfMonthIdx + i - 1;
 
 				// is selected
-				boolean lSelected = contains(lCalendars, lCalendar);  
+				boolean lSelected = (find(lCalendars, lCalendar) != null);  
 				dayButtons.get(lIdx).setSelected( lSelected );
 			}
 		}
@@ -678,7 +678,7 @@ private void refreshDayButtonToggleState()
 	 * @param calendar
 	 * @return
 	 */
-	private boolean contains(List<Calendar> calendars, Calendar calendar)
+	private Calendar find(List<Calendar> calendars, Calendar calendar)
 	{
 		for (Calendar c : calendars)
 		{
@@ -687,9 +687,9 @@ private boolean contains(List<Calendar> calendars, Calendar calendar)
 			  && c.get(Calendar.DATE) == calendar.get(Calendar.DATE)
 			   )
 			{
-				return true;
+				return c;
 			}
 		}
-		return false;
+		return null;
 	}
 }