fixed warnings

src/zutil/network/nio/worker/SystemWorker.java

@@ -23,8 +23,7 @@ public class SystemWorker extends ThreadedEventWorker {
 	// Maps a SocketChannel to a RspHandler
 	private Map<Double, ResponseEvent> rspEvents = new HashMap<Double, ResponseEvent>();	
 	// Difren services listening on specific messages
-	@SuppressWarnings("unchecked")
+	private Map<Class<?>, NetworkService> services = new HashMap<Class<?>, NetworkService>();
-	private Map<Class, NetworkService> services = new HashMap<Class, NetworkService>();
 	/**
 	 * Creates a new SystemWorker
 	 * @param nio The Network
@@ -69,8 +68,7 @@ public class SystemWorker extends ThreadedEventWorker {
 	 * @param c The Message class
 	 * @param ns The service
 	 */
-	@SuppressWarnings("unchecked")
+	public void registerService(Class<?> c, NetworkService ns){
-	public void registerService(Class c, NetworkService ns){
 		services.put(c, ns);
 	}
 
@@ -79,8 +77,7 @@ public class SystemWorker extends ThreadedEventWorker {
 	 * 
 	 * @param c The class
 	 */
-	@SuppressWarnings("unchecked")
+	public void unregisterService(Class<?> c){
-	public void unregisterService(Class c){
 		services.remove(c);
 	}
 

src/zutil/network/nio/worker/grid/GridClient.java

@@ -17,7 +17,6 @@ import zutil.network.nio.worker.WorkerDataEvent;
  * 
  * @author Ziver
  */
-@SuppressWarnings("unchecked")
 public class GridClient extends ThreadedEventWorker {
 	private static LinkedList<GridJob> jobQueue;
 	private static GridThread thread;
@@ -44,7 +43,7 @@ public class GridClient extends ThreadedEventWorker {
 	 */
 	public void initiate() throws IOException{
 		network.setDefaultWorker(this);
-		network.send(new GridMessage(GridMessage.REGISTER));
+		network.send(new GridMessage<Object>(GridMessage.REGISTER));
 
 		for(int i=0; i<Runtime.getRuntime().availableProcessors() ;i++){
 			Thread t = new Thread(thread);
@@ -56,14 +55,14 @@ public class GridClient extends ThreadedEventWorker {
 	public void messageEvent(WorkerDataEvent e) {
 		// ignores other messages than GridMessage
 		if(e.data instanceof GridMessage){
-			GridMessage msg = (GridMessage)e.data;
+			GridMessage<?> msg = (GridMessage<?>)e.data;
 			switch(msg.messageType()){
 			// Receive data from Server
 			case GridMessage.INIT_DATA:
 				thread.setInitData(msg.getData());
 				break;
 			case GridMessage.COMP_DATA:
-				jobQueue.add(new GridJob(msg.getJobQueueID(), (Queue)msg.getData()));
+				jobQueue.add(new GridJob(msg.getJobQueueID(), (Queue<?>)msg.getData()));
 				break;
 			}
 		}
@@ -79,9 +78,9 @@ public class GridClient extends ThreadedEventWorker {
 	 */
 	public static void jobDone(int jobID, boolean correct, Object result) throws IOException{
 		if(correct)
-			network.send(new GridMessage(GridMessage.COMP_SUCCESSFUL, jobID, result));
+			network.send(new GridMessage<Object>(GridMessage.COMP_SUCCESSFUL, jobID, result));
 		else
-			network.send(new GridMessage(GridMessage.COMP_INCORRECT, jobID, result));
+			network.send(new GridMessage<Object>(GridMessage.COMP_INCORRECT, jobID, result));
 	}
 
 	/**
@@ -92,7 +91,7 @@ public class GridClient extends ThreadedEventWorker {
 	 */
 	public static void jobError(int jobID){
 		try{
-			network.send(new GridMessage(GridMessage.COMP_SUCCESSFUL, jobID));
+			network.send(new GridMessage<Object>(GridMessage.COMP_SUCCESSFUL, jobID));
 		}catch(Exception e){e.printStackTrace();}
 	}
 
@@ -102,7 +101,7 @@ public class GridClient extends ThreadedEventWorker {
 	 */
 	public static synchronized GridJob getNextJob() throws IOException{
 		if(jobQueue.isEmpty()){
-			network.send(new GridMessage(GridMessage.NEW_DATA));
+			network.send(new GridMessage<Object>(GridMessage.NEW_DATA));
 			while(jobQueue.isEmpty()){
 				try{Thread.sleep(100);}catch(Exception e){}
 			}

src/zutil/network/nio/worker/grid/GridResultHandler.java

@@ -6,5 +6,6 @@ package zutil.network.nio.worker.grid;
  * @author Ziver
  */
 public interface GridResultHandler<T> {
+	
 	public void resultEvent(int jobID, boolean correct, T result);
 }

src/zutil/network/nio/worker/grid/GridServerWorker.java

@@ -14,18 +14,18 @@ import zutil.network.nio.worker.WorkerDataEvent;
  * 
  * @author Ziver
  */
-@SuppressWarnings("unchecked")
+
 public class GridServerWorker extends ThreadedEventWorker{
 	// Job timeout after 30 min
 	public static int JOB_TIMEOUT = 1000*60*30;
 
 	private HashMap<Integer, GridJob> jobs; // contains all the ongoing jobs
 	private Queue<GridJob> reSendjobQueue; // Contains all the jobs that will be recalculated
-	private GridJobGenerator jobGenerator; // The job generator
+	private GridJobGenerator<?> jobGenerator; // The job generator
-	private GridResultHandler resHandler;
+	private GridResultHandler<Object> resHandler;
 	private int nextJobID;
 
-	public GridServerWorker(GridResultHandler resHandler, GridJobGenerator jobGenerator){
+	public GridServerWorker(GridResultHandler<Object> resHandler, GridJobGenerator<?> jobGenerator){
 		this.resHandler = resHandler;
 		this.jobGenerator = jobGenerator;
 		nextJobID = 0;
@@ -41,12 +41,12 @@ public class GridServerWorker extends ThreadedEventWorker{
 		try {
 			// ignores other messages than GridMessage
 			if(e.data instanceof GridMessage){
-				GridMessage msg = (GridMessage)e.data;
+				GridMessage<?> msg = (GridMessage<?>)e.data;
 				GridJob job = null;
 
 				switch(msg.messageType()){
 				case GridMessage.REGISTER:
-					e.network.send(e.socket, new GridMessage(GridMessage.INIT_DATA, 0, jobGenerator.initValues()));
+					e.network.send(e.socket, new GridMessage<Object>(GridMessage.INIT_DATA, 0, jobGenerator.initValues()));
 					break;
 				// Sending new data to compute to the client
 				case GridMessage.NEW_DATA:
@@ -60,7 +60,7 @@ public class GridServerWorker extends ThreadedEventWorker{
 						jobs.put(job.jobID, job);
 						nextJobID++;
 					}
-					GridMessage newMsg = new GridMessage(GridMessage.COMP_DATA, job.jobID, job.job);
+					GridMessage<Object> newMsg = new GridMessage<Object>(GridMessage.COMP_DATA, job.jobID, job.job);
 					e.network.send(e.socket, newMsg);				
 					break;