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, 16 insertions, 11 deletions

diff --git a/source/com/c2kernel/entity/proxy/ProxyServerConnection.java b/source/com/c2kernel/entity/proxy/ProxyServerConnection.java
index 191492f..6807953 100755..100644
--- a/source/com/c2kernel/entity/proxy/ProxyServerConnection.java
+++ b/source/com/c2kernel/entity/proxy/ProxyServerConnection.java
@@ -10,7 +10,11 @@
 

 package com.c2kernel.entity.proxy;

 

-import java.io.*;

+import java.io.BufferedReader;

+import java.io.IOException;

+import java.io.InputStreamReader;

+import java.io.InterruptedIOException;

+import java.io.PrintWriter;

 import java.net.Socket;

 

 import com.c2kernel.common.InvalidDataException;

@@ -30,7 +34,7 @@ public class ProxyServerConnection extends Thread
     PrintWriter serverStream;

     boolean listening = false;

     static boolean isServer = false;

-        

+

     /**

      * Create an entity proxy manager to listen for proxy events and reap unused proxies

      */

@@ -43,8 +47,9 @@ public class ProxyServerConnection extends Thread
         listening = true;

         start();

     }

-    

-    public void run() {

+

+    @Override

+	public void run() {

         Thread.currentThread().setName("Proxy Client Connection Listener to "+serverName+":"+serverPort);

         while (listening) {

             try {

@@ -72,14 +77,14 @@ public class ProxyServerConnection extends Thread
                 try {

                     serverStream.close();

                     serverConnection.close();

-                } catch (IOException e1) { } 

+                } catch (IOException e1) { }

+

 

-                

                 serverStream = null;

                 serverConnection = null;

             }

         }

-        

+

         if (serverStream != null) {

             try {

                 Logger.msg(1, "Disconnecting from proxy server on "+serverName+":"+serverPort);

@@ -90,9 +95,9 @@ public class ProxyServerConnection extends Thread
             } catch (Exception e) {

                 Logger.error("Error disconnecting from proxy server.");

             }

-        }        

+        }

     }

-    

+

     public void connect() {

         Logger.msg(3, "ProxyServerConnection - connecting to proxy server on "+serverName+":"+serverPort);

         try {

@@ -111,12 +116,12 @@ public class ProxyServerConnection extends Thread
             serverIsActive = false;

         }

     }

-    

+

     public void shutdown() {

         Logger.msg("Proxy Client: flagging shutdown.");

         listening = false;

     }

-    

+

     /**

      * @param sub

      */