public -> private+get

diff --git a/examples/java/dht/chord/ChordTask.java b/examples/java/dht/chord/ChordTask.java
index 0e5edfc..e43fc8b 100644 (file)
--- a/examples/java/dht/chord/ChordTask.java
+++ b/examples/java/dht/chord/ChordTask.java
@@ -10,11 +10,20 @@ import dht.chord.Common;
 import org.simgrid.msg.Task;
 
 public class ChordTask extends Task {
-  public String issuerHostName;
-  public String answerTo;
+  private String issuerHostName;
+  private String answerTo;
   public ChordTask() {
     this(null,null);
   }
+
+  public String getIssuerHostName(){
+    return this.issuerHostName;
+  }
+
+  public String getAnswerTo(){
+    return this.answerTo;
+  }
+
   public ChordTask(String issuerHostName, String answerTo) {
     super(null, Common.COMP_SIZE, Common.COMM_SIZE);
     this.issuerHostName = issuerHostName;

diff --git a/examples/java/dht/chord/FindSuccessorAnswerTask.java b/examples/java/dht/chord/FindSuccessorAnswerTask.java
index cb46127..9d2440a 100644 (file)
--- a/examples/java/dht/chord/FindSuccessorAnswerTask.java
+++ b/examples/java/dht/chord/FindSuccessorAnswerTask.java
@@ -7,7 +7,10 @@
 package dht.chord;
 
 public class FindSuccessorAnswerTask extends ChordTask {
-  public int answerId;
+  private int answerId;
+  public int getAnswerId(){
+    return this.answerId;
+  }
 
   public FindSuccessorAnswerTask(String issuerHostname, String answerTo, int answerId) {
     super(issuerHostname,answerTo);

diff --git a/examples/java/dht/chord/FindSuccessorTask.java b/examples/java/dht/chord/FindSuccessorTask.java
index 0c78f8b..a16d9ca 100644 (file)
--- a/examples/java/dht/chord/FindSuccessorTask.java
+++ b/examples/java/dht/chord/FindSuccessorTask.java
@@ -7,7 +7,11 @@
 package dht.chord;
 
 public class FindSuccessorTask extends ChordTask {
-  public int requestId;
+  private int requestId;
+
+  public int getRequestId(){
+    return this.requestId;
+  }
 
   public FindSuccessorTask(String issuerHostname, String answerTo,  int requestId) {
     super(issuerHostname, answerTo);

diff --git a/examples/java/dht/chord/GetPredecessorAnswerTask.java b/examples/java/dht/chord/GetPredecessorAnswerTask.java
index d0d35ab..d9ff5c8 100644 (file)
--- a/examples/java/dht/chord/GetPredecessorAnswerTask.java
+++ b/examples/java/dht/chord/GetPredecessorAnswerTask.java
@@ -7,7 +7,12 @@
 package dht.chord;
 
 public class GetPredecessorAnswerTask extends ChordTask {
-  public int answerId;
+  private int answerId;
+
+  public int getAnswerId(){
+    return this.answerId;
+  }
+
   public GetPredecessorAnswerTask(String issuerHostname, String answerTo, int answerId) {
     super(issuerHostname,answerTo);
     this.answerId = answerId;

diff --git a/examples/java/dht/chord/Node.java b/examples/java/dht/chord/Node.java
index 275c75e..2cb52d8 100644 (file)
--- a/examples/java/dht/chord/Node.java
+++ b/examples/java/dht/chord/Node.java
@@ -112,26 +112,27 @@ public class Node extends Process {
   void handleTask(Task task) {
     if (task instanceof FindSuccessorTask) {
       FindSuccessorTask fTask = (FindSuccessorTask)task;
-      Msg.debug("Receiving a 'Find Successor' request from " + fTask.issuerHostName + " for id " + fTask.requestId);
+      Msg.debug("Receiving a 'Find Successor' request from " + fTask.getIssuerHostName() + " for id " + 
+                fTask.getRequestId());
       // is my successor the successor?
-      if (isInInterval(fTask.requestId, this.id + 1, fingers[0])) {
-        Msg.debug("Send the request to " + fTask.answerTo + " with answer " + fingers[0]);
+      if (isInInterval(fTask.getRequestId(), this.id + 1, fingers[0])) {
+        Msg.debug("Send the request to " + fTask.getAnswerTo() + " with answer " + fingers[0]);
         FindSuccessorAnswerTask answer = new FindSuccessorAnswerTask(getHost().getName(), mailbox, fingers[0]);
-        answer.dsend(fTask.answerTo);
+        answer.dsend(fTask.getAnswerTo());
       } else {
         // otherwise, forward the request to the closest preceding finger in my table
-        int closest = closestPrecedingNode(fTask.requestId);
+        int closest = closestPrecedingNode(fTask.getRequestId());
         Msg.debug("Forward the request to " + closest);
         fTask.dsend(Integer.toString(closest));
       }
     } else if (task instanceof GetPredecessorTask) {
       GetPredecessorTask gTask = (GetPredecessorTask)(task);
-      Msg.debug("Receiving a 'Get Predecessor' request from " + gTask.issuerHostName);
+      Msg.debug("Receiving a 'Get Predecessor' request from " + gTask.getIssuerHostName());
       GetPredecessorAnswerTask answer = new GetPredecessorAnswerTask(getHost().getName(), mailbox, predId);
-      answer.dsend(gTask.answerTo);
+      answer.dsend(gTask.getAnswerTo());
     } else if (task instanceof NotifyTask) {
       NotifyTask nTask = (NotifyTask)task;
-      notify(nTask.requestId);
+      notify(nTask.getRequestId());
     } else {
       Msg.debug("Ignoring unexpected task of type:" + task);
     }
@@ -203,7 +204,7 @@ public class Node extends Process {
           commReceive.waitCompletion(Common.TIMEOUT);
           Task taskReceived = commReceive.getTask();
           if (taskReceived instanceof GetPredecessorAnswerTask) {
-            predecessorId = ((GetPredecessorAnswerTask) taskReceived).answerId;
+            predecessorId = ((GetPredecessorAnswerTask) taskReceived).getAnswerId();
             stop = true;
           } else {
             handleTask(taskReceived);
@@ -257,7 +258,7 @@ public class Node extends Process {
             //TODO: Check if this this our answer.
             FindSuccessorAnswerTask fTask = (FindSuccessorAnswerTask) task;
             stop = true;
-            successor = fTask.answerId;
+            successor = fTask.getAnswerId();
           } else {
             handleTask(task);
           }

diff --git a/examples/java/dht/chord/NotifyTask.java b/examples/java/dht/chord/NotifyTask.java
index daf4129..fcc580a 100644 (file)
--- a/examples/java/dht/chord/NotifyTask.java
+++ b/examples/java/dht/chord/NotifyTask.java
@@ -7,7 +7,11 @@
 package dht.chord;
 
 public class NotifyTask extends ChordTask {
-  public int requestId;
+  private int requestId;
+  public int getRequestId(){
+    return this.requestId;
+  }
+
   public NotifyTask(String issuerHostname, String answerTo, int requestId) {
     super(issuerHostname, answerTo);
     this.requestId = requestId;

diff --git a/src/bindings/java/org/simgrid/msg/Process.java b/src/bindings/java/org/simgrid/msg/Process.java
index d50a475..433259f 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/Process.java
+++ b/src/bindings/java/org/simgrid/msg/Process.java
@@ -76,8 +76,8 @@ public abstract class Process implements Runnable {
        private int ppid = -1;
        private Host host = null;
 
-       /** The arguments of the method function of the process. */     
-       public ArrayList<String> args;
+       /** The arguments of the method function of the process. */
+       private ArrayList<String> args;
 
 
        /**  Default constructor */