Housekeeping

 * Generic types parameterized
 * SupressWarnings annotations added where parameterization impossible
 * Unused members commented out
 * SerialVersionUID added/removed where necessary
 * Superfluous imports removed
 * Other small changed to get rid of some compiler/validator warnings

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@976 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 6 insertions, 6 deletions

diff --git a/utils/src/main/java/at/gv/egiz/org/apache/tomcat/util/http/AcceptLanguage.java b/utils/src/main/java/at/gv/egiz/org/apache/tomcat/util/http/AcceptLanguage.java
index 9cf8a003..d39ce675 100644
--- a/utils/src/main/java/at/gv/egiz/org/apache/tomcat/util/http/AcceptLanguage.java
+++ b/utils/src/main/java/at/gv/egiz/org/apache/tomcat/util/http/AcceptLanguage.java
@@ -60,7 +60,7 @@ public class AcceptLanguage {
         return (Locale)l.elementAt(0);
     }
 
-    public static Enumeration getLocales(String acceptLanguage) {
+    public static Enumeration<Locale> getLocales(String acceptLanguage) {
             // Short circuit with an empty enumeration if null header
         if (acceptLanguage == null) {
             Vector<Locale> v = new Vector<Locale>();
@@ -132,15 +132,15 @@ public class AcceptLanguage {
         }
     }
 
-    private static void extractLocales(Hashtable languages, Vector q,
+    private static void extractLocales(Hashtable<String, Vector<String>> languages, Vector<Double> q,
             Vector<Locale> l)
     {
         // XXX We will need to order by q value Vector in the Future ?
-        Enumeration e = q.elements();
+        Enumeration<Double> e = q.elements();
         while (e.hasMoreElements()) {
-            Vector v =
-                (Vector)languages.get(((Double)e.nextElement()).toString());
-            Enumeration le = v.elements();
+            Vector<String> v =
+                (Vector<String>)languages.get(((Double)e.nextElement()).toString());
+            Enumeration<String> le = v.elements();
             while (le.hasMoreElements()) {
                     String language = (String)le.nextElement();
                         String country = "";