Revert "Let our examples compile with java 1.6, or almost"

Sonar is actually right to not like that brain overload. Plus, not all
examples were compiling with prehistorical Java anyway.

This reverts commit 848ff1f03de7a300b6314015e5fb4b28348490c4.

diff --git a/examples/java/app/bittorrent/Peer.java b/examples/java/app/bittorrent/Peer.java
index 649c3b5..0bdc770 100644 (file)
--- a/examples/java/app/bittorrent/Peer.java
+++ b/examples/java/app/bittorrent/Peer.java
@@ -33,10 +33,10 @@ public class Peer extends Process {
   protected char[][] bitfieldBlocks = new char[Common.FILE_PIECES][Common.PIECES_BLOCKS];
   protected short[] piecesCount = new short[Common.FILE_PIECES];
   protected int piecesRequested = 0;
   protected char[][] bitfieldBlocks = new char[Common.FILE_PIECES][Common.PIECES_BLOCKS];
   protected short[] piecesCount = new short[Common.FILE_PIECES];
   protected int piecesRequested = 0;

-  protected ArrayList<Integer> currentPieces = new ArrayList<Integer>();
+  protected ArrayList<Integer> currentPieces = new ArrayList<>();

   protected int currentPiece = -1;
   protected int currentPiece = -1;

-  protected HashMap<Integer, Connection> activePeers = new HashMap<Integer, Connection>();
-  protected HashMap<Integer, Connection> peers = new HashMap<Integer, Connection>();
+  protected HashMap<Integer, Connection> activePeers = new HashMap<>();
+  protected HashMap<Integer, Connection> peers = new HashMap<>();

   protected Comm commReceived = null;
 
   public Peer(Host host, String name, String[]args) {
   protected Comm commReceived = null;
 
   public Peer(Host host, String name, String[]args) {

diff --git a/examples/java/app/bittorrent/Tracker.java b/examples/java/app/bittorrent/Tracker.java
index b8126a8..980d9c6 100644 (file)
--- a/examples/java/app/bittorrent/Tracker.java
+++ b/examples/java/app/bittorrent/Tracker.java
@@ -36,7 +36,7 @@ public class Tracker extends Process {
     //Retrieve the end time
     deadline = Double.parseDouble(args[0]);
     //Building peers array
     //Retrieve the end time
     deadline = Double.parseDouble(args[0]);
     //Building peers array

-    peersList = new ArrayList<Integer>();
+    peersList = new ArrayList<>();

 
     Msg.info("Tracker launched.");
     while (Msg.getClock() < deadline) {
 
     Msg.info("Tracker launched.");
     while (Msg.getClock() < deadline) {

diff --git a/examples/java/app/bittorrent/TrackerTask.java b/examples/java/app/bittorrent/TrackerTask.java
index ec4ee36..d27a7d7 100644 (file)
--- a/examples/java/app/bittorrent/TrackerTask.java
+++ b/examples/java/app/bittorrent/TrackerTask.java
@@ -39,6 +39,6 @@ public class TrackerTask extends Task {
     this.uploaded = uploaded;
     this.downloaded = downloaded;
     this.left = left;
     this.uploaded = uploaded;
     this.downloaded = downloaded;
     this.left = left;

-    this.peers = new ArrayList<Integer>();
+    this.peers = new ArrayList<>();

   }
 }
   }
 }

diff --git a/examples/java/app/centralizedmutex/Coordinator.java b/examples/java/app/centralizedmutex/Coordinator.java
index d6cd28f..1931293 100644 (file)
--- a/examples/java/app/centralizedmutex/Coordinator.java
+++ b/examples/java/app/centralizedmutex/Coordinator.java
@@ -14,7 +14,7 @@ import org.simgrid.msg.Process;
 import org.simgrid.msg.MsgException;
 
 public class Coordinator extends Process {
 import org.simgrid.msg.MsgException;
 
 public class Coordinator extends Process {

-  LinkedList<RequestTask> waitingQueue=new LinkedList<RequestTask>();
+  LinkedList<RequestTask> waitingQueue=new LinkedList<>();

   int csToServe;
 
   public Coordinator(Host host, String name, String[]args) {
   int csToServe;
 
   public Coordinator(Host host, String name, String[]args) {

diff --git a/examples/java/cloud/masterworker/Master.java b/examples/java/cloud/masterworker/Master.java
index f2e23e2..c2b95d9 100644 (file)
--- a/examples/java/cloud/masterworker/Master.java
+++ b/examples/java/cloud/masterworker/Master.java
@@ -25,7 +25,7 @@ public class Master extends Process {
 
   public void main(String[] args) throws MsgException {
     int workersCount = Main.NHOSTS;
 
   public void main(String[] args) throws MsgException {
     int workersCount = Main.NHOSTS;

-    ArrayList<VM> vms = new ArrayList<VM>();
+    ArrayList<VM> vms = new ArrayList<>();

 
     // Create one VM per host and bind a process inside each one. 
     for (int i = 0; i < workersCount; i++) {
 
     // Create one VM per host and bind a process inside each one. 
     for (int i = 0; i < workersCount; i++) {

diff --git a/examples/java/cloud/migration/Test.java b/examples/java/cloud/migration/Test.java
index 36f98b3..83c8044 100644 (file)
--- a/examples/java/cloud/migration/Test.java
+++ b/examples/java/cloud/migration/Test.java
@@ -42,7 +42,7 @@ public class Test extends Process{
       e.printStackTrace();
     }
 
       e.printStackTrace();
     }
 

-    List<VM> vms = new ArrayList<VM>();
+    List<VM> vms = new ArrayList<>();

 
     /* Create VM1 */
     int dpRate = 70;
 
     /* Create VM1 */
     int dpRate = 70;

diff --git a/examples/java/dht/kademlia/Bucket.java b/examples/java/dht/kademlia/Bucket.java
index c0eaa92..1abceb1 100644 (file)
--- a/examples/java/dht/kademlia/Bucket.java
+++ b/examples/java/dht/kademlia/Bucket.java
@@ -12,7 +12,7 @@ public class Bucket {
   private int id;
 
   public Bucket(int id) {
   private int id;
 
   public Bucket(int id) {

-    this.nodes = new ArrayList<Integer>();
+    this.nodes = new ArrayList<>();

     this.id = id;
   }
 
     this.id = id;
   }
 

diff --git a/examples/java/energy/vm/EnergyVMRunner.java b/examples/java/energy/vm/EnergyVMRunner.java
index 7fa2702..35ccc6a 100644 (file)
--- a/examples/java/energy/vm/EnergyVMRunner.java
+++ b/examples/java/energy/vm/EnergyVMRunner.java
@@ -27,7 +27,7 @@ public class EnergyVMRunner extends Process {
       Task  task = new Task(this.getHost().getName()+"-task", 300E6 , 0);
       try {
         task.execute();
       Task  task = new Task(this.getHost().getName()+"-task", 300E6 , 0);
       try {
         task.execute();

-      } catch (HostFailureException | TaskCancelledException e) { // If your compiler fails on that multicatch, please proceed to Java 1.7 or higher
+      } catch (HostFailureException | TaskCancelledException e) {

         Msg.error(e.getMessage());
         e.printStackTrace();
       } 
         Msg.error(e.getMessage());
         e.printStackTrace();
       }