TP2: Simplify the compacter method in the image class.

[TP_POO.git] / Listes / Liste.java

diff --git a/Listes/Liste.java b/Listes/Liste.java
index 711b9830aab8c81dd8c72060ca5cb06a1700e02d..ca2d42d96920de9eea6647d88bf3eba71f80158d 100644 (file)
--- a/Listes/Liste.java
+++ b/Listes/Liste.java
@@ -44,7 +44,7 @@ public class Liste {
 
     private boolean isEmpty()
     {
-        return headNode == null;
+        return getHeadNode() == null;
     }
 
     private int getSize() {
@@ -116,19 +116,22 @@ public class Liste {
     }
 
     public void afficher() {
+        String className = this.getClass().getSimpleName();
+        int i = 0;
+        System.out.println("---- " + className + " ----");
         if (isEmpty()) {
-            System.out.println("Liste vide");
+            return;
         } else if (headNode.getNext() == null) {
-            System.out.println("Valeur du noeud 0 : " + headNode.getData());
+            System.out.println("element " + i + " : " + headNode.getData());
         } else {
-            IntNode nodeCursor = headNode;
-            int i = 0;
-            while (nodeCursor.getNext() != null) {
-                System.out.println("Valeur du noeud " + i + " : " + nodeCursor.getData());
-                nodeCursor = nodeCursor.getNext();
+            IntNode nodeCursorNext = headNode.getNext();
+            System.out.println("element " + i + " : " + headNode.getData());
+            i++;
+            while (nodeCursorNext != null) {
+                System.out.println("element " + i + " : " + nodeCursorNext.getData());
+                nodeCursorNext = nodeCursorNext.getNext();
                 i++;
             }
-            System.out.println("Valeur du noeud " + i++ + " : " + nodeCursor.getData());
         }
     }