From 409c339df3f63423c1922adb96958c0068133795 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 2 Aug 2013 15:03:58 +0200
Subject: Export workflows with resource version numbers in the module import
 xml

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

(limited to 'src')

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 521b9cf..b7398fe 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
@@ -138,11 +138,13 @@ 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()+"\" type=\"CA\">boot/CA/"+compActDef.getActName()+".xml</Resource>\n");
+			if (imports!=null) {
+				imports.write("<Resource name=\""+compActDef.getActName()+"\" "+(compActDef.getVersion()==null?"":"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()+"\" type=\"EA\">boot/EA/"+actDef.getActName()+".xml</Resource>\n");
+			if (imports!=null) imports.write("<Resource name=\""+actDef.getActName()+"\" "+(actDef.getVersion()==null?"":"version=\""+actDef.getVersion()+"\" ")+"type=\"EA\">boot/EA/"+actDef.getActName()+".xml</Resource>\n");
 		}
 	}
 
@@ -151,7 +153,7 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
 		try {
 			FileStringUtility.string2File(new File(dir, name+".xml"),
 				LocalObjectLoader.getScript(name, version));
-			if (imports!=null) imports.write("<Resource name=\""+name+"\" type=\"SC\">boot/SC/"+name+".xml</Resource>\n");
+			if (imports!=null) imports.write("<Resource name=\""+name+"\" "+(version==null?"":"version=\""+version+"\" ")+"type=\"SC\">boot/SC/"+name+".xml</Resource>\n");
 		} catch (Exception ex) {
 			Logger.error(ex);
 			JOptionPane.showMessageDialog(null, "Could not export script "+name+"_"+version, "Error", JOptionPane.ERROR_MESSAGE);
@@ -163,7 +165,7 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
 		try {
 			FileStringUtility.string2File(new File(dir, name+".xsd"),
 					LocalObjectLoader.getSchema(name, Integer.parseInt(version)).schema);
-			if (imports!=null) imports.write("<Resource name=\""+name+"\" type=\"OD\">boot/OD/"+name+".xsd</Resource>\n");
+			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);
 			JOptionPane.showMessageDialog(null, "Could not export schema "+name+"_"+version, "Error", JOptionPane.ERROR_MESSAGE);
-- 
cgit v1.2.3