Merge branch 'SWF-1510'

spring-faces/src/main/java/org/springframework/faces/model/SerializableListDataModel.java

@@ -19,22 +19,17 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.faces.model.DataModel;
-import javax.faces.model.DataModelEvent;
-import javax.faces.model.DataModelListener;
+import javax.faces.model.ListDataModel;
 
 import org.springframework.util.Assert;
 
 /**
- * A simple List-to-JSF-DataModel adapter that is also serializable.
- * 
+ * A simple {@link ListDataModel List-to-JSF-DataModel} adapter that is also {@link Serializable}.
+ *
  * @author Jeremy Grelle
+ * @author Phillip Webb
  */
-public class SerializableListDataModel<T> extends DataModel<T> implements Serializable {
-
-	private int rowIndex = 0;
-
-	private List<T> data;
+public class SerializableListDataModel<T> extends ListDataModel<T> implements Serializable {
 
 	public SerializableListDataModel() {
 		this(new ArrayList<T>());
@@ -51,57 +46,20 @@ public class SerializableListDataModel<T> extends DataModel<T> implements Serial
 		setWrappedData(list);
 	}
 
-	public int getRowCount() {
-		return this.data.size();
-	}
-
-	public T getRowData() {
-		Assert.isTrue(isRowAvailable(), getClass()
-				+ " is in an illegal state - no row is available at the current index.");
-		return this.data.get(this.rowIndex);
-	}
-
-	public int getRowIndex() {
-		return this.rowIndex;
-	}
-
-	public List<T> getWrappedData() {
-		return this.data;
-	}
-
-	public boolean isRowAvailable() {
-		return this.rowIndex >= 0 && this.rowIndex < this.data.size();
-	}
-
-	public void setRowIndex(int newRowIndex) {
-		if (newRowIndex < -1) {
-			throw new IllegalArgumentException("Illegal row index for " + getClass() + ": " + newRowIndex);
-		}
-		int oldRowIndex = this.rowIndex;
-		this.rowIndex = newRowIndex;
-		if (this.data != null && oldRowIndex != this.rowIndex) {
-			Object row = isRowAvailable() ? getRowData() : null;
-			DataModelEvent event = new DataModelEvent(this, this.rowIndex, row);
-			DataModelListener[] listeners = getDataModelListeners();
-			for (DataModelListener listener : listeners) {
-				listener.rowSelected(event);
-			}
-		}
-	}
-
 	@SuppressWarnings("unchecked")
+	public List<T> getWrappedData() {
+		return (List<T>) super.getWrappedData();
+	}
+
 	public void setWrappedData(Object data) {
 		if (data == null) {
 			data = new ArrayList<T>();
 		}
 		Assert.isInstanceOf(List.class, data, "The data object for " + getClass() + " must be a List");
-		this.data = (List<T>) data;
-		int newRowIndex = 0;
-		setRowIndex(newRowIndex);
+		super.setWrappedData(data);
 	}
 
 	public String toString() {
-		return this.data.toString();
+		return getWrappedData().toString();
 	}
-
 }