1 files changed, 9 insertions, 12 deletions
diff --git a/java/demo/Freeze/transform/Recreate.java b/java/demo/Freeze/transform/Recreate.java
index fe0bece7663..33a0298d8df 100644
--- a/java/demo/Freeze/transform/Recreate.java
+++ b/java/demo/Freeze/transform/Recreate.java
@@ -23,40 +23,37 @@ class Recreate extends Ice.Application
 
         Connection connection = Util.createConnection(communicator(), "dbnew");
 
-        final java.util.Comparator less =
-        new java.util.Comparator()
+        final java.util.Comparator<String> less = new java.util.Comparator<String>()
         {
-            public int compare(Object o1, Object o2)
+            public int compare(String s1, String s2)
             {
-                if(o1 == o2)
+                if(s1 == s2)
                 {
                     return 0;
                 }
-                else if(o1 == null)
+                else if(s1 == null)
                 {
-                    return -((Comparable)o2).compareTo(o1);
+                    return -s2.compareTo(s1);
                 }
                 else
                 {
-                    return ((Comparable)o1).compareTo(o2);
+                    return s1.compareTo(s2);
                 }
             }
         };
 
-        java.util.Map indexComparators = new java.util.HashMap();
-        indexComparators.put("phoneNumber", less);
-
         try
         {
+            NewContacts.IndexComparators indexComparators = new NewContacts.IndexComparators(less);
             NewContacts.recreate(connection, "contacts", less, indexComparators);
         }
         finally
         {
             connection.close();
         }
-        
+
         System.out.println("Recreated contacts database successfully!");
-    
+
         return 0;
     }