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

1 files changed, 20 insertions, 12 deletions

diff --git a/source/com/c2kernel/utils/FileStringUtility.java b/source/com/c2kernel/utils/FileStringUtility.java
index 84f46ca..843a44e 100644
--- a/source/com/c2kernel/utils/FileStringUtility.java
+++ b/source/com/c2kernel/utils/FileStringUtility.java
@@ -1,7 +1,16 @@
 package com.c2kernel.utils;

 

 //Java

-import java.io.*;

+import java.io.BufferedInputStream;

+import java.io.BufferedReader;

+import java.io.BufferedWriter;

+import java.io.File;

+import java.io.FileInputStream;

+import java.io.FileNotFoundException;

+import java.io.FileReader;

+import java.io.FileWriter;

+import java.io.IOException;

+import java.io.InputStream;

 import java.lang.reflect.Array;

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -73,7 +82,7 @@ public class FileStringUtility
 			lines.addElement(thisLine);

 		String[] lineArray = new String[lines.size()];

 		for (int i = 0; i < lines.size(); i++)

-			lineArray[i] = (String) lines.get(i);

+			lineArray[i] = lines.get(i);

 		return lineArray;

 	}

 

@@ -106,7 +115,7 @@ public class FileStringUtility
 	 **************************************************************************/

 	static public void string2File(String fileName, String data) throws FileNotFoundException, IOException

 	{

-		string2File(new File(fileName), data);        

+		string2File(new File(fileName), data);

 	}

 

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

@@ -226,8 +235,8 @@ public class FileStringUtility
 		{

 			files = dir.listFiles();

 

-			for (int i = 0; i < files.length; i++)

-				deleteDir(files[i].getAbsolutePath(), true, true);

+			for (File file : files)

+				deleteDir(file.getAbsolutePath(), true, true);

 		}

 

 		return deleteDir(dirPath);

@@ -255,11 +264,10 @@ public class FileStringUtility
 

 		files = dir.listFiles();

 

-		for (int i = 0; i < files.length; i++)

-		{

-			fileName = files[i].getName();

+		for (File file : files) {

+			fileName = file.getName();

 

-			if (files[i].isFile())

+			if (file.isFile())

 			{

 				fileNames.add(dirPath + "/" + fileName);

 			}

@@ -334,7 +342,7 @@ public class FileStringUtility
 	/**************************************************************************

 	 * Load the contents of the language file

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

-	static public Hashtable loadLanguageFile(String configFile)

+	static public Hashtable<String, String> loadLanguageFile(String configFile)

 	{

 		try

 		{

@@ -353,7 +361,7 @@ public class FileStringUtility
 		{

 			Logger.error("FileStringUtility.loadLanguageFile() - could not load language file '" + configFile+"'");

 			Logger.error(e);

-			return new Hashtable();

+			return new Hashtable<String, String>();

 		}

 

 	}

@@ -402,7 +410,7 @@ public class FileStringUtility
         StringBuffer tmp=new StringBuffer(src);

         int length = from.length();

         int index = tmp.toString().indexOf(from);

-        while (index>0) 

+        while (index>0)

         {

             tmp.replace(index,index+length,to);

             index = tmp.toString().indexOf(from);