1.1 --- a/javap/src/main/java/org/apidesign/javap/TrapDataIterator.java	Sun Dec 09 16:25:36 2012 +0100
     1.2 +++ b/javap/src/main/java/org/apidesign/javap/TrapDataIterator.java	Sun Dec 09 16:44:27 2012 +0100
     1.3 @@ -9,8 +9,8 @@
     1.4   * @author Jaroslav Tulach <jtulach@netbeans.org>
     1.5   */
     1.6  public final class TrapDataIterator {
     1.7 -    private final java.util.Map<Short, TrapData> exStart = new java.util.HashMap<Short, TrapData>();
     1.8 -    private final java.util.Map<Short, TrapData> exStop = new java.util.HashMap<Short, TrapData>();
     1.9 +    private final Hashtable exStart = new Hashtable();
    1.10 +    private final Hashtable exStop = new Hashtable();
    1.11      private TrapData[] current = new TrapData[10];
    1.12      private int currentCount;
    1.13      
    1.14 @@ -23,11 +23,12 @@
    1.15      }
    1.16  
    1.17      public void advanceTo(int i) {
    1.18 -        TrapData e = exStart.get((short) i);
    1.19 +        Short s = Short.valueOf((short)i);
    1.20 +        TrapData e = (TrapData) exStart.get(s);
    1.21          if (e != null) {
    1.22              add(e);
    1.23          }
    1.24 -        e = exStop.get((short) i);
    1.25 +        e = (TrapData) exStop.get(s);
    1.26          if (e != null) {
    1.27              remove(e);
    1.28          }