test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java

*** 39,48 ****
--- 39,50 ----
  import com.sun.tools.classfile.ClassFile;
  import com.sun.tools.classfile.Code_attribute;
  import com.sun.tools.classfile.CompilationID_attribute;
  import com.sun.tools.classfile.ConstantPool;
  import com.sun.tools.classfile.ConstantPool.CONSTANT_Class_info;
+ import com.sun.tools.classfile.ConstantPool.CONSTANT_Module_info;
+ import com.sun.tools.classfile.ConstantPool.CONSTANT_Package_info;
  import com.sun.tools.classfile.ConstantPool.CONSTANT_Double_info;
  import com.sun.tools.classfile.ConstantPool.CONSTANT_Fieldref_info;
  import com.sun.tools.classfile.ConstantPool.CONSTANT_Float_info;
  import com.sun.tools.classfile.ConstantPool.CONSTANT_Integer_info;
  import com.sun.tools.classfile.ConstantPool.CONSTANT_InterfaceMethodref_info;
*** 78,90 ****
  import com.sun.tools.classfile.Module_attribute.ProvidesEntry;
  import com.sun.tools.classfile.Module_attribute.RequiresEntry;
  import com.sun.tools.classfile.ModuleHashes_attribute;
  import com.sun.tools.classfile.ModuleHashes_attribute.Entry;
  import com.sun.tools.classfile.ModuleMainClass_attribute;
  import com.sun.tools.classfile.ModuleTarget_attribute;
  import com.sun.tools.classfile.ModulePackages_attribute;
- import com.sun.tools.classfile.ModuleVersion_attribute;
  import com.sun.tools.classfile.Opcode;
  import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute;
  import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute;
  import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute;
  import com.sun.tools.classfile.RuntimeVisibleAnnotations_attribute;
--- 80,92 ----
  import com.sun.tools.classfile.Module_attribute.ProvidesEntry;
  import com.sun.tools.classfile.Module_attribute.RequiresEntry;
  import com.sun.tools.classfile.ModuleHashes_attribute;
  import com.sun.tools.classfile.ModuleHashes_attribute.Entry;
  import com.sun.tools.classfile.ModuleMainClass_attribute;
+ import com.sun.tools.classfile.ModuleResolution_attribute;
  import com.sun.tools.classfile.ModuleTarget_attribute;
  import com.sun.tools.classfile.ModulePackages_attribute;
  import com.sun.tools.classfile.Opcode;
  import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute;
  import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute;
  import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute;
  import com.sun.tools.classfile.RuntimeVisibleAnnotations_attribute;
*** 668,677 ****
--- 670,713 ----
          }
          return value;
      }
  
      @Override
+     public String visitModule(CONSTANT_Module_info info, Integer p) {
+         String value = slist.get(p);
+         if (value == null) {
+             try {
+                 value = visit(cfpool.get(info.name_index), info.name_index);
+                 slist.set(p, value);
+                 xpool.add(new Element("CONSTANT_Module",
+                         new String[]{"id", p.toString()},
+                         value));
+             } catch (ConstantPoolException ex) {
+                 ex.printStackTrace();
+             }
+         }
+         return value;
+     }
+ 
+     @Override
+     public String visitPackage(CONSTANT_Package_info info, Integer p) {
+         String value = slist.get(p);
+         if (value == null) {
+             try {
+                 value = visit(cfpool.get(info.name_index), info.name_index);
+                 slist.set(p, value);
+                 xpool.add(new Element("CONSTANT_Package",
+                         new String[]{"id", p.toString()},
+                         value));
+             } catch (ConstantPoolException ex) {
+                 ex.printStackTrace();
+             }
+         }
+         return value;
+     }
+ 
+     @Override
      public String visitDouble(CONSTANT_Double_info c, Integer p) {
          String value = slist.get(p);
          if (value == null) {
              value = Double.toString(c.value);
              slist.set(p, value);
*** 1493,1516 ****
          p.add(e);
          return null;
      }
  
      @Override
!     public Element visitModuleTarget(ModuleTarget_attribute attr, Element p) {
!         Element e = new Element(x.getCpString(attr.attribute_name_index));
!         e.add(x.getCpString(attr.os_name_index));
!         e.add(x.getCpString(attr.os_arch_index));
!         e.add(x.getCpString(attr.os_version_index));
          e.trimToSize();
          p.add(e);
          return null;
      }
  
      @Override
!     public Element visitModuleVersion(ModuleVersion_attribute attr, Element p) {
          Element e = new Element(x.getCpString(attr.attribute_name_index));
!         e.add(x.getCpString(attr.version_index));
          e.trimToSize();
          p.add(e);
          return null;
      }
  }
--- 1529,1552 ----
          p.add(e);
          return null;
      }
  
      @Override
!     public Element visitModuleResolution(ModuleResolution_attribute attr, Element p) {
!         Element e = new Element("ModuleResolution");
!         e.setAttr("flags", Integer.toString(attr.resolution_flags));
          e.trimToSize();
          p.add(e);
          return null;
      }
  
      @Override
!     public Element visitModuleTarget(ModuleTarget_attribute attr, Element p) {
          Element e = new Element(x.getCpString(attr.attribute_name_index));
!         e.add(x.getCpString(attr.os_name_index));
!         e.add(x.getCpString(attr.os_arch_index));
!         e.add(x.getCpString(attr.os_version_index));
          e.trimToSize();
          p.add(e);
          return null;
      }
  }