src/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java

*** 32,56 ****
  
  package com.sun.tools.hat.internal.util;
  
  import java.util.Enumeration;
  import java.util.NoSuchElementException;
  
! public class CompositeEnumeration implements Enumeration {
!     Enumeration e1;
!     Enumeration e2;
  
!     public CompositeEnumeration(Enumeration e1, Enumeration e2) {
          this.e1 = e1;
          this.e2 = e2;
      }
  
      public boolean hasMoreElements() {
          return e1.hasMoreElements() || e2.hasMoreElements();
      }
  
!     public Object nextElement() {
          if (e1.hasMoreElements()) {
              return e1.nextElement();
          }
  
          if (e2.hasMoreElements()) {
--- 32,57 ----
  
  package com.sun.tools.hat.internal.util;
  
  import java.util.Enumeration;
  import java.util.NoSuchElementException;
+ import com.sun.tools.hat.internal.model.JavaHeapObject;
  
! public class CompositeEnumeration implements Enumeration<JavaHeapObject> {
!     Enumeration<JavaHeapObject> e1;
!     Enumeration<JavaHeapObject> e2;
  
!     public CompositeEnumeration(Enumeration<JavaHeapObject> e1, Enumeration<JavaHeapObject> e2) {
          this.e1 = e1;
          this.e2 = e2;
      }
  
      public boolean hasMoreElements() {
          return e1.hasMoreElements() || e2.hasMoreElements();
      }
  
!     public JavaHeapObject nextElement() {
          if (e1.hasMoreElements()) {
              return e1.nextElement();
          }
  
          if (e2.hasMoreElements()) {