From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 2 Aug 2011 22:10:28 +0200
Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors
 or warnings :)

---
 source/com/c2kernel/scripting/ErrorInfo.java     | 4 ++--
 source/com/c2kernel/scripting/Script.java        | 6 +++---
 source/com/c2kernel/scripting/ScriptConsole.java | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/scripting/ErrorInfo.java
 mode change 100755 => 100644 source/com/c2kernel/scripting/Script.java
 mode change 100755 => 100644 source/com/c2kernel/scripting/ScriptConsole.java

(limited to 'source/com/c2kernel/scripting')

diff --git a/source/com/c2kernel/scripting/ErrorInfo.java b/source/com/c2kernel/scripting/ErrorInfo.java
old mode 100755
new mode 100644
index 2714b93..1e813ec
--- 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
old mode 100755
new mode 100644
index 7b1c6db..4abb5cf
--- 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
old mode 100755
new mode 100644
index c144ef7..d79cd5c
--- 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;    
-- 
cgit v1.2.3