From b9402204384bb5cfc25e6038d2f976f9f0c16fba Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 18 Nov 2013 09:53:33 +0100
Subject: 3.0-SNAPSHOT IssueID #28

---
 .../gui/lifecycle/desc/ElemActDefOutcomeHandler.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java')

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java b/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
index b7398fe..08cbf4c 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
@@ -118,18 +118,18 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
 	public static void exportAct(File dir, BufferedWriter imports, ActivityDef actDef) throws Exception {
 		
 		// Export associated schema
-		exportSchema((String)actDef.getProperties().get("SchemaType"), (String)actDef.getProperties().get("SchemaVersion"), imports, new File(dir, "OD"));
+		exportSchema((String)actDef.getProperties().get("SchemaType"), Integer.parseInt(actDef.getProperties().get("SchemaVersion").toString()), imports, new File(dir, "OD"));
 		// Export associated script
-		exportScript((String)actDef.getProperties().get("ScriptName"), (String)actDef.getProperties().get("ScriptVersion"), imports, new File(dir, "SC"));
+		exportScript((String)actDef.getProperties().get("ScriptName"), Integer.parseInt(actDef.getProperties().get("ScriptVersion").toString()), imports, new File(dir, "SC"));
 
 		//Export child act if composite
 		if (actDef instanceof CompositeActivityDef) {
 			CompositeActivityDef compActDef = (CompositeActivityDef)actDef;
 			for (int i=0; i<compActDef.getChildren().length; i++) { // export slot defined scripts and schemas
 				GraphableVertex vert = compActDef.getChildren()[i];
-				exportScript((String)vert.getProperties().get("ScriptName"), (String)vert.getProperties().get("ScriptVersion"), imports, new File(dir, "SC"));
-				exportScript((String)vert.getProperties().get("RoutingScriptName"), (String)vert.getProperties().get("RoutingScriptVersion"), imports, new File(dir, "SC"));
-				exportSchema((String)vert.getProperties().get("SchemaType"), (String)vert.getProperties().get("SchemaVersion"), imports, new File(dir, "OD"));
+				exportScript((String)vert.getProperties().get("ScriptName"), Integer.parseInt(actDef.getProperties().get("ScriptVersion").toString()), imports, new File(dir, "SC"));
+				exportScript((String)vert.getProperties().get("RoutingScriptName"), Integer.parseInt(actDef.getProperties().get("RoutingScriptVersion").toString()), imports, new File(dir, "SC"));
+				exportSchema((String)vert.getProperties().get("SchemaType"), Integer.parseInt(actDef.getProperties().get("SchemaVersion").toString()), imports, new File(dir, "OD"));
 			}
 			GraphableVertex[] childDefs = compActDef.getLayoutableChildren();
 			for (GraphableVertex childDef : childDefs) {
@@ -139,16 +139,16 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
 			// export marshalled compAct
 			FileStringUtility.string2File(new File(new File(dir, "CA"), compActDef.getActName()+".xml"), Gateway.getMarshaller().marshall(compActDef));
 			if (imports!=null) {
-				imports.write("<Resource name=\""+compActDef.getActName()+"\" "+(compActDef.getVersion()==null?"":"version=\""+compActDef.getVersion()+"\" ")+"type=\"CA\">boot/CA/"+compActDef.getActName()+".xml</Resource>\n");
+				imports.write("<Resource name=\""+compActDef.getActName()+"\" "+(compActDef.getVersion()==-1?"":"version=\""+compActDef.getVersion()+"\" ")+"type=\"CA\">boot/CA/"+compActDef.getActName()+".xml</Resource>\n");
 			}
 		}
 		else {
 			FileStringUtility.string2File(new File(new File(dir, "EA"), actDef.getActName()+".xml"), Gateway.getMarshaller().marshall(actDef));
-			if (imports!=null) imports.write("<Resource name=\""+actDef.getActName()+"\" "+(actDef.getVersion()==null?"":"version=\""+actDef.getVersion()+"\" ")+"type=\"EA\">boot/EA/"+actDef.getActName()+".xml</Resource>\n");
+			if (imports!=null) imports.write("<Resource name=\""+actDef.getActName()+"\" "+(actDef.getVersion()==-1?"":"version=\""+actDef.getVersion()+"\" ")+"type=\"EA\">boot/EA/"+actDef.getActName()+".xml</Resource>\n");
 		}
 	}
 
-	public static void exportScript(String name, String version, BufferedWriter imports, File dir) {
+	public static void exportScript(String name, Integer version, BufferedWriter imports, File dir) {
 		if (name == null || name.length()==0 || name.contains(":")) return;
 		try {
 			FileStringUtility.string2File(new File(dir, name+".xml"),
@@ -160,11 +160,11 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
 		}
 	}
 
-	public static void exportSchema(String name, String version, BufferedWriter imports, File dir) {
+	public static void exportSchema(String name, Integer version, BufferedWriter imports, File dir) {
 		if (name == null || name.length()==0) return;
 		try {
 			FileStringUtility.string2File(new File(dir, name+".xsd"),
-					LocalObjectLoader.getSchema(name, Integer.parseInt(version)).schema);
+					LocalObjectLoader.getSchema(name, version).schema);
 			if (imports!=null) imports.write("<Resource name=\""+name+"\" "+(version==null?"":"version=\""+version+"\" ")+"type=\"OD\">boot/OD/"+name+".xsd</Resource>\n");
 		} catch (Exception ex) {
 			Logger.error(ex);
-- 
cgit v1.2.3