From 208a508e59bc6def035e5a9547ac05d973cf4fe4 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 3 Sep 2013 17:10:59 +0200
Subject: [PATCH] java examples: reorg the imports

---
 examples/java/async/Master.java                 | 3 +--
 examples/java/async/Slave.java                  | 3 +--
 examples/java/bittorrent/Connection.java        | 1 -
 examples/java/bittorrent/Peer.java              | 5 +----
 examples/java/bittorrent/Tracker.java           | 6 ++----
 examples/java/commTime/Master.java              | 3 +--
 examples/java/master_slave_kill/Slave.java      | 3 +--
 examples/java/migration/Policeman.java          | 1 -
 examples/java/mutualExclusion/MutexCentral.java | 2 --
 examples/java/startKillTime/Master.java         | 5 ++---
 examples/java/startKillTime/Slave.java          | 7 +++----
 11 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/examples/java/async/Master.java b/examples/java/async/Master.java
index 5f270cb9fb..4810f64938 100644
--- 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 ca0696564c..557602b311 100644
--- 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 f0a33391a0..18c8c9e3e0 100644
--- 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 47b300fd84..32c2d30a2d 100644
--- 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 d41bafd9a7..1a108a3663 100644
--- 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 dda4718c94..9bcca54604 100644
--- 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 e52dd93733..6a72f24368 100644
--- 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 3e01db31c7..3dd8d9707c 100644
--- 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 94702a6ca6..e368c3ab47 100644
--- 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 eb043465b1..2edb535b4c 100644
--- 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 e9942f0938..9d8e062e1e 100644
--- 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
-- 
2.20.1