ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/loops/MapCheck.java
(Generate patch)

Comparing jsr166/src/test/loops/MapCheck.java (file contents):
Revision 1.6 by jsr166, Thu Oct 29 23:09:07 2009 UTC vs.
Revision 1.9 by jsr166, Mon Nov 2 23:51:32 2009 UTC

# Line 9 | Line 9
9   *
10   * When run with "s" second arg, this requires file "testwords", which
11   * is best used with real words.  We can't check in this file, but you
12 < * can create one from a real dictonary (1 line per word) and then run
12 > * can create one from a real dictionary (1 line per word) and then run
13   * linux "shuf" to randomize entries.
14   */
15   import java.util.*;
# Line 40 | Line 40 | public class MapCheck {
40          if (args.length > 0) {
41              try {
42                  mapClass = Class.forName(args[0]);
43 <            } catch(ClassNotFoundException e) {
43 >            } catch (ClassNotFoundException e) {
44                  throw new RuntimeException("Class " + args[0] + " not found.");
45              }
46          }
# Line 99 | Line 99 | public class MapCheck {
99  
100      static Map newMap() {
101          try {
102 <            return (Map)mapClass.newInstance();
103 <        } catch(Exception e) {
102 >            return (Map) mapClass.newInstance();
103 >        } catch (Exception e) {
104              throw new RuntimeException("Can't instantiate " + mapClass + ": " + e);
105          }
106      }
# Line 134 | Line 134 | public class MapCheck {
134          try {
135              m.put(null, x);
136              v = m.get(null);
137 <        } catch(NullPointerException npe) {
137 >        } catch (NullPointerException npe) {
138              System.out.println("Map does not allow null keys");
139              return;
140          }
# Line 164 | Line 164 | public class MapCheck {
164          Map<Integer,Integer> intMap = (Map<Integer,Integer>)s;
165          timer.start(nm, n);
166          for (int i = 0; i < n; i++) {
167 <            if ((Integer)(intMap.get(i)) != i) ++sum;
167 >            if ((Integer) (intMap.get(i)) != i) ++sum;
168          }
169          timer.finish();
170          reallyAssert (sum == expect);
# Line 350 | Line 350 | public class MapCheck {
350  
351          FileInputStream is = new FileInputStream("MapCheck.dat");
352          ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(is));
353 <        Map m = (Map)in.readObject();
353 >        Map m = (Map) in.readObject();
354  
355          long endTime = System.currentTimeMillis();
356          long time = endTime - startTime;
# Line 651 | Line 651 | public class MapCheck {
651  
652          static void printStats() {
653              for (Iterator it = accum.entrySet().iterator(); it.hasNext(); ) {
654 <                Map.Entry e = (Map.Entry)(it.next());
655 <                Stats stats = ((Stats)(e.getValue()));
654 >                Map.Entry e = (Map.Entry) it.next();
655 >                Stats stats = (Stats) e.getValue();
656                  System.out.print(e.getKey() + ": ");
657                  long s;
658                  long n = stats.number;
# Line 682 | Line 682 | public class MapCheck {
682              if (st == null)
683                  accum.put(name, new Stats(elapsed, numOps));
684              else
685 <                ((Stats)st).addTime(elapsed, numOps);
685 >                ((Stats) st).addTime(elapsed, numOps);
686          }
687  
688      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines