X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Futil%2Fswing%2FSortedListModel.java;h=39a5ce2463f2b09cfdb9bef14750252cdb81d46d;hb=953de352675a4ad91fe307d816a4ea7780c94274;hp=eebf86ab049cac77e8608dfc909e892520d55c30;hpb=e4f461213da0e30faf9e9eb2e97626abff320618;p=jSite.git

diff --git a/src/de/todesbaum/util/swing/SortedListModel.java b/src/de/todesbaum/util/swing/SortedListModel.java
index eebf86a..39a5ce2 100644
--- a/src/de/todesbaum/util/swing/SortedListModel.java
+++ b/src/de/todesbaum/util/swing/SortedListModel.java
@@ -1,6 +1,5 @@
 /*
- * todesbaum-lib - 
- * Copyright (C) 2006 David Roden
+ * jSite - SortedListModel.java - Copyright © 2006–2012 David Roden
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,15 +27,16 @@ import java.util.ListIterator;
 
 import javax.swing.AbstractListModel;
 
-
 /**
+ * @param <T>
+ *            The type of the elements
  * @author David Roden &lt;droden@gmail.com&gt;
- * @version $Id$
  */
-public class SortedListModel extends AbstractListModel implements List {
-	
-	private List elements = new ArrayList();
-	
+public class SortedListModel<T extends Comparable<T>> extends AbstractListModel implements List<T> {
+
+	/** The elements. */
+	private List<T> elements = new ArrayList<T>();
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -54,7 +54,7 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public void add(int index, Object element) {
+	public void add(int index, T element) {
 		elements.add(index, element);
 		Collections.sort(elements);
 		fireContentsChanged(this, 0, size());
@@ -63,7 +63,7 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public boolean add(Object o) {
+	public boolean add(T o) {
 		boolean result = elements.add(o);
 		Collections.sort(elements);
 		fireContentsChanged(this, 0, size());
@@ -73,7 +73,7 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public boolean addAll(Collection c) {
+	public boolean addAll(Collection<? extends T> c) {
 		boolean result = elements.addAll(c);
 		Collections.sort(elements);
 		fireContentsChanged(this, 0, size());
@@ -83,7 +83,7 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public boolean addAll(int index, Collection c) {
+	public boolean addAll(int index, Collection<? extends T> c) {
 		boolean result = elements.addAll(index, c);
 		Collections.sort(elements);
 		fireContentsChanged(this, 0, size());
@@ -108,13 +108,14 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public boolean containsAll(Collection c) {
+	public boolean containsAll(Collection<?> c) {
 		return elements.containsAll(c);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public boolean equals(Object o) {
 		return elements.equals(o);
 	}
@@ -122,13 +123,14 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public Object get(int index) {
+	public T get(int index) {
 		return elements.get(index);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public int hashCode() {
 		return elements.hashCode();
 	}
@@ -150,7 +152,7 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public Iterator iterator() {
+	public Iterator<T> iterator() {
 		return elements.iterator();
 	}
 
@@ -164,21 +166,21 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public ListIterator listIterator() {
+	public ListIterator<T> listIterator() {
 		return elements.listIterator();
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public ListIterator listIterator(int index) {
+	public ListIterator<T> listIterator(int index) {
 		return elements.listIterator(index);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public Object remove(int index) {
+	public T remove(int index) {
 		fireContentsChanged(this, 0, size());
 		return elements.remove(index);
 	}
@@ -194,7 +196,7 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public boolean removeAll(Collection c) {
+	public boolean removeAll(Collection<?> c) {
 		fireContentsChanged(this, 0, size());
 		return elements.removeAll(c);
 	}
@@ -202,7 +204,7 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public boolean retainAll(Collection c) {
+	public boolean retainAll(Collection<?> c) {
 		fireContentsChanged(this, 0, size());
 		return elements.retainAll(c);
 	}
@@ -210,8 +212,8 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public Object set(int index, Object element) {
-		Object result = elements.set(index, element);
+	public T set(int index, T element) {
+		T result = elements.set(index, element);
 		Collections.sort(elements);
 		fireContentsChanged(this, 0, size());
 		return result;
@@ -227,7 +229,7 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public List subList(int fromIndex, int toIndex) {
+	public List<T> subList(int fromIndex, int toIndex) {
 		return elements.subList(fromIndex, toIndex);
 	}
 
@@ -241,7 +243,7 @@ public class SortedListModel extends AbstractListModel implements List {
 	/**
 	 * {@inheritDoc}
 	 */
-	public Object[] toArray(Object[] a) {
+	public <U extends Object> U[] toArray(U[] a) {
 		return elements.toArray(a);
 	}