From bcb1dacada802dd7512a81c7cfbe484b0eb287ba Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 9 Jun 2016 16:49:09 +0200
Subject: [PATCH] cosmetics in java

---
 examples/java/trace/pingpong/Main.java        |  4 +--
 examples/java/trace/pingpong/Sender.java      | 28 ++++++++-----------
 .../java/org/simgrid/msg/Semaphore.java       |  5 ++--
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/examples/java/trace/pingpong/Main.java b/examples/java/trace/pingpong/Main.java
index 1e82ea8077..bd43e174ac 100644
--- a/examples/java/trace/pingpong/Main.java
+++ b/examples/java/trace/pingpong/Main.java
@@ -14,8 +14,8 @@ public class Main  {
   public static void main(String[] args) throws MsgException, NativeException {
     Msg.init(args);
     if(args.length < 1) {
-      Msg.info("Usage   : TracingTest platform_file");
-      Msg.info("example : TracingTest ../platforms/platform.xml");
+      Msg.info("Usage   : Main platform_file");
+      Msg.info("example : Main ../platforms/platform.xml");
       System.exit(1);
     }
 
diff --git a/examples/java/trace/pingpong/Sender.java b/examples/java/trace/pingpong/Sender.java
index f17cabd6ff..5fe2760115 100644
--- a/examples/java/trace/pingpong/Sender.java
+++ b/examples/java/trace/pingpong/Sender.java
@@ -15,8 +15,9 @@ import org.simgrid.msg.HostNotFoundException;
 import org.simgrid.trace.Trace;
 
 public class Sender extends Process {
-  private final double commSizeLat = 1;
-  private final double commSizeBw = 100000000;
+  private static final double commSizeLat = 1;
+  private static final double commSizeBw = 100000000;
+  private static final String PM_STATE = "PM_STATE";
 
   public Sender(String hostname, String name, String[] args) throws HostNotFoundException, NativeException {
     super(hostname,name,args);
@@ -24,22 +25,17 @@ public class Sender extends Process {
 
   public void main(String[] args) throws MsgException {
     Msg.info("hello !"); 
-    Trace.hostPushState (getHost().getName(), "PM_STATE", "sendingPing");
+    Trace.hostPushState (getHost().getName(), PM_STATE, "sendingPing");
 
     int hostCount = args.length;
     Msg.info("host count: " + hostCount);
     String mailboxes[] = new String[hostCount]; 
     double time;
     double computeDuration = 0;
-    PingPongTask ping, pong;
+    PingPongTask ping;
 
     for(int pos = 0; pos < args.length ; pos++) {
-      try {
-        mailboxes[pos] = Host.getByName(args[pos]).getName();
-      } catch (HostNotFoundException e) {
-        Msg.info("Invalid deployment file: " + e.toString());
-        System.exit(1);
-      }
+      mailboxes[pos] = Host.getByName(args[pos]).getName();
     }
 
     for (int pos = 0; pos < hostCount; pos++) { 
@@ -49,15 +45,15 @@ public class Sender extends Process {
       ping.setTime(time);
       ping.send(mailboxes[pos]);
 
-      Trace.hostPushState (getHost().getName(), "PM_STATE", "waitingPong");
-      pong = (PingPongTask)Task.receive(getHost().getName());
+      Trace.hostPushState (getHost().getName(), PM_STATE, "waitingPong");
+      PingPongTask pong = (PingPongTask)Task.receive(getHost().getName());
       double timeGot = Msg.getClock();
       double timeSent = ping.getTime();
-      double communicationTime=0;
+      double communicationTime;
 
       Msg.info("Got at time "+ timeGot);
       Msg.info("Was sent at time "+timeSent);
-      time=timeSent;
+      time = timeSent;
 
       communicationTime=timeGot - time;
       Msg.info("Communication time : " + communicationTime);
@@ -65,11 +61,11 @@ public class Sender extends Process {
       Msg.info(" --- bw "+ commSizeBw/communicationTime + " ----");
 
       /* Pop the last state (going back to sending ping) */  
-      Trace.hostPopState (getHost().getName(), "PM_STATE");
+      Trace.hostPopState (getHost().getName(), PM_STATE);
     }
 
     /* Pop the sendingPong state */  
-    Trace.hostPopState (getHost().getName(), "PM_STATE");
+    Trace.hostPopState (getHost().getName(), PM_STATE);
     Msg.info("goodbye!");
   }
 }
diff --git a/src/bindings/java/org/simgrid/msg/Semaphore.java b/src/bindings/java/org/simgrid/msg/Semaphore.java
index 0172aa3b03..4952184c95 100644
--- a/src/bindings/java/org/simgrid/msg/Semaphore.java
+++ b/src/bindings/java/org/simgrid/msg/Semaphore.java
@@ -34,6 +34,7 @@ public class Semaphore {
 	/** Locks on the semaphore object until the provided timeout expires
 	 * @exception TimeoutException if the timeout expired before 
 	 *            the semaphore could be acquired.
+	 * @param timeout the duration of the lock
 	 */
 	public native void acquire(double timeout) throws TimeoutException;
 	/** Locks on the semaphore object with no timeout
@@ -42,8 +43,8 @@ public class Semaphore {
 		try {
 			acquire(-1);
 		} catch (TimeoutException e) {
-			// This should not happen.
-			assert(false);
+			e.printStackTrace(); // This should not happen.
+			assert false ;
 		}
 	}
 	/** Releases the semaphore object
-- 
2.20.1