[richfaces-svn-commits] JBoss Rich Faces SVN: r2580 - in trunk/ui/calendar/src/main/java/org/richfaces: renderkit and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2007-08-29 10:59:38 -0400 (Wed, 29 Aug 2007)
New Revision: 2580

Removed:
   trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarDataModelItemAdaptor.java
Modified:
   trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
Log:
CalendarDataModelItem - getDate() removed

Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java	2007-08-29 14:59:20 UTC (rev 2579)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java	2007-08-29 14:59:38 UTC (rev 2580)
@@ -21,12 +21,10 @@
 
 package org.richfaces.component;
 
-import java.util.AbstractCollection;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
@@ -50,9 +48,7 @@
 import org.richfaces.event.CurrentDateChangeListener;
 import org.richfaces.model.CalendarDataModel;
 import org.richfaces.model.CalendarDataModelItem;
-import org.richfaces.renderkit.CalendarDataModelItemAdaptor;
 import org.richfaces.renderkit.CalendarRendererBase;
-//import org.richfaces.component.CurrentDateChangeListener;
 
 // import org.richfaces.renderkit.html.BaseGradient.Data;
 
@@ -361,8 +357,7 @@
 				args.put("startDate", CalendarRendererBase
 						.formatDate(preloadDateRange[0]));
 				args
-						.put("days", new AdaptingCollection(
-								calendarDataModelItems));
+						.put("days", calendarDataModelItems);
 				return args;
 			}
 		}
@@ -408,40 +403,3 @@
 	}	
 
 }
-
-class AdaptingCollection extends AbstractCollection {
-	private CalendarDataModelItem[] items;
-
-	public AdaptingCollection(CalendarDataModelItem[] items) {
-		super();
-		this.items = items;
-	}
-
-	public Iterator iterator() {
-		return new Iterator() {
-			private int idx = 0;
-
-			private CalendarDataModelItemAdaptor adaptor = new CalendarDataModelItemAdaptor();
-
-			public boolean hasNext() {
-				return idx < items.length;
-			}
-
-			public Object next() {
-				adaptor.setItem(items[idx++]);
-				return adaptor;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-
-		};
-	}
-
-	public int size() {
-		return this.items.length;
-	}	
-	
-
-}

Deleted: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarDataModelItemAdaptor.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarDataModelItemAdaptor.java	2007-08-29 14:59:20 UTC (rev 2579)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarDataModelItemAdaptor.java	2007-08-29 14:59:38 UTC (rev 2580)
@@ -1,49 +0,0 @@
-/**
- * License Agreement.
- *
- *  JBoss RichFaces - Ajax4jsf Component Library
- *
- * Copyright (C) 2007  Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- */
-
-package org.richfaces.renderkit;
-
-import org.richfaces.model.CalendarDataModelItem;
-
-/**
- * @author Nick Belaevski - mailto:nbelaevski at exadel.com
- * created 04.07.2007
- *
- */
-public class CalendarDataModelItemAdaptor {
-	private CalendarDataModelItem item;
-	
-	public void setItem(CalendarDataModelItem item) {
-		this.item = item;
-	}
-	
-	public CalendarDataModelItem getItem() {
-		return item;
-	}
-	
-	public Object getDate() {
-		return CalendarRendererBase.formatDate(item.getDate());
-	}
-	
-	public Object getData() {
-		return item.getData();
-	}
-}