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, 17 insertions, 18 deletions

diff --git a/source/com/c2kernel/utils/Logger.java b/source/com/c2kernel/utils/Logger.java
index 2d4d975..45edbee 100644
--- a/source/com/c2kernel/utils/Logger.java
+++ b/source/com/c2kernel/utils/Logger.java
@@ -32,9 +32,9 @@ public class Logger
 	static private void printMessage(String message, int msgLogLevel)

 	{

         synchronized(logStreams) {

-            for (Iterator iter = logStreams.keySet().iterator(); iter.hasNext();) {

-                PrintStream element = (PrintStream)iter.next();

-                int logLevel = ((Integer)logStreams.get(element)).intValue();

+            for (Iterator<PrintStream> iter = logStreams.keySet().iterator(); iter.hasNext();) {

+                PrintStream element = iter.next();

+                int logLevel = logStreams.get(element).intValue();

                 if (logLevel < msgLogLevel || (logLevel > 9 && logLevel - 10 < msgLogLevel))

                     continue;

                 if (logLevel > 9)

@@ -51,7 +51,7 @@ public class Logger
             }

         }

 	}

-    

+

     static private void printMessage(Throwable ex) {

             StringWriter msgString = new StringWriter();

             PrintWriter msg = new PrintWriter(msgString);

@@ -59,7 +59,7 @@ public class Logger
             ex.printStackTrace(msg);

             printMessage(msgString.toString(), 0);

     }

-    

+

 	static public boolean doLog(int logLevel)

 	{

         return mHighestLogLevel >= logLevel;

@@ -67,7 +67,7 @@ public class Logger
 	/**

 	 * Use this only for temporary messages while developing/debugging When the code is stable, change calls to debug to

 	 * message/warning/error with an appropriate log level This makes it easier to manage debug calls in the source.

-	 * 

+	 *

 	 * @param msg -

 	 *            the string to write to the console, or log file if specified in cmd line

 	 */

@@ -81,7 +81,7 @@ public class Logger
 	}

 	/**

 	 * Use Logger.message to report information that will be useful for debugging a release

-	 * 

+	 *

 	 * @param level -

 	 *            log level of this message. If the current log level has been on the cmd line to be less that this number, the log message

 	 *            will not be displayed

@@ -143,23 +143,22 @@ public class Logger
             if (logLevel > 9) logLevel-=10;

             if (logLevel > mHighestLogLevel) mHighestLogLevel = logLevel;

         }

-        

+

     }

     /**

      * @param console

      */

     public static void removeLogStream(PrintStream console) {

         synchronized(logStreams) {

-            Integer logIntObj = (Integer)logStreams.get(console);

-            if (logIntObj == null) return; // not registered 

+            Integer logIntObj = logStreams.get(console);

+            if (logIntObj == null) return; // not registered

             int logLevel = (logIntObj).intValue();

             logStreams.remove(console);

-            

+

             // recalculate lowest log level

             if (logLevel == mHighestLogLevel || (logLevel > 9 && logLevel-10 == mHighestLogLevel)) {

                 mHighestLogLevel = -1;

-                for (Iterator iter = logStreams.values().iterator(); iter.hasNext();) {

-                    Integer element = (Integer)iter.next();

+                for (Integer element : logStreams.values()) {

                     int thisLogLevel = element.intValue()>9?element.intValue()-10:element.intValue();

                     if (thisLogLevel > mHighestLogLevel || mHighestLogLevel == -1)

                         mHighestLogLevel = thisLogLevel;

@@ -167,7 +166,7 @@ public class Logger
             }

         }

     }

-    

+

     static public void initConsole(String id)

     {

         String portString = Gateway.getProperty(id+".Console.port");

@@ -177,19 +176,19 @@ public class Logger
         } catch (NumberFormatException ex) {

             Logger.msg("No port defined for "+id+" console. Using any port.");

         }

-            

+

         mConsole = new SimpleTCPIPServer(port, ScriptConsole.class, 5);

         mConsole.startListening();

         Gateway.setProperty(id+".Console.port", String.valueOf(mConsole.getPort()));

     }

-    

+

     static public int getConsolePort() {

         return mConsole.getPort();

     }

-    

+

     static public void closeConsole()

     {

         if (mConsole != null)

-            mConsole.stopListening(); 

+            mConsole.stopListening();

     }

 }