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, 13 deletions

diff --git a/source/com/c2kernel/scripting/ScriptConsole.java b/source/com/c2kernel/scripting/ScriptConsole.java
index d79cd5c..33d4b7f 100644
--- a/source/com/c2kernel/scripting/ScriptConsole.java
+++ b/source/com/c2kernel/scripting/ScriptConsole.java
@@ -4,7 +4,6 @@ import java.io.BufferedReader;
 import java.io.IOException;

 import java.io.InputStreamReader;

 import java.io.InterruptedIOException;

-import java.io.OutputStreamWriter;

 import java.io.PrintStream;

 import java.net.InetAddress;

 import java.net.Socket;

@@ -47,7 +46,7 @@ public class ScriptConsole implements SocketHandler {
     static ArrayList<String> securityHosts = new ArrayList<String>();

     public static final short NONE = 0;

     public static final short ALLOW = 1;

-    public static final short DENY = 2;    

+    public static final short DENY = 2;

     static short securityMode;

 

     static {

@@ -75,18 +74,20 @@ public class ScriptConsole implements SocketHandler {
     public ScriptConsole() {

     }

 

-    public String getName() {

+    @Override

+	public String getName() {

         return "Script Console";

     }

 

-    public boolean isBusy() {

+    @Override

+	public boolean isBusy() {

         return (socket != null);

     }

 

-    public void setSocket(Socket newSocket) {

+    @Override

+	public void setSocket(Socket newSocket) {

         try {

             input = new BufferedReader(new InputStreamReader(newSocket.getInputStream()));

-            OutputStreamWriter ansi = new OutputStreamWriter(newSocket.getOutputStream(), "US-ASCII");

             output = new PrintStream(newSocket.getOutputStream());

             newSocket.setSoTimeout(0);

             socket = newSocket;

@@ -100,7 +101,8 @@ public class ScriptConsole implements SocketHandler {
         }

     }

 

-    public void shutdown() {

+    @Override

+	public void shutdown() {

         Socket closingSocket = socket;

         socket = null;

         if (closingSocket == null)

@@ -118,7 +120,8 @@ public class ScriptConsole implements SocketHandler {
     }

 

 

-    public void run() {

+    @Override

+	public void run() {

         // check permission

         boolean allowed = true;

         if (securityMode!=NONE) {

@@ -127,7 +130,7 @@ public class ScriptConsole implements SocketHandler {
                     allowed = false;

             }

             else if (securityMode==ALLOW)

-                allowed = false;                

+                allowed = false;

         }

 

         if (!allowed) {

@@ -150,7 +153,7 @@ public class ScriptConsole implements SocketHandler {
                 try {

                 manager.declareBean("system", Gateway.getProxyManager().getProxy(

                 		Gateway.getLDAPLookup().getRoleManager().getAgentPath("system")), AgentProxy.class);

-                } catch (Exception ex) { 

+                } catch (Exception ex) {

                 	output.println("System agent unavailable");

                 }

                 context = manager.loadScriptingEngine("javascript");

@@ -200,7 +203,7 @@ public class ScriptConsole implements SocketHandler {
                     	continue;

                     }

                     try {

-                        if (command.endsWith("\\")) { 

+                        if (command.endsWith("\\")) {

                             commandBuffer.append(command.substring(0,command.length()-1));

                             continue;

                         }

@@ -208,11 +211,11 @@ public class ScriptConsole implements SocketHandler {
                         command = commandBuffer.toString();

                         commandBuffer = new StringBuffer();

                         Logger.msg("Console command from "+socket.getInetAddress()+": "+command);

-                        

+

                         // process control

                         if (command.equals("shutdown")) {

                         			WrapperManager.stop(0);

-                        }                    

+                        }

                         else {

                         	Object response = context.eval("Command", 0, 0, command);

                         	if (response instanceof org.mozilla.javascript.Undefined)