exo5: add a SortedMap from the TreeMap.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/exo5/IStrComparator.java b/exo5/IStrComparator.java
deleted file mode 100644 (file)
index 080ba22..0000000
--- a/exo5/IStrComparator.java
+++ /dev/null
@@ -1,14 +0,0 @@
-import java.util.Comparator;
-
-class IStrComparator implements Comparator<String> {
-    private String wordToCompare;
-
-    IStrComparator(String w) {
-        wordToCompare = w;
-    }
-
-    public int compare(String str1, String str2) {
-        return str1.compareTo(str2);
-    }
-
-}

diff --git a/exo5/Main.java b/exo5/Main.java
index 6a780291e35fc7025c3e84ef8410156c76d116d8..1ec751215c7c5bd4710ca47cefe6a69f39c6a297 100644 (file)
--- a/exo5/Main.java
+++ b/exo5/Main.java
@@ -2,6 +2,7 @@ import java.io.File;
 import java.util.Scanner;
 import java.io.IOException;
 import java.util.TreeMap;
+import java.util.SortedMap;
 
 class Main {
 
@@ -30,8 +31,16 @@ class Main {
         catch (IOException e) {
             e.printStackTrace();
         }
+
+        System.out.println("TreeMap full content:");
         for (String wordCursor : tm.keySet()) {
             System.out.println("Word \"" + wordCursor + "\" occured " + tm.get(wordCursor) + " times");
         }
+
+        System.out.println("SortedMap content after the word \"milieu\":");
+        SortedMap<String, Integer> stm = tm.tailMap("milieu");
+        for (String wordCursor : stm.keySet()) {
+            System.out.println("Word \"" + wordCursor + "\" occured " + stm.get(wordCursor) + " times");
+        }
     }
 }

diff --git a/exo5/Makefile b/exo5/Makefile
index d928d62148d9d2391a1ce1198239b9c88c5d18e6..57e5217df7d61bf1aa034dc5a50c387f801a08f0 100644 (file)
--- a/exo5/Makefile
+++ b/exo5/Makefile
@@ -47,7 +47,6 @@ JVM = java
 
 CLASSES = \
                StrComparator.java \
-               IStrComparator.java \
                Main.java
 
 #