From 848ff1f03de7a300b6314015e5fb4b28348490c4 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 11 Jan 2017 15:25:08 +0100
Subject: [PATCH] Let our examples compile with java 1.6, or almost

---
 examples/java/app/bittorrent/Peer.java              | 6 +++---
 examples/java/app/bittorrent/Tracker.java           | 2 +-
 examples/java/app/bittorrent/TrackerTask.java       | 2 +-
 examples/java/app/centralizedmutex/Coordinator.java | 2 +-
 examples/java/cloud/masterworker/Master.java        | 2 +-
 examples/java/cloud/migration/Test.java             | 2 +-
 examples/java/dht/kademlia/Bucket.java              | 2 +-
 examples/java/energy/vm/EnergyVMRunner.java         | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/java/app/bittorrent/Peer.java b/examples/java/app/bittorrent/Peer.java
index 0bdc770232..649c3b52fa 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<>();
+  protected ArrayList<Integer> currentPieces = new ArrayList<Integer>();
   protected int currentPiece = -1;
-  protected HashMap<Integer, Connection> activePeers = new HashMap<>();
-  protected HashMap<Integer, Connection> peers = new HashMap<>();
+  protected HashMap<Integer, Connection> activePeers = new HashMap<Integer, Connection>();
+  protected HashMap<Integer, Connection> peers = new HashMap<Integer, Connection>();
   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 980d9c6117..b8126a8d4f 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<>();
+    peersList = new ArrayList<Integer>();
 
     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 d27a7d7d29..ec4ee3636d 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<>();
+    this.peers = new ArrayList<Integer>();
   }
 }
diff --git a/examples/java/app/centralizedmutex/Coordinator.java b/examples/java/app/centralizedmutex/Coordinator.java
index 193129305b..d6cd28f013 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<>();
+  LinkedList<RequestTask> waitingQueue=new LinkedList<RequestTask>();
   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 c2b95d9ffc..f2e23e2e97 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<>();
+    ArrayList<VM> vms = new ArrayList<VM>();
 
     // 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 5d6384192e..c64a4dcad5 100644
--- a/examples/java/cloud/migration/Test.java
+++ b/examples/java/cloud/migration/Test.java
@@ -37,7 +37,7 @@ public class Test extends Process{
       e.printStackTrace();
     }
 
-    List<VM> vms = new ArrayList<>();
+    List<VM> vms = new ArrayList<VM>();
 
     /* Create VM1 */
     int dpRate = 70;
diff --git a/examples/java/dht/kademlia/Bucket.java b/examples/java/dht/kademlia/Bucket.java
index 1abceb15f0..c0eaa92616 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<>();
+    this.nodes = new ArrayList<Integer>();
     this.id = id;
   }
 
diff --git a/examples/java/energy/vm/EnergyVMRunner.java b/examples/java/energy/vm/EnergyVMRunner.java
index 0e636f65e3..be5d65f21d 100644
--- a/examples/java/energy/vm/EnergyVMRunner.java
+++ b/examples/java/energy/vm/EnergyVMRunner.java
@@ -28,7 +28,7 @@ public class EnergyVMRunner extends Process {
       Task  task = new Task(this.getHost().getName()+"-task", 300E6 , 0);
       try {
         task.execute();
-      } catch (HostFailureException | TaskCancelledException e) {
+      } catch (HostFailureException | TaskCancelledException e) { // If your compiler fails on that multicatch, please proceed to Java 1.7 or higher
         Msg.error(e.getMessage());
         e.printStackTrace();
       } 
-- 
2.20.1