From: rkv <rkv@opencascade.com>
Date: Mon, 10 Dec 2012 07:20:10 +0000 (+0000)
Subject: Run Salome with separated parameters. Read output and error streams.
X-Git-Tag: Root_Delivery2_2013_04_22~210
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=23617c4df70e11c0fc8253111d9821e272215c8f;p=tools%2Fsiman.git

Run Salome with separated parameters. Read output and error streams.
---

diff --git a/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java b/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java
index 89f500f..d5f2a75 100644
--- a/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java
+++ b/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java
@@ -15,6 +15,9 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Applet providing a set of buttons. Each button is defined by three parameters:<BR>
@@ -178,7 +181,7 @@ public class ToolbarApplet extends java.applet.Applet implements ActionListener
 				}
 			}
 		} catch (Exception error) {
-			error.printStackTrace(); // RKV: NOPMD: TODO: try to use logger
+			error.printStackTrace(); // RKV: NOPMD: Applet output
 		}
 	}
 
@@ -243,12 +246,31 @@ public class ToolbarApplet extends java.applet.Applet implements ActionListener
 			if (isOk) {
 				// Execute the runSalome script.
 				// filename here indeed a string containing parameters for runSalome.
-				Runtime.getRuntime().exec(
-						new String[] { script.getAbsolutePath(), params },
-						null, new File(SALOME_HOME));
+				List<String> cmd = new ArrayList<String>(Arrays.asList(params
+						.split("\\s")));
+				cmd.add(0, script.getAbsolutePath());
+				Process proc = Runtime.getRuntime().exec(
+						cmd.toArray(new String[] {}), null,
+						new File(SALOME_HOME));
 				// Refresh the current scenario view
 				getAppletContext().showDocument(
 						new URL(this.getParameter("refresh")));
+				BufferedReader bri = new BufferedReader(new InputStreamReader(
+						proc.getInputStream()));
+				BufferedReader bre = new BufferedReader(new InputStreamReader(
+						proc.getErrorStream()));
+				String line = bri.readLine();
+				while (line != null) {
+					System.out.println(line); // RKV: NOPMD: Applet output
+					line = bri.readLine();
+				}
+				bri.close();
+				line = bre.readLine();
+				while (line != null) {
+					System.out.println(line); // RKV: NOPMD: Applet output
+					line = bre.readLine();
+				}
+				bre.close();
 			} else {
 				// Checkout of the scenario is failed at the beginning.
 				if (response != null) {