From 06cd4c71b46975c2d863d060117a829601125fe6 Mon Sep 17 00:00:00 2001
From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 6 Nov 2013 08:19:54 +0000
Subject: [PATCH] Fix to (refs #4521)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@28182 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 .../org/simantics/modelica/ModelicaManager.java |  11 +++++++----
 org.simantics.sysdyn.ui/icons/dependency.png    | Bin 387 -> 447 bytes
 .../icons/dependency_old.png                    | Bin 0 -> 387 bytes
 org.simantics.sysdyn.ui/icons/flow.png          | Bin 349 -> 198 bytes
 org.simantics.sysdyn.ui/icons/flow_old.png      | Bin 0 -> 349 bytes
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 org.simantics.sysdyn.ui/icons/dependency_old.png
 create mode 100644 org.simantics.sysdyn.ui/icons/flow_old.png

diff --git a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
index 5df32f8a..da8f6ba4 100644
--- a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
+++ b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
@@ -526,10 +526,8 @@ public class ModelicaManager {
 	 * @throws IOException
 	 */
 	public static Process runModelica(SimulationLocation location, IModelicaMonitor monitor, HashMap<String, String> experimentParameters, HashMap<String, String> parameterChanges) throws IOException {
+		ArrayList<String> commands = new ArrayList<String>();
 		try {
-			ArrayList<String> commands = new ArrayList<String>();
-			commands.add(location.executableFile.getAbsolutePath());
-
 			if(experimentParameters.get(RESULT_FILE_NAME) != null) {
 				commands.add("-r="+experimentParameters.get(RESULT_FILE_NAME));
 			}
@@ -566,7 +564,12 @@ public class ModelicaManager {
 			e.printStackTrace();
 		}
 		
-		return runWithEnvironment(location.omHome, location.getModelDir(), location.executableFile);
+		// Commands to String[]
+		String[] commandString = new String[commands.size()];
+		for (int i = 0; i < commands.size(); ++i)
+			 commandString[i] = commands.get(i);
+		
+		return runWithEnvironment(location.omHome, location.getModelDir(), location.executableFile, commandString);
 	}
 
 	public static String getFlatModelText(SimulationLocation location, IModelicaMonitor monitor, List<String> additional) {
diff --git a/org.simantics.sysdyn.ui/icons/dependency.png b/org.simantics.sysdyn.ui/icons/dependency.png
index 6a604a309e7996e66446f40a00738e16c33b4199..768b55f7eeb98402d74a6a3d5f77aed1c4442a75 100644
GIT binary patch
delta 421
zcmV;W0b2fp1HS{1B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^RY3k3=&2kg|^tpET4Oi4sRR5;6>lRYm(aTJH2bMI|x5z)na#Afgvv}r_Q
z_x1&R1w=}&M7r3lQYHh7ut-E}5K||?L<gi&O)8?IO8>{uRDUJhzCGi~IZsaVJ4f(h
z>1Y7kzW`dq$Q5d?ajZLN&%t2<*EIm*DVRU*z;Ev(G71=!7laIu!f=VjCT{4)@)Wc=
zZy+f|1Q8oc0>CiPi^T)^;v<0LDflvjIMRuthzQCH=nhB>H<YZj{V#~b!@x9(521+a
zIS?aP*kfbj<9~PSUqR$_446gq7-KH5Bu>d3uok|hE{ll~mQS`=NzDAzCU@;xBh?h<
zl0JG~qbM0xgX<tl15{J!$_GIMe7<itI$Ra3BplFjN_s|gB1;ogHt0sQ58H~<BxQk-
zA(U6hrkfR%V-)R2B#k>&Y;6Of1J!3*pe#^Rs(IFR1s)}H5BgN|J3aUY^t^9fF_uf?
P00000NkvXXu0mjfZ(Xm4

delta 360
zcmV-u0hj*21A_yQB!2{FK}|sb0I$e51&Zka000SaNLh0L01m_e01m_fl`9S#0000P
zbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz07*naR5(xVldn!gF%-tX
zK?n>KL6FNcpr*m_1UvwOAo=GI*G!<M_5w>L5d;Yui`pQ(z<(skEaBesr!D8U4O1jz
zC=z~2({oOHzJ5*9Rxt1jmh!wXe@vk4JwTo2Eb$|O@#_Rf=fj*O;wzk9KgC2vpsEmM
ziwVL6rW!<5jEn6}h%n&ZaXYw-JzoNQoh^9ht=XGRXF?v{d$6QfbT*GhW3*QYcf+f6
zh2~^t2a?nvd0|wwf~@X*KuxyJ%|3HzE?RIi2Pfs@x3+~pEUvM!zJ{XM!F2kD)#VEJ
zH{B?JMqnOZCeLAa{~{b5mbsFcTcF|itRGl7XNmv60DJ<Awjmq8l}gqC0000<MNUMn
GLSTXr`k1W%

diff --git a/org.simantics.sysdyn.ui/icons/dependency_old.png b/org.simantics.sysdyn.ui/icons/dependency_old.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a604a309e7996e66446f40a00738e16c33b4199
GIT binary patch
literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB9600009a7bBm000ie000ie0hKEb8vp<R8FWQhbW?9;ba!ELWdK2BZ(?O2No`?g
zWm08fWO;GPWjp`?0RTxvK~y+T?US!gLopP_zd;BL6hV;7GoYry@B};nf*|?l5Z6qg
zruG6$CJ_V)8jIQ>yuc*MEaBesr!D8U4O1jzC=z~2({oOHzJ5*9Rxt1jmh!wXe@vk4
zJwTo2Eb$|O@#_Rf=fj*O;wzk9KgC2vpsEmMiwVL6rW!<5jEn6}h%n&ZaXYw-JzoNQ
zoh^9ht=XGRXF?v{d$6QfbT*GhW3*QYcf+f6h2~^t2a?nvc~rH6tnPe3O}5U>K67X;
zT5vN5C*|X}wuL_|uCcMchN9TPboz$X<qG#V-6()YU>;s3&tZ4}A{-o+xssS$pyBwe
hA6PhNiT}R<d;*KMAsfGyO4a}X002ovPDHLkV1iypn$G|L

literal 0
HcmV?d00001

diff --git a/org.simantics.sysdyn.ui/icons/flow.png b/org.simantics.sysdyn.ui/icons/flow.png
index b1a1819238c6de8f9e50988f4151261fa6ba64ea..e90b3d28b295c0716bf0d4b59fcc0b36eb502f63 100644
GIT binary patch
delta 170
zcmcc1bc}I=N<CYWx4R1i82ohJT@Pe%7I;J!Gca%qgD@k*tT_@uLG}_)Usv|K+^k#%
z%$bYY-U5Y!JzX3_EKZ-DY{+#WfX8Y6-v4vsm&Y5Gcrq>RV|2aZlG@y@x=+-@Y0^~Y
z{tF^<f(%oyI14j&^vcDrNx$8s&1m|V=Zd;=^EtjXPc8~+?|l1U{`nGSlNrj~#wD(6
PKo0VB^>bP0l+XkKz|c3?

delta 322
zcmV-I0logl0o?+SB!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o0002*Nkl<ZILl-F|NlP&C4h;6LNLS(2$<!u+iQ{&8`%c@`ti%=
z=l5S%k;NE6u~2#<6C4$P|NLe6^ZO6O?_Ylye*OFn)BwW27=L~OF^HBFl4SVx>o>#A
z+qW*AYQLZl(!&BX$x7Ik;qO170ssEM@$bKXf%rGW?|(r27bf<H;men=dRkd(C$CMr
zWzGV#8Ke-d8K~$tSn+QJ{TCtk>-TSvD}TdX0CM*JhkLO)8|Y^+n~Q^sK~hqR;q|N6
z47YFGy>NTZJv$qC7!U&t3bieO7VHPw{0OL7o#a@!(0}y=Q1d~cYjrVVVT9)e00`&6
UH{EQk&;S4c07*qoM6N<$g3i~NuK)l5

diff --git a/org.simantics.sysdyn.ui/icons/flow_old.png b/org.simantics.sysdyn.ui/icons/flow_old.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1a1819238c6de8f9e50988f4151261fa6ba64ea
GIT binary patch
literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy?@2^KR5;6H
z{Qv(y10{fofkH6E3<#LzvD<5s6C2qE{QB|B=I8fcSCPdSL9tMJA`=`HfB*bt`1AV@
z!|z{z7=Hcy4b%X_zZiZ3F^HBFl4SVx>o>#A+qW*AYQLZl(!&BX$x7Ik;qO170ssEM
z@$bKXf%rGW?|(r27bf<H;men=dRkd(C$CMrWzGV#8Ke-d8K~$tSn+QJ{TCtk>-TSv
zD}TdX0CM*JhkLO)8|Y^+n~Q^sK~hqR;q|N647YFGy>NTZJsWr!5CaSfwJm@a><8NX
v2&h?|<XE`SfAs`V^Fg3%bunULgy#hS2<N~z-E6GT00000NkvXXu0mjfI|-VZ

literal 0
HcmV?d00001

-- 
2.47.1