Merge branch 'master' into fix/execute_benched

[simgrid.git] / examples / java / app / pingpong / Main.java

diff --git a/examples/java/app/pingpong/Main.java b/examples/java/app/pingpong/Main.java
index cce0555..2030da9 100644 (file)
--- a/examples/java/app/pingpong/Main.java
+++ b/examples/java/app/pingpong/Main.java
@@ -1,24 +1,35 @@
-/* Copyright (c) 2006-2014, 2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2017. 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. */
 
 package app.pingpong;
+import java.io.File;
+
+import org.simgrid.msg.HostNotFoundException;
 import org.simgrid.msg.Msg;
-import org.simgrid.msg.MsgException;
-import org.simgrid.msg.NativeException;
  
-public class Main {
-  public static void main(String[] args) throws MsgException, NativeException{
+class Main {
+  protected static final int TASK_COUNT = 3;
+       
+  private Main() {
+    throw new IllegalAccessError("Utility class");
+  }
+
+  public static void main(String[] args) throws HostNotFoundException {
     Msg.init(args);
-    if(args.length < 1) {
-      Msg.info("Usage   : Main platform_file");
-      Msg.info("example : Main ../platforms/platform.xml");
-      System.exit(1);
+    
+    String platfFile = "../../examples/platforms/small_platform.xml";
+    if (args.length == 1)
+       platfFile = args[0];
+    
+    File f = new File(platfFile); 
+    if (!f.exists()) {
+      Msg.error("File " + platfFile + " does not exist in " + System.getProperty("user.dir"));
+      Msg.error("Usage  : Main ../platforms/platform.xml");
     }
-
-    Msg.createEnvironment(args[0]);
+    
+    Msg.createEnvironment(platfFile);
     new Sender("Jacquelin", "Sender", new String[] {"Boivin"}).start();
     new Receiver ("Boivin", "Receiver", null).start();