Add getNodes() and getSuccessors() methods and remove iterable from Graph and Node.

src/main/org/insa/algo/shortestpath/BellmanFordAlgorithm.java

@@ -41,8 +41,8 @@ public class BellmanFordAlgorithm extends ShortestPathAlgorithm {
         boolean found = false;
         for (int i = 0; !found && i < nbNodes; ++i) {
             found = true;
-			for (Node node : graph) {
+            for (Node node: graph.getNodes()) {
-				for (Arc arc : node) {
+                for (Arc arc: node.getSuccessors()) {
 
                     // Small test to check allowed roads...
                     if (!data.isAllowed(arc)) {
@@ -73,7 +73,8 @@ public class BellmanFordAlgorithm extends ShortestPathAlgorithm {
         // Destination has no predecessor, the solution is infeasible...
         if (predecessorArcs[data.getDestination().getId()] == null) {
             solution = new ShortestPathSolution(data, Status.INFEASIBLE);
-		} else {
+        }
+        else {
 
             // The destination has been found, notify the observers.
             notifyDestinationReached(data.getDestination());

src/main/org/insa/algo/weakconnectivity/WeaklyConnectedComponentsAlgorithm.java

@@ -77,8 +77,8 @@ public class WeaklyConnectedComponentsAlgorithm
             res.add(new HashSet<Integer>());
         }
 
-        for (Node node: getInputData().getGraph()) {
+        for (Node node: getInputData().getGraph().getNodes()) {
-            for (Arc arc: node) {
+            for (Arc arc: node.getSuccessors()) {
                 res.get(node.getId()).add(arc.getDestination().getId());
                 if (arc.getRoadInformation().isOneWay()) {
                     res.get(arc.getDestination().getId()).add(node.getId());

src/main/org/insa/graph/Graph.java

@@ -2,7 +2,6 @@ package org.insa.graph;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -12,7 +11,7 @@ import java.util.List;
  * holds a list of nodes and each node holds a list of its successors.
  *
  */
-public final class Graph implements Iterable<Node> {
+public final class Graph {
 
     // Map identifier.
     private final String mapId;
@@ -68,9 +67,13 @@ public final class Graph implements Iterable<Node> {
         return this.nodes.size();
     }
 
-    @Override
+    /**
-    public Iterator<Node> iterator() {
+     * @return List of nodes in this graph (unmodifiable).
-        return this.nodes.iterator();
+     * 
+     * @see Collections#unmodifiableList(List)
+     */
+    public List<Node> getNodes() {
+        return this.nodes;
     }
 
     /**
@@ -97,7 +100,7 @@ public final class Graph implements Iterable<Node> {
         }
         for (Node node: nodes) {
             Node orig = trNodes.get(node.getId());
-            for (Arc arc: node) {
+            for (Arc arc: node.getSuccessors()) {
                 if (arc.getRoadInformation().isOneWay()) {
                     Node dest = trNodes.get(arc.getDestination().getId());
                     dest.addSuccessor(new ArcBackward(new ArcForward(orig, dest, arc.getLength(),

src/main/org/insa/graph/Node.java

@@ -2,7 +2,7 @@ package org.insa.graph;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
+import java.util.List;
 
 /**
  * Class representing a Node in a {@link Graph}.
@@ -13,7 +13,7 @@ import java.util.Iterator;
  * Nodes are comparable based on their ID.
  *
  */
-public final class Node implements Comparable<Node>, Iterable<Arc> {
+public final class Node implements Comparable<Node> {
 
     /**
      * Link the two given nodes with one or two arcs (depending on roadInformation),
@@ -107,9 +107,13 @@ public final class Node implements Comparable<Node>, Iterable<Arc> {
         return !this.successors.isEmpty();
     }
 
-    @Override
+    /**
-    public Iterator<Arc> iterator() {
+     * @return List of successors of this node (unmodifiable list).
-        return Collections.unmodifiableList(this.successors).iterator();
+     * 
+     * @see Collections#unmodifiableList(List)
+     */
+    public List<Arc> getSuccessors() {
+        return Collections.unmodifiableList(this.successors);
     }
 
     /**

src/main/org/insa/graphics/NodesInputPanel.java

@@ -65,7 +65,7 @@ public class NodesInputPanel extends JPanel
         public Node findClosestNode(Point point) {
             Node minNode = null;
             double minDis = Double.POSITIVE_INFINITY;
-            for (Node node: graph) {
+            for (Node node: graph.getNodes()) {
                 double dlon = point.getLongitude() - node.getPoint().getLongitude();
                 double dlat = point.getLatitude() - node.getPoint().getLatitude();
                 double dis = dlon * dlon + dlat * dlat; // No need to square

src/main/org/insa/graphics/drawing/components/BasicDrawing.java

@@ -679,8 +679,8 @@ public class BasicDrawing extends JPanel implements Drawing {
         this.removeMouseMotionListener(zoomAndPanListener);
         this.removeMouseWheelListener(zoomAndPanListener);
 
-        for (Node node: graph) {
+        for (Node node: graph.getNodes()) {
-            for (Arc arc: node) {
+            for (Arc arc: node.getSuccessors()) {
                 // Draw arcs only if there are one-way arcs or if origin is lower than
                 // destination, avoid drawing two-ways arc twice.
                 if (arc.getRoadInformation().isOneWay()

src/test/org/insa/graph/GraphTest.java

@@ -62,7 +62,7 @@ public class GraphTest {
      */
     private List<Arc> getArcsBetween(Node a, Node b) {
         List<Arc> arcs = new ArrayList<>();
-        for (Arc arc: a) {
+        for (Arc arc: a.getSuccessors()) {
             if (arc.getDestination().equals(b)) {
                 arcs.add(arc);
             }

src/test/org/insa/graph/NodeTest.java

@@ -54,7 +54,7 @@ public class NodeTest {
      * @return The first arc between from a to b, or null.
      */
     private Arc getFirstArcBetween(Node a, Node b) {
-        for (Arc arc: a) {
+        for (Arc arc: a.getSuccessors()) {
             if (arc.getDestination().equals(b)) {
                 return arc;
             }