bug 252 - Freeze finalizers

bug 2552 - Update Freeze for Java5

1 files changed, 19 insertions, 32 deletions

diff --git a/java/demo/Freeze/transform/ReadNew.java b/java/demo/Freeze/transform/ReadNew.java
index 96ba48150a5..30add0aa939 100644
--- a/java/demo/Freeze/transform/ReadNew.java
+++ b/java/demo/Freeze/transform/ReadNew.java
@@ -23,60 +23,47 @@ class ReadNew 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);
             boolean createDb = true;
             NewContacts contacts = new NewContacts(connection, "contacts", createDb, less, indexComparators);
-            
+
             System.out.println("All contacts (default order)");
-            java.util.Iterator p = contacts.entrySet().iterator();
-            while(p.hasNext())
+            for(java.util.Map.Entry<String, NewContactData> entry : contacts.entrySet())
             {
-                java.util.Map.Entry entry = (java.util.Map.Entry)p.next();
-                NewContactData data = (NewContactData)entry.getValue();
-
-                System.out.println((String)entry.getKey() + ":\t\t"
-                                   + data.phoneNumber + " " + data.emailAddress);
+                NewContactData data = entry.getValue();
+                System.out.println(entry.getKey() + ":\t\t" + data.phoneNumber + " " + data.emailAddress);
             }
-            
+
             System.out.println("\nAll contacts (ordered by phone number)");
-            java.util.SortedMap phoneNumberMap = contacts.mapForIndex("phoneNumber");
-            p = phoneNumberMap.values().iterator();
-            while(p.hasNext())
+            java.util.SortedMap<String, java.util.Set<java.util.Map.Entry<String, NewContactData>>> phoneNumberMap =
+                contacts.mapForPhoneNumber();
+            for(java.util.Set<java.util.Map.Entry<String, NewContactData>> entries : phoneNumberMap.values())
             {
-                java.util.Set entries = (java.util.Set)p.next();
-                java.util.Iterator q = entries.iterator();
-                while(q.hasNext())
+                for(java.util.Map.Entry<String, NewContactData> entry : entries)
                 {
-                    java.util.Map.Entry entry = (java.util.Map.Entry)q.next();
-                    NewContactData data = (NewContactData)entry.getValue();
-
-                    System.out.println((String)entry.getKey() + ":\t\t"
-                                       + data.phoneNumber + " " + data.emailAddress);
-                    
+                    NewContactData data = entry.getValue();
+                    System.out.println(entry.getKey() + ":\t\t" + data.phoneNumber + " " + data.emailAddress);
                 }
             }
         }
@@ -84,7 +71,7 @@ class ReadNew extends Ice.Application
         {
             connection.close();
         }
-    
+
         return 0;
     }