From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 17 Feb 2017 21:35:34 +0000 (+0100)
Subject: Revert "Let our examples compile with java 1.6, or almost"
X-Git-Tag: v3_15~325
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/74db3bddde778d9033c92e387b27cd20fe97762c

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 649c3b52fa..0bdc770232 100644
--- 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 ArrayList<Integer> currentPieces = new ArrayList<Integer>();
+  protected ArrayList<Integer> currentPieces = new ArrayList<>();
   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) {
diff --git a/examples/java/app/bittorrent/Tracker.java b/examples/java/app/bittorrent/Tracker.java
index b8126a8d4f..980d9c6117 100644
--- 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
-    peersList = new ArrayList<Integer>();
+    peersList = new ArrayList<>();
 
     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 ec4ee3636d..d27a7d7d29 100644
--- 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.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 d6cd28f013..193129305b 100644
--- 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 {
-  LinkedList<RequestTask> waitingQueue=new LinkedList<RequestTask>();
+  LinkedList<RequestTask> waitingQueue=new LinkedList<>();
   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 f2e23e2e97..c2b95d9ffc 100644
--- 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;
-    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++) {
diff --git a/examples/java/cloud/migration/Test.java b/examples/java/cloud/migration/Test.java
index 36f98b3d0e..83c80449e9 100644
--- 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();
     }
 
-    List<VM> vms = new ArrayList<VM>();
+    List<VM> vms = new ArrayList<>();
 
     /* Create VM1 */
     int dpRate = 70;
diff --git a/examples/java/dht/kademlia/Bucket.java b/examples/java/dht/kademlia/Bucket.java
index c0eaa92616..1abceb15f0 100644
--- 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) {
-    this.nodes = new ArrayList<Integer>();
+    this.nodes = new ArrayList<>();
     this.id = id;
   }
 
diff --git a/examples/java/energy/vm/EnergyVMRunner.java b/examples/java/energy/vm/EnergyVMRunner.java
index 7fa27025c3..35ccc6af79 100644
--- 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();
-      } 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();
       }