From: Arnaud Giersch Date: Thu, 12 Sep 2013 11:52:29 +0000 (+0200) Subject: Use Msg.verb instead of System.out for message. X-Git-Tag: v3_9_90~123^2~12 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b52c8b520fad18e1797a61ca0f7a9478c39a4e58 Use Msg.verb instead of System.out for message. Also reindent the whole file. --- diff --git a/examples/java/masterslave/Masterslave.java b/examples/java/masterslave/Masterslave.java index f687ebdcb2..8e15954fc8 100644 --- a/examples/java/masterslave/Masterslave.java +++ b/examples/java/masterslave/Masterslave.java @@ -1,8 +1,8 @@ /* - * Copyright 2006-2012. The SimGrid Team. All rights reserved. + * Copyright 2006-2012. The SimGrid Team. All rights reserved. * * This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. + * under the terms of the license (GNU LGPL) which comes with this package. */ package masterslave; @@ -15,24 +15,24 @@ import org.simgrid.msg.NativeException; public class Masterslave { public static final int TASK_COMP_SIZE = 10000000; public static final int TASK_COMM_SIZE = 10000000; - /* This only contains the launcher. If you do nothing more than than you can run + /* This only contains the launcher. If you do nothing more than than you can run * java simgrid.msg.Msg * which also contains such a launcher */ - - 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"; - - System.out.println("Platform: "+platf+"; Deployment:"+deploy+"; Current directory: "+new File(".").getAbsolutePath()); - - /* construct the platform and deploy the application */ - Msg.createEnvironment(platf); - Msg.deployApplication(deploy); - /* execute the simulation. */ + + 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"; + + Msg.verb("Platform: "+platf+"; Deployment:"+deploy+"; Current directory: "+new File(".").getAbsolutePath()); + + /* construct the platform and deploy the application */ + Msg.createEnvironment(platf); + Msg.deployApplication(deploy); + /* execute the simulation. */ Msg.run(); } }