java examples: reorg the imports

diff --git a/examples/java/async/Master.java b/examples/java/async/Master.java
index 5f270cb..4810f64 100644 (file)
--- a/examples/java/async/Master.java
+++ b/examples/java/async/Master.java
@@ -12,11 +12,10 @@ import java.util.ArrayList;
 
 import org.simgrid.msg.Comm;
 import org.simgrid.msg.Host;
-import org.simgrid.msg.Process;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.MsgException;
+import org.simgrid.msg.Process;
 import org.simgrid.msg.Task;
-import org.simgrid.msg.Process;;
 
 public class Master extends Process {
        public Master(Host host, String name, String[]args) {

diff --git a/examples/java/async/Slave.java b/examples/java/async/Slave.java
index ca06965..557602b 100644 (file)
--- a/examples/java/async/Slave.java
+++ b/examples/java/async/Slave.java
@@ -8,13 +8,12 @@ package async;
 import org.simgrid.msg.Comm;
 import org.simgrid.msg.Host;
 import org.simgrid.msg.HostFailureException;
-import org.simgrid.msg.HostNotFoundException;
 import org.simgrid.msg.Msg;
+import org.simgrid.msg.Process;
 import org.simgrid.msg.Task;
 import org.simgrid.msg.TaskCancelledException;
 import org.simgrid.msg.TimeoutException;
 import org.simgrid.msg.TransferFailureException;
-import org.simgrid.msg.Process;
 
 public class Slave extends Process {
        public Slave(Host host, String name, String[]args) {

diff --git a/examples/java/bittorrent/Connection.java b/examples/java/bittorrent/Connection.java
index f0a3339..18c8c9e 100644 (file)
--- a/examples/java/bittorrent/Connection.java
+++ b/examples/java/bittorrent/Connection.java
@@ -7,7 +7,6 @@
 package bittorrent;
 
 import java.util.Arrays;
-import org.simgrid.msg.Msg;
 public class Connection {
        /**
         * Remote peer id

diff --git a/examples/java/bittorrent/Peer.java b/examples/java/bittorrent/Peer.java
index 47b300f..32c2d30 100644 (file)
--- a/examples/java/bittorrent/Peer.java
+++ b/examples/java/bittorrent/Peer.java
@@ -8,7 +8,6 @@ package bittorrent;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
@@ -16,12 +15,10 @@ import org.simgrid.msg.Comm;
 import org.simgrid.msg.Host;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.MsgException;
-import org.simgrid.msg.RngStream;
 import org.simgrid.msg.Process;
+import org.simgrid.msg.RngStream;
 import org.simgrid.msg.Task;
 
-import bittorrent.Connection;
-
 /**
  * Main class for peers execution
  */

diff --git a/examples/java/bittorrent/Tracker.java b/examples/java/bittorrent/Tracker.java
index d41bafd..1a108a3 100644 (file)
--- a/examples/java/bittorrent/Tracker.java
+++ b/examples/java/bittorrent/Tracker.java
@@ -6,16 +6,14 @@
  */
 package bittorrent;
 import java.util.ArrayList;
-import java.util.Iterator;
 
 import org.simgrid.msg.Comm;
 import org.simgrid.msg.Host;
-import org.simgrid.msg.Process;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.MsgException;
-import org.simgrid.msg.Task;
-
+import org.simgrid.msg.Process;
 import org.simgrid.msg.RngStream;
+import org.simgrid.msg.Task;
 /**
  * Tracker, handle requests from peers.
  */

diff --git a/examples/java/commTime/Master.java b/examples/java/commTime/Master.java
index dda4718..9bcca54 100644 (file)
--- a/examples/java/commTime/Master.java
+++ b/examples/java/commTime/Master.java
@@ -10,11 +10,10 @@
 package commTime;
 
 import org.simgrid.msg.Host;
-import org.simgrid.msg.HostNotFoundException;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.MsgException;
-import org.simgrid.msg.Task;
 import org.simgrid.msg.Process;
+import org.simgrid.msg.Task;
 
 public class Master extends Process {
        public Master(Host host, String name, String[]args) {

diff --git a/examples/java/master_slave_kill/Slave.java b/examples/java/master_slave_kill/Slave.java
index e52dd93..6a72f24 100644 (file)
--- a/examples/java/master_slave_kill/Slave.java
+++ b/examples/java/master_slave_kill/Slave.java
@@ -27,9 +27,8 @@ public class Slave extends Process {
        Msg.info("Send Mail1!");
        task.send("mail1");
        
-       Task task2;
         try {
-                task2 = Task.receive("mail2");
+                Task.receive("mail2");
         } catch (MsgException e) {
                 Msg.debug("Received failed");
                 return;

diff --git a/examples/java/migration/Policeman.java b/examples/java/migration/Policeman.java
index 3e01db3..3dd8d97 100644 (file)
--- a/examples/java/migration/Policeman.java
+++ b/examples/java/migration/Policeman.java
@@ -9,7 +9,6 @@ package migration;
 import org.simgrid.msg.Host;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.MsgException;
-import org.simgrid.msg.Task;
 import org.simgrid.msg.Process;
 
 public class Policeman extends Process {

diff --git a/examples/java/mutualExclusion/MutexCentral.java b/examples/java/mutualExclusion/MutexCentral.java
index 94702a6..e368c3a 100644 (file)
--- a/examples/java/mutualExclusion/MutexCentral.java
+++ b/examples/java/mutualExclusion/MutexCentral.java
@@ -9,8 +9,6 @@ package mutualExclusion;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.NativeException;
 
-import org.simgrid.msg.*;
-
 public class MutexCentral {
 
        /* This only contains the launcher. If you do nothing more than than you can run 

diff --git a/examples/java/startKillTime/Master.java b/examples/java/startKillTime/Master.java
index eb04346..2edb535 100644 (file)
--- a/examples/java/startKillTime/Master.java
+++ b/examples/java/startKillTime/Master.java
@@ -7,11 +7,10 @@
 package startKillTime;
 import org.simgrid.msg.Host;
 import org.simgrid.msg.HostFailureException;
-import org.simgrid.msg.HostNotFoundException;
-import org.simgrid.msg.TransferFailureException;
-import org.simgrid.msg.TimeoutException;
 import org.simgrid.msg.Msg;
 import org.simgrid.msg.Process;
+import org.simgrid.msg.TimeoutException;
+import org.simgrid.msg.TransferFailureException;
 
 
 public class Master extends Process {

diff --git a/examples/java/startKillTime/Slave.java b/examples/java/startKillTime/Slave.java
index e9942f0..9d8e062 100644 (file)
--- a/examples/java/startKillTime/Slave.java
+++ b/examples/java/startKillTime/Slave.java
@@ -6,13 +6,12 @@
  */
 package startKillTime;
 import org.simgrid.msg.Host;
-import org.simgrid.msg.MsgException;
 import org.simgrid.msg.HostFailureException;
-import org.simgrid.msg.HostNotFoundException;
-import org.simgrid.msg.TransferFailureException;
-import org.simgrid.msg.TimeoutException;
 import org.simgrid.msg.Msg;
+import org.simgrid.msg.MsgException;
 import org.simgrid.msg.Process;
+import org.simgrid.msg.TimeoutException;
+import org.simgrid.msg.TransferFailureException;
 
 /**
  * Lazy Guy Slave, suspends itself ASAP