X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/jaceP2P.git/blobdiff_plain/9e956705309c9875a2550b863127892b1a52723c..c7001582aeefb419483631f88a0b0ee5873ae951:/src/jaceP2P/TokenThread.java

diff --git a/src/jaceP2P/TokenThread.java b/src/jaceP2P/TokenThread.java
index 1f11e73..3c9d76b 100644
--- a/src/jaceP2P/TokenThread.java
+++ b/src/jaceP2P/TokenThread.java
@@ -2,7 +2,6 @@ package jaceP2P;
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;
-import java.util.Vector;
 import and.Mapping.*;
 
 public class TokenThread extends Thread {
@@ -58,13 +57,13 @@ public class TokenThread extends Thread {
 		// System.out.println("finished set token");
 	}
 
-	@SuppressWarnings("unchecked")
+
 	public void distribute() {
 		System.out.println("totalDaemons="
 				+ SuperNodeListe.Instance().getTotalDaemons());
 		int nbLocal = Register.Instance().getSize();
 		int totalDaemons;
-		Vector liste = SuperNodeListe.Instance().getListe();
+		ArrayList<Object> liste = SuperNodeListe.Instance().getListe();
 		
 		/******* Sébastien Miquée ********/
 		ArrayList<GNode> gnodes = null ;
@@ -86,14 +85,14 @@ public class TokenThread extends Thread {
 							if (((SuperNodeData) liste.get(i)).getNbOfNodes() < nbDaemons)
 								try {
 									// System.out.println("Snode="+i+" nodes="+((SuperNodeData)liste.get(i)).getNbOfNodes());
-									Vector nodes = Register.Instance()
+									ArrayList<Node> nodes = Register.Instance()
 											.getListe();
 									int amountToSend = nbDaemons
 											- ((SuperNodeData) liste.get(i))
 													.getNbOfNodes();
-									Vector newVector = new Vector();
+									ArrayList<Node> newVector = new ArrayList<Node>() ;
 									for (int j = 0; j < amountToSend; j++) {
-										newVector.add(nodes.elementAt(j));
+										newVector.add(nodes.get(j));
 									}
 									((SuperNodeData) liste.get(i)).getStub()
 											.sendSurplus(newVector, gnodes);
@@ -140,7 +139,7 @@ public class TokenThread extends Thread {
 			index = (index + 1) % SuperNodeListe.Instance().getListe().size();
 			// System.out.println("index="+index);
 			try {
-				((SuperNodeData) liste.elementAt(index)).getStub().setToken();
+				((SuperNodeData) liste.get(index)).getStub().setToken();
 				if (index != SuperNodeListe.Instance().existSuperNode(
 						LocalHost.Instance().getIP()))
 					token = false;
@@ -149,7 +148,7 @@ public class TokenThread extends Thread {
 			} catch (Exception e) {
 				try {
 					System.err.println("Unable to send Token to "
-							+ ((SuperNodeData) liste.elementAt(index)).getIP()
+							+ ((SuperNodeData) liste.get(index)).getIP()
 							+ " :" + e);
 					/*
 					 * SuperNodeListe.Instance().removeSuperNode(((SuperNodeData)