From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 3 Sep 2013 15:45:15 +0000 (+0200)
Subject: give this example default values for the arguments so that it can be run from eclipse
X-Git-Tag: v3_9_90~123^2~21
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/54411abe12640c81450a0d4e13e763f0b0bf70be

give this example default values for the arguments so that it can be run from eclipse
---

diff --git a/examples/java/masterslave/Masterslave.java b/examples/java/masterslave/Masterslave.java
index 128e75322b..f687ebdcb2 100644
--- a/examples/java/masterslave/Masterslave.java
+++ b/examples/java/masterslave/Masterslave.java
@@ -7,6 +7,8 @@
 
 package masterslave;
 
+import java.io.File;
+
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.NativeException;
 
@@ -21,15 +23,15 @@ public class Masterslave {
     public static void main(String[] args) throws NativeException {       
 	    /* initialize the MSG simulation. Must be done before anything else (even logging). */
 	    Msg.init(args);
+	    
+	    String platf  = args.length > 1 ? args[0] : "examples/java/platform.xml";
+	    String deploy =  args.length > 1 ? args[1] : "examples/java/masterslave/masterslaveDeployment.xml";
 	
-	    if (args.length < 2) {    		
-			Msg.info("Usage   : Masterslave platform_file deployment_file");
-			Msg.info("example : Masterslave basic_platform.xml basic_deployment.xml");
-			System.exit(1);	
-		}
+	    System.out.println("Platform: "+platf+"; Deployment:"+deploy+"; Current directory: "+new File(".").getAbsolutePath());
+	    
 		/* construct the platform and deploy the application */
-		Msg.createEnvironment(args[0]);
-		Msg.deployApplication(args[1]);
+		Msg.createEnvironment(platf);
+		Msg.deployApplication(deploy);
 		/*  execute the simulation. */
         Msg.run();
     }