1.1 --- a/src/share/classes/com/sun/tools/classfile/Attribute.java Thu Feb 20 18:28:46 2014 +0400
1.2 +++ b/src/share/classes/com/sun/tools/classfile/Attribute.java Mon Mar 03 16:08:06 2014 +0400
1.3 @@ -71,10 +71,6 @@
1.4 // defer init of standardAttributeClasses until after options set up
1.5 }
1.6
1.7 - public void setCompat(boolean compat) {
1.8 - this.compat = compat;
1.9 - }
1.10 -
1.11 public Attribute createAttribute(ClassReader cr, int name_index, byte[] data)
1.12 throws IOException {
1.13 if (standardAttributes == null) {
1.14 @@ -109,9 +105,10 @@
1.15 protected void init() {
1.16 standardAttributes = new HashMap<String,Class<? extends Attribute>>();
1.17 standardAttributes.put(AnnotationDefault, AnnotationDefault_attribute.class);
1.18 - standardAttributes.put(BootstrapMethods, BootstrapMethods_attribute.class);
1.19 + standardAttributes.put(BootstrapMethods, BootstrapMethods_attribute.class);
1.20 standardAttributes.put(CharacterRangeTable, CharacterRangeTable_attribute.class);
1.21 standardAttributes.put(Code, Code_attribute.class);
1.22 + standardAttributes.put(CompilationID, CompilationID_attribute.class);
1.23 standardAttributes.put(ConstantValue, ConstantValue_attribute.class);
1.24 standardAttributes.put(Deprecated, Deprecated_attribute.class);
1.25 standardAttributes.put(EnclosingMethod, EnclosingMethod_attribute.class);
1.26 @@ -120,29 +117,23 @@
1.27 standardAttributes.put(LineNumberTable, LineNumberTable_attribute.class);
1.28 standardAttributes.put(LocalVariableTable, LocalVariableTable_attribute.class);
1.29 standardAttributes.put(LocalVariableTypeTable, LocalVariableTypeTable_attribute.class);
1.30 -
1.31 - if (!compat) { // old javap does not recognize recent attributes
1.32 - standardAttributes.put(MethodParameters, MethodParameters_attribute.class);
1.33 - standardAttributes.put(CompilationID, CompilationID_attribute.class);
1.34 - standardAttributes.put(RuntimeInvisibleAnnotations, RuntimeInvisibleAnnotations_attribute.class);
1.35 - standardAttributes.put(RuntimeInvisibleParameterAnnotations, RuntimeInvisibleParameterAnnotations_attribute.class);
1.36 - standardAttributes.put(RuntimeVisibleAnnotations, RuntimeVisibleAnnotations_attribute.class);
1.37 - standardAttributes.put(RuntimeVisibleParameterAnnotations, RuntimeVisibleParameterAnnotations_attribute.class);
1.38 - standardAttributes.put(RuntimeVisibleTypeAnnotations, RuntimeVisibleTypeAnnotations_attribute.class);
1.39 - standardAttributes.put(RuntimeInvisibleTypeAnnotations, RuntimeInvisibleTypeAnnotations_attribute.class);
1.40 - standardAttributes.put(Signature, Signature_attribute.class);
1.41 - standardAttributes.put(SourceID, SourceID_attribute.class);
1.42 - }
1.43 -
1.44 + standardAttributes.put(MethodParameters, MethodParameters_attribute.class);
1.45 + standardAttributes.put(RuntimeInvisibleAnnotations, RuntimeInvisibleAnnotations_attribute.class);
1.46 + standardAttributes.put(RuntimeInvisibleParameterAnnotations, RuntimeInvisibleParameterAnnotations_attribute.class);
1.47 + standardAttributes.put(RuntimeVisibleAnnotations, RuntimeVisibleAnnotations_attribute.class);
1.48 + standardAttributes.put(RuntimeVisibleParameterAnnotations, RuntimeVisibleParameterAnnotations_attribute.class);
1.49 + standardAttributes.put(RuntimeVisibleTypeAnnotations, RuntimeVisibleTypeAnnotations_attribute.class);
1.50 + standardAttributes.put(RuntimeInvisibleTypeAnnotations, RuntimeInvisibleTypeAnnotations_attribute.class);
1.51 + standardAttributes.put(Signature, Signature_attribute.class);
1.52 standardAttributes.put(SourceDebugExtension, SourceDebugExtension_attribute.class);
1.53 standardAttributes.put(SourceFile, SourceFile_attribute.class);
1.54 + standardAttributes.put(SourceID, SourceID_attribute.class);
1.55 standardAttributes.put(StackMap, StackMap_attribute.class);
1.56 standardAttributes.put(StackMapTable, StackMapTable_attribute.class);
1.57 standardAttributes.put(Synthetic, Synthetic_attribute.class);
1.58 }
1.59
1.60 private Map<String,Class<? extends Attribute>> standardAttributes;
1.61 - private boolean compat; // don't support recent attrs in compatibility mode
1.62 }
1.63
1.64 public static Attribute read(ClassReader cr) throws IOException {
