From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001 From: abranson Date: Tue, 2 Aug 2011 22:10:28 +0200 Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors or warnings :) --- source/com/c2kernel/utils/ActDefCache.java | 2 +- source/com/c2kernel/utils/CastorArrayList.java | 8 +-- source/com/c2kernel/utils/CastorHashMap.java | 6 +-- source/com/c2kernel/utils/CastorXMLUtility.java | 2 +- source/com/c2kernel/utils/FileStringUtility.java | 8 +-- source/com/c2kernel/utils/Language.java | 2 +- source/com/c2kernel/utils/Logger.java | 2 +- source/com/c2kernel/utils/Resource.java | 4 +- source/com/c2kernel/utils/SoftCache.java | 34 +++++++------ source/com/c2kernel/utils/TransientCache.java | 57 +++++++++++----------- source/com/c2kernel/utils/XmlElementParser.java | 2 +- .../c2kernel/utils/server/HTTPRequestHandler.java | 2 +- .../c2kernel/utils/server/SimpleTCPIPServer.java | 2 +- 13 files changed, 66 insertions(+), 65 deletions(-) mode change 100755 => 100644 source/com/c2kernel/utils/ActDefCache.java mode change 100755 => 100644 source/com/c2kernel/utils/CastorArrayList.java mode change 100755 => 100644 source/com/c2kernel/utils/CastorHashMap.java mode change 100755 => 100644 source/com/c2kernel/utils/FileStringUtility.java mode change 100755 => 100644 source/com/c2kernel/utils/Language.java mode change 100755 => 100644 source/com/c2kernel/utils/Logger.java mode change 100755 => 100644 source/com/c2kernel/utils/Resource.java mode change 100755 => 100644 source/com/c2kernel/utils/TransientCache.java mode change 100755 => 100644 source/com/c2kernel/utils/XmlElementParser.java mode change 100755 => 100644 source/com/c2kernel/utils/server/HTTPRequestHandler.java mode change 100755 => 100644 source/com/c2kernel/utils/server/SimpleTCPIPServer.java (limited to 'source/com/c2kernel/utils') diff --git a/source/com/c2kernel/utils/ActDefCache.java b/source/com/c2kernel/utils/ActDefCache.java old mode 100755 new mode 100644 index bfd5cdb..148d934 --- 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 actCache = new SoftCache(); 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 old mode 100755 new mode 100644 index 10ff948..7596dd9 --- 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 implements Serializable{ + public ArrayList list; public CastorArrayList() { super(); - list = new ArrayList(); + list = new ArrayList(); } - public CastorArrayList(ArrayList list) { + public CastorArrayList(ArrayList list) { this(); this.list = list; } diff --git a/source/com/c2kernel/utils/CastorHashMap.java b/source/com/c2kernel/utils/CastorHashMap.java old mode 100755 new mode 100644 index fec2044..25e5ab4 --- 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 { public CastorHashMap() { @@ -18,13 +18,13 @@ public class CastorHashMap extends HashMap int numKeys = size(); KeyValuePair[] keyValuePairs = new KeyValuePair[numKeys]; - Iterator keyIter = keySet().iterator(); + Iterator keyIter = keySet().iterator(); int i = 0; for(i=0; i mMappingKeys = new HashSet(); /** * 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 old mode 100755 new mode 100644 index 948341a..84f46ca --- 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 lines = new Vector(); 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 listDir(String dirPath, boolean withDirs, boolean recursive) { - ArrayList fileNames = new ArrayList(); + ArrayList fileNames = new ArrayList(); 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 props = new Hashtable(); 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 old mode 100755 new mode 100644 index ae0947f..ee74f96 --- 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 mTableOfUntranslated = new Hashtable(); 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 old mode 100755 new mode 100644 index 6ac3f7c..2d4d975 --- 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 logStreams = new HashMap(); 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 old mode 100755 new mode 100644 index 7a47625..33100d8 --- 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 txtCache = new Hashtable(); + static private Hashtable imgCache = new Hashtable(); 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 extends AbstractMap { - private final Map hash = new HashMap(); + private final Map> hash = new HashMap>(); private final int minSize; - private final LinkedList hardCache = new LinkedList(); - private final ReferenceQueue queue = new ReferenceQueue(); + private final LinkedList hardCache = new LinkedList(); + private final ReferenceQueue queue = new ReferenceQueue(); 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 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(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 keySet() { processQueue(); return hash.keySet(); } - public Set entrySet() { + public Set> 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 extends SoftReference { private final Object key; - private SoftValue(Object k, Object key, ReferenceQueue q) { - super(k, q); + private SoftValue(Object key, V value, ReferenceQueue q) { + super(value, q); this.key = key; } } diff --git a/source/com/c2kernel/utils/TransientCache.java b/source/com/c2kernel/utils/TransientCache.java old mode 100755 new mode 100644 index b93bbd7..8991b87 --- 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 extends AbstractMap { - private Map map = new Hashtable(); - public synchronized Set entrySet() { - Map newMap; - Iterator iter; - newMap = new Hashtable(); - iter = map.entrySet().iterator(); + private Map> map = new Hashtable>(); + + public synchronized Set> entrySet() { + Map newMap = new Hashtable(); + Iterator>> iter = map.entrySet().iterator(); while (iter.hasNext()) { - Map.Entry me = (Map.Entry)iter.next(); - Reference ref = (Reference)me.getValue(); - Object o = ref.get(); + Entry> me = iter.next(); + Reference 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 ref = makeReference(value); + ref = (Reference)map.put(key, ref); if (ref != null) return (ref.get()); return null; } - public abstract Reference makeReference(Object value); + public abstract Reference makeReference(Object value); - public Object remove(Object key) { - Iterator i = map.entrySet().iterator(); - Entry correctEntry = null; + public V remove(Object key) { + Iterator>> i = map.entrySet().iterator(); + Entry> correctEntry = null; if (key == null) { while (correctEntry == null && i.hasNext()) { - Entry e = (Entry)i.next(); + Entry> e = i.next(); if (e.getKey() == null) correctEntry = e; } } else { while (correctEntry == null && i.hasNext()) { - Entry e = (Entry)i.next(); + Entry> 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 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 keySet = null; - public Set keySet() { + public Set keySet() { if (keySet == null) { - keySet = new AbstractSet() { - public Iterator iterator() { - return new Iterator() { - private Iterator i = map.entrySet().iterator(); + keySet = new AbstractSet() { + public Iterator iterator() { + return new Iterator() { + private Iterator>> 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 old mode 100755 new mode 100644 index f6fef4b..0f138d3 --- 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 returnData = new Vector(); String[] returnArray = new String[0]; try { diff --git a/source/com/c2kernel/utils/server/HTTPRequestHandler.java b/source/com/c2kernel/utils/server/HTTPRequestHandler.java old mode 100755 new mode 100644 index 1cad863..78635e6 --- 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 headers = new HashMap(); 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 old mode 100755 new mode 100644 index 12e8ec4..8db9257 --- 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 currentHandlers = new ArrayList(); static short noServers = 0; public SimpleTCPIPServer(int port, Class handlerClass, int maxConnections) -- cgit v1.2.3