svn commit: r815032 - /commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java

[ba...@apache.org]

Author: bayard
Date: Tue Sep 15 05:54:35 2009
New Revision: 815032

URL: http://svn.apache.org/viewvc?rev=815032&view=rev
Log:
Merging from -r468106:814127 of collections_jdk5_branch - namely where this code was generified; mostly in r738956.

Also see the following revisions:

    ------------------------------------------------------------------------
    r471202 | scolebourne | 2006-11-04 06:21:44 -0800 (Sat, 04 Nov 2006) | 1 line
    
    Remove getCollection() - use covariant decorated()
    ------------------------------------------------------------------------

Modified:
    commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java

Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java?rev=815032&r1=815031&r2=815032&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java (original)
+++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java Tue Sep 15 05:54:35 2009
@@ -39,8 +39,8 @@
  *
  * @author Stephen Colebourne
  */
-public final class UnmodifiableBuffer
-        extends AbstractBufferDecorator
+public final class UnmodifiableBuffer<E>
+        extends AbstractBufferDecorator<E>
         implements Unmodifiable, Serializable {
 
     /** Serialization version */
@@ -55,11 +55,11 @@
      * @return an unmodifiable Buffer
      * @throws IllegalArgumentException if buffer is null
      */
-    public static Buffer decorate(Buffer buffer) {
+    public static <E> Buffer<E> decorate(Buffer<E> buffer) {
         if (buffer instanceof Unmodifiable) {
             return buffer;
         }
-        return new UnmodifiableBuffer(buffer);
+        return new UnmodifiableBuffer<E>(buffer);
     }
 
     //-----------------------------------------------------------------------
@@ -69,7 +69,7 @@
      * @param buffer  the buffer to decorate, must not be null
      * @throws IllegalArgumentException if buffer is null
      */
-    private UnmodifiableBuffer(Buffer buffer) {
+    private UnmodifiableBuffer(Buffer<E> buffer) {
         super(buffer);
     }
 
@@ -92,21 +92,22 @@
      * @throws IOException
      * @throws ClassNotFoundException
      */
+    @SuppressWarnings("unchecked")
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
-        collection = (Collection) in.readObject();
+        collection = (Collection<E>) in.readObject();
     }
 
     //-----------------------------------------------------------------------
-    public Iterator iterator() {
-        return UnmodifiableIterator.decorate(getCollection().iterator());
+    public Iterator<E> iterator() {
+        return UnmodifiableIterator.decorate(decorated().iterator());
     }
 
     public boolean add(Object object) {
         throw new UnsupportedOperationException();
     }
 
-    public boolean addAll(Collection coll) {
+    public boolean addAll(Collection<? extends E> coll) {
         throw new UnsupportedOperationException();
     }
 
@@ -118,16 +119,16 @@
         throw new UnsupportedOperationException();
     }
 
-    public boolean removeAll(Collection coll) {
+    public boolean removeAll(Collection<?> coll) {
         throw new UnsupportedOperationException();
     }
 
-    public boolean retainAll(Collection coll) {
+    public boolean retainAll(Collection<?> coll) {
         throw new UnsupportedOperationException();
     }
 
     //-----------------------------------------------------------------------
-    public Object remove() {
+    public E remove() {
         throw new UnsupportedOperationException();
     }