diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
--- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	Tue Sep 15 21:56:04 2015 -0700
@@ -194,7 +194,7 @@
 
 
     /** Entries in the constant pool. */
-    public static abstract
+    public abstract static
     class Entry implements Comparable<Object> {
         protected final byte tag;       // a CONSTANT_foo code
         protected int valueHash;        // cached hashCode
@@ -338,7 +338,7 @@
         return (REF_getField <= refKind && refKind <= REF_invokeInterface);
     }
 
-    public static abstract
+    public abstract static
     class LiteralEntry extends Entry {
         protected LiteralEntry(byte tag) {
             super(tag);
@@ -785,7 +785,7 @@
         return new String(sig);
     }
 
-    static private int skipTo(char semi, String sig, int i) {
+    private static int skipTo(char semi, String sig, int i) {
         i = sig.indexOf(semi, i);
         return (i >= 0) ? i : sig.length();
     }