From 79bdf4aa01fb9ca991de032733919923a19192c8 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Sun, 27 Oct 2013 21:06:45 +0100
Subject: 3.0-SNAPSHOT Do Integer.parseInt(propObj.toString()) to tolerate
 String or Integer version properties.

---
 src/main/java/com/c2kernel/scripting/Script.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main/java/com/c2kernel/scripting/Script.java')

diff --git a/src/main/java/com/c2kernel/scripting/Script.java b/src/main/java/com/c2kernel/scripting/Script.java
index 1a755ea..9166e2e 100644
--- a/src/main/java/com/c2kernel/scripting/Script.java
+++ b/src/main/java/com/c2kernel/scripting/Script.java
@@ -43,7 +43,7 @@ public class Script
 {
     String mScript = "";
     String mName;
-    String mVersion;
+    Integer mVersion;
     HashMap<String, Parameter> mInputParams = new HashMap<String, Parameter>();
     HashMap<String, Parameter> mAllInputParams = new HashMap<String, Parameter>();
     HashMap<String, Parameter> mOutputParams = new HashMap<String, Parameter>();
@@ -79,7 +79,7 @@ public class Script
     public Script(String scriptName, int scriptVersion) throws ScriptingEngineException
     {
         mName = scriptName;
-        mVersion = String.valueOf(scriptVersion);
+        mVersion = scriptVersion;
         if (!scriptName.equals("")) 
         	loadScript(mName, mVersion);
     }
@@ -92,7 +92,7 @@ public class Script
     {
         mName = "<expr>";
         setScriptEngine(lang);
-        mVersion = "";
+        mVersion = null;
         addOutput(null, returnType);
         mScript = expr;
     }
@@ -121,7 +121,7 @@ public class Script
 
     public Script(ItemProxy object, AgentProxy subject, Job job) throws ScriptingEngineException
     {
-        this(job.getActPropString("ScriptName"), job.getActPropString("ScriptVersion") == null ? -1 : Integer.parseInt(job.getActPropString("ScriptVersion")));
+        this(job.getActPropString("ScriptName"), job.getActPropString("ScriptVersion") == null ? null : Integer.parseInt(job.getActPropString("ScriptVersion").toString()));
         // set environment - this needs to be well documented for script developers
         if (!mInputParams.containsKey("item"))
         	addInputParam("item", ItemProxy.class);
@@ -183,7 +183,7 @@ public class Script
     	engine.setContext(context);
     }
     
-    private void loadScript(String scriptName, String scriptVersion) throws ScriptingEngineException
+    private void loadScript(String scriptName, int scriptVersion) throws ScriptingEngineException
     {
         try
         {
-- 
cgit v1.2.3