Finished move to generics. Enforced 1.6 compliance for now. No errors or

warnings :)

3 files changed, 6 insertions, 6 deletions

diff --git a/source/com/c2kernel/scripting/ErrorInfo.java b/source/com/c2kernel/scripting/ErrorInfo.java
index 2714b93..1e813ec 100755..100644
--- a/source/com/c2kernel/scripting/ErrorInfo.java
+++ b/source/com/c2kernel/scripting/ErrorInfo.java
@@ -12,12 +12,12 @@ import java.util.Iterator;
  * All rights reserved.

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

 public class ErrorInfo {

-    ArrayList msg;

+    ArrayList<String> msg;

     boolean fatal = false;

           

     public ErrorInfo() {

         super();

-        msg = new ArrayList();

+        msg = new ArrayList<String>();

     }

     

     public void addError(String error) {

diff --git a/source/com/c2kernel/scripting/Script.java b/source/com/c2kernel/scripting/Script.java
index 7b1c6db..4abb5cf 100755..100644
--- a/source/com/c2kernel/scripting/Script.java
+++ b/source/com/c2kernel/scripting/Script.java
@@ -39,9 +39,9 @@ public class Script
     String mName;

     String mVersion;

     String mLang;

-    HashMap mInputParams = new HashMap();

-    HashMap mAllInputParams = new HashMap();

-    ArrayList mIncludes = new ArrayList();

+    HashMap<String, Parameter> mInputParams = new HashMap<String, Parameter>();

+    HashMap<String, Parameter> mAllInputParams = new HashMap<String, Parameter>();

+    ArrayList<Script> mIncludes = new ArrayList<Script>();

     BSFManager scriptManager;

 

     /**

diff --git a/source/com/c2kernel/scripting/ScriptConsole.java b/source/com/c2kernel/scripting/ScriptConsole.java
index c144ef7..d79cd5c 100755..100644
--- a/source/com/c2kernel/scripting/ScriptConsole.java
+++ b/source/com/c2kernel/scripting/ScriptConsole.java
@@ -44,7 +44,7 @@ public class ScriptConsole implements SocketHandler {
     Socket socket = null;

     BSFManager manager;

     BSFEngine context;

-    static ArrayList securityHosts = new ArrayList();

+    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;