--- old/make/CompileJavaModules.gmk 2017-11-30 22:14:27.008233640 -0800 +++ new/make/CompileJavaModules.gmk 2017-11-30 22:14:26.166151563 -0800 @@ -300,7 +300,9 @@ ################################################################################ -java.xml_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS +java.xml_ADD_JAVAC_FLAGS += -Xdoclint:all/protected \ + '-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \ + javax.xml.transform javax.xml.validation javax.xml.xpath)' java.xml_CLEAN += .properties ################################################################################ --- old/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java 2017-11-30 22:14:29.244451600 -0800 +++ new/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java 2017-11-30 22:14:28.389368256 -0800 @@ -32,6 +32,7 @@ * * @version $Id: ConstantDouble.java 1747278 2016-06-07 17:28:43Z britter $ * @see Constant + * @LastModified: Nov 2017 */ public final class ConstantDouble extends Constant implements ConstantObject { @@ -121,6 +122,6 @@ */ @Override public Object getConstantValue( final ConstantPool cp ) { - return new Double(bytes); + return bytes; } } --- old/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java 2017-11-30 22:14:31.474668975 -0800 +++ new/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFloat.java 2017-11-30 22:14:30.613585046 -0800 @@ -32,6 +32,7 @@ * * @version $Id: ConstantFloat.java 1747278 2016-06-07 17:28:43Z britter $ * @see Constant + * @LastModified: Nov 2017 */ public final class ConstantFloat extends Constant implements ConstantObject { @@ -122,6 +123,6 @@ */ @Override public Object getConstantValue( final ConstantPool cp ) { - return new Float(bytes); + return bytes; } } --- old/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java 2017-11-30 22:14:33.649880989 -0800 +++ new/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java 2017-11-30 22:14:32.840802129 -0800 @@ -26,6 +26,7 @@ *
Stack: ... -> ...,* * @version $Id: DCONST.java 1747278 2016-06-07 17:28:43Z britter $ + * @LastModified: Nov 2017 */ public class DCONST extends Instruction implements ConstantPushInstruction { @@ -55,7 +56,7 @@ @Override public Number getValue() { - return new Double(value); + return value; } --- old/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java 2017-11-30 22:14:35.806091151 -0800 +++ new/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/FCONST.java 2017-11-30 22:14:34.985011121 -0800 @@ -26,6 +26,7 @@ *
Stack: ... -> ...,* * @version $Id: FCONST.java 1747278 2016-06-07 17:28:43Z britter $ + * @LastModified: Nov 2017 */ public class FCONST extends Instruction implements ConstantPushInstruction { @@ -57,7 +58,7 @@ @Override public Number getValue() { - return new Float(value); + return value; } --- old/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEDYNAMIC.java 2017-11-30 22:14:37.958300923 -0800 +++ new/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEDYNAMIC.java 2017-11-30 22:14:37.168223915 -0800 @@ -1,6 +1,5 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. */ /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -41,6 +40,7 @@ * * The invokedynamic instruction in The Java Virtual Machine Specification * @since 6.0 + * @LastModified: Nov 2017 */ public class INVOKEDYNAMIC extends InvokeInstruction { @@ -124,8 +124,14 @@ /** * Override the parent method because our classname is held elsewhere. + * + * @param cpg the ConstantPool generator + * @deprecated in FieldOrMethod + * + * @return name of the referenced class/interface */ @Override + @Deprecated public String getClassName( final ConstantPoolGen cpg ) { final ConstantPool cp = cpg.getConstantPool(); final ConstantInvokeDynamic cid = (ConstantInvokeDynamic) cp.getConstant(super.getIndex(), Const.CONSTANT_InvokeDynamic); --- old/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java 2017-11-30 22:14:40.127512352 -0800 +++ new/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java 2017-11-30 22:14:39.302431933 -0800 @@ -32,6 +32,7 @@ * @version $Id: InstructionFactory.java 1749603 2016-06-21 20:50:19Z ggregory $ * @see Const * @see InstructionConst + * @LastModified: Nov 2017 */ public class InstructionFactory { @@ -573,7 +574,7 @@ + short_names[dest - Const.T_CHAR]; Instruction i = null; try { - i = (Instruction) java.lang.Class.forName(name).newInstance(); + i = (Instruction) java.lang.Class.forName(name).getDeclaredConstructor().newInstance(); } catch (final Exception e) { throw new RuntimeException("Could not find instruction: " + name, e); } --- old/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java 2017-11-30 22:14:42.256719882 -0800 +++ new/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java 2017-11-30 22:14:41.433639658 -0800 @@ -32,6 +32,7 @@ *
Stack: ... -> ..., item* * @version $Id: LDC.java 1749603 2016-06-21 20:50:19Z ggregory $ + * @LastModified: Nov 2017 */ public class LDC extends CPInstruction implements PushInstruction, ExceptionThrower { @@ -104,9 +105,9 @@ c = cpg.getConstantPool().getConstant(i); return ((com.sun.org.apache.bcel.internal.classfile.ConstantUtf8) c).getBytes(); case com.sun.org.apache.bcel.internal.Const.CONSTANT_Float: - return new Float(((com.sun.org.apache.bcel.internal.classfile.ConstantFloat) c).getBytes()); + return ((com.sun.org.apache.bcel.internal.classfile.ConstantFloat) c).getBytes(); case com.sun.org.apache.bcel.internal.Const.CONSTANT_Integer: - return Integer.valueOf(((com.sun.org.apache.bcel.internal.classfile.ConstantInteger) c).getBytes()); + return ((com.sun.org.apache.bcel.internal.classfile.ConstantInteger) c).getBytes(); case com.sun.org.apache.bcel.internal.Const.CONSTANT_Class: final int nameIndex = ((com.sun.org.apache.bcel.internal.classfile.ConstantClass) c).getNameIndex(); c = cpg.getConstantPool().getConstant(nameIndex); --- old/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java 2017-11-30 22:14:44.376926535 -0800 +++ new/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java 2017-11-30 22:14:43.599850794 -0800 @@ -26,6 +26,7 @@ *
Stack: ... -> ..., item.word1, item.word2* * @version $Id: LDC2_W.java 1749603 2016-06-21 20:50:19Z ggregory $ + * @LastModified: Nov 2017 */ public class LDC2_W extends CPInstruction implements PushInstruction { @@ -59,9 +60,9 @@ final com.sun.org.apache.bcel.internal.classfile.Constant c = cpg.getConstantPool().getConstant(super.getIndex()); switch (c.getTag()) { case com.sun.org.apache.bcel.internal.Const.CONSTANT_Long: - return Long.valueOf(((com.sun.org.apache.bcel.internal.classfile.ConstantLong) c).getBytes()); + return ((com.sun.org.apache.bcel.internal.classfile.ConstantLong) c).getBytes(); case com.sun.org.apache.bcel.internal.Const.CONSTANT_Double: - return new Double(((com.sun.org.apache.bcel.internal.classfile.ConstantDouble) c).getBytes()); + return ((com.sun.org.apache.bcel.internal.classfile.ConstantDouble) c).getBytes(); default: // Never reached throw new RuntimeException("Unknown or invalid constant type at " + super.getIndex()); }