Finished move to generics. Enforced 1.6 compliance for now. No errors or

warnings :)

13 files changed, 66 insertions, 65 deletions

diff --git a/source/com/c2kernel/utils/ActDefCache.java b/source/com/c2kernel/utils/ActDefCache.java
index bfd5cdb..148d934 100755..100644
--- a/source/com/c2kernel/utils/ActDefCache.java
+++ b/source/com/c2kernel/utils/ActDefCache.java
@@ -15,7 +15,7 @@ import com.c2kernel.persistency.outcome.Viewpoint;
 

 public class ActDefCache {

 	

-	SoftCache actCache = new SoftCache();

+	SoftCache<String, ActCacheEntry> actCache = new SoftCache<String, ActCacheEntry>();

 	

 	public ActivityDef get(String actName, String actVersion) throws ObjectNotFoundException, InvalidDataException {

 		ActivityDef thisActDef;

diff --git a/source/com/c2kernel/utils/CastorArrayList.java b/source/com/c2kernel/utils/CastorArrayList.java
index 10ff948..7596dd9 100755..100644
--- a/source/com/c2kernel/utils/CastorArrayList.java
+++ b/source/com/c2kernel/utils/CastorArrayList.java
@@ -15,15 +15,15 @@ import java.util.ArrayList;
  * All rights reserved.

  **************************************************************************/

 //

-abstract public class CastorArrayList implements Serializable{

-    public ArrayList list = new ArrayList();

+abstract public class CastorArrayList<T> implements Serializable{

+    public ArrayList<T> list;

     

     public CastorArrayList() {

         super();

-		list = new ArrayList();       

+		list = new ArrayList<T>();       

     }

     

-    public CastorArrayList(ArrayList list) {

+    public CastorArrayList(ArrayList<T> list) {

         this();

         this.list = list;

     }

diff --git a/source/com/c2kernel/utils/CastorHashMap.java b/source/com/c2kernel/utils/CastorHashMap.java
index fec2044..25e5ab4 100755..100644
--- a/source/com/c2kernel/utils/CastorHashMap.java
+++ b/source/com/c2kernel/utils/CastorHashMap.java
@@ -6,7 +6,7 @@ import java.util.Iterator;
 

 // This subclass of hashtable can be marshalled

 // and unmarshalled with Castor

-public class CastorHashMap extends HashMap

+public class CastorHashMap extends HashMap<String,Object>

 {

     public CastorHashMap()

     {

@@ -18,13 +18,13 @@ public class CastorHashMap extends HashMap
         int            numKeys       = size();

 

         KeyValuePair[] keyValuePairs = new KeyValuePair[numKeys];

-        Iterator       keyIter       = keySet().iterator();

+        Iterator<String> keyIter     = keySet().iterator();

         int            i             = 0;

 

         for(i=0; i<numKeys; i++)

             if (keyIter.hasNext())

             {

-                String tmp = (String)keyIter.next();

+                String tmp = keyIter.next();

                 keyValuePairs[i]   = new KeyValuePair(tmp,get(tmp));

             }

 

diff --git a/source/com/c2kernel/utils/CastorXMLUtility.java b/source/com/c2kernel/utils/CastorXMLUtility.java
index 07e8e3f..1f68e77 100644
--- a/source/com/c2kernel/utils/CastorXMLUtility.java
+++ b/source/com/c2kernel/utils/CastorXMLUtility.java
@@ -28,7 +28,7 @@ import com.c2kernel.persistency.outcome.Outcome;
 public class CastorXMLUtility

 {

     private static Mapping mMapping     = new Mapping();

-    private static HashSet mMappingKeys = new HashSet();

+    private static HashSet<URL> mMappingKeys = new HashSet<URL>();

 

     /**

      * Looks for a file called 'index.xml' at the given URL, and loads every file

diff --git a/source/com/c2kernel/utils/FileStringUtility.java b/source/com/c2kernel/utils/FileStringUtility.java
index 948341a..84f46ca 100755..100644
--- a/source/com/c2kernel/utils/FileStringUtility.java
+++ b/source/com/c2kernel/utils/FileStringUtility.java
@@ -67,7 +67,7 @@ public class FileStringUtility
 	{

 		FileReader fr = new FileReader(file);

 		BufferedReader buf = new BufferedReader(fr);

-		Vector lines = new Vector();

+		Vector<String> lines = new Vector<String>();

 		String thisLine = null;

 		while ((thisLine = buf.readLine()) != null)

 			lines.addElement(thisLine);

@@ -240,9 +240,9 @@ public class FileStringUtility
 	 * @param dirPath starting directory

 	 * @param recursive goes into the subdirectories

 	 **************************************************************************/

-	static public ArrayList listDir(String dirPath, boolean withDirs, boolean recursive)

+	static public ArrayList<String> listDir(String dirPath, boolean withDirs, boolean recursive)

 	{

-		ArrayList fileNames = new ArrayList();

+		ArrayList<String> fileNames = new ArrayList<String>();

 		File dir = new File(dirPath);

 		File files[];

 		String fileName;

@@ -339,7 +339,7 @@ public class FileStringUtility
 		try

 		{

 			String language = FileStringUtility.file2String(configFile);

-			Hashtable props = new Hashtable();

+			Hashtable<String, String> props = new Hashtable<String, String>();

 			StringTokenizer tok = new StringTokenizer(language, "\n");

 			while (tok.hasMoreTokens())

 			{

diff --git a/source/com/c2kernel/utils/Language.java b/source/com/c2kernel/utils/Language.java
index ae0947f..ee74f96 100755..100644
--- a/source/com/c2kernel/utils/Language.java
+++ b/source/com/c2kernel/utils/Language.java
@@ -12,7 +12,7 @@ import java.util.Hashtable;
 public class Language

 {

 	public static Hashtable mTableOfTranslation = new Hashtable();

-    public static Hashtable mTableOfUntranslated = new Hashtable();

+    public static Hashtable<String, String> mTableOfUntranslated = new Hashtable<String, String>();

     public static boolean isTranlated=false;

 	private Hashtable tableOfTranslation = new Hashtable();

     

diff --git a/source/com/c2kernel/utils/Logger.java b/source/com/c2kernel/utils/Logger.java
index 6ac3f7c..2d4d975 100755..100644
--- a/source/com/c2kernel/utils/Logger.java
+++ b/source/com/c2kernel/utils/Logger.java
@@ -26,7 +26,7 @@ public class Logger
      * add ten to output time before each message

 	 */

 	private static int mHighestLogLevel = 0;

-    private static HashMap logStreams = new HashMap();

+    private static HashMap<PrintStream, Integer> logStreams = new HashMap<PrintStream, Integer>();

     static protected SimpleTCPIPServer  mConsole       = null;

 

 	static private void printMessage(String message, int msgLogLevel)

diff --git a/source/com/c2kernel/utils/Resource.java b/source/com/c2kernel/utils/Resource.java
index 7a47625..33100d8 100755..100644
--- a/source/com/c2kernel/utils/Resource.java
+++ b/source/com/c2kernel/utils/Resource.java
@@ -15,8 +15,8 @@ import com.c2kernel.common.ObjectNotFoundException;
  * @version $Revision: 1.71 $

  **************************************************************************/

 public class Resource {

-    static private Hashtable txtCache = new Hashtable();

-    static private Hashtable imgCache = new Hashtable();

+    static private Hashtable<String, String> txtCache = new Hashtable<String, String>();

+    static private Hashtable<String, ImageIcon> imgCache = new Hashtable<String, ImageIcon>();

     static private URL baseURL = null;

     static private URL domainBaseURL = null;

     static private URL importURL = null;

diff --git a/source/com/c2kernel/utils/SoftCache.java b/source/com/c2kernel/utils/SoftCache.java
index f13c87d..6680f30 100644
--- a/source/com/c2kernel/utils/SoftCache.java
+++ b/source/com/c2kernel/utils/SoftCache.java
@@ -10,12 +10,12 @@ import java.util.*;
  * 

  * $Revision: 1.5 $ $Date: 2004/10/29 13:29:09 $

  ******************************************************************************/

-public class SoftCache extends AbstractMap {

+public class SoftCache<K, V> extends AbstractMap<K, V> {

 

-    private final Map hash = new HashMap();

+    private final Map<K, SoftValue<V>> hash = new HashMap<K, SoftValue<V>>();

     private final int minSize;

-    private final LinkedList hardCache = new LinkedList();

-    private final ReferenceQueue queue = new ReferenceQueue();

+    private final LinkedList<V> hardCache = new LinkedList<V>();

+    private final ReferenceQueue<V> queue = new ReferenceQueue<V>();

 

     public SoftCache() {

         this(0);

@@ -25,9 +25,10 @@ public class SoftCache extends AbstractMap {
         this.minSize = minSize;

     }

 

-    public Object get(Object key) {

-        Object result = null;

-        SoftReference soft_ref = (SoftReference) hash.get(key);

+    @Override

+    public V get(Object key) {

+        V result = null;

+        SoftValue<V> soft_ref = hash.get(key);

         if (soft_ref != null) {

             result = soft_ref.get();

             if (result == null)

@@ -42,19 +43,20 @@ public class SoftCache extends AbstractMap {
         return result;

     }

 

-    public Object put(Object key, Object value) {

+    public V put(K key, V value) {

         processQueue();

         if (minSize > 0) {

             hardCache.addFirst(value);

             if (hardCache.size() > minSize)

                 hardCache.removeLast();

         }

-        return hash.put(key, new SoftValue(value, key, queue));

+        hash.put(key, new SoftValue<V>(key, value, queue));

+        return value;

     }

 

-    public Object remove(Object key) {

+    public V remove(Object key) {

         processQueue();

-        return hash.remove(key);

+        return hash.remove(key).get();

     }

 

     public void clear() {

@@ -68,21 +70,21 @@ public class SoftCache extends AbstractMap {
         return hash.size();

     }

     

-    public Set keySet() {

+    public Set<K> keySet() {

         processQueue();

         return hash.keySet();

     }

 

-    public Set entrySet() {

+    public Set<Map.Entry<K, V>> entrySet() {

         // Would have to create another Map to do this - too expensive

         // Throwing runtime expensive is dangerous, but better than nulls

         throw new UnsupportedOperationException();

     }    

     

-    private static class SoftValue extends SoftReference {

+    private static class SoftValue<V> extends SoftReference<V> {

         private final Object key;

-        private SoftValue(Object k, Object key, ReferenceQueue q) {

-            super(k, q);

+        private SoftValue(Object key, V value, ReferenceQueue<V> q) {

+            super(value, q);

             this.key = key;

         }

     }

diff --git a/source/com/c2kernel/utils/TransientCache.java b/source/com/c2kernel/utils/TransientCache.java
index b93bbd7..8991b87 100755..100644
--- a/source/com/c2kernel/utils/TransientCache.java
+++ b/source/com/c2kernel/utils/TransientCache.java
@@ -12,18 +12,17 @@ import java.util.*;
  * Copyright (C) 2003 CERN - European Organization for Nuclear Research

  * All rights reserved.

  **************************************************************************/

-public abstract class TransientCache extends AbstractMap {

+public abstract class TransientCache<K, V> extends AbstractMap<K, V> {

     

-    private Map map = new Hashtable();

-    public synchronized Set entrySet() {

-        Map newMap;

-        Iterator iter;

-        newMap = new Hashtable();

-        iter = map.entrySet().iterator();

+    private Map<K, Reference<V>> map = new Hashtable<K, Reference<V>>();

+    

+    public synchronized Set<Entry<K, V>> entrySet() {

+        Map<K, V> newMap = new Hashtable<K,V>();

+        Iterator<Entry<K, Reference<V>>> iter = map.entrySet().iterator();

         while (iter.hasNext()) {

-            Map.Entry me = (Map.Entry)iter.next();

-            Reference ref = (Reference)me.getValue();

-            Object o = ref.get();

+        	Entry<K, Reference<V>> me = iter.next();

+            Reference<V> ref = me.getValue();

+            V o = ref.get();

             if (o == null) {

                 // Delete cleared reference 

                 iter.remove();

@@ -36,35 +35,35 @@ public abstract class TransientCache extends AbstractMap {
         return newMap.entrySet();

     }

     

-    public synchronized Object put(Object key, Object value) {

-        Reference ref = makeReference(value);

-        ref = (Reference)map.put(key, ref);

+    public synchronized V put(K key, V value) {

+        Reference<V> ref = makeReference(value);

+        ref = (Reference<V>)map.put(key, ref);

         if (ref != null)

             return (ref.get());

         return null;

     }

     

-    public abstract Reference makeReference(Object value);

+    public abstract Reference<V> makeReference(Object value);

     

-    public Object remove(Object key) {

-        Iterator i = map.entrySet().iterator();

-        Entry correctEntry = null;

+    public V remove(Object key) {

+        Iterator<Entry<K, Reference<V>>> i = map.entrySet().iterator();

+        Entry<K, Reference<V>> correctEntry = null;

         if (key == null) {

             while (correctEntry == null && i.hasNext()) {

-                Entry e = (Entry)i.next();

+                Entry<K, Reference<V>> e = i.next();

                 if (e.getKey() == null)

                     correctEntry = e;

             }

         } else {

             while (correctEntry == null && i.hasNext()) {

-                Entry e = (Entry)i.next();

+            	Entry<K, Reference<V>> e = i.next();

                 if (key.equals(e.getKey()))

                     correctEntry = e;

             }

         }

-        Object oldValue = null;

+        V oldValue = null;

         if (correctEntry != null) {

-            Reference correctReference = (Reference)correctEntry.getValue();

+            Reference<V> correctReference = correctEntry.getValue();

             oldValue = correctReference.get();

             i.remove();

         }

@@ -77,21 +76,21 @@ public abstract class TransientCache extends AbstractMap {
         map.entrySet().clear();

     }

     

-    private transient Set keySet = null;

+    private transient Set<K> keySet = null;

     

-    public Set keySet() {

+    public Set<K> keySet() {

         if (keySet == null) {

-            keySet = new AbstractSet() {

-            public Iterator iterator() {

-                return new Iterator() {

-                private Iterator i = map.entrySet().iterator();

+            keySet = new AbstractSet<K>() {

+            public Iterator<K> iterator() {

+                return new Iterator<K>() {

+                private Iterator<Entry<K, Reference<V>>> i = map.entrySet().iterator();

 

                 public boolean hasNext() {

                     return i.hasNext();

                 }

 

-                public Object next() {

-                    return ((Entry)i.next()).getKey();

+                public K next() {

+                    return i.next().getKey();

                 }

 

                 public void remove() {

diff --git a/source/com/c2kernel/utils/XmlElementParser.java b/source/com/c2kernel/utils/XmlElementParser.java
index f6fef4b..0f138d3 100755..100644
--- a/source/com/c2kernel/utils/XmlElementParser.java
+++ b/source/com/c2kernel/utils/XmlElementParser.java
@@ -27,7 +27,7 @@ public class XmlElementParser
     

     public static String[] parseOld(String data, String path)

         {

-            Vector returnData = new Vector();

+            Vector<String> returnData = new Vector<String>();

             String[] returnArray = new String[0];

             try

             {

diff --git a/source/com/c2kernel/utils/server/HTTPRequestHandler.java b/source/com/c2kernel/utils/server/HTTPRequestHandler.java
index 1cad863..78635e6 100755..100644
--- a/source/com/c2kernel/utils/server/HTTPRequestHandler.java
+++ b/source/com/c2kernel/utils/server/HTTPRequestHandler.java
@@ -14,7 +14,7 @@ import com.c2kernel.utils.Logger;
 

 public class HTTPRequestHandler implements SocketHandler {

 

-    protected HashMap headers = new HashMap();

+    protected HashMap<String, String> headers = new HashMap<String, String>();

     protected String method;

     protected String resource;

     protected String version;

diff --git a/source/com/c2kernel/utils/server/SimpleTCPIPServer.java b/source/com/c2kernel/utils/server/SimpleTCPIPServer.java
index 12e8ec4..8db9257 100755..100644
--- a/source/com/c2kernel/utils/server/SimpleTCPIPServer.java
+++ b/source/com/c2kernel/utils/server/SimpleTCPIPServer.java
@@ -20,7 +20,7 @@ public class SimpleTCPIPServer implements Runnable
     Class               handlerClass    = null;

     ServerSocket        serverSocket    = null;

     boolean            keepListening   = true;

-    ArrayList           currentHandlers = new ArrayList();

+    ArrayList<SocketHandler>           currentHandlers = new ArrayList<SocketHandler>();

     static short       noServers = 0;

 

     public SimpleTCPIPServer(int port, Class handlerClass, int maxConnections)