[freenet-cvs] r21892 - trunk/freenet/test/freenet/support

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-08-15 10:49:39 +0000 (Fri, 15 Aug 2008)
New Revision: 21892

Modified:
   trunk/freenet/test/freenet/support/BufferTest.java
   trunk/freenet/test/freenet/support/ByteArrayWrapperTest.java
   trunk/freenet/test/freenet/support/MultiValueTableTest.java
Log:
generic-related warning hunt, take 2

Modified: trunk/freenet/test/freenet/support/BufferTest.java
===================================================================
--- trunk/freenet/test/freenet/support/BufferTest.java  2008-08-15 10:45:32 UTC 
(rev 21891)
+++ trunk/freenet/test/freenet/support/BufferTest.java  2008-08-15 10:49:39 UTC 
(rev 21892)
@@ -141,7 +141,7 @@
                Buffer b2 = new Buffer("Buffer2".getBytes());
                Buffer b3 = new Buffer("Buffer1".getBytes());

-               Map hashMap = new HashMap();
+               Map<Buffer, Buffer> hashMap = new HashMap<Buffer, Buffer>();

                hashMap.put(b1, b1); 
                hashMap.put(b2, b2);

Modified: trunk/freenet/test/freenet/support/ByteArrayWrapperTest.java
===================================================================
--- trunk/freenet/test/freenet/support/ByteArrayWrapperTest.java        
2008-08-15 10:45:32 UTC (rev 21891)
+++ trunk/freenet/test/freenet/support/ByteArrayWrapperTest.java        
2008-08-15 10:49:39 UTC (rev 21892)
@@ -32,7 +32,7 @@
                assertFalse(wrapper2.equals(wrapper3));
                assertFalse(wrapper1.equals(new String()));

-               Map map = new HashMap();
+               Map<ByteArrayWrapper, ByteArrayWrapper> map = new 
HashMap<ByteArrayWrapper, ByteArrayWrapper>();

                map.put(wrapper1, wrapper1);
                map.put(wrapper2, wrapper2); // should clobber 1 by hashcode

Modified: trunk/freenet/test/freenet/support/MultiValueTableTest.java
===================================================================
--- trunk/freenet/test/freenet/support/MultiValueTableTest.java 2008-08-15 
10:45:32 UTC (rev 21891)
+++ trunk/freenet/test/freenet/support/MultiValueTableTest.java 2008-08-15 
10:49:39 UTC (rev 21892)
@@ -63,8 +63,8 @@
         * @param valuesNumber number of objects to create
         * @return the sample List
         */
-       private List fillSampleValuesList(int valuesNumber) {
-               List sampleValues = new LinkedList();
+       private List<Object> fillSampleValuesList(int valuesNumber) {
+               List<Object> sampleValues = new LinkedList<Object>();
                for(int i=0; i<valuesNumber;i++)
                        sampleValues.add(new Object());
                return sampleValues;