From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: More code cleanup: Refactored Entity Proxy Subscription to handle
 generics better Rewrote RemoteMap to use TreeMap instead of the internal
 array for order. It now sorts its keys by number if they parse, else as
 strings. Removed a no-longer-in-progress outcome form class

---
 source/com/c2kernel/utils/Language.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'source/com/c2kernel/utils/Language.java')

diff --git a/source/com/c2kernel/utils/Language.java b/source/com/c2kernel/utils/Language.java
index ee74f96..0b71d16 100644
--- a/source/com/c2kernel/utils/Language.java
+++ b/source/com/c2kernel/utils/Language.java
@@ -11,11 +11,11 @@ import java.util.Hashtable;
 
 public class Language
 {
-	public static Hashtable mTableOfTranslation = new Hashtable();
+	public static Hashtable<?, ?> mTableOfTranslation = new Hashtable<Object, Object>();
     public static Hashtable<String, String> mTableOfUntranslated = new Hashtable<String, String>();
     public static boolean isTranlated=false;
-	private Hashtable tableOfTranslation = new Hashtable();
-    
+	private Hashtable<?, ?> tableOfTranslation = new Hashtable<Object, Object>();
+
 	public static String translate(String english)
 	{
         if (!isTranlated) return english;
@@ -23,13 +23,13 @@ public class Language
         if (rep != null && !rep.equals("")) {
             String translated = (String) mTableOfTranslation.get(english);
             if (translated != null) return translated;
-            else 
+            else
             {
                 mTableOfUntranslated.put(english,"");
                 try
                 {
                     String s = "";
-                    Enumeration e = mTableOfUntranslated.keys();
+                    Enumeration<String> e = mTableOfUntranslated.keys();
                     while (e.hasMoreElements()) s =s+"\n"+e.nextElement();
                     FileStringUtility.string2File("untranslated.txt",s);
                 }
@@ -42,11 +42,11 @@ public class Language
         }
 		return rep;
 	}
-    
+
     public Language(String filePath)
-    {        
+    {
         String languageFile = filePath;
-                if (languageFile == null || languageFile.length() == 0) 
+                if (languageFile == null || languageFile.length() == 0)
                 // no language file defined for this process
                     return;
                 tableOfTranslation = FileStringUtility.loadLanguageFile(languageFile);
@@ -56,7 +56,7 @@ public class Language
         String rep = english;
         if (rep != null && !rep.equals("")) {
             String translated = (String) tableOfTranslation.get(english);
-            if (translated != null) 
+            if (translated != null)
                 rep = translated;
         }
         return rep;
-- 
cgit v1.2.3