From 2d399a35369597a2d52c77bcb02b247e5a857de6 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Sat, 27 Feb 2010 23:05:57 +0000
Subject: [PATCH] Simplify this example by not declaring BasicTask since that's
 empty

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7133 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 examples/java/basic/BasicTask.java | 18 ------------------
 examples/java/basic/Forwarder.java |  5 ++---
 examples/java/basic/Makefile.am    |  2 +-
 examples/java/basic/Master.java    |  2 +-
 examples/java/basic/Slave.java     |  5 ++---
 5 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 examples/java/basic/BasicTask.java

diff --git a/examples/java/basic/BasicTask.java b/examples/java/basic/BasicTask.java
deleted file mode 100644
index 2ba5f2e0bd..0000000000
--- a/examples/java/basic/BasicTask.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * $Id$
- *
- * Copyright 2006,2007 Martin Quinson, Malek Cherier         
- * All rights reserved. 
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. 
- */
-
-import simgrid.msg.*;
-
-public class BasicTask extends Task {
-    	
-    public BasicTask(String name, double computeDuration, double messageSize) throws JniException{
-	super(name,computeDuration,messageSize);		
-    }
-}
diff --git a/examples/java/basic/Forwarder.java b/examples/java/basic/Forwarder.java
index 6d383c9fa9..dd69021aff 100644
--- a/examples/java/basic/Forwarder.java
+++ b/examples/java/basic/Forwarder.java
@@ -26,9 +26,9 @@ public class Forwarder extends simgrid.msg.Process {
       int slavesCount = lastOutput - firstOutput + 1;
       Msg.info("Receiving on 'slave_"+input+"'");
       while(true) {
-	 Task t = Task.receive("slave_"+input);	
+	 Task task = Task.receive("slave_"+input);	
 	 
-	 if (t instanceof FinalizeTask) {
+	 if (task instanceof FinalizeTask) {
 	    Msg.info("Got a finalize task. Let's forward that we're done.");
 	    
 	    for (int cpt = firstOutput; cpt<=lastOutput; cpt++) {
@@ -37,7 +37,6 @@ public class Forwarder extends simgrid.msg.Process {
 	    }
 	    break;
 	 }
-	 BasicTask task = (BasicTask)t;
 	 int dest = firstOutput + (taskCount % slavesCount);
 	 
 	 Msg.info("Sending \"" + task.getName() + "\" to \"slave_" + dest + "\"");
diff --git a/examples/java/basic/Makefile.am b/examples/java/basic/Makefile.am
index e4cd679be0..7a3b3c9a37 100644
--- a/examples/java/basic/Makefile.am
+++ b/examples/java/basic/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST=basic_deployment.xml basic_platform.xml
 
 # Declare sources:
 JAVA_SRC=Master.java Forwarder.java Slave.java BasicTest.java \
-         BasicTask.java FinalizeTask.java
+         FinalizeTask.java
 JAVA_TESTS=BasicTest.class
 TESTS=$(JAVA_TESTS)
 
diff --git a/examples/java/basic/Master.java b/examples/java/basic/Master.java
index 594c392b9d..2b4ef9a253 100644
--- a/examples/java/basic/Master.java
+++ b/examples/java/basic/Master.java
@@ -25,7 +25,7 @@ public class Master extends simgrid.msg.Process {
       Msg.info("Hello! Got "+  slavesCount + " slaves and "+tasksCount+" tasks to process");
       
       for (int i = 0; i < tasksCount; i++) {
-	 BasicTask task = new BasicTask("Task_" + i, taskComputeSize, taskCommunicateSize); 
+	 Task task = new Task("Task_" + i, taskComputeSize, taskCommunicateSize); 
 	 Msg.info("Sending \"" + task.getName()+ "\" to \"slave_" + i % slavesCount + "\"");
 	 task.send("slave_"+(i%slavesCount));
       }
diff --git a/examples/java/basic/Slave.java b/examples/java/basic/Slave.java
index 05b2380852..d2bb15d32b 100644
--- a/examples/java/basic/Slave.java
+++ b/examples/java/basic/Slave.java
@@ -21,12 +21,11 @@ public class Slave extends simgrid.msg.Process {
       Msg.info("Receiving on 'slave_"+num+"'");
       
       while(true) { 
-	 Task t = Task.receive("slave_"+num);	
+	 Task task = Task.receive("slave_"+num);	
 	 
-	 if (t instanceof FinalizeTask) {
+	 if (task instanceof FinalizeTask) {
 	    break;
 	 }
-	 BasicTask task = (BasicTask)t;
 	 Msg.info("Received \"" + task.getName() +  "\". Processing it.");	 
 	 task.execute();
 	 Msg.info("\"" + task.getName() + "\" done ");
-- 
2.20.1