diff -r 5546b5710844 -r 5611d2529b49 jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java	Tue Aug 08 22:52:41 2017 +0000
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java	Sun Aug 13 21:10:40 2017 -0700
@@ -21,32 +21,33 @@
 
 package com.sun.org.apache.bcel.internal.generic;
 
-
 /**
  * POP2 - Pop two top operand stack words
  *
  * <PRE>Stack: ..., word2, word1 -&gt; ...</PRE>
  *
- * @author  <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A>
+ * @version $Id: POP2.java 1747278 2016-06-07 17:28:43Z britter $
  */
 public class POP2 extends StackInstruction implements PopInstruction {
-  public POP2() {
-    super(com.sun.org.apache.bcel.internal.Constants.POP2);
-  }
+
+    public POP2() {
+        super(com.sun.org.apache.bcel.internal.Const.POP2);
+    }
 
 
-  /**
-   * Call corresponding visitor method(s). The order is:
-   * Call visitor methods of implemented interfaces first, then
-   * call methods according to the class hierarchy in descending order,
-   * i.e., the most specific visitXXX() call comes last.
-   *
-   * @param v Visitor object
-   */
-  public void accept(Visitor v) {
-    v.visitStackConsumer(this);
-    v.visitPopInstruction(this);
-    v.visitStackInstruction(this);
-    v.visitPOP2(this);
-  }
+    /**
+     * Call corresponding visitor method(s). The order is:
+     * Call visitor methods of implemented interfaces first, then
+     * call methods according to the class hierarchy in descending order,
+     * i.e., the most specific visitXXX() call comes last.
+     *
+     * @param v Visitor object
+     */
+    @Override
+    public void accept( final Visitor v ) {
+        v.visitStackConsumer(this);
+        v.visitPopInstruction(this);
+        v.visitStackInstruction(this);
+        v.visitPOP2(this);
+    }
 }