# HG changeset patch # User martin # Date 1442379364 25200 # Node ID 2ee9017c759754e3f7fe45823ce30606b99ee37b # Parent 1fa861caf840f6b7d7960feb217a734cc5862575 8136583: Core libraries should use blessed modifier order Summary: Run blessed-modifier-order script (see bug) Reviewed-by: psandoz, chegar, alanb, plevart diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java --- a/jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java Tue Sep 15 21:56:04 2015 -0700 @@ -42,7 +42,7 @@ class DefaultInterface { - private final static NetworkInterface defaultInterface = + private static final NetworkInterface defaultInterface = chooseDefaultInterface(); static NetworkInterface getDefault() { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java --- a/jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java Tue Sep 15 21:56:04 2015 -0700 @@ -106,7 +106,7 @@ tmpSet.addAll(Control.getNoFallbackControl(Control.FORMAT_DEFAULT).getCandidateLocales("", l)); supportedLocaleSet = Collections.unmodifiableSet(tmpSet); } - private final static Locale[] supportedLocale = supportedLocaleSet.toArray(new Locale[0]); + private static final Locale[] supportedLocale = supportedLocaleSet.toArray(new Locale[0]); @SuppressWarnings("fallthrough") private static Locale convertMacOSXLocaleToJavaLocale(String macosxloc) { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java Tue Sep 15 21:56:04 2015 -0700 @@ -45,7 +45,7 @@ final class RC2Crypt extends SymmetricCipher { // PITABLE from the RFC, used in key setup - private final static int[] PI_TABLE = new int[] { + private static final int[] PI_TABLE = new int[] { 0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79, 0x4a, 0xa0, 0xd8, 0x9d, 0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e, diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java Tue Sep 15 21:56:04 2015 -0700 @@ -59,7 +59,7 @@ // TABLE[EKB] from section 6 of RFC 2268, used to convert effective key // size to/from encoded version number - private final static int[] EKB_TABLE = new int[] { + private static final int[] EKB_TABLE = new int[] { 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, 0x30, 0x04, 0xb6, 0xdc, 0x7d, 0xdf, 0x32, 0x4b, diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java Tue Sep 15 21:56:04 2015 -0700 @@ -66,23 +66,23 @@ public final class RSACipher extends CipherSpi { // constant for an empty byte array - private final static byte[] B0 = new byte[0]; + private static final byte[] B0 = new byte[0]; // mode constant for public key encryption - private final static int MODE_ENCRYPT = 1; + private static final int MODE_ENCRYPT = 1; // mode constant for private key decryption - private final static int MODE_DECRYPT = 2; + private static final int MODE_DECRYPT = 2; // mode constant for private key encryption (signing) - private final static int MODE_SIGN = 3; + private static final int MODE_SIGN = 3; // mode constant for public key decryption (verifying) - private final static int MODE_VERIFY = 4; + private static final int MODE_VERIFY = 4; // constant for raw RSA - private final static String PAD_NONE = "NoPadding"; + private static final String PAD_NONE = "NoPadding"; // constant for PKCS#1 v1.5 RSA - private final static String PAD_PKCS1 = "PKCS1Padding"; + private static final String PAD_PKCS1 = "PKCS1Padding"; // constant for PKCS#2 v2.0 OAEP with MGF1 - private final static String PAD_OAEP_MGF1 = "OAEP"; + private static final String PAD_OAEP_MGF1 = "OAEP"; // current mode, one of MODE_* above. Set when init() is called private int mode; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java Tue Sep 15 21:56:04 2015 -0700 @@ -43,7 +43,7 @@ */ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi { - private final static String MSG = "TlsKeyMaterialGenerator must be " + private static final String MSG = "TlsKeyMaterialGenerator must be " + "initialized using a TlsKeyMaterialParameterSpec"; @SuppressWarnings("deprecation") diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java Tue Sep 15 21:56:04 2015 -0700 @@ -43,7 +43,7 @@ */ public final class TlsMasterSecretGenerator extends KeyGeneratorSpi { - private final static String MSG = "TlsMasterSecretGenerator must be " + private static final String MSG = "TlsMasterSecretGenerator must be " + "initialized using a TlsMasterSecretParameterSpec"; @SuppressWarnings("deprecation") diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java Tue Sep 15 21:56:04 2015 -0700 @@ -50,23 +50,23 @@ // magic constants and utility functions, also used by other files // in this package - private final static byte[] B0 = new byte[0]; + private static final byte[] B0 = new byte[0]; - final static byte[] LABEL_MASTER_SECRET = // "master secret" + static final byte[] LABEL_MASTER_SECRET = // "master secret" { 109, 97, 115, 116, 101, 114, 32, 115, 101, 99, 114, 101, 116 }; - final static byte[] LABEL_KEY_EXPANSION = // "key expansion" + static final byte[] LABEL_KEY_EXPANSION = // "key expansion" { 107, 101, 121, 32, 101, 120, 112, 97, 110, 115, 105, 111, 110 }; - final static byte[] LABEL_CLIENT_WRITE_KEY = // "client write key" + static final byte[] LABEL_CLIENT_WRITE_KEY = // "client write key" { 99, 108, 105, 101, 110, 116, 32, 119, 114, 105, 116, 101, 32, 107, 101, 121 }; - final static byte[] LABEL_SERVER_WRITE_KEY = // "server write key" + static final byte[] LABEL_SERVER_WRITE_KEY = // "server write key" { 115, 101, 114, 118, 101, 114, 32, 119, 114, 105, 116, 101, 32, 107, 101, 121 }; - final static byte[] LABEL_IV_BLOCK = // "IV block" + static final byte[] LABEL_IV_BLOCK = // "IV block" { 73, 86, 32, 98, 108, 111, 99, 107 }; /* @@ -79,7 +79,7 @@ private static final byte[] HMAC_opad128 = genPad((byte)0x5c, 128); // SSL3 magic mix constants ("A", "BB", "CCC", ...) - final static byte[][] SSL3_CONST = genConst(); + static final byte[][] SSL3_CONST = genConst(); static byte[] genPad(byte b, int count) { byte[] padding = new byte[count]; @@ -109,7 +109,7 @@ // PRF implementation - private final static String MSG = "TlsPrfGenerator must be " + private static final String MSG = "TlsPrfGenerator must be " + "initialized using a TlsPrfParameterSpec"; @SuppressWarnings("deprecation") @@ -368,7 +368,7 @@ * appropriate supportsParamters() checks into KeyGenerators (not * currently there). */ - static public class V12 extends TlsPrfGenerator { + public static class V12 extends TlsPrfGenerator { protected SecretKey engineGenerateKey() { return engineGenerateKey0(true); } @@ -377,7 +377,7 @@ /** * A KeyGenerator implementation that supports TLS 1.0/1.1. */ - static public class V10 extends TlsPrfGenerator { + public static class V10 extends TlsPrfGenerator { protected SecretKey engineGenerateKey() { return engineGenerateKey0(false); } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java Tue Sep 15 21:56:04 2015 -0700 @@ -41,7 +41,7 @@ */ public final class TlsRsaPremasterSecretGenerator extends KeyGeneratorSpi { - private final static String MSG = "TlsRsaPremasterSecretGenerator must be " + private static final String MSG = "TlsRsaPremasterSecretGenerator must be " + "initialized using a TlsRsaPremasterSecretParameterSpec"; @SuppressWarnings("deprecation") diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java Tue Sep 15 21:56:04 2015 -0700 @@ -342,7 +342,7 @@ * presence of attributes. That is, flags are a mix of modifier * bits and attribute indicators. */ - public static abstract + public abstract static class Holder { // We need this abstract method to interpret embedded CP refs. @@ -461,7 +461,7 @@ // Lightweight interface to hide details of band structure. // Also used for testing. - public static abstract + public abstract static class ValueStream { public int getInt(int bandIndex) { throw undef(); } public void putInt(int bandIndex, int value) { throw undef(); } @@ -667,7 +667,7 @@ public boolean hasCallables() { return (elems.length > 0 && elems[0].kind == EK_CBLE); } - static private final Element[] noElems = {}; + private static final Element[] noElems = {}; public Element[] getCallables() { if (hasCallables()) { Element[] nelems = Arrays.copyOf(elems, elems.length); @@ -783,7 +783,7 @@ * Replaces '\c' by the decimal code of the character c. * Replaces '0xNNN' by the decimal code of the hex number NNN. */ - static public + public static String normalizeLayoutString(String layout) { StringBuilder buf = new StringBuilder(); for (int i = 0, len = layout.length(); i < len; ) { @@ -1139,7 +1139,7 @@ bodies.toArray(res); return res; } - static private + private static int skipBody(String layout, int i) { assert(layout.charAt(i-1) == '['); if (layout.charAt(i) == ']') @@ -1156,7 +1156,7 @@ assert(layout.charAt(i) == ']'); return i; // return closing bracket } - static private + private static int tokenizeUInt(Layout.Element e, String layout, int i) { switch (layout.charAt(i++)) { case 'V': e.len = 0; break; @@ -1167,7 +1167,7 @@ } return i; } - static private + private static int tokenizeSInt(Layout.Element e, String layout, int i) { if (layout.charAt(i) == 'S') { e.flags |= EF_SIGN; @@ -1176,7 +1176,7 @@ return tokenizeUInt(e, layout, i); } - static private + private static boolean isDigit(char c) { return c >= '0' && c <= '9'; } @@ -1383,7 +1383,7 @@ return e.body[lastj]; } - static private + private static int parseInt(Layout.Element e, byte[] bytes, int pos, int[] buf) { int value = 0; int loBits = e.len * 8; @@ -1483,7 +1483,7 @@ } } - static private + private static void unparseInt(Layout.Element e, int value, ByteArrayOutputStream out) { int loBits = e.len * 8; if (loBits == 0) { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java Tue Sep 15 21:56:04 2015 -0700 @@ -73,7 +73,7 @@ boolean optVaryCodings = !p200.getBoolean(Utils.COM_PREFIX+"no.vary.codings"); boolean optBigStrings = !p200.getBoolean(Utils.COM_PREFIX+"no.big.strings"); - abstract protected Index getCPIndex(byte tag); + protected abstract Index getCPIndex(byte tag); // Local copy of highest class version. private Package.Version highestClassVersion = null; @@ -97,27 +97,27 @@ protected BandStructure() {} - final static Coding BYTE1 = Coding.of(1,256); + static final Coding BYTE1 = Coding.of(1,256); - final static Coding CHAR3 = Coding.of(3,128); + static final Coding CHAR3 = Coding.of(3,128); // Note: Tried sharper (3,16) with no post-zip benefit. // This is best used with BCI values: - final static Coding BCI5 = Coding.of(5,4); // mostly 1-byte offsets - final static Coding BRANCH5 = Coding.of(5,4,2); // mostly forward branches + static final Coding BCI5 = Coding.of(5,4); // mostly 1-byte offsets + static final Coding BRANCH5 = Coding.of(5,4,2); // mostly forward branches - final static Coding UNSIGNED5 = Coding.of(5,64); - final static Coding UDELTA5 = UNSIGNED5.getDeltaCoding(); + static final Coding UNSIGNED5 = Coding.of(5,64); + static final Coding UDELTA5 = UNSIGNED5.getDeltaCoding(); // "sharp" (5,64) zips 0.4% better than "medium" (5,128) // It zips 1.1% better than "flat" (5,192) - final static Coding SIGNED5 = Coding.of(5,64,1); //sharp - final static Coding DELTA5 = SIGNED5.getDeltaCoding(); + static final Coding SIGNED5 = Coding.of(5,64,1); //sharp + static final Coding DELTA5 = SIGNED5.getDeltaCoding(); // Note: Tried (5,128,2) and (5,192,2) with no benefit. - final static Coding MDELTA5 = Coding.of(5,64,2).getDeltaCoding(); + static final Coding MDELTA5 = Coding.of(5,64,2).getDeltaCoding(); - final private static Coding[] basicCodings = { + private static final Coding[] basicCodings = { // Table of "Canonical BHSD Codings" from Pack200 spec. null, // _meta_default @@ -250,7 +250,7 @@ null }; - final private static Map basicCodingIndexes; + private static final Map basicCodingIndexes; static { assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -362,9 +362,9 @@ protected long outputSize = -1; // cache - final public Coding regularCoding; + public final Coding regularCoding; - final public int seqForDebug; + public final int seqForDebug; public int elementCountForDebug; @@ -430,7 +430,7 @@ protected abstract long computeOutputSize(); - abstract protected void writeDataTo(OutputStream out) throws IOException; + protected abstract void writeDataTo(OutputStream out) throws IOException; /** Expect a certain number of values. */ void expectLength(int l) { @@ -468,7 +468,7 @@ readDataFrom(in); readyToDisburse(); } - abstract protected void readDataFrom(InputStream in) throws IOException; + protected abstract void readDataFrom(InputStream in) throws IOException; protected void readyToDisburse() { if (verbose > 1) Utils.log.fine("readyToDisburse "+this); setPhase(DISBURSE_PHASE); @@ -1447,7 +1447,7 @@ return b; } - static private final boolean NULL_IS_OK = true; + private static final boolean NULL_IS_OK = true; MultiBand all_bands = (MultiBand) new MultiBand("(package)", UNSIGNED5).init(); @@ -2539,7 +2539,7 @@ return false; } - static private boolean assertDoneDisbursing(Band b) { + private static boolean assertDoneDisbursing(Band b) { if (b.phase != DISBURSE_PHASE) { Utils.log.warning("assertDoneDisbursing: still in phase "+b.phase+": "+b); if (verbose() <= 1) return false; // fail now @@ -2562,7 +2562,7 @@ return true; } - static private void printCDecl(Band b) { + private static void printCDecl(Band b) { if (b instanceof MultiBand) { MultiBand mb = (MultiBand) b; for (int i = 0; i < mb.bandCount; i++) { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java Tue Sep 15 21:56:04 2015 -0700 @@ -56,7 +56,7 @@ return m.getCPMap(); } - static private final ConstantPool.Entry[] noRefs = ConstantPool.noRefs; + private static final ConstantPool.Entry[] noRefs = ConstantPool.noRefs; // The following fields are used directly by the ClassReader, etc. int max_stack; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java Tue Sep 15 21:56:04 2015 -0700 @@ -662,7 +662,7 @@ return lg; } - static private final byte[] byteBitWidths = new byte[0x100]; + private static final byte[] byteBitWidths = new byte[0x100]; static { for (int b = 0; b < byteBitWidths.length; b++) { byteBitWidths[b] = (byte) ceil_lg2(b + 1); diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java Tue Sep 15 21:56:04 2015 -0700 @@ -1139,7 +1139,7 @@ } } - static private + private static String pct(double num, double den) { return (Math.round((num / den)*10000)/100.0)+"%"; } 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 { 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(); } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java Tue Sep 15 21:56:04 2015 -0700 @@ -36,7 +36,7 @@ private Constants(){} - public final static int JAVA_MAGIC = 0xCAFEBABE; + public static final int JAVA_MAGIC = 0xCAFEBABE; /* Java Class Version numbers history @@ -48,93 +48,93 @@ 1.8 to 1.7.x 52,0 */ - public final static Package.Version JAVA_MIN_CLASS_VERSION = + public static final Package.Version JAVA_MIN_CLASS_VERSION = Package.Version.of(45, 03); - public final static Package.Version JAVA5_MAX_CLASS_VERSION = + public static final Package.Version JAVA5_MAX_CLASS_VERSION = Package.Version.of(49, 00); - public final static Package.Version JAVA6_MAX_CLASS_VERSION = + public static final Package.Version JAVA6_MAX_CLASS_VERSION = Package.Version.of(50, 00); - public final static Package.Version JAVA7_MAX_CLASS_VERSION = + public static final Package.Version JAVA7_MAX_CLASS_VERSION = Package.Version.of(51, 00); - public final static Package.Version JAVA8_MAX_CLASS_VERSION = + public static final Package.Version JAVA8_MAX_CLASS_VERSION = Package.Version.of(52, 00); - public final static int JAVA_PACKAGE_MAGIC = 0xCAFED00D; + public static final int JAVA_PACKAGE_MAGIC = 0xCAFED00D; - public final static Package.Version JAVA5_PACKAGE_VERSION = + public static final Package.Version JAVA5_PACKAGE_VERSION = Package.Version.of(150, 7); - public final static Package.Version JAVA6_PACKAGE_VERSION = + public static final Package.Version JAVA6_PACKAGE_VERSION = Package.Version.of(160, 1); - public final static Package.Version JAVA7_PACKAGE_VERSION = + public static final Package.Version JAVA7_PACKAGE_VERSION = Package.Version.of(170, 1); - public final static Package.Version JAVA8_PACKAGE_VERSION = + public static final Package.Version JAVA8_PACKAGE_VERSION = Package.Version.of(171, 0); // upper limit, should point to the latest class version - public final static Package.Version JAVA_MAX_CLASS_VERSION = + public static final Package.Version JAVA_MAX_CLASS_VERSION = JAVA8_MAX_CLASS_VERSION; // upper limit should point to the latest package version, for version info!. - public final static Package.Version MAX_PACKAGE_VERSION = + public static final Package.Version MAX_PACKAGE_VERSION = JAVA7_PACKAGE_VERSION; - public final static int CONSTANT_POOL_INDEX_LIMIT = 0x10000; - public final static int CONSTANT_POOL_NARROW_LIMIT = 0x00100; + public static final int CONSTANT_POOL_INDEX_LIMIT = 0x10000; + public static final int CONSTANT_POOL_NARROW_LIMIT = 0x00100; - public final static String JAVA_SIGNATURE_CHARS = "BSCIJFDZLV(["; + public static final String JAVA_SIGNATURE_CHARS = "BSCIJFDZLV(["; - public final static byte CONSTANT_Utf8 = 1; - public final static byte CONSTANT_unused2 = 2; // unused, was Unicode - public final static byte CONSTANT_Integer = 3; - public final static byte CONSTANT_Float = 4; - public final static byte CONSTANT_Long = 5; - public final static byte CONSTANT_Double = 6; - public final static byte CONSTANT_Class = 7; - public final static byte CONSTANT_String = 8; - public final static byte CONSTANT_Fieldref = 9; - public final static byte CONSTANT_Methodref = 10; - public final static byte CONSTANT_InterfaceMethodref = 11; - public final static byte CONSTANT_NameandType = 12; - public final static byte CONSTANT_unused13 = 13; - public final static byte CONSTANT_unused14 = 14; - public final static byte CONSTANT_MethodHandle = 15; - public final static byte CONSTANT_MethodType = 16; - public final static byte CONSTANT_unused17 = 17; // unused - public final static byte CONSTANT_InvokeDynamic = 18; + public static final byte CONSTANT_Utf8 = 1; + public static final byte CONSTANT_unused2 = 2; // unused, was Unicode + public static final byte CONSTANT_Integer = 3; + public static final byte CONSTANT_Float = 4; + public static final byte CONSTANT_Long = 5; + public static final byte CONSTANT_Double = 6; + public static final byte CONSTANT_Class = 7; + public static final byte CONSTANT_String = 8; + public static final byte CONSTANT_Fieldref = 9; + public static final byte CONSTANT_Methodref = 10; + public static final byte CONSTANT_InterfaceMethodref = 11; + public static final byte CONSTANT_NameandType = 12; + public static final byte CONSTANT_unused13 = 13; + public static final byte CONSTANT_unused14 = 14; + public static final byte CONSTANT_MethodHandle = 15; + public static final byte CONSTANT_MethodType = 16; + public static final byte CONSTANT_unused17 = 17; // unused + public static final byte CONSTANT_InvokeDynamic = 18; // pseudo-constants: - public final static byte CONSTANT_None = 0; - public final static byte CONSTANT_Signature = CONSTANT_unused13; - public final static byte CONSTANT_BootstrapMethod = CONSTANT_unused17; // used only in InvokeDynamic constants - public final static byte CONSTANT_Limit = 19; + public static final byte CONSTANT_None = 0; + public static final byte CONSTANT_Signature = CONSTANT_unused13; + public static final byte CONSTANT_BootstrapMethod = CONSTANT_unused17; // used only in InvokeDynamic constants + public static final byte CONSTANT_Limit = 19; - public final static byte CONSTANT_All = 50; // combined global map - public final static byte CONSTANT_LoadableValue = 51; // used for 'KL' and qldc operands - public final static byte CONSTANT_AnyMember = 52; // union of refs to field or (interface) method - public final static byte CONSTANT_FieldSpecific = 53; // used only for 'KQ' ConstantValue attrs - public final static byte CONSTANT_GroupFirst = CONSTANT_All; - public final static byte CONSTANT_GroupLimit = CONSTANT_FieldSpecific+1; + public static final byte CONSTANT_All = 50; // combined global map + public static final byte CONSTANT_LoadableValue = 51; // used for 'KL' and qldc operands + public static final byte CONSTANT_AnyMember = 52; // union of refs to field or (interface) method + public static final byte CONSTANT_FieldSpecific = 53; // used only for 'KQ' ConstantValue attrs + public static final byte CONSTANT_GroupFirst = CONSTANT_All; + public static final byte CONSTANT_GroupLimit = CONSTANT_FieldSpecific+1; // CONSTANT_MethodHandle reference kinds - public final static byte REF_getField = 1; - public final static byte REF_getStatic = 2; - public final static byte REF_putField = 3; - public final static byte REF_putStatic = 4; - public final static byte REF_invokeVirtual = 5; - public final static byte REF_invokeStatic = 6; - public final static byte REF_invokeSpecial = 7; - public final static byte REF_newInvokeSpecial = 8; - public final static byte REF_invokeInterface = 9; + public static final byte REF_getField = 1; + public static final byte REF_getStatic = 2; + public static final byte REF_putField = 3; + public static final byte REF_putStatic = 4; + public static final byte REF_invokeVirtual = 5; + public static final byte REF_invokeStatic = 6; + public static final byte REF_invokeSpecial = 7; + public static final byte REF_newInvokeSpecial = 8; + public static final byte REF_invokeInterface = 9; // pseudo-access bits - public final static int ACC_IC_LONG_FORM = (1<<16); //for ic_flags + public static final int ACC_IC_LONG_FORM = (1<<16); //for ic_flags // attribute "context types" public static final int ATTR_CONTEXT_CLASS = 0; @@ -199,14 +199,14 @@ public static final int NO_MODTIME = 0; // null modtime value // some comstantly empty containers - public final static int[] noInts = {}; - public final static byte[] noBytes = {}; - public final static Object[] noValues = {}; - public final static String[] noStrings = {}; - public final static List emptyList = Arrays.asList(noValues); + public static final int[] noInts = {}; + public static final byte[] noBytes = {}; + public static final Object[] noValues = {}; + public static final String[] noStrings = {}; + public static final List emptyList = Arrays.asList(noValues); // meta-coding - public final static int + public static final int _meta_default = 0, _meta_canon_min = 1, _meta_canon_max = 115, @@ -216,7 +216,7 @@ _meta_limit = 189; // bytecodes - public final static int + public static final int _nop = 0, // 0x00 _aconst_null = 1, // 0x01 _iconst_m1 = 2, // 0x02 @@ -422,10 +422,10 @@ _bytecode_limit = 202; // 0xca // End marker, used to terminate bytecode sequences: - public final static int _end_marker = 255; + public static final int _end_marker = 255; // Escapes: - public final static int _byte_escape = 254; - public final static int _ref_escape = 253; + public static final int _byte_escape = 254; + public static final int _ref_escape = 253; // Self-relative pseudo-opcodes for better compression. // A "linker op" is a bytecode which links to a class member. @@ -440,26 +440,26 @@ // For simplicity, we define the full symmetric set of variants. // However, some of them are relatively useless. // Self linker ops are enabled by Pack.selfCallVariants (true). - public final static int _first_linker_op = _getstatic; - public final static int _last_linker_op = _invokestatic; - public final static int _num_linker_ops = (_last_linker_op - _first_linker_op) + 1; - public final static int _self_linker_op = _bytecode_limit; - public final static int _self_linker_aload_flag = 1*_num_linker_ops; - public final static int _self_linker_super_flag = 2*_num_linker_ops; - public final static int _self_linker_limit = _self_linker_op + 4*_num_linker_ops; + public static final int _first_linker_op = _getstatic; + public static final int _last_linker_op = _invokestatic; + public static final int _num_linker_ops = (_last_linker_op - _first_linker_op) + 1; + public static final int _self_linker_op = _bytecode_limit; + public static final int _self_linker_aload_flag = 1*_num_linker_ops; + public static final int _self_linker_super_flag = 2*_num_linker_ops; + public static final int _self_linker_limit = _self_linker_op + 4*_num_linker_ops; // An "invoke init" op is a variant of invokespecial which works // only with the method name "". There are variants which // link to the current class, the super class, or the class of the // immediately previous "newinstance" op. There are 3 of these ops. // They all take method signature references as operands. // Invoke init ops are enabled by Pack.initCallVariants (true). - public final static int _invokeinit_op = _self_linker_limit; - public final static int _invokeinit_self_option = 0; - public final static int _invokeinit_super_option = 1; - public final static int _invokeinit_new_option = 2; - public final static int _invokeinit_limit = _invokeinit_op+3; + public static final int _invokeinit_op = _self_linker_limit; + public static final int _invokeinit_self_option = 0; + public static final int _invokeinit_super_option = 1; + public static final int _invokeinit_new_option = 2; + public static final int _invokeinit_limit = _invokeinit_op+3; - public final static int _pseudo_instruction_limit = _invokeinit_limit; + public static final int _pseudo_instruction_limit = _invokeinit_limit; // linker variant limit == 202+(7*4)+3 == 233 // Ldc variants support strongly typed references to constants. @@ -467,25 +467,25 @@ // which is a great simplification. // Ldc variants gain us only 0.007% improvement in compression ratio, // but they simplify the file format greatly. - public final static int _xldc_op = _invokeinit_limit; - public final static int _sldc = _ldc; // previously named _aldc - public final static int _cldc = _xldc_op+0; - public final static int _ildc = _xldc_op+1; - public final static int _fldc = _xldc_op+2; - public final static int _sldc_w = _ldc_w; // previously named _aldc_w - public final static int _cldc_w = _xldc_op+3; - public final static int _ildc_w = _xldc_op+4; - public final static int _fldc_w = _xldc_op+5; - public final static int _lldc2_w = _ldc2_w; - public final static int _dldc2_w = _xldc_op+6; + public static final int _xldc_op = _invokeinit_limit; + public static final int _sldc = _ldc; // previously named _aldc + public static final int _cldc = _xldc_op+0; + public static final int _ildc = _xldc_op+1; + public static final int _fldc = _xldc_op+2; + public static final int _sldc_w = _ldc_w; // previously named _aldc_w + public static final int _cldc_w = _xldc_op+3; + public static final int _ildc_w = _xldc_op+4; + public static final int _fldc_w = _xldc_op+5; + public static final int _lldc2_w = _ldc2_w; + public static final int _dldc2_w = _xldc_op+6; // anything other than primitive, string, or class must be handled with qldc: - public final static int _qldc = _xldc_op+7; - public final static int _qldc_w = _xldc_op+8; - public final static int _xldc_limit = _xldc_op+9; + public static final int _qldc = _xldc_op+7; + public static final int _qldc_w = _xldc_op+8; + public static final int _xldc_limit = _xldc_op+9; // handling of InterfaceMethodRef - public final static int _invoke_int_op = _xldc_limit; - public final static int _invokespecial_int = _invoke_int_op+0; - public final static int _invokestatic_int = _invoke_int_op+1; - public final static int _invoke_int_limit = _invoke_int_op+2; + public static final int _invoke_int_op = _xldc_limit; + public static final int _invokespecial_int = _invoke_int_op+0; + public static final int _invokestatic_int = _invoke_int_op+1; + public static final int _invoke_int_limit = _invoke_int_op+2; } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java Tue Sep 15 21:56:04 2015 -0700 @@ -376,7 +376,7 @@ } } - static private + private static File createTempFile(String basefile, String suffix) throws IOException { File base = new File(basefile); String prefix = base.getName(); @@ -393,7 +393,7 @@ return tmpfile.toFile(); } - static private + private static void printUsage(boolean doPack, boolean full, PrintStream out) { String prog = doPack ? "pack200" : "unpack200"; String[] packUsage = (String[])RESOURCE.getObject(DriverResource.PACK_HELP); @@ -408,7 +408,7 @@ } } - static private + private static String getZipComment(String jarfile) throws IOException { byte[] tail = new byte[1000]; long filelen = new File(jarfile).length(); diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java Tue Sep 15 21:56:04 2015 -0700 @@ -218,7 +218,7 @@ return sum; } - static private + private static double round(double x, double scale) { return Math.round(x * scale) / scale; } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java Tue Sep 15 21:56:04 2015 -0700 @@ -471,14 +471,14 @@ /// Format definitions. - static private final byte[][] BC_LENGTH = new byte[2][0x100]; - static private final byte[][] BC_INDEX = new byte[2][0x100]; - static private final byte[][] BC_TAG = new byte[2][0x100]; - static private final byte[][] BC_BRANCH = new byte[2][0x100]; - static private final byte[][] BC_SLOT = new byte[2][0x100]; - static private final byte[][] BC_CON = new byte[2][0x100]; - static private final String[] BC_NAME = new String[0x100]; // debug only - static private final String[][] BC_FORMAT = new String[2][_bytecode_limit]; // debug only + private static final byte[][] BC_LENGTH = new byte[2][0x100]; + private static final byte[][] BC_INDEX = new byte[2][0x100]; + private static final byte[][] BC_TAG = new byte[2][0x100]; + private static final byte[][] BC_BRANCH = new byte[2][0x100]; + private static final byte[][] BC_SLOT = new byte[2][0x100]; + private static final byte[][] BC_CON = new byte[2][0x100]; + private static final String[] BC_NAME = new String[0x100]; // debug only + private static final String[][] BC_FORMAT = new String[2][_bytecode_limit]; // debug only static { for (int i = 0; i < _bytecode_limit; i++) { BC_LENGTH[0][i] = -1; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java Tue Sep 15 21:56:04 2015 -0700 @@ -104,7 +104,7 @@ } // for JNI callbacks - static private Object currentInstance() { + private static Object currentInstance() { UnpackerImpl p200 = (UnpackerImpl) Utils.getTLGlobals(); return (p200 == null)? null: p200._nunp; } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java Tue Sep 15 21:56:04 2015 -0700 @@ -990,7 +990,7 @@ } // Helper for building InnerClasses attributes. - static private + private static void visitInnerClassRefs(Collection innerClasses, int mode, Collection refs) { if (innerClasses == null) { return; // no attribute; nothing to do diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java Tue Sep 15 21:56:04 2015 -0700 @@ -218,7 +218,7 @@ return res; } - final static int MAGIC_BYTES = 4; + static final int MAGIC_BYTES = 4; void readArchiveMagic() throws IOException { // Read a minimum of bytes in the first gulp. diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java Tue Sep 15 21:56:04 2015 -0700 @@ -265,7 +265,7 @@ } } // Wrapper to prevent closing of client-supplied stream. - static private + private static class NonCloser extends FilterOutputStream { NonCloser(OutputStream out) { super(out); } public void close() throws IOException { flush(); } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java Tue Sep 15 21:56:04 2015 -0700 @@ -46,7 +46,7 @@ * replaced by {@link javax.net.ssl.HttpsURLConnection}. */ @Deprecated -abstract public +public abstract class HttpsURLConnection extends HttpURLConnection { /* diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java Tue Sep 15 21:56:04 2015 -0700 @@ -61,7 +61,7 @@ * * @see java.security.Security security properties */ - public final static String getDefaultAlgorithm() { + public static final String getDefaultAlgorithm() { String type; type = AccessController.doPrivileged(new PrivilegedAction<>() { public String run() { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java Tue Sep 15 21:56:04 2015 -0700 @@ -61,7 +61,7 @@ * * @see java.security.Security security properties */ - public final static String getDefaultAlgorithm() { + public static final String getDefaultAlgorithm() { String type; type = AccessController.doPrivileged(new PrivilegedAction<>() { public String run() { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java --- a/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java Tue Sep 15 21:56:04 2015 -0700 @@ -56,7 +56,7 @@ static final long serialVersionUID = -2048442350420423405L; private java.security.cert.X509Certificate wrappedCert; - synchronized private static java.security.cert.CertificateFactory + private static synchronized java.security.cert.CertificateFactory getFactory() throws java.security.cert.CertificateException { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java --- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java Tue Sep 15 21:56:04 2015 -0700 @@ -43,8 +43,8 @@ * */ public final class Client extends NTLM { - final private String hostname; - final private String username; + private final String hostname; + private final String username; private String domain; private byte[] pw1, pw2; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java --- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java Tue Sep 15 21:56:04 2015 -0700 @@ -36,13 +36,13 @@ /** * If the incoming packet is invalid. */ - public final static int PACKET_READ_ERROR = 1; + public static final int PACKET_READ_ERROR = 1; /** * If the client cannot get a domain value from the server and the * caller has not provided one. */ - public final static int NO_DOMAIN_INFO = 2; + public static final int NO_DOMAIN_INFO = 2; /** * If the domain provided by the client does not match the one received @@ -53,22 +53,22 @@ /** * If the client name is not found on server's user database. */ - public final static int USER_UNKNOWN = 3; + public static final int USER_UNKNOWN = 3; /** * If authentication fails. */ - public final static int AUTH_FAILED = 4; + public static final int AUTH_FAILED = 4; /** * If an illegal version string is provided. */ - public final static int BAD_VERSION = 5; + public static final int BAD_VERSION = 5; /** * Protocol errors. */ - public final static int PROTOCOL = 6; + public static final int PROTOCOL = 6; private int errorCode; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java --- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java Tue Sep 15 21:56:04 2015 -0700 @@ -49,8 +49,8 @@ * */ public abstract class Server extends NTLM { - final private String domain; - final private boolean allVersion; + private final String domain; + private final boolean allVersion; /** * Creates a Server instance. * @param version the NTLM version to use, which can be: diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/io/Console.java --- a/jdk/src/java.base/share/classes/java/io/Console.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/io/Console.java Tue Sep 15 21:56:04 2015 -0700 @@ -554,7 +554,7 @@ }); } private static Console cons; - private native static boolean istty(); + private static native boolean istty(); private Console() { readLock = new Object(); writeLock = new Object(); diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/io/DataInputStream.java --- a/jdk/src/java.base/share/classes/java/io/DataInputStream.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/io/DataInputStream.java Tue Sep 15 21:56:04 2015 -0700 @@ -585,7 +585,7 @@ * valid modified UTF-8 encoding of a Unicode string. * @see java.io.DataInputStream#readUnsignedShort() */ - public final static String readUTF(DataInput in) throws IOException { + public static final String readUTF(DataInput in) throws IOException { int utflen = in.readUnsignedShort(); byte[] bytearr = null; char[] chararr = null; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/io/File.java --- a/jdk/src/java.base/share/classes/java/io/File.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/io/File.java Tue Sep 15 21:56:04 2015 -0700 @@ -2204,7 +2204,7 @@ // -- Integration with java.nio.file -- - private volatile transient Path filePath; + private transient volatile Path filePath; /** * Returns a {@link Path java.nio.file.Path} object constructed from the diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/io/FilePermission.java --- a/jdk/src/java.base/share/classes/java/io/FilePermission.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/io/FilePermission.java Tue Sep 15 21:56:04 2015 -0700 @@ -101,32 +101,32 @@ /** * Execute action. */ - private final static int EXECUTE = 0x1; + private static final int EXECUTE = 0x1; /** * Write action. */ - private final static int WRITE = 0x2; + private static final int WRITE = 0x2; /** * Read action. */ - private final static int READ = 0x4; + private static final int READ = 0x4; /** * Delete action. */ - private final static int DELETE = 0x8; + private static final int DELETE = 0x8; /** * Read link action. */ - private final static int READLINK = 0x10; + private static final int READLINK = 0x10; /** * All actions (read,write,execute,delete,readlink) */ - private final static int ALL = READ|WRITE|EXECUTE|DELETE|READLINK; + private static final int ALL = READ|WRITE|EXECUTE|DELETE|READLINK; /** * No actions. */ - private final static int NONE = 0x0; + private static final int NONE = 0x0; // the actions mask private transient int mask; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/io/ObjectInputStream.java --- a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java Tue Sep 15 21:56:04 2015 -0700 @@ -1079,7 +1079,7 @@ /** * Provide access to the persistent fields read from the input stream. */ - public static abstract class GetField { + public abstract static class GetField { /** * Get the ObjectStreamClass that describes the fields in the stream. diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java --- a/jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java Tue Sep 15 21:56:04 2015 -0700 @@ -875,7 +875,7 @@ * * @since 1.2 */ - public static abstract class PutField { + public abstract static class PutField { /** * Put the value of the named boolean field into the persistent field. diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java --- a/jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java Tue Sep 15 21:56:04 2015 -0700 @@ -1839,7 +1839,7 @@ * Returns true if the given class defines a static initializer method, * false otherwise. */ - private native static boolean hasStaticInitializer(Class cl); + private static native boolean hasStaticInitializer(Class cl); /** * Class for computing and caching field/constructor/method signatures diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java --- a/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java Tue Sep 15 21:56:04 2015 -0700 @@ -36,12 +36,12 @@ /** * Magic number that is written to the stream header. */ - final static short STREAM_MAGIC = (short)0xaced; + static final short STREAM_MAGIC = (short)0xaced; /** * Version number that is written to the stream header. */ - final static short STREAM_VERSION = 5; + static final short STREAM_VERSION = 5; /* Each item in the stream is preceded by a tag */ @@ -49,95 +49,95 @@ /** * First tag value. */ - final static byte TC_BASE = 0x70; + static final byte TC_BASE = 0x70; /** * Null object reference. */ - final static byte TC_NULL = (byte)0x70; + static final byte TC_NULL = (byte)0x70; /** * Reference to an object already written into the stream. */ - final static byte TC_REFERENCE = (byte)0x71; + static final byte TC_REFERENCE = (byte)0x71; /** * new Class Descriptor. */ - final static byte TC_CLASSDESC = (byte)0x72; + static final byte TC_CLASSDESC = (byte)0x72; /** * new Object. */ - final static byte TC_OBJECT = (byte)0x73; + static final byte TC_OBJECT = (byte)0x73; /** * new String. */ - final static byte TC_STRING = (byte)0x74; + static final byte TC_STRING = (byte)0x74; /** * new Array. */ - final static byte TC_ARRAY = (byte)0x75; + static final byte TC_ARRAY = (byte)0x75; /** * Reference to Class. */ - final static byte TC_CLASS = (byte)0x76; + static final byte TC_CLASS = (byte)0x76; /** * Block of optional data. Byte following tag indicates number * of bytes in this block data. */ - final static byte TC_BLOCKDATA = (byte)0x77; + static final byte TC_BLOCKDATA = (byte)0x77; /** * End of optional block data blocks for an object. */ - final static byte TC_ENDBLOCKDATA = (byte)0x78; + static final byte TC_ENDBLOCKDATA = (byte)0x78; /** * Reset stream context. All handles written into stream are reset. */ - final static byte TC_RESET = (byte)0x79; + static final byte TC_RESET = (byte)0x79; /** * long Block data. The long following the tag indicates the * number of bytes in this block data. */ - final static byte TC_BLOCKDATALONG= (byte)0x7A; + static final byte TC_BLOCKDATALONG= (byte)0x7A; /** * Exception during write. */ - final static byte TC_EXCEPTION = (byte)0x7B; + static final byte TC_EXCEPTION = (byte)0x7B; /** * Long string. */ - final static byte TC_LONGSTRING = (byte)0x7C; + static final byte TC_LONGSTRING = (byte)0x7C; /** * new Proxy Class Descriptor. */ - final static byte TC_PROXYCLASSDESC = (byte)0x7D; + static final byte TC_PROXYCLASSDESC = (byte)0x7D; /** * new Enum constant. * @since 1.5 */ - final static byte TC_ENUM = (byte)0x7E; + static final byte TC_ENUM = (byte)0x7E; /** * Last tag value. */ - final static byte TC_MAX = (byte)0x7E; + static final byte TC_MAX = (byte)0x7E; /** * First wire handle to be assigned. */ - final static int baseWireHandle = 0x7e0000; + static final int baseWireHandle = 0x7e0000; /******************************************************/ @@ -147,7 +147,7 @@ * Bit mask for ObjectStreamClass flag. Indicates a Serializable class * defines its own writeObject method. */ - final static byte SC_WRITE_METHOD = 0x01; + static final byte SC_WRITE_METHOD = 0x01; /** * Bit mask for ObjectStreamClass flag. Indicates Externalizable data @@ -157,23 +157,23 @@ * @see #PROTOCOL_VERSION_2 * @since 1.2 */ - final static byte SC_BLOCK_DATA = 0x08; + static final byte SC_BLOCK_DATA = 0x08; /** * Bit mask for ObjectStreamClass flag. Indicates class is Serializable. */ - final static byte SC_SERIALIZABLE = 0x02; + static final byte SC_SERIALIZABLE = 0x02; /** * Bit mask for ObjectStreamClass flag. Indicates class is Externalizable. */ - final static byte SC_EXTERNALIZABLE = 0x04; + static final byte SC_EXTERNALIZABLE = 0x04; /** * Bit mask for ObjectStreamClass flag. Indicates class is an enum type. * @since 1.5 */ - final static byte SC_ENUM = 0x10; + static final byte SC_ENUM = 0x10; /* *******************************************************************/ @@ -187,7 +187,7 @@ * @see java.io.ObjectInputStream#enableResolveObject(boolean) * @since 1.2 */ - final static SerializablePermission SUBSTITUTION_PERMISSION = + static final SerializablePermission SUBSTITUTION_PERMISSION = new SerializablePermission("enableSubstitution"); /** @@ -197,7 +197,7 @@ * @see java.io.ObjectInputStream#readObjectOverride() * @since 1.2 */ - final static SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION = + static final SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION = new SerializablePermission("enableSubclassImplementation"); /** * A Stream Protocol Version.

@@ -210,7 +210,7 @@ * @see java.io.ObjectOutputStream#useProtocolVersion(int) * @since 1.2 */ - public final static int PROTOCOL_VERSION_1 = 1; + public static final int PROTOCOL_VERSION_1 = 1; /** @@ -231,5 +231,5 @@ * @see #SC_BLOCK_DATA * @since 1.2 */ - public final static int PROTOCOL_VERSION_2 = 2; + public static final int PROTOCOL_VERSION_2 = 2; } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/io/Reader.java --- a/jdk/src/java.base/share/classes/java/io/Reader.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/io/Reader.java Tue Sep 15 21:56:04 2015 -0700 @@ -157,7 +157,7 @@ * If {@code off} is negative, or {@code len} is negative, * or {@code len} is greater than {@code cbuf.length - off} */ - abstract public int read(char cbuf[], int off, int len) throws IOException; + public abstract int read(char cbuf[], int off, int len) throws IOException; /** Maximum skip-buffer size */ private static final int maxSkipBufferSize = 8192; @@ -260,6 +260,6 @@ * * @exception IOException If an I/O error occurs */ - abstract public void close() throws IOException; + public abstract void close() throws IOException; } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/io/Writer.java --- a/jdk/src/java.base/share/classes/java/io/Writer.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/io/Writer.java Tue Sep 15 21:56:04 2015 -0700 @@ -142,7 +142,7 @@ * @throws IOException * If an I/O error occurs */ - abstract public void write(char cbuf[], int off, int len) throws IOException; + public abstract void write(char cbuf[], int off, int len) throws IOException; /** * Writes a string. @@ -312,7 +312,7 @@ * @throws IOException * If an I/O error occurs */ - abstract public void flush() throws IOException; + public abstract void flush() throws IOException; /** * Closes the stream, flushing it first. Once the stream has been closed, @@ -322,6 +322,6 @@ * @throws IOException * If an I/O error occurs */ - abstract public void close() throws IOException; + public abstract void close() throws IOException; } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/Class.java --- a/jdk/src/java.base/share/classes/java/lang/Class.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/Class.java Tue Sep 15 21:56:04 2015 -0700 @@ -469,8 +469,8 @@ return null; } } - private volatile transient Constructor cachedConstructor; - private volatile transient Class newInstanceCallerCache; + private transient volatile Constructor cachedConstructor; + private transient volatile Class newInstanceCallerCache; /** @@ -1123,7 +1123,7 @@ } } - private final static class EnclosingMethodInfo { + private static final class EnclosingMethodInfo { private Class enclosingClass; private String name; private String descriptor; @@ -2514,11 +2514,11 @@ } } - private volatile transient SoftReference> reflectionData; + private transient volatile SoftReference> reflectionData; // Incremented by the VM on each call to JVM TI RedefineClasses() // that redefines this class or a superclass. - private volatile transient int classRedefinedCount = 0; + private transient volatile int classRedefinedCount = 0; // Lazily create and cache ReflectionData private ReflectionData reflectionData() { @@ -2561,7 +2561,7 @@ private native String getGenericSignature0(); // Generic info repository; lazily initialized - private volatile transient ClassRepository genericInfo; + private transient volatile ClassRepository genericInfo; // accessor for factory private GenericsFactory getFactory() { @@ -3353,7 +3353,7 @@ } return enumConstants; } - private volatile transient T[] enumConstants = null; + private transient volatile T[] enumConstants = null; /** * Returns a map from simple name to enum constant. This package-private @@ -3375,7 +3375,7 @@ } return enumConstantDirectory; } - private volatile transient Map enumConstantDirectory = null; + private transient volatile Map enumConstantDirectory = null; /** * Casts an object to the class or interface represented @@ -3523,7 +3523,7 @@ // Annotations cache @SuppressWarnings("UnusedDeclaration") - private volatile transient AnnotationData annotationData; + private transient volatile AnnotationData annotationData; private AnnotationData annotationData() { while (true) { // retry loop @@ -3578,7 +3578,7 @@ // Annotation types cache their internal (AnnotationType) form @SuppressWarnings("UnusedDeclaration") - private volatile transient AnnotationType annotationType; + private transient volatile AnnotationType annotationType; boolean casAnnotationType(AnnotationType oldType, AnnotationType newType) { return Atomic.casAnnotationType(this, oldType, newType); diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/ClassLoader.java --- a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java Tue Sep 15 21:56:04 2015 -0700 @@ -1030,7 +1030,7 @@ return findLoadedClass0(name); } - private native final Class findLoadedClass0(String name); + private final native Class findLoadedClass0(String name); /** * Sets the signers of a class. This should be invoked after defining a diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java --- a/jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java Tue Sep 15 21:56:04 2015 -0700 @@ -47,14 +47,14 @@ final class ConditionalSpecialCasing { // context conditions. - final static int FINAL_CASED = 1; - final static int AFTER_SOFT_DOTTED = 2; - final static int MORE_ABOVE = 3; - final static int AFTER_I = 4; - final static int NOT_BEFORE_DOT = 5; + static final int FINAL_CASED = 1; + static final int AFTER_SOFT_DOTTED = 2; + static final int MORE_ABOVE = 3; + static final int AFTER_I = 4; + static final int NOT_BEFORE_DOT = 5; // combining class definitions - final static int COMBINING_CLASS_ABOVE = 230; + static final int COMBINING_CLASS_ABOVE = 230; // Special case mapping entries static Entry[] entry = { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/Integer.java --- a/jdk/src/java.base/share/classes/java/lang/Integer.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/Integer.java Tue Sep 15 21:56:04 2015 -0700 @@ -76,7 +76,7 @@ /** * All possible chars for representing a number as a String */ - final static char[] digits = { + static final char[] digits = { '0' , '1' , '2' , '3' , '4' , '5' , '6' , '7' , '8' , '9' , 'a' , 'b' , 'c' , 'd' , 'e' , 'f' , 'g' , 'h' , @@ -344,7 +344,7 @@ } while (charPos > offset); } - final static char [] DigitTens = { + static final char [] DigitTens = { '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', @@ -357,7 +357,7 @@ '9', '9', '9', '9', '9', '9', '9', '9', '9', '9', } ; - final static char [] DigitOnes = { + static final char [] DigitOnes = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', @@ -467,7 +467,7 @@ } } - final static int [] sizeTable = { 9, 99, 999, 9999, 99999, 999999, 9999999, + static final int [] sizeTable = { 9, 99, 999, 9999, 99999, 999999, 9999999, 99999999, 999999999, Integer.MAX_VALUE }; // Requires positive x diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/Package.java --- a/jdk/src/java.base/share/classes/java/lang/Package.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/Package.java Tue Sep 15 21:56:04 2015 -0700 @@ -656,6 +656,6 @@ private final String implVersion; private final String implVendor; private final URL sealBase; - private transient final ClassLoader loader; + private final transient ClassLoader loader; private transient Class packageInfo; } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java --- a/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java Tue Sep 15 21:56:04 2015 -0700 @@ -458,7 +458,7 @@ * * @since 1.7 */ - public static abstract class Redirect { + public abstract static class Redirect { /** * The type of a {@link Redirect}. */ diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/StringCoding.java --- a/jdk/src/java.base/share/classes/java/lang/StringCoding.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/StringCoding.java Tue Sep 15 21:56:04 2015 -0700 @@ -52,9 +52,9 @@ private StringCoding() { } /** The cached coders for each thread */ - private final static ThreadLocal> decoder = + private static final ThreadLocal> decoder = new ThreadLocal<>(); - private final static ThreadLocal> encoder = + private static final ThreadLocal> encoder = new ThreadLocal<>(); private static boolean warnUnsupportedCharset = true; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/System.java --- a/jdk/src/java.base/share/classes/java/lang/System.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/System.java Tue Sep 15 21:56:04 2015 -0700 @@ -81,7 +81,7 @@ * corresponds to keyboard input or another input source specified by * the host environment or user. */ - public final static InputStream in = null; + public static final InputStream in = null; /** * The "standard" output stream. This stream is already @@ -108,7 +108,7 @@ * @see java.io.PrintStream#println(java.lang.Object) * @see java.io.PrintStream#println(java.lang.String) */ - public final static PrintStream out = null; + public static final PrintStream out = null; /** * The "standard" error output stream. This stream is already @@ -122,7 +122,7 @@ * variable out, has been redirected to a file or other * destination that is typically not continuously monitored. */ - public final static PrintStream err = null; + public static final PrintStream err = null; /* The security manager for the system. */ diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/Thread.java --- a/jdk/src/java.base/share/classes/java/lang/Thread.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/Thread.java Tue Sep 15 21:56:04 2015 -0700 @@ -244,17 +244,17 @@ /** * The minimum priority that a thread can have. */ - public final static int MIN_PRIORITY = 1; + public static final int MIN_PRIORITY = 1; /** * The default priority that is assigned to a thread. */ - public final static int NORM_PRIORITY = 5; + public static final int NORM_PRIORITY = 5; /** * The maximum priority that a thread can have. */ - public final static int MAX_PRIORITY = 10; + public static final int MAX_PRIORITY = 10; /** * Returns a reference to the currently executing thread object. @@ -1688,8 +1688,8 @@ return result.booleanValue(); } - private native static StackTraceElement[][] dumpThreads(Thread[] threads); - private native static Thread[] getThreads(); + private static native StackTraceElement[][] dumpThreads(Thread[] threads); + private static native Thread[] getThreads(); /** * Returns the identifier of this Thread. The thread ID is a positive diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java --- a/jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java Tue Sep 15 21:56:04 2015 -0700 @@ -33,7 +33,7 @@ * @author Frank Yellin * @since 1.0 */ -abstract public class VirtualMachineError extends Error { +public abstract class VirtualMachineError extends Error { private static final long serialVersionUID = 4161983926571568670L; /** diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java --- a/jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java Tue Sep 15 21:56:04 2015 -0700 @@ -49,7 +49,7 @@ } /** Define this to extract the delegated target which supplies the invocation behavior. */ - abstract protected MethodHandle getTarget(); + protected abstract MethodHandle getTarget(); @Override abstract MethodHandle asTypeUncached(MethodType newType); diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java --- a/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java Tue Sep 15 21:56:04 2015 -0700 @@ -445,9 +445,9 @@ /** This subclass handles static field references. */ static class StaticAccessor extends DirectMethodHandle { - final private Class fieldType; - final private Object staticBase; - final private long staticOffset; + private final Class fieldType; + private final Object staticBase; + private final long staticOffset; private StaticAccessor(MethodType mtype, LambdaForm form, MemberName member, Object staticBase, long staticOffset) { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java --- a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Tue Sep 15 21:56:04 2015 -0700 @@ -140,9 +140,9 @@ /** instance counters for dumped classes */ - private final static HashMap DUMP_CLASS_FILES_COUNTERS; + private static final HashMap DUMP_CLASS_FILES_COUNTERS; /** debugging flag for saving generated class files */ - private final static File DUMP_CLASS_FILES_DIR; + private static final File DUMP_CLASS_FILES_DIR; static { if (DUMP_CLASS_FILES) { @@ -771,7 +771,7 @@ mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, MH, "invokeBasic", type.basicType().toMethodDescriptorString(), false); } - static private Class[] STATICALLY_INVOCABLE_PACKAGES = { + private static Class[] STATICALLY_INVOCABLE_PACKAGES = { // Sample classes from each package we are willing to bind to statically: java.lang.Object.class, java.util.Arrays.class, diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java Tue Sep 15 21:56:04 2015 -0700 @@ -440,7 +440,7 @@ * Use best possible cause for err.initCause(), substituting the * cause for err itself if the cause has the same (or better) type. */ - static private Error initCauseFrom(Error err, Exception ex) { + private static Error initCauseFrom(Error err, Exception ex) { Throwable th = ex.getCause(); if (err.getClass().isInstance(th)) return (Error) th; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Tue Sep 15 21:56:04 2015 -0700 @@ -147,7 +147,7 @@ return lookup.revealDirect(target).reflectAs(expected, lookup); } // Copied from AccessibleObject, as used by Method.setAccessible, etc.: - static final private java.security.Permission ACCESS_PERMISSION = + private static final java.security.Permission ACCESS_PERMISSION = new ReflectPermission("suppressAccessChecks"); /** @@ -1884,7 +1884,7 @@ * or if the resulting method handle's type would have * too many parameters */ - static public + public static MethodHandle spreadInvoker(MethodType type, int leadingArgCount) { if (leadingArgCount < 0 || leadingArgCount > type.parameterCount()) throw newIllegalArgumentException("bad argument count", leadingArgCount); @@ -1927,7 +1927,7 @@ * @throws IllegalArgumentException if the resulting method handle's type would have * too many parameters */ - static public + public static MethodHandle exactInvoker(MethodType type) { return type.invokers().exactInvoker(); } @@ -1966,7 +1966,7 @@ * @throws IllegalArgumentException if the resulting method handle's type would have * too many parameters */ - static public + public static MethodHandle invoker(MethodType type) { return type.invokers().genericInvoker(); } @@ -2322,7 +2322,7 @@ return MethodHandleImpl.makeIntrinsic(mtype, lform, Intrinsic.ZERO); } - synchronized private static MethodHandle setCachedMethodHandle(MethodHandle[] cache, int pos, MethodHandle value) { + private static synchronized MethodHandle setCachedMethodHandle(MethodHandle[] cache, int pos, MethodHandle value) { // Simulate a CAS, to avoid racy duplication of results. MethodHandle prev = cache[pos]; if (prev != null) return prev; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java Tue Sep 15 21:56:04 2015 -0700 @@ -111,7 +111,7 @@ return (entry != null) ? entry.get() : null; } - synchronized public MethodHandle setCachedMethodHandle(int which, MethodHandle mh) { + public synchronized MethodHandle setCachedMethodHandle(int which, MethodHandle mh) { // Simulate a CAS, to avoid racy duplication of results. SoftReference entry = methodHandles[which]; if (entry != null) { @@ -130,7 +130,7 @@ return (entry != null) ? entry.get() : null; } - synchronized public LambdaForm setCachedLambdaForm(int which, LambdaForm form) { + public synchronized LambdaForm setCachedLambdaForm(int which, LambdaForm form) { // Simulate a CAS, to avoid racy duplication of results. SoftReference entry = lambdaForms[which]; if (entry != null) { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/ref/Reference.java --- a/jdk/src/java.base/share/classes/java/lang/ref/Reference.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/ref/Reference.java Tue Sep 15 21:56:04 2015 -0700 @@ -107,7 +107,7 @@ * pending: next element in the pending list (or null if last) * otherwise: NULL */ - transient private Reference discovered; /* used by VM */ + private transient Reference discovered; /* used by VM */ /* Object used to synchronize with the garbage collector. The collector @@ -115,7 +115,7 @@ * therefore critical that any code holding this lock complete as quickly * as possible, allocate no new objects, and avoid calling user code. */ - static private class Lock { } + private static class Lock { } private static Lock lock = new Lock(); diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java --- a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java Tue Sep 15 21:56:04 2015 -0700 @@ -51,7 +51,7 @@ static ReferenceQueue NULL = new Null<>(); static ReferenceQueue ENQUEUED = new Null<>(); - static private class Lock { }; + private static class Lock { }; private Lock lock = new Lock(); private volatile Reference head = null; private long queueLength = 0; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java --- a/jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java Tue Sep 15 21:56:04 2015 -0700 @@ -66,7 +66,7 @@ /** * Timestamp clock, updated by the garbage collector */ - static private long clock; + private static long clock; /** * Timestamp updated by each invocation of the get method. The VM may use diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java --- a/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java Tue Sep 15 21:56:04 2015 -0700 @@ -61,7 +61,7 @@ * has sufficient privilege to defeat Java language access * control checks. */ - static final private java.security.Permission ACCESS_PERMISSION = + private static final java.security.Permission ACCESS_PERMISSION = new ReflectPermission("suppressAccessChecks"); /** diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/math/BigDecimal.java --- a/jdk/src/java.base/share/classes/java/math/BigDecimal.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/math/BigDecimal.java Tue Sep 15 21:56:04 2015 -0700 @@ -2268,14 +2268,14 @@ * digit prior to a nonzero discarded fraction. Note that this rounding * mode never decreases the magnitude of the calculated value. */ - public final static int ROUND_UP = 0; + public static final int ROUND_UP = 0; /** * Rounding mode to round towards zero. Never increments the digit * prior to a discarded fraction (i.e., truncates). Note that this * rounding mode never increases the magnitude of the calculated value. */ - public final static int ROUND_DOWN = 1; + public static final int ROUND_DOWN = 1; /** * Rounding mode to round towards positive infinity. If the @@ -2284,7 +2284,7 @@ * {@code ROUND_DOWN}. Note that this rounding mode never * decreases the calculated value. */ - public final static int ROUND_CEILING = 2; + public static final int ROUND_CEILING = 2; /** * Rounding mode to round towards negative infinity. If the @@ -2293,7 +2293,7 @@ * {@code ROUND_UP}. Note that this rounding mode never * increases the calculated value. */ - public final static int ROUND_FLOOR = 3; + public static final int ROUND_FLOOR = 3; /** * Rounding mode to round towards {@literal "nearest neighbor"} @@ -2303,7 +2303,7 @@ * that this is the rounding mode that most of us were taught in * grade school. */ - public final static int ROUND_HALF_UP = 4; + public static final int ROUND_HALF_UP = 4; /** * Rounding mode to round towards {@literal "nearest neighbor"} @@ -2312,7 +2312,7 @@ * fraction is {@literal >} 0.5; otherwise, behaves as for * {@code ROUND_DOWN}. */ - public final static int ROUND_HALF_DOWN = 5; + public static final int ROUND_HALF_DOWN = 5; /** * Rounding mode to round towards the {@literal "nearest neighbor"} @@ -2324,7 +2324,7 @@ * rounding mode that minimizes cumulative error when applied * repeatedly over a sequence of calculations. */ - public final static int ROUND_HALF_EVEN = 6; + public static final int ROUND_HALF_EVEN = 6; /** * Rounding mode to assert that the requested operation has an exact @@ -2332,7 +2332,7 @@ * specified on an operation that yields an inexact result, an * {@code ArithmeticException} is thrown. */ - public final static int ROUND_UNNECESSARY = 7; + public static final int ROUND_UNNECESSARY = 7; // Scaling/Rounding Operations @@ -3398,7 +3398,7 @@ return charPos; } - final static char[] DIGIT_TENS = { + static final char[] DIGIT_TENS = { '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', @@ -3411,7 +3411,7 @@ '9', '9', '9', '9', '9', '9', '9', '9', '9', '9', }; - final static char[] DIGIT_ONES = { + static final char[] DIGIT_ONES = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/math/BigInteger.java --- a/jdk/src/java.base/share/classes/java/math/BigInteger.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/math/BigInteger.java Tue Sep 15 21:56:04 2015 -0700 @@ -184,7 +184,7 @@ /** * This mask is used to obtain the value of an int as if it were unsigned. */ - final static long LONG_MASK = 0xffffffffL; + static final long LONG_MASK = 0xffffffffL; /** * This constant limits {@code mag.length} of BigIntegers to the supported @@ -1212,7 +1212,7 @@ /** * Initialize static constant array when class is loaded. */ - private final static int MAX_CONSTANT = 16; + private static final int MAX_CONSTANT = 16; private static BigInteger posConst[] = new BigInteger[MAX_CONSTANT+1]; private static BigInteger negConst[] = new BigInteger[MAX_CONSTANT+1]; diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java --- a/jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java Tue Sep 15 21:56:04 2015 -0700 @@ -55,7 +55,7 @@ /** * flag set if the native connect() call not to be used */ - private final static boolean connectDisabled = os.contains("OS X"); + private static final boolean connectDisabled = os.contains("OS X"); /** * Load net library into runtime. diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java --- a/jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java Tue Sep 15 21:56:04 2015 -0700 @@ -721,6 +721,6 @@ abstract void socketSendUrgentData(int data) throws IOException; - public final static int SHUT_RD = 0; - public final static int SHUT_WR = 1; + public static final int SHUT_RD = 0; + public static final int SHUT_WR = 1; } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/Authenticator.java --- a/jdk/src/java.base/share/classes/java/net/Authenticator.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/Authenticator.java Tue Sep 15 21:56:04 2015 -0700 @@ -119,7 +119,7 @@ * @see SecurityManager#checkPermission * @see java.net.NetPermission */ - public synchronized static void setDefault(Authenticator a) { + public static synchronized void setDefault(Authenticator a) { SecurityManager sm = System.getSecurityManager(); if (sm != null) { NetPermission setDefaultPermission diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/ContentHandler.java --- a/jdk/src/java.base/share/classes/java/net/ContentHandler.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/ContentHandler.java Tue Sep 15 21:56:04 2015 -0700 @@ -81,7 +81,7 @@ * @see java.net.URLConnection#setContentHandlerFactory(java.net.ContentHandlerFactory) * @since 1.0 */ -abstract public class ContentHandler { +public abstract class ContentHandler { /** * Given a URL connect stream positioned at the beginning of the @@ -92,7 +92,7 @@ * @return the object read by the {@code ContentHandler}. * @exception IOException if an I/O error occurs while reading the object. */ - abstract public Object getContent(URLConnection urlc) throws IOException; + public abstract Object getContent(URLConnection urlc) throws IOException; /** * Given a URL connect stream positioned at the beginning of the diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/CookieHandler.java --- a/jdk/src/java.base/share/classes/java/net/CookieHandler.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/CookieHandler.java Tue Sep 15 21:56:04 2015 -0700 @@ -69,7 +69,7 @@ * {@link NetPermission}{@code ("getCookieHandler")} * @see #setDefault(CookieHandler) */ - public synchronized static CookieHandler getDefault() { + public static synchronized CookieHandler getDefault() { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SecurityConstants.GET_COOKIEHANDLER_PERMISSION); @@ -89,7 +89,7 @@ * {@link NetPermission}{@code ("setCookieHandler")} * @see #getDefault() */ - public synchronized static void setDefault(CookieHandler cHandler) { + public static synchronized void setDefault(CookieHandler cHandler) { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SecurityConstants.SET_COOKIEHANDLER_PERMISSION); diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/CookieManager.java --- a/jdk/src/java.base/share/classes/java/net/CookieManager.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/CookieManager.java Tue Sep 15 21:56:04 2015 -0700 @@ -362,7 +362,7 @@ } - static private boolean isInPortList(String lst, int port) { + private static boolean isInPortList(String lst, int port) { int i = lst.indexOf(','); int val = -1; while (i > 0) { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/DatagramPacket.java --- a/jdk/src/java.base/share/classes/java/net/DatagramPacket.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/DatagramPacket.java Tue Sep 15 21:56:04 2015 -0700 @@ -384,5 +384,5 @@ /** * Perform class load-time initializations. */ - private native static void init(); + private static native void init(); } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/HostPortrange.java --- a/jdk/src/java.base/share/classes/java/net/HostPortrange.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/HostPortrange.java Tue Sep 15 21:56:04 2015 -0700 @@ -225,9 +225,9 @@ } // these shouldn't leak outside the implementation - final static int[] HTTP_PORT = {80, 80}; - final static int[] HTTPS_PORT = {443, 443}; - final static int[] NO_PORT = {-1, -1}; + static final int[] HTTP_PORT = {80, 80}; + static final int[] HTTPS_PORT = {443, 443}; + static final int[] NO_PORT = {-1, -1}; int[] defaultPort() { if (scheme.equals("http")) { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/HttpCookie.java --- a/jdk/src/java.base/share/classes/java/net/HttpCookie.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/HttpCookie.java Tue Sep 15 21:56:04 2015 -0700 @@ -84,11 +84,11 @@ // Since the positive and zero max-age have their meanings, // this value serves as a hint as 'not specify max-age' - private final static long MAX_AGE_UNSPECIFIED = -1; + private static final long MAX_AGE_UNSPECIFIED = -1; // date formats used by Netscape's cookie draft // as well as formats seen on various sites - private final static String[] COOKIE_DATE_FORMATS = { + private static final String[] COOKIE_DATE_FORMATS = { "EEE',' dd-MMM-yyyy HH:mm:ss 'GMT'", "EEE',' dd MMM yyyy HH:mm:ss 'GMT'", "EEE MMM dd yyyy HH:mm:ss 'GMT'Z", @@ -98,8 +98,8 @@ }; // constant strings represent set-cookie header token - private final static String SET_COOKIE = "set-cookie:"; - private final static String SET_COOKIE2 = "set-cookie2:"; + private static final String SET_COOKIE = "set-cookie:"; + private static final String SET_COOKIE2 = "set-cookie2:"; // ---------------- Ctors -------------- diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/HttpURLConnection.java --- a/jdk/src/java.base/share/classes/java/net/HttpURLConnection.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/HttpURLConnection.java Tue Sep 15 21:56:04 2015 -0700 @@ -66,7 +66,7 @@ * @see java.net.HttpURLConnection#disconnect() * @since 1.1 */ -abstract public class HttpURLConnection extends URLConnection { +public abstract class HttpURLConnection extends URLConnection { /* instance variables */ /** diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/Inet4Address.java --- a/jdk/src/java.base/share/classes/java/net/Inet4Address.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/Inet4Address.java Tue Sep 15 21:56:04 2015 -0700 @@ -84,7 +84,7 @@ public final class Inet4Address extends InetAddress { - final static int INADDRSZ = 4; + static final int INADDRSZ = 4; /** use serialVersionUID from InetAddress, but Inet4Address instance * is always replaced by an InetAddress instance before being diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/Inet6Address.java --- a/jdk/src/java.base/share/classes/java/net/Inet6Address.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/Inet6Address.java Tue Sep 15 21:56:04 2015 -0700 @@ -173,7 +173,7 @@ public final class Inet6Address extends InetAddress { - final static int INADDRSZ = 16; + static final int INADDRSZ = 16; /* * cached scope_id - for link-local address use only. @@ -922,7 +922,7 @@ } // Utilities - private final static int INT16SZ = 2; + private static final int INT16SZ = 2; /* * Convert IPv6 binary address into presentation (printable) format. diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/NetworkInterface.java --- a/jdk/src/java.base/share/classes/java/net/NetworkInterface.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/NetworkInterface.java Tue Sep 15 21:56:04 2015 -0700 @@ -400,16 +400,16 @@ false); } - private native static NetworkInterface[] getAll() + private static native NetworkInterface[] getAll() throws SocketException; - private native static NetworkInterface getByName0(String name) + private static native NetworkInterface getByName0(String name) throws SocketException; - private native static NetworkInterface getByIndex0(int index) + private static native NetworkInterface getByIndex0(int index) throws SocketException; - private native static NetworkInterface getByInetAddress0(InetAddress addr) + private static native NetworkInterface getByInetAddress0(InetAddress addr) throws SocketException; /** @@ -525,12 +525,12 @@ return virtual; } - private native static boolean isUp0(String name, int ind) throws SocketException; - private native static boolean isLoopback0(String name, int ind) throws SocketException; - private native static boolean supportsMulticast0(String name, int ind) throws SocketException; - private native static boolean isP2P0(String name, int ind) throws SocketException; - private native static byte[] getMacAddr0(byte[] inAddr, String name, int ind) throws SocketException; - private native static int getMTU0(String name, int ind) throws SocketException; + private static native boolean isUp0(String name, int ind) throws SocketException; + private static native boolean isLoopback0(String name, int ind) throws SocketException; + private static native boolean supportsMulticast0(String name, int ind) throws SocketException; + private static native boolean isP2P0(String name, int ind) throws SocketException; + private static native byte[] getMacAddr0(byte[] inAddr, String name, int ind) throws SocketException; + private static native int getMTU0(String name, int ind) throws SocketException; /** * Compares this object against the specified object. diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/Proxy.java --- a/jdk/src/java.base/share/classes/java/net/Proxy.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/Proxy.java Tue Sep 15 21:56:04 2015 -0700 @@ -69,7 +69,7 @@ * {@code Socket s = new Socket(Proxy.NO_PROXY);} * */ - public final static Proxy NO_PROXY = new Proxy(); + public static final Proxy NO_PROXY = new Proxy(); // Creates the proxy that represents a {@code DIRECT} connection. private Proxy() { diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/ResponseCache.java --- a/jdk/src/java.base/share/classes/java/net/ResponseCache.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/ResponseCache.java Tue Sep 15 21:56:04 2015 -0700 @@ -80,7 +80,7 @@ * @return the system-wide {@code ResponseCache} * @since 1.5 */ - public synchronized static ResponseCache getDefault() { + public static synchronized ResponseCache getDefault() { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SecurityConstants.GET_RESPONSECACHE_PERMISSION); @@ -103,7 +103,7 @@ * @see #getDefault() * @since 1.5 */ - public synchronized static void setDefault(ResponseCache responseCache) { + public static synchronized void setDefault(ResponseCache responseCache) { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SecurityConstants.SET_RESPONSECACHE_PERMISSION); diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/SocketInputStream.java --- a/jdk/src/java.base/share/classes/java/net/SocketInputStream.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/SocketInputStream.java Tue Sep 15 21:56:04 2015 -0700 @@ -287,5 +287,5 @@ /** * Perform class load-time initializations. */ - private native static void init(); + private static native void init(); } diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/SocketOptions.java --- a/jdk/src/java.base/share/classes/java/net/SocketOptions.java Wed Sep 16 08:24:40 2015 -0400 +++ b/jdk/src/java.base/share/classes/java/net/SocketOptions.java Tue Sep 15 21:56:04 2015 -0700 @@ -139,7 +139,7 @@ * @see Socket#getTcpNoDelay */ - @Native public final static int TCP_NODELAY = 0x0001; + @Native public static final int TCP_NODELAY = 0x0001; /** * Fetch the local address binding of a socket (this option cannot @@ -160,7 +160,7 @@ * @see DatagramSocket#getLocalAddress */ - @Native public final static int SO_BINDADDR = 0x000F; + @Native public static final int SO_BINDADDR = 0x000F; /** Sets SO_REUSEADDR for a socket. This is used only for MulticastSockets * in java, and it is set by default for MulticastSockets. @@ -168,7 +168,7 @@ * Valid for: DatagramSocketImpl */ - @Native public final static int SO_REUSEADDR = 0x04; + @Native public static final int SO_REUSEADDR = 0x04; /** * Sets SO_BROADCAST for a socket. This option enables and disables @@ -179,7 +179,7 @@ * @since 1.4 */ - @Native public final static int SO_BROADCAST = 0x0020; + @Native public static final int SO_BROADCAST = 0x0020; /** Set which outgoing interface on which to send multicast packets. * Useful on hosts with multiple network interfaces, where applications @@ -191,7 +191,7 @@ * @see MulticastSocket#getInterface() */ - @Native public final static int IP_MULTICAST_IF = 0x10; + @Native public static final int IP_MULTICAST_IF = 0x10; /** Same as above. This option is introduced so that the behaviour * with IP_MULTICAST_IF will be kept the same as before, while @@ -203,7 +203,7 @@ * @see MulticastSocket#getNetworkInterface() * @since 1.4 */ - @Native public final static int IP_MULTICAST_IF2 = 0x1f; + @Native public static final int IP_MULTICAST_IF2 = 0x1f; /** * This option enables or disables local loopback of multicast datagrams. @@ -211,7 +211,7 @@ * @since 1.4 */ - @Native public final static int IP_MULTICAST_LOOP = 0x12; + @Native public static final int IP_MULTICAST_LOOP = 0x12; /** * This option sets the type-of-service or traffic class field @@ -219,7 +219,7 @@ * @since 1.4 */ - @Native public final static int IP_TOS = 0x3; + @Native public static final int IP_TOS = 0x3; /** * Specify a linger-on-close timeout. This option disables/enables @@ -237,7 +237,7 @@ * @see Socket#setSoLinger * @see Socket#getSoLinger */ - @Native public final static int SO_LINGER = 0x0080; + @Native public static final int SO_LINGER = 0x0080; /** Set a timeout on blocking Socket operations: * 
@@ -258,7 +258,7 @@
      * @see ServerSocket#setSoTimeout
      * @see DatagramSocket#setSoTimeout
      */
-    @Native public final static int SO_TIMEOUT = 0x1006;
+    @Native public static final int SO_TIMEOUT = 0x1006;
 
     /**
      * Set a hint the size of the underlying buffers used by the
@@ -275,7 +275,7 @@
      * @see DatagramSocket#setSendBufferSize
      * @see DatagramSocket#getSendBufferSize
      */
-    @Native public final static int SO_SNDBUF = 0x1001;
+    @Native public static final int SO_SNDBUF = 0x1001;
 
     /**
      * Set a hint the size of the underlying buffers used by the
@@ -293,7 +293,7 @@
      * @see DatagramSocket#setReceiveBufferSize
      * @see DatagramSocket#getReceiveBufferSize
      */
-    @Native public final static int SO_RCVBUF = 0x1002;
+    @Native public static final int SO_RCVBUF = 0x1002;
 
     /**
      * When the keepalive option is set for a TCP socket and no data
@@ -316,7 +316,7 @@
      * @see Socket#setKeepAlive
      * @see Socket#getKeepAlive
      */
-    @Native public final static int SO_KEEPALIVE = 0x0008;
+    @Native public static final int SO_KEEPALIVE = 0x0008;
 
     /**
      * When the OOBINLINE option is set, any TCP urgent data received on
@@ -327,5 +327,5 @@
      * @see Socket#setOOBInline
      * @see Socket#getOOBInline
      */
-    @Native public final static int SO_OOBINLINE = 0x1003;
+    @Native public static final int SO_OOBINLINE = 0x1003;
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/SocketOutputStream.java
--- a/jdk/src/java.base/share/classes/java/net/SocketOutputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/net/SocketOutputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -178,6 +178,6 @@
     /**
      * Perform class load-time initializations.
      */
-    private native static void init();
+    private static native void init();
 
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/SocketPermission.java
--- a/jdk/src/java.base/share/classes/java/net/SocketPermission.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/net/SocketPermission.java	Tue Sep 15 21:56:04 2015 -0700
@@ -154,32 +154,32 @@
     /**
      * Connect to host:port
      */
-    private final static int CONNECT    = 0x1;
+    private static final int CONNECT    = 0x1;
 
     /**
      * Listen on host:port
      */
-    private final static int LISTEN     = 0x2;
+    private static final int LISTEN     = 0x2;
 
     /**
      * Accept a connection from host:port
      */
-    private final static int ACCEPT     = 0x4;
+    private static final int ACCEPT     = 0x4;
 
     /**
      * Resolve DNS queries
      */
-    private final static int RESOLVE    = 0x8;
+    private static final int RESOLVE    = 0x8;
 
     /**
      * No actions
      */
-    private final static int NONE               = 0x0;
+    private static final int NONE               = 0x0;
 
     /**
      * All actions
      */
-    private final static int ALL        = CONNECT|LISTEN|ACCEPT|RESOLVE;
+    private static final int ALL        = CONNECT|LISTEN|ACCEPT|RESOLVE;
 
     // various port constants
     private static final int PORT_MIN = 0;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/URI.java
--- a/jdk/src/java.base/share/classes/java/net/URI.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/net/URI.java	Tue Sep 15 21:56:04 2015 -0700
@@ -492,15 +492,15 @@
 
     // The remaining fields may be computed on demand
 
-    private volatile transient String schemeSpecificPart;
-    private volatile transient int hash;        // Zero ==> undefined
-
-    private volatile transient String decodedUserInfo = null;
-    private volatile transient String decodedAuthority = null;
-    private volatile transient String decodedPath = null;
-    private volatile transient String decodedQuery = null;
-    private volatile transient String decodedFragment = null;
-    private volatile transient String decodedSchemeSpecificPart = null;
+    private transient volatile String schemeSpecificPart;
+    private transient volatile int hash;        // Zero ==> undefined
+
+    private transient volatile String decodedUserInfo = null;
+    private transient volatile String decodedAuthority = null;
+    private transient volatile String decodedPath = null;
+    private transient volatile String decodedQuery = null;
+    private transient volatile String decodedFragment = null;
+    private transient volatile String decodedSchemeSpecificPart = null;
 
     /**
      * The string form of this URI.
@@ -2175,7 +2175,7 @@
     // This method takes a string argument rather than a char array so that
     // this test can be performed without invoking path.toCharArray().
     //
-    static private int needsNormalization(String path) {
+    private static int needsNormalization(String path) {
         boolean normal = true;
         int ns = 0;                     // Number of segments
         int end = path.length() - 1;    // Index of last char in path
@@ -2232,7 +2232,7 @@
     //   All slashes in path replaced by '\0'
     //   segs[i] == Index of first char in segment i (0 <= i < segs.length)
     //
-    static private void split(char[] path, int[] segs) {
+    private static void split(char[] path, int[] segs) {
         int end = path.length - 1;      // Index of last char in path
         int p = 0;                      // Index of next char in path
         int i = 0;                      // Index of current segment
@@ -2281,7 +2281,7 @@
     // Postconditions:
     //   path[0] .. path[return value] == Resulting path
     //
-    static private int join(char[] path, int[] segs) {
+    private static int join(char[] path, int[] segs) {
         int ns = segs.length;           // Number of segments
         int end = path.length - 1;      // Index of last char in path
         int p = 0;                      // Index of next path char to write
@@ -2645,7 +2645,7 @@
 
     // -- Escaping and encoding --
 
-    private final static char[] hexDigits = {
+    private static final char[] hexDigits = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
     };
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/URLConnection.java
--- a/jdk/src/java.base/share/classes/java/net/URLConnection.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/net/URLConnection.java	Tue Sep 15 21:56:04 2015 -0700
@@ -365,7 +365,7 @@
      * @see #getConnectTimeout()
      * @see #setConnectTimeout(int)
      */
-    abstract public void connect() throws IOException;
+    public abstract void connect() throws IOException;
 
     /**
      * Sets a specified timeout value, in milliseconds, to be used
@@ -1440,7 +1440,7 @@
      * @see        java.io.InputStream#markSupported()
      * @see        java.net.URLConnection#getContentType()
      */
-    static public String guessContentTypeFromStream(InputStream is)
+    public static String guessContentTypeFromStream(InputStream is)
                         throws IOException {
         // If we can't read ahead safely, just give up on guessing
         if (!is.markSupported())
@@ -1605,7 +1605,7 @@
      * method, the stream should have already been checked to be sure it
      * contains Microsoft Structured Storage data.
      */
-    static private boolean checkfpx(InputStream is) throws IOException {
+    private static boolean checkfpx(InputStream is) throws IOException {
 
         /* Test for FlashPix image data in Microsoft Structured Storage format.
          * In general, should do this with calls to an SS implementation.
@@ -1766,7 +1766,7 @@
      * Returns -1, If EOF is reached before len bytes are read, returns 0
      * otherwise
      */
-    static private int readBytes(int c[], int len, InputStream is)
+    private static int readBytes(int c[], int len, InputStream is)
                 throws IOException {
 
         byte buf[] = new byte[len];
@@ -1787,7 +1787,7 @@
      * until either EOF is reached, or the specified
      * number of bytes have been skipped
      */
-    static private long skipForward(InputStream is, long toSkip)
+    private static long skipForward(InputStream is, long toSkip)
                 throws IOException {
 
         long eachSkip = 0;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/net/URLStreamHandler.java
--- a/jdk/src/java.base/share/classes/java/net/URLStreamHandler.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/net/URLStreamHandler.java	Tue Sep 15 21:56:04 2015 -0700
@@ -68,7 +68,7 @@
      * @exception  IOException  if an I/O error occurs while opening the
      *               connection.
      */
-    abstract protected URLConnection openConnection(URL u) throws IOException;
+    protected abstract URLConnection openConnection(URL u) throws IOException;
 
     /**
      * Same as openConnection(URL), except that the connection will be
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/nio/Bits.java
--- a/jdk/src/java.base/share/classes/java/nio/Bits.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/nio/Bits.java	Tue Sep 15 21:56:04 2015 -0700
@@ -64,7 +64,7 @@
 
     // -- get/put char --
 
-    static private char makeChar(byte b1, byte b0) {
+    private static char makeChar(byte b1, byte b0) {
         return (char)((b1 << 8) | (b0 & 0xff));
     }
 
@@ -136,7 +136,7 @@
 
     // -- get/put short --
 
-    static private short makeShort(byte b1, byte b0) {
+    private static short makeShort(byte b1, byte b0) {
         return (short)((b1 << 8) | (b0 & 0xff));
     }
 
@@ -208,7 +208,7 @@
 
     // -- get/put int --
 
-    static private int makeInt(byte b3, byte b2, byte b1, byte b0) {
+    private static int makeInt(byte b3, byte b2, byte b1, byte b0) {
         return (((b3       ) << 24) |
                 ((b2 & 0xff) << 16) |
                 ((b1 & 0xff) <<  8) |
@@ -301,7 +301,7 @@
 
     // -- get/put long --
 
-    static private long makeLong(byte b7, byte b6, byte b5, byte b4,
+    private static long makeLong(byte b7, byte b6, byte b5, byte b4,
                                  byte b3, byte b2, byte b1, byte b0)
     {
         return ((((long)b7       ) << 56) |
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/nio/channels/Pipe.java
--- a/jdk/src/java.base/share/classes/java/nio/channels/Pipe.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/nio/channels/Pipe.java	Tue Sep 15 21:56:04 2015 -0700
@@ -56,7 +56,7 @@
      *
      * @since 1.4
      */
-    public static abstract class SourceChannel
+    public abstract static class SourceChannel
         extends AbstractSelectableChannel
         implements ReadableByteChannel, ScatteringByteChannel
     {
@@ -90,7 +90,7 @@
      *
      * @since 1.4
      */
-    public static abstract class SinkChannel
+    public abstract static class SinkChannel
         extends AbstractSelectableChannel
         implements WritableByteChannel, GatheringByteChannel
     {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java
--- a/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java	Tue Sep 15 21:56:04 2015 -0700
@@ -191,7 +191,7 @@
     public static final CoderResult OVERFLOW
         = new CoderResult(CR_OVERFLOW, 0);
 
-    private static abstract class Cache {
+    private abstract static class Cache {
 
         private Map> cache = null;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java
--- a/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -547,9 +547,9 @@
 
         private Iterator serviceIterator;
 
-        private final static int I_NONE   = 1;
-        private final static int I_SIZE   = 2;
-        private final static int I_PARAMS = 3;
+        private static final int I_NONE   = 1;
+        private static final int I_SIZE   = 2;
+        private static final int I_PARAMS = 3;
 
         private int initType;
         private int initKeySize;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/security/KeyStore.java
--- a/jdk/src/java.base/share/classes/java/security/KeyStore.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/KeyStore.java	Tue Sep 15 21:56:04 2015 -0700
@@ -974,7 +974,7 @@
      * if no such property exists.
      * @see java.security.Security security properties
      */
-    public final static String getDefaultType() {
+    public static final String getDefaultType() {
         String kstype;
         kstype = AccessController.doPrivileged(new PrivilegedAction<>() {
             public String run() {
@@ -1811,7 +1811,7 @@
      * @see javax.net.ssl.KeyStoreBuilderParameters
      * @since 1.5
      */
-    public static abstract class Builder {
+    public abstract static class Builder {
 
         // maximum times to try the callbackhandler if the password is wrong
         static final int MAX_CALLBACK_TRIES = 3;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/security/Provider.java
--- a/jdk/src/java.base/share/classes/java/security/Provider.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/Provider.java	Tue Sep 15 21:56:04 2015 -0700
@@ -998,9 +998,9 @@
         return new String[] {type, alg};
     }
 
-    private final static String ALIAS_PREFIX = "Alg.Alias.";
-    private final static String ALIAS_PREFIX_LOWER = "alg.alias.";
-    private final static int ALIAS_LENGTH = ALIAS_PREFIX.length();
+    private static final String ALIAS_PREFIX = "Alg.Alias.";
+    private static final String ALIAS_PREFIX_LOWER = "alg.alias.";
+    private static final int ALIAS_LENGTH = ALIAS_PREFIX.length();
 
     private void parseLegacyPut(String name, String value) {
         if (name.toLowerCase(ENGLISH).startsWith(ALIAS_PREFIX_LOWER)) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/security/SecureRandom.java
--- a/jdk/src/java.base/share/classes/java/security/SecureRandom.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/SecureRandom.java	Tue Sep 15 21:56:04 2015 -0700
@@ -424,7 +424,7 @@
      *
      * @see #getSeed
      */
-    synchronized public void setSeed(byte[] seed) {
+    public synchronized void setSeed(byte[] seed) {
         secureRandomSpi.engineSetSeed(seed);
     }
 
@@ -465,7 +465,7 @@
      * @param bytes the array to be filled in with random bytes.
      */
     @Override
-    synchronized public void nextBytes(byte[] bytes) {
+    public synchronized void nextBytes(byte[] bytes) {
         secureRandomSpi.engineNextBytes(bytes);
     }
 
@@ -484,7 +484,7 @@
      * of pseudo-random bits (right justified, with leading zeros).
      */
     @Override
-    final protected int next(int numBits) {
+    protected final int next(int numBits) {
         int numBytes = (numBits+7)/8;
         byte[] b = new byte[numBytes];
         int next = 0;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/security/Signature.java
--- a/jdk/src/java.base/share/classes/java/security/Signature.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/Signature.java	Tue Sep 15 21:56:04 2015 -0700
@@ -141,19 +141,19 @@
      * Possible {@link #state} value, signifying that
      * this signature object has not yet been initialized.
      */
-    protected final static int UNINITIALIZED = 0;
+    protected static final int UNINITIALIZED = 0;
 
     /**
      * Possible {@link #state} value, signifying that
      * this signature object has been initialized for signing.
      */
-    protected final static int SIGN = 2;
+    protected static final int SIGN = 2;
 
     /**
      * Possible {@link #state} value, signifying that
      * this signature object has been initialized for verification.
      */
-    protected final static int VERIFY = 3;
+    protected static final int VERIFY = 3;
 
     /**
      * Current state of this signature object.
@@ -174,13 +174,13 @@
     }
 
     // name of the special signature alg
-    private final static String RSA_SIGNATURE = "NONEwithRSA";
+    private static final String RSA_SIGNATURE = "NONEwithRSA";
 
     // name of the equivalent cipher alg
-    private final static String RSA_CIPHER = "RSA/ECB/PKCS1Padding";
+    private static final String RSA_CIPHER = "RSA/ECB/PKCS1Padding";
 
     // all the services we need to lookup for compatibility with Cipher
-    private final static List rsaIds = Arrays.asList(
+    private static final List rsaIds = Arrays.asList(
         new ServiceId[] {
             new ServiceId("Signature", "NONEwithRSA"),
             new ServiceId("Cipher", "RSA/ECB/PKCS1Padding"),
@@ -263,7 +263,7 @@
         return sig;
     }
 
-    private final static Map signatureInfo;
+    private static final Map signatureInfo;
 
     static {
         signatureInfo = new ConcurrentHashMap<>();
@@ -1147,9 +1147,9 @@
             }
         }
 
-        private final static int I_PUB     = 1;
-        private final static int I_PRIV    = 2;
-        private final static int I_PRIV_SR = 3;
+        private static final int I_PUB     = 1;
+        private static final int I_PRIV    = 2;
+        private static final int I_PRIV_SR = 3;
 
         private void init(SignatureSpi spi, int type, Key  key,
                 SecureRandom random) throws InvalidKeyException {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java
--- a/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -299,7 +299,7 @@
      * by the {@code certpathbuilder.type} security property, or the string
      * {@literal "PKIX"} if no such property exists.
      */
-    public final static String getDefaultType() {
+    public static final String getDefaultType() {
         String cpbtype =
             AccessController.doPrivileged(new PrivilegedAction<>() {
                 public String run() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java
--- a/jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -49,7 +49,7 @@
      * the methods in this class. This ensures that the helper is initialized
      * prior to a tunneled call from the Sun provider.
      */
-    synchronized static void initialize() {
+    static synchronized void initialize() {
         if (CertPathHelper.instance == null) {
             CertPathHelper.instance = new CertPathHelperImpl();
         }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java
--- a/jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -311,7 +311,7 @@
      * by the {@code certpathvalidator.type} security property, or the string
      * {@literal "PKIX"} if no such property exists.
      */
-    public final static String getDefaultType() {
+    public static final String getDefaultType() {
         String cpvtype =
             AccessController.doPrivileged(new PrivilegedAction<>() {
                 public String run() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/security/cert/CertStore.java
--- a/jdk/src/java.base/share/classes/java/security/cert/CertStore.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/cert/CertStore.java	Tue Sep 15 21:56:04 2015 -0700
@@ -407,7 +407,7 @@
      * {@code certstore.type} security property, or the string
      * {@literal "LDAP"} if no such property exists.
      */
-    public final static String getDefaultType() {
+    public static final String getDefaultType() {
         String cstype;
         cstype = AccessController.doPrivileged(new PrivilegedAction<>() {
             public String run() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java
--- a/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java	Tue Sep 15 21:56:04 2015 -0700
@@ -87,7 +87,7 @@
 
     private static final Debug debug = Debug.getInstance("certpath");
 
-    private final static ObjectIdentifier ANY_EXTENDED_KEY_USAGE =
+    private static final ObjectIdentifier ANY_EXTENDED_KEY_USAGE =
         ObjectIdentifier.newInternal(new int[] {2, 5, 29, 37, 0});
 
     static {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/AttributedString.java
--- a/jdk/src/java.base/share/classes/java/text/AttributedString.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/AttributedString.java	Tue Sep 15 21:56:04 2015 -0700
@@ -667,7 +667,7 @@
     }
 
     // returns whether the two objects are either both null or equal
-    private final static boolean valuesMatch(Object value1, Object value2) {
+    private static final boolean valuesMatch(Object value1, Object value2) {
         if (value1 == null) {
             return value2 == null;
         } else {
@@ -732,7 +732,7 @@
 
     // the iterator class associated with this string class
 
-    final private class AttributedStringIterator implements AttributedCharacterIterator {
+    private final class AttributedStringIterator implements AttributedCharacterIterator {
 
         // note on synchronization:
         // we don't synchronize on the iterator, assuming that an iterator is only used in one thread.
@@ -1045,7 +1045,7 @@
 
     // the map class associated with this string class, giving access to the attributes of one run
 
-    final private class AttributeMap extends AbstractMap {
+    private final class AttributeMap extends AbstractMap {
 
         int runIndex;
         int beginIndex;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/CollationElementIterator.java
--- a/jdk/src/java.base/share/classes/java/text/CollationElementIterator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/CollationElementIterator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -111,7 +111,7 @@
      * Null order which indicates the end of string is reached by the
      * cursor.
      */
-    public final static int NULLORDER = 0xffffffff;
+    public static final int NULLORDER = 0xffffffff;
 
     /**
      * CollationElementIterator constructor.  This takes the source string and
@@ -358,7 +358,7 @@
      * @param order the collation element
      * @return the element's primary component
      */
-    public final static int primaryOrder(int order)
+    public static final int primaryOrder(int order)
     {
         order &= RBCollationTables.PRIMARYORDERMASK;
         return (order >>> RBCollationTables.PRIMARYORDERSHIFT);
@@ -368,7 +368,7 @@
      * @param order the collation element
      * @return the element's secondary component
      */
-    public final static short secondaryOrder(int order)
+    public static final short secondaryOrder(int order)
     {
         order = order & RBCollationTables.SECONDARYORDERMASK;
         return ((short)(order >> RBCollationTables.SECONDARYORDERSHIFT));
@@ -378,7 +378,7 @@
      * @param order the collation element
      * @return the element's tertiary component
      */
-    public final static short tertiaryOrder(int order)
+    public static final short tertiaryOrder(int order)
     {
         return ((short)(order &= RBCollationTables.TERTIARYORDERMASK));
     }
@@ -540,14 +540,14 @@
      * Determine if a character is a Thai vowel (which sorts after
      * its base consonant).
      */
-    private final static boolean isThaiPreVowel(int ch) {
+    private static final boolean isThaiPreVowel(int ch) {
         return (ch >= 0x0e40) && (ch <= 0x0e44);
     }
 
     /**
      * Determine if a character is a Thai base consonant
      */
-    private final static boolean isThaiBaseConsonant(int ch) {
+    private static final boolean isThaiBaseConsonant(int ch) {
         return (ch >= 0x0e01) && (ch <= 0x0e2e);
     }
 
@@ -555,14 +555,14 @@
      * Determine if a character is a Lao vowel (which sorts after
      * its base consonant).
      */
-    private final static boolean isLaoPreVowel(int ch) {
+    private static final boolean isLaoPreVowel(int ch) {
         return (ch >= 0x0ec0) && (ch <= 0x0ec4);
     }
 
     /**
      * Determine if a character is a Lao base consonant
      */
-    private final static boolean isLaoBaseConsonant(int ch) {
+    private static final boolean isLaoBaseConsonant(int ch) {
         return (ch >= 0x0e81) && (ch <= 0x0eae);
     }
 
@@ -634,7 +634,7 @@
      *  Check if a comparison order is ignorable.
      *  @return true if a character is ignorable, false otherwise.
      */
-    final static boolean isIgnorable(int order)
+    static final boolean isIgnorable(int order)
     {
         return ((primaryOrder(order) == 0) ? true : false);
     }
@@ -770,7 +770,7 @@
         return order;
     }
 
-    final static int UNMAPPEDCHARVALUE = 0x7FFF0000;
+    static final int UNMAPPEDCHARVALUE = 0x7FFF0000;
 
     private NormalizerBase text = null;
     private int[] buffer = null;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/CollationKey.java
--- a/jdk/src/java.base/share/classes/java/text/CollationKey.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/CollationKey.java	Tue Sep 15 21:56:04 2015 -0700
@@ -108,7 +108,7 @@
      * zero if this is greater than target.
      * @see java.text.Collator#compare
      */
-    abstract public int compareTo(CollationKey target);
+    public abstract int compareTo(CollationKey target);
 
     /**
      * Returns the String that this CollationKey represents.
@@ -128,7 +128,7 @@
      *
      * @return a byte array representation of the CollationKey
      */
-    abstract public byte[] toByteArray();
+    public abstract byte[] toByteArray();
 
 
   /**
@@ -145,5 +145,5 @@
         this.source = source;
     }
 
-    final private String source;
+    private final String source;
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/Collator.java
--- a/jdk/src/java.base/share/classes/java/text/Collator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/Collator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -136,7 +136,7 @@
      * @see java.text.Collator#setStrength
      * @see java.text.Collator#getStrength
      */
-    public final static int PRIMARY = 0;
+    public static final int PRIMARY = 0;
     /**
      * Collator strength value.  When set, only SECONDARY and above differences are
      * considered significant during comparison. The assignment of strengths
@@ -146,7 +146,7 @@
      * @see java.text.Collator#setStrength
      * @see java.text.Collator#getStrength
      */
-    public final static int SECONDARY = 1;
+    public static final int SECONDARY = 1;
     /**
      * Collator strength value.  When set, only TERTIARY and above differences are
      * considered significant during comparison. The assignment of strengths
@@ -155,7 +155,7 @@
      * @see java.text.Collator#setStrength
      * @see java.text.Collator#getStrength
      */
-    public final static int TERTIARY = 2;
+    public static final int TERTIARY = 2;
 
     /**
      * Collator strength value.  When set, all differences are
@@ -168,7 +168,7 @@
      * (A, combining-grave) will be considered significant at the IDENTICAL
      * level if decomposition is set to NO_DECOMPOSITION.
      */
-    public final static int IDENTICAL = 3;
+    public static final int IDENTICAL = 3;
 
     /**
      * Decomposition mode value. With NO_DECOMPOSITION
@@ -178,7 +178,7 @@
      * @see java.text.Collator#getDecomposition
      * @see java.text.Collator#setDecomposition
      */
-    public final static int NO_DECOMPOSITION = 0;
+    public static final int NO_DECOMPOSITION = 0;
 
     /**
      * Decomposition mode value. With CANONICAL_DECOMPOSITION
@@ -193,7 +193,7 @@
      * @see java.text.Collator#getDecomposition
      * @see java.text.Collator#setDecomposition
      */
-    public final static int CANONICAL_DECOMPOSITION = 1;
+    public static final int CANONICAL_DECOMPOSITION = 1;
 
     /**
      * Decomposition mode value. With FULL_DECOMPOSITION
@@ -212,7 +212,7 @@
      * @see java.text.Collator#getDecomposition
      * @see java.text.Collator#setDecomposition
      */
-    public final static int FULL_DECOMPOSITION = 2;
+    public static final int FULL_DECOMPOSITION = 2;
 
     /**
      * Gets the Collator for the current default locale.
@@ -472,7 +472,7 @@
      * Generates the hash code for this Collator.
      */
     @Override
-    abstract public int hashCode();
+    public abstract int hashCode();
 
     /**
      * Default constructor.  This constructor is
@@ -499,17 +499,17 @@
      * string in the compare() method.
      * @see java.text.Collator#compare
      */
-    final static int LESS = -1;
+    static final int LESS = -1;
     /**
      * EQUAL is returned if source string is compared to be equal to target
      * string in the compare() method.
      * @see java.text.Collator#compare
      */
-    final static int EQUAL = 0;
+    static final int EQUAL = 0;
     /**
      * GREATER is returned if source string is compared to be greater than
      * target string in the compare() method.
      * @see java.text.Collator#compare
      */
-    final static int GREATER = 1;
+    static final int GREATER = 1;
  }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/DateFormat.java
--- a/jdk/src/java.base/share/classes/java/text/DateFormat.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/DateFormat.java	Tue Sep 15 21:56:04 2015 -0700
@@ -175,100 +175,100 @@
      * Useful constant for ERA field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int ERA_FIELD = 0;
+    public static final int ERA_FIELD = 0;
     /**
      * Useful constant for YEAR field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int YEAR_FIELD = 1;
+    public static final int YEAR_FIELD = 1;
     /**
      * Useful constant for MONTH field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int MONTH_FIELD = 2;
+    public static final int MONTH_FIELD = 2;
     /**
      * Useful constant for DATE field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int DATE_FIELD = 3;
+    public static final int DATE_FIELD = 3;
     /**
      * Useful constant for one-based HOUR_OF_DAY field alignment.
      * Used in FieldPosition of date/time formatting.
      * HOUR_OF_DAY1_FIELD is used for the one-based 24-hour clock.
      * For example, 23:59 + 01:00 results in 24:59.
      */
-    public final static int HOUR_OF_DAY1_FIELD = 4;
+    public static final int HOUR_OF_DAY1_FIELD = 4;
     /**
      * Useful constant for zero-based HOUR_OF_DAY field alignment.
      * Used in FieldPosition of date/time formatting.
      * HOUR_OF_DAY0_FIELD is used for the zero-based 24-hour clock.
      * For example, 23:59 + 01:00 results in 00:59.
      */
-    public final static int HOUR_OF_DAY0_FIELD = 5;
+    public static final int HOUR_OF_DAY0_FIELD = 5;
     /**
      * Useful constant for MINUTE field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int MINUTE_FIELD = 6;
+    public static final int MINUTE_FIELD = 6;
     /**
      * Useful constant for SECOND field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int SECOND_FIELD = 7;
+    public static final int SECOND_FIELD = 7;
     /**
      * Useful constant for MILLISECOND field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int MILLISECOND_FIELD = 8;
+    public static final int MILLISECOND_FIELD = 8;
     /**
      * Useful constant for DAY_OF_WEEK field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int DAY_OF_WEEK_FIELD = 9;
+    public static final int DAY_OF_WEEK_FIELD = 9;
     /**
      * Useful constant for DAY_OF_YEAR field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int DAY_OF_YEAR_FIELD = 10;
+    public static final int DAY_OF_YEAR_FIELD = 10;
     /**
      * Useful constant for DAY_OF_WEEK_IN_MONTH field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int DAY_OF_WEEK_IN_MONTH_FIELD = 11;
+    public static final int DAY_OF_WEEK_IN_MONTH_FIELD = 11;
     /**
      * Useful constant for WEEK_OF_YEAR field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int WEEK_OF_YEAR_FIELD = 12;
+    public static final int WEEK_OF_YEAR_FIELD = 12;
     /**
      * Useful constant for WEEK_OF_MONTH field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int WEEK_OF_MONTH_FIELD = 13;
+    public static final int WEEK_OF_MONTH_FIELD = 13;
     /**
      * Useful constant for AM_PM field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int AM_PM_FIELD = 14;
+    public static final int AM_PM_FIELD = 14;
     /**
      * Useful constant for one-based HOUR field alignment.
      * Used in FieldPosition of date/time formatting.
      * HOUR1_FIELD is used for the one-based 12-hour clock.
      * For example, 11:30 PM + 1 hour results in 12:30 AM.
      */
-    public final static int HOUR1_FIELD = 15;
+    public static final int HOUR1_FIELD = 15;
     /**
      * Useful constant for zero-based HOUR field alignment.
      * Used in FieldPosition of date/time formatting.
      * HOUR0_FIELD is used for the zero-based 12-hour clock.
      * For example, 11:30 PM + 1 hour results in 00:30 AM.
      */
-    public final static int HOUR0_FIELD = 16;
+    public static final int HOUR0_FIELD = 16;
     /**
      * Useful constant for TIMEZONE field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int TIMEZONE_FIELD = 17;
+    public static final int TIMEZONE_FIELD = 17;
 
     // Proclaim serial compatibility with 1.1 FCS
     private static final long serialVersionUID = 7218322306649953788L;
@@ -455,7 +455,7 @@
      * @see java.util.Locale.Category#FORMAT
      * @return a time formatter.
      */
-    public final static DateFormat getTimeInstance()
+    public static final DateFormat getTimeInstance()
     {
         return get(DEFAULT, 0, 1, Locale.getDefault(Locale.Category.FORMAT));
     }
@@ -472,7 +472,7 @@
      * SHORT for "h:mm a" in the US locale.
      * @return a time formatter.
      */
-    public final static DateFormat getTimeInstance(int style)
+    public static final DateFormat getTimeInstance(int style)
     {
         return get(style, 0, 1, Locale.getDefault(Locale.Category.FORMAT));
     }
@@ -485,7 +485,7 @@
      * @param aLocale the given locale.
      * @return a time formatter.
      */
-    public final static DateFormat getTimeInstance(int style,
+    public static final DateFormat getTimeInstance(int style,
                                                  Locale aLocale)
     {
         return get(style, 0, 1, aLocale);
@@ -501,7 +501,7 @@
      * @see java.util.Locale.Category#FORMAT
      * @return a date formatter.
      */
-    public final static DateFormat getDateInstance()
+    public static final DateFormat getDateInstance()
     {
         return get(0, DEFAULT, 2, Locale.getDefault(Locale.Category.FORMAT));
     }
@@ -518,7 +518,7 @@
      * SHORT for "M/d/yy" in the US locale.
      * @return a date formatter.
      */
-    public final static DateFormat getDateInstance(int style)
+    public static final DateFormat getDateInstance(int style)
     {
         return get(0, style, 2, Locale.getDefault(Locale.Category.FORMAT));
     }
@@ -531,7 +531,7 @@
      * @param aLocale the given locale.
      * @return a date formatter.
      */
-    public final static DateFormat getDateInstance(int style,
+    public static final DateFormat getDateInstance(int style,
                                                  Locale aLocale)
     {
         return get(0, style, 2, aLocale);
@@ -547,7 +547,7 @@
      * @see java.util.Locale.Category#FORMAT
      * @return a date/time formatter.
      */
-    public final static DateFormat getDateTimeInstance()
+    public static final DateFormat getDateTimeInstance()
     {
         return get(DEFAULT, DEFAULT, 3, Locale.getDefault(Locale.Category.FORMAT));
     }
@@ -566,7 +566,7 @@
      * SHORT for "h:mm a" in the US locale.
      * @return a date/time formatter.
      */
-    public final static DateFormat getDateTimeInstance(int dateStyle,
+    public static final DateFormat getDateTimeInstance(int dateStyle,
                                                        int timeStyle)
     {
         return get(timeStyle, dateStyle, 3, Locale.getDefault(Locale.Category.FORMAT));
@@ -580,7 +580,7 @@
      * @param aLocale the given locale.
      * @return a date/time formatter.
      */
-    public final static DateFormat
+    public static final DateFormat
         getDateTimeInstance(int dateStyle, int timeStyle, Locale aLocale)
     {
         return get(timeStyle, dateStyle, 3, aLocale);
@@ -592,7 +592,7 @@
      *
      * @return a date/time formatter
      */
-    public final static DateFormat getInstance() {
+    public static final DateFormat getInstance() {
         return getDateTimeInstance(SHORT, SHORT);
     }
 
@@ -934,107 +934,107 @@
         /**
          * Constant identifying the era field.
          */
-        public final static Field ERA = new Field("era", Calendar.ERA);
+        public static final Field ERA = new Field("era", Calendar.ERA);
 
         /**
          * Constant identifying the year field.
          */
-        public final static Field YEAR = new Field("year", Calendar.YEAR);
+        public static final Field YEAR = new Field("year", Calendar.YEAR);
 
         /**
          * Constant identifying the month field.
          */
-        public final static Field MONTH = new Field("month", Calendar.MONTH);
+        public static final Field MONTH = new Field("month", Calendar.MONTH);
 
         /**
          * Constant identifying the day of month field.
          */
-        public final static Field DAY_OF_MONTH = new
+        public static final Field DAY_OF_MONTH = new
                             Field("day of month", Calendar.DAY_OF_MONTH);
 
         /**
          * Constant identifying the hour of day field, where the legal values
          * are 1 to 24.
          */
-        public final static Field HOUR_OF_DAY1 = new Field("hour of day 1",-1);
+        public static final Field HOUR_OF_DAY1 = new Field("hour of day 1",-1);
 
         /**
          * Constant identifying the hour of day field, where the legal values
          * are 0 to 23.
          */
-        public final static Field HOUR_OF_DAY0 = new
+        public static final Field HOUR_OF_DAY0 = new
                Field("hour of day", Calendar.HOUR_OF_DAY);
 
         /**
          * Constant identifying the minute field.
          */
-        public final static Field MINUTE =new Field("minute", Calendar.MINUTE);
+        public static final Field MINUTE =new Field("minute", Calendar.MINUTE);
 
         /**
          * Constant identifying the second field.
          */
-        public final static Field SECOND =new Field("second", Calendar.SECOND);
+        public static final Field SECOND =new Field("second", Calendar.SECOND);
 
         /**
          * Constant identifying the millisecond field.
          */
-        public final static Field MILLISECOND = new
+        public static final Field MILLISECOND = new
                 Field("millisecond", Calendar.MILLISECOND);
 
         /**
          * Constant identifying the day of week field.
          */
-        public final static Field DAY_OF_WEEK = new
+        public static final Field DAY_OF_WEEK = new
                 Field("day of week", Calendar.DAY_OF_WEEK);
 
         /**
          * Constant identifying the day of year field.
          */
-        public final static Field DAY_OF_YEAR = new
+        public static final Field DAY_OF_YEAR = new
                 Field("day of year", Calendar.DAY_OF_YEAR);
 
         /**
          * Constant identifying the day of week field.
          */
-        public final static Field DAY_OF_WEEK_IN_MONTH =
+        public static final Field DAY_OF_WEEK_IN_MONTH =
                      new Field("day of week in month",
                                             Calendar.DAY_OF_WEEK_IN_MONTH);
 
         /**
          * Constant identifying the week of year field.
          */
-        public final static Field WEEK_OF_YEAR = new
+        public static final Field WEEK_OF_YEAR = new
               Field("week of year", Calendar.WEEK_OF_YEAR);
 
         /**
          * Constant identifying the week of month field.
          */
-        public final static Field WEEK_OF_MONTH = new
+        public static final Field WEEK_OF_MONTH = new
             Field("week of month", Calendar.WEEK_OF_MONTH);
 
         /**
          * Constant identifying the time of day indicator
          * (e.g. "a.m." or "p.m.") field.
          */
-        public final static Field AM_PM = new
+        public static final Field AM_PM = new
                             Field("am pm", Calendar.AM_PM);
 
         /**
          * Constant identifying the hour field, where the legal values are
          * 1 to 12.
          */
-        public final static Field HOUR1 = new Field("hour 1", -1);
+        public static final Field HOUR1 = new Field("hour 1", -1);
 
         /**
          * Constant identifying the hour field, where the legal values are
          * 0 to 11.
          */
-        public final static Field HOUR0 = new
+        public static final Field HOUR0 = new
                             Field("hour", Calendar.HOUR);
 
         /**
          * Constant identifying the time zone field.
          */
-        public final static Field TIME_ZONE = new Field("time zone", -1);
+        public static final Field TIME_ZONE = new Field("time zone", -1);
     }
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/MessageFormat.java
--- a/jdk/src/java.base/share/classes/java/text/MessageFormat.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/MessageFormat.java	Tue Sep 15 21:56:04 2015 -0700
@@ -1168,7 +1168,7 @@
          * indicating the index in the arguments array of the
          * argument from which the text was generated.
          */
-        public final static Field ARGUMENT =
+        public static final Field ARGUMENT =
                            new Field("message argument field");
     }
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/NumberFormat.java
--- a/jdk/src/java.base/share/classes/java/text/NumberFormat.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/NumberFormat.java	Tue Sep 15 21:56:04 2015 -0700
@@ -425,7 +425,7 @@
      * @return the {@code NumberFormat} instance for general-purpose number
      * formatting
      */
-    public final static NumberFormat getInstance() {
+    public static final NumberFormat getInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), NUMBERSTYLE);
     }
 
@@ -454,7 +454,7 @@
      * @see java.util.Locale#getDefault(java.util.Locale.Category)
      * @see java.util.Locale.Category#FORMAT
      */
-    public final static NumberFormat getNumberInstance() {
+    public static final NumberFormat getNumberInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), NUMBERSTYLE);
     }
 
@@ -487,7 +487,7 @@
      * @return a number format for integer values
      * @since 1.4
      */
-    public final static NumberFormat getIntegerInstance() {
+    public static final NumberFormat getIntegerInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), INTEGERSTYLE);
     }
 
@@ -519,7 +519,7 @@
      * @see java.util.Locale#getDefault(java.util.Locale.Category)
      * @see java.util.Locale.Category#FORMAT
      */
-    public final static NumberFormat getCurrencyInstance() {
+    public static final NumberFormat getCurrencyInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), CURRENCYSTYLE);
     }
 
@@ -544,7 +544,7 @@
      * @see java.util.Locale#getDefault(java.util.Locale.Category)
      * @see java.util.Locale.Category#FORMAT
      */
-    public final static NumberFormat getPercentInstance() {
+    public static final NumberFormat getPercentInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), PERCENTSTYLE);
     }
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/RBCollationTables.java
--- a/jdk/src/java.base/share/classes/java/text/RBCollationTables.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/RBCollationTables.java	Tue Sep 15 21:56:04 2015 -0700
@@ -258,7 +258,7 @@
         }
     }
 
-    final static int getEntry(Vector list, String name, boolean fwd) {
+    static final int getEntry(Vector list, String name, boolean fwd) {
         for (int i = 0; i < list.size(); i++) {
             EntryPair pair = list.elementAt(i);
             if (pair.fwd == fwd && pair.entryName.equals(name)) {
@@ -272,17 +272,17 @@
     // constants
     // ==============================================================
     //sherman/Todo: is the value big enough?????
-    final static int EXPANDCHARINDEX = 0x7E000000; // Expand index follows
-    final static int CONTRACTCHARINDEX = 0x7F000000;  // contract indexes follow
-    final static int UNMAPPED = 0xFFFFFFFF;
+    static final int EXPANDCHARINDEX = 0x7E000000; // Expand index follows
+    static final int CONTRACTCHARINDEX = 0x7F000000;  // contract indexes follow
+    static final int UNMAPPED = 0xFFFFFFFF;
 
-    final static int PRIMARYORDERMASK = 0xffff0000;
-    final static int SECONDARYORDERMASK = 0x0000ff00;
-    final static int TERTIARYORDERMASK = 0x000000ff;
-    final static int PRIMARYDIFFERENCEONLY = 0xffff0000;
-    final static int SECONDARYDIFFERENCEONLY = 0xffffff00;
-    final static int PRIMARYORDERSHIFT = 16;
-    final static int SECONDARYORDERSHIFT = 8;
+    static final int PRIMARYORDERMASK = 0xffff0000;
+    static final int SECONDARYORDERMASK = 0x0000ff00;
+    static final int TERTIARYORDERMASK = 0x000000ff;
+    static final int PRIMARYDIFFERENCEONLY = 0xffff0000;
+    static final int SECONDARYDIFFERENCEONLY = 0xffffff00;
+    static final int PRIMARYORDERSHIFT = 16;
+    static final int SECONDARYORDERSHIFT = 8;
 
     // ==============================================================
     // instance variables
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/RBTableBuilder.java
--- a/jdk/src/java.base/share/classes/java/text/RBTableBuilder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/RBTableBuilder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -583,14 +583,14 @@
     // ==============================================================
     // constants
     // ==============================================================
-    final static int CHARINDEX = 0x70000000;  // need look up in .commit()
+    static final int CHARINDEX = 0x70000000;  // need look up in .commit()
 
-    private final static int IGNORABLEMASK = 0x0000ffff;
-    private final static int PRIMARYORDERINCREMENT = 0x00010000;
-    private final static int SECONDARYORDERINCREMENT = 0x00000100;
-    private final static int TERTIARYORDERINCREMENT = 0x00000001;
-    private final static int INITIALTABLESIZE = 20;
-    private final static int MAXKEYSIZE = 5;
+    private static final int IGNORABLEMASK = 0x0000ffff;
+    private static final int PRIMARYORDERINCREMENT = 0x00010000;
+    private static final int SECONDARYORDERINCREMENT = 0x00000100;
+    private static final int TERTIARYORDERINCREMENT = 0x00000001;
+    private static final int INITIALTABLESIZE = 20;
+    private static final int MAXKEYSIZE = 5;
 
     // ==============================================================
     // instance variables
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java
--- a/jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -750,12 +750,12 @@
     // private
     // ==============================================================
 
-    final static int CHARINDEX = 0x70000000;  // need look up in .commit()
-    final static int EXPANDCHARINDEX = 0x7E000000; // Expand index follows
-    final static int CONTRACTCHARINDEX = 0x7F000000;  // contract indexes follow
-    final static int UNMAPPED = 0xFFFFFFFF;
+    static final int CHARINDEX = 0x70000000;  // need look up in .commit()
+    static final int EXPANDCHARINDEX = 0x7E000000; // Expand index follows
+    static final int CONTRACTCHARINDEX = 0x7F000000;  // contract indexes follow
+    static final int UNMAPPED = 0xFFFFFFFF;
 
-    private final static int COLLATIONKEYOFFSET = 1;
+    private static final int COLLATIONKEYOFFSET = 1;
 
     private RBCollationTables tables = null;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java
--- a/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java	Tue Sep 15 21:56:04 2015 -0700
@@ -456,42 +456,42 @@
      * Saved numberFormat and pattern.
      * @see SimpleDateFormat#checkNegativeNumberExpression
      */
-    transient private NumberFormat originalNumberFormat;
-    transient private String originalNumberPattern;
+    private transient NumberFormat originalNumberFormat;
+    private transient String originalNumberPattern;
 
     /**
      * The minus sign to be used with format and parse.
      */
-    transient private char minusSign = '-';
+    private transient char minusSign = '-';
 
     /**
      * True when a negative sign follows a number.
      * (True as default in Arabic.)
      */
-    transient private boolean hasFollowingMinusSign = false;
+    private transient boolean hasFollowingMinusSign = false;
 
     /**
      * True if standalone form needs to be used.
      */
-    transient private boolean forceStandaloneForm = false;
+    private transient boolean forceStandaloneForm = false;
 
     /**
      * The compiled pattern.
      */
-    transient private char[] compiledPattern;
+    private transient char[] compiledPattern;
 
     /**
      * Tags for the compiled pattern.
      */
-    private final static int TAG_QUOTE_ASCII_CHAR       = 100;
-    private final static int TAG_QUOTE_CHARS            = 101;
+    private static final int TAG_QUOTE_ASCII_CHAR       = 100;
+    private static final int TAG_QUOTE_CHARS            = 101;
 
     /**
      * Locale dependent digit zero.
      * @see #zeroPaddingNumber
      * @see java.text.DecimalFormatSymbols#getZeroDigit
      */
-    transient private char zeroDigit;
+    private transient char zeroDigit;
 
     /**
      * The symbols used by this formatter for week names, month names,
@@ -510,7 +510,7 @@
      */
     private Date defaultCenturyStart;
 
-    transient private int defaultCenturyStartYear;
+    private transient int defaultCenturyStartYear;
 
     private static final int MILLIS_PER_MINUTE = 60 * 1000;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/AbstractList.java
--- a/jdk/src/java.base/share/classes/java/util/AbstractList.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/AbstractList.java	Tue Sep 15 21:56:04 2015 -0700
@@ -115,7 +115,7 @@
      *
      * @throws IndexOutOfBoundsException {@inheritDoc}
      */
-    abstract public E get(int index);
+    public abstract E get(int index);
 
     /**
      * {@inheritDoc}
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/BitSet.java
--- a/jdk/src/java.base/share/classes/java/util/BitSet.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/BitSet.java	Tue Sep 15 21:56:04 2015 -0700
@@ -68,9 +68,9 @@
      * a long, which consists of 64 bits, requiring 6 address bits.
      * The choice of word size is determined purely by performance concerns.
      */
-    private final static int ADDRESS_BITS_PER_WORD = 6;
-    private final static int BITS_PER_WORD = 1 << ADDRESS_BITS_PER_WORD;
-    private final static int BIT_INDEX_MASK = BITS_PER_WORD - 1;
+    private static final int ADDRESS_BITS_PER_WORD = 6;
+    private static final int BITS_PER_WORD = 1 << ADDRESS_BITS_PER_WORD;
+    private static final int BIT_INDEX_MASK = BITS_PER_WORD - 1;
 
     /* Used to shift left or right for a partial word mask */
     private static final long WORD_MASK = 0xffffffffffffffffL;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/Calendar.java
--- a/jdk/src/java.base/share/classes/java/util/Calendar.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/Calendar.java	Tue Sep 15 21:56:04 2015 -0700
@@ -370,13 +370,13 @@
      * @see GregorianCalendar#AD
      * @see GregorianCalendar#BC
      */
-    public final static int ERA = 0;
+    public static final int ERA = 0;
 
     /**
      * Field number for get and set indicating the
      * year. This is a calendar-specific value; see subclass documentation.
      */
-    public final static int YEAR = 1;
+    public static final int YEAR = 1;
 
     /**
      * Field number for get and set indicating the
@@ -399,7 +399,7 @@
      * @see #DECEMBER
      * @see #UNDECIMBER
      */
-    public final static int MONTH = 2;
+    public static final int MONTH = 2;
 
     /**
      * Field number for get and set indicating the
@@ -412,7 +412,7 @@
      * @see #getFirstDayOfWeek
      * @see #getMinimalDaysInFirstWeek
      */
-    public final static int WEEK_OF_YEAR = 3;
+    public static final int WEEK_OF_YEAR = 3;
 
     /**
      * Field number for get and set indicating the
@@ -425,7 +425,7 @@
      * @see #getFirstDayOfWeek
      * @see #getMinimalDaysInFirstWeek
      */
-    public final static int WEEK_OF_MONTH = 4;
+    public static final int WEEK_OF_MONTH = 4;
 
     /**
      * Field number for get and set indicating the
@@ -434,7 +434,7 @@
      *
      * @see #DAY_OF_MONTH
      */
-    public final static int DATE = 5;
+    public static final int DATE = 5;
 
     /**
      * Field number for get and set indicating the
@@ -443,13 +443,13 @@
      *
      * @see #DATE
      */
-    public final static int DAY_OF_MONTH = 5;
+    public static final int DAY_OF_MONTH = 5;
 
     /**
      * Field number for get and set indicating the day
      * number within the current year.  The first day of the year has value 1.
      */
-    public final static int DAY_OF_YEAR = 6;
+    public static final int DAY_OF_YEAR = 6;
 
     /**
      * Field number for get and set indicating the day
@@ -465,7 +465,7 @@
      * @see #FRIDAY
      * @see #SATURDAY
      */
-    public final static int DAY_OF_WEEK = 7;
+    public static final int DAY_OF_WEEK = 7;
 
     /**
      * Field number for get and set indicating the
@@ -490,7 +490,7 @@
      * @see #DAY_OF_WEEK
      * @see #WEEK_OF_MONTH
      */
-    public final static int DAY_OF_WEEK_IN_MONTH = 8;
+    public static final int DAY_OF_WEEK_IN_MONTH = 8;
 
     /**
      * Field number for get and set indicating
@@ -501,7 +501,7 @@
      * @see #PM
      * @see #HOUR
      */
-    public final static int AM_PM = 9;
+    public static final int AM_PM = 9;
 
     /**
      * Field number for get and set indicating the
@@ -512,7 +512,7 @@
      * @see #AM_PM
      * @see #HOUR_OF_DAY
      */
-    public final static int HOUR = 10;
+    public static final int HOUR = 10;
 
     /**
      * Field number for get and set indicating the
@@ -521,28 +521,28 @@
      *
      * @see #HOUR
      */
-    public final static int HOUR_OF_DAY = 11;
+    public static final int HOUR_OF_DAY = 11;
 
     /**
      * Field number for get and set indicating the
      * minute within the hour.
      * E.g., at 10:04:15.250 PM the MINUTE is 4.
      */
-    public final static int MINUTE = 12;
+    public static final int MINUTE = 12;
 
     /**
      * Field number for get and set indicating the
      * second within the minute.
      * E.g., at 10:04:15.250 PM the SECOND is 15.
      */
-    public final static int SECOND = 13;
+    public static final int SECOND = 13;
 
     /**
      * Field number for get and set indicating the
      * millisecond within the second.
      * E.g., at 10:04:15.250 PM the MILLISECOND is 250.
      */
-    public final static int MILLISECOND = 14;
+    public static final int MILLISECOND = 14;
 
     /**
      * Field number for get and set
@@ -553,7 +553,7 @@
      * TimeZone implementation subclass supports
      * historical GMT offset changes.
      */
-    public final static int ZONE_OFFSET = 15;
+    public static final int ZONE_OFFSET = 15;
 
     /**
      * Field number for get and set indicating the
@@ -564,146 +564,146 @@
      * TimeZone implementation subclass supports
      * historical Daylight Saving Time schedule changes.
      */
-    public final static int DST_OFFSET = 16;
+    public static final int DST_OFFSET = 16;
 
     /**
      * The number of distinct fields recognized by get and set.
      * Field numbers range from 0..FIELD_COUNT-1.
      */
-    public final static int FIELD_COUNT = 17;
+    public static final int FIELD_COUNT = 17;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Sunday.
      */
-    public final static int SUNDAY = 1;
+    public static final int SUNDAY = 1;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Monday.
      */
-    public final static int MONDAY = 2;
+    public static final int MONDAY = 2;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Tuesday.
      */
-    public final static int TUESDAY = 3;
+    public static final int TUESDAY = 3;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Wednesday.
      */
-    public final static int WEDNESDAY = 4;
+    public static final int WEDNESDAY = 4;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Thursday.
      */
-    public final static int THURSDAY = 5;
+    public static final int THURSDAY = 5;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Friday.
      */
-    public final static int FRIDAY = 6;
+    public static final int FRIDAY = 6;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Saturday.
      */
-    public final static int SATURDAY = 7;
+    public static final int SATURDAY = 7;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * first month of the year in the Gregorian and Julian calendars.
      */
-    public final static int JANUARY = 0;
+    public static final int JANUARY = 0;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * second month of the year in the Gregorian and Julian calendars.
      */
-    public final static int FEBRUARY = 1;
+    public static final int FEBRUARY = 1;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * third month of the year in the Gregorian and Julian calendars.
      */
-    public final static int MARCH = 2;
+    public static final int MARCH = 2;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * fourth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int APRIL = 3;
+    public static final int APRIL = 3;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * fifth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int MAY = 4;
+    public static final int MAY = 4;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * sixth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int JUNE = 5;
+    public static final int JUNE = 5;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * seventh month of the year in the Gregorian and Julian calendars.
      */
-    public final static int JULY = 6;
+    public static final int JULY = 6;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * eighth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int AUGUST = 7;
+    public static final int AUGUST = 7;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * ninth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int SEPTEMBER = 8;
+    public static final int SEPTEMBER = 8;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * tenth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int OCTOBER = 9;
+    public static final int OCTOBER = 9;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * eleventh month of the year in the Gregorian and Julian calendars.
      */
-    public final static int NOVEMBER = 10;
+    public static final int NOVEMBER = 10;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * twelfth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int DECEMBER = 11;
+    public static final int DECEMBER = 11;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * thirteenth month of the year. Although GregorianCalendar
      * does not use this value, lunar calendars do.
      */
-    public final static int UNDECIMBER = 12;
+    public static final int UNDECIMBER = 12;
 
     /**
      * Value of the {@link #AM_PM} field indicating the
      * period of the day from midnight to just before noon.
      */
-    public final static int AM = 0;
+    public static final int AM = 0;
 
     /**
      * Value of the {@link #AM_PM} field indicating the
      * period of the day from noon to just before midnight.
      */
-    public final static int PM = 1;
+    public static final int PM = 1;
 
     /**
      * A style specifier for {@link #getDisplayNames(int, int, Locale)
@@ -856,7 +856,7 @@
      * are two special values, UNSET and COMPUTED. Values from
      * MINIMUM_USER_SET to Integer.MAX_VALUE are legal user set values.
      */
-    transient private int   stamp[];
+    private transient int   stamp[];
 
     /**
      * The currently set time for this calendar, expressed in milliseconds after
@@ -911,7 +911,7 @@
     /**
      * True if zone references to a shared TimeZone object.
      */
-    transient private boolean sharedZone = false;
+    private transient boolean sharedZone = false;
 
     /**
      * The first day of the week, with possible values SUNDAY,
@@ -1003,24 +1003,24 @@
 
     // Mask values for calendar fields
     @SuppressWarnings("PointlessBitwiseExpression")
-    final static int ERA_MASK           = (1 << ERA);
-    final static int YEAR_MASK          = (1 << YEAR);
-    final static int MONTH_MASK         = (1 << MONTH);
-    final static int WEEK_OF_YEAR_MASK  = (1 << WEEK_OF_YEAR);
-    final static int WEEK_OF_MONTH_MASK = (1 << WEEK_OF_MONTH);
-    final static int DAY_OF_MONTH_MASK  = (1 << DAY_OF_MONTH);
-    final static int DATE_MASK          = DAY_OF_MONTH_MASK;
-    final static int DAY_OF_YEAR_MASK   = (1 << DAY_OF_YEAR);
-    final static int DAY_OF_WEEK_MASK   = (1 << DAY_OF_WEEK);
-    final static int DAY_OF_WEEK_IN_MONTH_MASK  = (1 << DAY_OF_WEEK_IN_MONTH);
-    final static int AM_PM_MASK         = (1 << AM_PM);
-    final static int HOUR_MASK          = (1 << HOUR);
-    final static int HOUR_OF_DAY_MASK   = (1 << HOUR_OF_DAY);
-    final static int MINUTE_MASK        = (1 << MINUTE);
-    final static int SECOND_MASK        = (1 << SECOND);
-    final static int MILLISECOND_MASK   = (1 << MILLISECOND);
-    final static int ZONE_OFFSET_MASK   = (1 << ZONE_OFFSET);
-    final static int DST_OFFSET_MASK    = (1 << DST_OFFSET);
+    static final int ERA_MASK           = (1 << ERA);
+    static final int YEAR_MASK          = (1 << YEAR);
+    static final int MONTH_MASK         = (1 << MONTH);
+    static final int WEEK_OF_YEAR_MASK  = (1 << WEEK_OF_YEAR);
+    static final int WEEK_OF_MONTH_MASK = (1 << WEEK_OF_MONTH);
+    static final int DAY_OF_MONTH_MASK  = (1 << DAY_OF_MONTH);
+    static final int DATE_MASK          = DAY_OF_MONTH_MASK;
+    static final int DAY_OF_YEAR_MASK   = (1 << DAY_OF_YEAR);
+    static final int DAY_OF_WEEK_MASK   = (1 << DAY_OF_WEEK);
+    static final int DAY_OF_WEEK_IN_MONTH_MASK  = (1 << DAY_OF_WEEK_IN_MONTH);
+    static final int AM_PM_MASK         = (1 << AM_PM);
+    static final int HOUR_MASK          = (1 << HOUR);
+    static final int HOUR_OF_DAY_MASK   = (1 << HOUR_OF_DAY);
+    static final int MINUTE_MASK        = (1 << MINUTE);
+    static final int SECOND_MASK        = (1 << SECOND);
+    static final int MILLISECOND_MASK   = (1 << MILLISECOND);
+    static final int ZONE_OFFSET_MASK   = (1 << ZONE_OFFSET);
+    static final int DST_OFFSET_MASK    = (1 << DST_OFFSET);
 
     /**
      * {@code Calendar.Builder} is used for creating a {@code Calendar} from
@@ -2795,7 +2795,7 @@
      * @see #roll(int,int)
      * @see #set(int,int)
      */
-    abstract public void add(int field, int amount);
+    public abstract void add(int field, int amount);
 
     /**
      * Adds or subtracts (up/down) a single unit of time on the given time
@@ -2817,7 +2817,7 @@
      * @see Calendar#add(int,int)
      * @see Calendar#set(int,int)
      */
-    abstract public void roll(int field, boolean up);
+    public abstract void roll(int field, boolean up);
 
     /**
      * Adds the specified (signed) amount to the specified calendar field
@@ -3104,7 +3104,7 @@
      * @see #getActualMinimum(int)
      * @see #getActualMaximum(int)
      */
-    abstract public int getMinimum(int field);
+    public abstract int getMinimum(int field);
 
     /**
      * Returns the maximum value for the given calendar field of this
@@ -3121,7 +3121,7 @@
      * @see #getActualMinimum(int)
      * @see #getActualMaximum(int)
      */
-    abstract public int getMaximum(int field);
+    public abstract int getMaximum(int field);
 
     /**
      * Returns the highest minimum value for the given calendar field
@@ -3139,7 +3139,7 @@
      * @see #getActualMinimum(int)
      * @see #getActualMaximum(int)
      */
-    abstract public int getGreatestMinimum(int field);
+    public abstract int getGreatestMinimum(int field);
 
     /**
      * Returns the lowest maximum value for the given calendar field
@@ -3161,7 +3161,7 @@
      * @see #getActualMinimum(int)
      * @see #getActualMaximum(int)
      */
-    abstract public int getLeastMaximum(int field);
+    public abstract int getLeastMaximum(int field);
 
     /**
      * Returns the minimum value that the specified calendar field
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/Comparators.java
--- a/jdk/src/java.base/share/classes/java/util/Comparators.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/Comparators.java	Tue Sep 15 21:56:04 2015 -0700
@@ -61,7 +61,7 @@
     /**
      * Null-friendly comparators
      */
-    final static class NullComparator implements Comparator, Serializable {
+    static final class NullComparator implements Comparator, Serializable {
         private static final long serialVersionUID = -7569533591570686392L;
         private final boolean nullFirst;
         // if null, non-null Ts are considered equal
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/Currency.java
--- a/jdk/src/java.base/share/classes/java/util/Currency.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/Currency.java	Tue Sep 15 21:56:04 2015 -0700
@@ -110,13 +110,13 @@
      * Default fraction digits for this currency.
      * Set from currency data tables.
      */
-    transient private final int defaultFractionDigits;
+    private final transient int defaultFractionDigits;
 
     /**
      * ISO 4217 numeric code for this currency.
      * Set from currency data tables.
      */
-    transient private final int numericCode;
+    private final transient int numericCode;
 
 
     // class data: instance map
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/Date.java
--- a/jdk/src/java.base/share/classes/java/util/Date.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/Date.java	Tue Sep 15 21:56:04 2015 -0700
@@ -613,7 +613,7 @@
         // syntax error
         throw new IllegalArgumentException();
     }
-    private final static String wtb[] = {
+    private static final String wtb[] = {
         "am", "pm",
         "monday", "tuesday", "wednesday", "thursday", "friday",
         "saturday", "sunday",
@@ -622,7 +622,7 @@
         "gmt", "ut", "utc", "est", "edt", "cst", "cdt",
         "mst", "mdt", "pst", "pdt"
     };
-    private final static int ttb[] = {
+    private static final int ttb[] = {
         14, 1, 0, 0, 0, 0, 0, 0, 0,
         2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
         10000 + 0, 10000 + 0, 10000 + 0,    // GMT/UT/UTC
@@ -1300,7 +1300,7 @@
         return gcal;
     }
 
-    synchronized private static final BaseCalendar getJulianCalendar() {
+    private static final synchronized BaseCalendar getJulianCalendar() {
         if (jcal == null) {
             jcal = (BaseCalendar) CalendarSystem.forName("julian");
         }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/Dictionary.java
--- a/jdk/src/java.base/share/classes/java/util/Dictionary.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/Dictionary.java	Tue Sep 15 21:56:04 2015 -0700
@@ -60,7 +60,7 @@
      *
      * @return  the number of keys in this dictionary.
      */
-    abstract public int size();
+    public abstract int size();
 
     /**
      * Tests if this dictionary maps no keys to value. The general contract
@@ -70,7 +70,7 @@
      * @return  {@code true} if this dictionary maps no keys to values;
      *          {@code false} otherwise.
      */
-    abstract public boolean isEmpty();
+    public abstract boolean isEmpty();
 
     /**
      * Returns an enumeration of the keys in this dictionary. The general
@@ -82,7 +82,7 @@
      * @see     java.util.Dictionary#elements()
      * @see     java.util.Enumeration
      */
-    abstract public Enumeration keys();
+    public abstract Enumeration keys();
 
     /**
      * Returns an enumeration of the values in this dictionary. The general
@@ -94,7 +94,7 @@
      * @see     java.util.Dictionary#keys()
      * @see     java.util.Enumeration
      */
-    abstract public Enumeration elements();
+    public abstract Enumeration elements();
 
     /**
      * Returns the value to which the key is mapped in this dictionary.
@@ -109,7 +109,7 @@
      * @exception NullPointerException if the {@code key} is {@code null}.
      * @see     java.util.Dictionary#put(java.lang.Object, java.lang.Object)
      */
-    abstract public V get(Object key);
+    public abstract V get(Object key);
 
     /**
      * Maps the specified {@code key} to the specified
@@ -138,7 +138,7 @@
      * @see        java.lang.Object#equals(java.lang.Object)
      * @see        java.util.Dictionary#get(java.lang.Object)
      */
-    abstract public V put(K key, V value);
+    public abstract V put(K key, V value);
 
     /**
      * Removes the {@code key} (and its corresponding
@@ -151,5 +151,5 @@
      *          mapping.
      * @exception NullPointerException if {@code key} is {@code null}.
      */
-    abstract public V remove(Object key);
+    public abstract V remove(Object key);
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/GregorianCalendar.java
--- a/jdk/src/java.base/share/classes/java/util/GregorianCalendar.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/GregorianCalendar.java	Tue Sep 15 21:56:04 2015 -0700
@@ -2282,7 +2282,7 @@
      * Long.MIN_VALUE, the fixed date value is unknown. Currently,
      * Julian calendar dates are not cached.
      */
-    transient private long cachedFixedDate = Long.MIN_VALUE;
+    private transient long cachedFixedDate = Long.MIN_VALUE;
 
     /**
      * Converts the time value (millisecond offset from the Object array representing a
      * key-value pair.
      */
-    abstract protected Object[][] getContents();
+    protected abstract Object[][] getContents();
 
     // ==================privates====================
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/Locale.java
--- a/jdk/src/java.base/share/classes/java/util/Locale.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/Locale.java	Tue Sep 15 21:56:04 2015 -0700
@@ -483,91 +483,91 @@
  */
 public final class Locale implements Cloneable, Serializable {
 
-    static private final  Cache LOCALECACHE = new Cache();
+    private static final  Cache LOCALECACHE = new Cache();
 
     /** Useful constant for language.
      */
-    static public final Locale ENGLISH = createConstant("en", "");
+    public static final Locale ENGLISH = createConstant("en", "");
 
     /** Useful constant for language.
      */
-    static public final Locale FRENCH = createConstant("fr", "");
+    public static final Locale FRENCH = createConstant("fr", "");
 
     /** Useful constant for language.
      */
-    static public final Locale GERMAN = createConstant("de", "");
+    public static final Locale GERMAN = createConstant("de", "");
 
     /** Useful constant for language.
      */
-    static public final Locale ITALIAN = createConstant("it", "");
+    public static final Locale ITALIAN = createConstant("it", "");
 
     /** Useful constant for language.
      */
-    static public final Locale JAPANESE = createConstant("ja", "");
+    public static final Locale JAPANESE = createConstant("ja", "");
 
     /** Useful constant for language.
      */
-    static public final Locale KOREAN = createConstant("ko", "");
+    public static final Locale KOREAN = createConstant("ko", "");
 
     /** Useful constant for language.
      */
-    static public final Locale CHINESE = createConstant("zh", "");
+    public static final Locale CHINESE = createConstant("zh", "");
 
     /** Useful constant for language.
      */
-    static public final Locale SIMPLIFIED_CHINESE = createConstant("zh", "CN");
+    public static final Locale SIMPLIFIED_CHINESE = createConstant("zh", "CN");
 
     /** Useful constant for language.
      */
-    static public final Locale TRADITIONAL_CHINESE = createConstant("zh", "TW");
+    public static final Locale TRADITIONAL_CHINESE = createConstant("zh", "TW");
 
     /** Useful constant for country.
      */
-    static public final Locale FRANCE = createConstant("fr", "FR");
+    public static final Locale FRANCE = createConstant("fr", "FR");
 
     /** Useful constant for country.
      */
-    static public final Locale GERMANY = createConstant("de", "DE");
+    public static final Locale GERMANY = createConstant("de", "DE");
 
     /** Useful constant for country.
      */
-    static public final Locale ITALY = createConstant("it", "IT");
+    public static final Locale ITALY = createConstant("it", "IT");
 
     /** Useful constant for country.
      */
-    static public final Locale JAPAN = createConstant("ja", "JP");
+    public static final Locale JAPAN = createConstant("ja", "JP");
 
     /** Useful constant for country.
      */
-    static public final Locale KOREA = createConstant("ko", "KR");
+    public static final Locale KOREA = createConstant("ko", "KR");
 
     /** Useful constant for country.
      */
-    static public final Locale CHINA = SIMPLIFIED_CHINESE;
+    public static final Locale CHINA = SIMPLIFIED_CHINESE;
 
     /** Useful constant for country.
      */
-    static public final Locale PRC = SIMPLIFIED_CHINESE;
+    public static final Locale PRC = SIMPLIFIED_CHINESE;
 
     /** Useful constant for country.
      */
-    static public final Locale TAIWAN = TRADITIONAL_CHINESE;
+    public static final Locale TAIWAN = TRADITIONAL_CHINESE;
 
     /** Useful constant for country.
      */
-    static public final Locale UK = createConstant("en", "GB");
+    public static final Locale UK = createConstant("en", "GB");
 
     /** Useful constant for country.
      */
-    static public final Locale US = createConstant("en", "US");
+    public static final Locale US = createConstant("en", "US");
 
     /** Useful constant for country.
      */
-    static public final Locale CANADA = createConstant("en", "CA");
+    public static final Locale CANADA = createConstant("en", "CA");
 
     /** Useful constant for country.
      */
-    static public final Locale CANADA_FRENCH = createConstant("fr", "CA");
+    public static final Locale CANADA_FRENCH = createConstant("fr", "CA");
 
     /**
      * Useful constant for the root locale.  The root locale is the locale whose
@@ -577,7 +577,7 @@
      *
      * @since 1.6
      */
-    static public final Locale ROOT = createConstant("", "");
+    public static final Locale ROOT = createConstant("", "");
 
     /**
      * The key for the private use extension ('x').
@@ -586,7 +586,7 @@
      * @see Builder#setExtension(char, String)
      * @since 1.7
      */
-    static public final char PRIVATE_USE_EXTENSION = 'x';
+    public static final char PRIVATE_USE_EXTENSION = 'x';
 
     /**
      * The key for Unicode locale extension ('u').
@@ -595,7 +595,7 @@
      * @see Builder#setExtension(char, String)
      * @since 1.7
      */
-    static public final char UNICODE_LOCALE_EXTENSION = 'u';
+    public static final char UNICODE_LOCALE_EXTENSION = 'u';
 
     /** serialization ID
      */
@@ -2018,9 +2018,9 @@
      */
     private transient volatile int hashCodeValue = 0;
 
-    private volatile static Locale defaultLocale = initDefault();
-    private volatile static Locale defaultDisplayLocale = null;
-    private volatile static Locale defaultFormatLocale = null;
+    private static volatile Locale defaultLocale = initDefault();
+    private static volatile Locale defaultDisplayLocale = null;
+    private static volatile Locale defaultFormatLocale = null;
 
     private transient volatile String languageTag;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/PropertyPermission.java
--- a/jdk/src/java.base/share/classes/java/util/PropertyPermission.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/PropertyPermission.java	Tue Sep 15 21:56:04 2015 -0700
@@ -90,20 +90,20 @@
     /**
      * Read action.
      */
-    private final static int READ    = 0x1;
+    private static final int READ    = 0x1;
 
     /**
      * Write action.
      */
-    private final static int WRITE   = 0x2;
+    private static final int WRITE   = 0x2;
     /**
      * All actions (read,write);
      */
-    private final static int ALL     = READ|WRITE;
+    private static final int ALL     = READ|WRITE;
     /**
      * No actions.
      */
-    private final static int NONE    = 0x0;
+    private static final int NONE    = 0x0;
 
     /**
      * The actions mask.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/Random.java
--- a/jdk/src/java.base/share/classes/java/util/Random.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/Random.java	Tue Sep 15 21:56:04 2015 -0700
@@ -165,7 +165,7 @@
      *
      * @param seed the initial seed
      */
-    synchronized public void setSeed(long seed) {
+    public synchronized void setSeed(long seed) {
         this.seed.set(initialScramble(seed));
         haveNextNextGaussian = false;
     }
@@ -580,7 +580,7 @@
      *         standard deviation {@code 1.0} from this random number
      *         generator's sequence
      */
-    synchronized public double nextGaussian() {
+    public synchronized double nextGaussian() {
         // See Knuth, ACP, Section 3.4.1 Algorithm C.
         if (haveNextNextGaussian) {
             haveNextNextGaussian = false;
@@ -1197,7 +1197,7 @@
     /**
      * Save the {@code Random} instance to a stream.
      */
-    synchronized private void writeObject(ObjectOutputStream s)
+    private synchronized void writeObject(ObjectOutputStream s)
         throws IOException {
 
         // set the values of the Serializable fields
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java
--- a/jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java	Tue Sep 15 21:56:04 2015 -0700
@@ -1125,8 +1125,8 @@
      * be streamed out for compatibility with JDK 1.1.
      */
     private final byte monthLength[] = staticMonthLength;
-    private final static byte staticMonthLength[] = {31,28,31,30,31,30,31,31,30,31,30,31};
-    private final static byte staticLeapMonthLength[] = {31,29,31,30,31,30,31,31,30,31,30,31};
+    private static final byte staticMonthLength[] = {31,28,31,30,31,30,31,31,30,31,30,31};
+    private static final byte staticLeapMonthLength[] = {31,29,31,30,31,30,31,31,30,31,30,31};
 
     /**
      * Variables specifying the mode of the start rule.  Takes the following
@@ -1278,7 +1278,7 @@
      */
     private int serialVersionOnStream = currentSerialVersion;
 
-    synchronized private void invalidateCache() {
+    private synchronized void invalidateCache() {
         cacheYear = startYear - 1;
         cacheStart = cacheEnd = 0;
     }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/Spliterators.java
--- a/jdk/src/java.base/share/classes/java/util/Spliterators.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/Spliterators.java	Tue Sep 15 21:56:04 2015 -0700
@@ -833,7 +833,7 @@
 
     // Implementations
 
-    private static abstract class EmptySpliterator, C> {
+    private abstract static class EmptySpliterator, C> {
 
         EmptySpliterator() { }
 
@@ -1253,7 +1253,7 @@
      * @see #spliterator(Iterator, long, int)
      * @since 1.8
      */
-    public static abstract class AbstractSpliterator implements Spliterator {
+    public abstract static class AbstractSpliterator implements Spliterator {
         static final int BATCH_UNIT = 1 << 10;  // batch array size increment
         static final int MAX_BATCH = 1 << 25;  // max batch array size;
         private final int characteristics;
@@ -1376,7 +1376,7 @@
      * @see #spliterator(java.util.PrimitiveIterator.OfInt, long, int)
      * @since 1.8
      */
-    public static abstract class AbstractIntSpliterator implements Spliterator.OfInt {
+    public abstract static class AbstractIntSpliterator implements Spliterator.OfInt {
         static final int MAX_BATCH = AbstractSpliterator.MAX_BATCH;
         static final int BATCH_UNIT = AbstractSpliterator.BATCH_UNIT;
         private final int characteristics;
@@ -1486,7 +1486,7 @@
      * @see #spliterator(java.util.PrimitiveIterator.OfLong, long, int)
      * @since 1.8
      */
-    public static abstract class AbstractLongSpliterator implements Spliterator.OfLong {
+    public abstract static class AbstractLongSpliterator implements Spliterator.OfLong {
         static final int MAX_BATCH = AbstractSpliterator.MAX_BATCH;
         static final int BATCH_UNIT = AbstractSpliterator.BATCH_UNIT;
         private final int characteristics;
@@ -1596,7 +1596,7 @@
      * @see #spliterator(java.util.PrimitiveIterator.OfDouble, long, int)
      * @since 1.8
      */
-    public static abstract class AbstractDoubleSpliterator implements Spliterator.OfDouble {
+    public abstract static class AbstractDoubleSpliterator implements Spliterator.OfDouble {
         static final int MAX_BATCH = AbstractSpliterator.MAX_BATCH;
         static final int BATCH_UNIT = AbstractSpliterator.BATCH_UNIT;
         private final int characteristics;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/TimeZone.java
--- a/jdk/src/java.base/share/classes/java/util/TimeZone.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/TimeZone.java	Tue Sep 15 21:56:04 2015 -0700
@@ -130,7 +130,7 @@
  * @author       Mark Davis, David Goldsmith, Chen-Lieh Huang, Alan Liu
  * @since        1.1
  */
-abstract public class TimeZone implements Serializable, Cloneable {
+public abstract class TimeZone implements Serializable, Cloneable {
     /**
      * Sole constructor.  (For invocation by subclass constructors, typically
      * implicit.)
@@ -253,7 +253,7 @@
      *
      * @param offsetMillis the given base time zone offset to GMT.
      */
-    abstract public void setRawOffset(int offsetMillis);
+    public abstract void setRawOffset(int offsetMillis);
 
     /**
      * Returns the amount of time in milliseconds to add to UTC to get
@@ -500,7 +500,7 @@
      * @return {@code true} if the given date is in Daylight Saving Time,
      *         {@code false}, otherwise.
      */
-    abstract public boolean inDaylightTime(Date date);
+    public abstract boolean inDaylightTime(Date date);
 
     /**
      * Gets the TimeZone for the given ID.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/Timer.java
--- a/jdk/src/java.base/share/classes/java/util/Timer.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/Timer.java	Tue Sep 15 21:56:04 2015 -0700
@@ -119,7 +119,7 @@
     /**
      * This ID is used to generate thread names.
      */
-    private final static AtomicInteger nextSerialNumber = new AtomicInteger(0);
+    private static final AtomicInteger nextSerialNumber = new AtomicInteger(0);
     private static int serialNumber() {
         return nextSerialNumber.getAndIncrement();
     }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/jar/Pack200.java
--- a/jdk/src/java.base/share/classes/java/util/jar/Pack200.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/jar/Pack200.java	Tue Sep 15 21:56:04 2015 -0700
@@ -127,7 +127,7 @@
      *
      * @return  A newly allocated Packer engine.
      */
-    public synchronized static Packer newPacker() {
+    public static synchronized Packer newPacker() {
         return (Packer) newInstance(PACK_PROVIDER);
     }
 
@@ -688,7 +688,7 @@
     private static Class packerImpl;
     private static Class unpackerImpl;
 
-    private synchronized static Object newInstance(String prop) {
+    private static synchronized Object newInstance(String prop) {
         String implName = "(unknown)";
         try {
             Class impl = (PACK_PROVIDER.equals(prop))? packerImpl: unpackerImpl;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/regex/Pattern.java
--- a/jdk/src/java.base/share/classes/java/util/regex/Pattern.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/regex/Pattern.java	Tue Sep 15 21:56:04 2015 -0700
@@ -3787,7 +3787,7 @@
      * Abstract node class to match one character satisfying some
      * boolean property.
      */
-    private static abstract class CharProperty extends Node {
+    private abstract static class CharProperty extends Node {
         abstract boolean isSatisfiedBy(int ch);
         CharProperty complement() {
             return new CharProperty() {
@@ -3815,7 +3815,7 @@
      * Optimized version of CharProperty that works only for
      * properties never satisfied by Supplementary characters.
      */
-    private static abstract class BmpCharProperty extends CharProperty {
+    private abstract static class BmpCharProperty extends CharProperty {
         boolean match(Matcher matcher, int i, CharSequence seq) {
             if (i < matcher.to) {
                 return isSatisfiedBy(seq.charAt(i))
@@ -5578,7 +5578,7 @@
             return m == null ? null : m.make();
         }
 
-        private static abstract class CharPropertyFactory {
+        private abstract static class CharPropertyFactory {
             abstract CharProperty make();
         }
 
@@ -5600,7 +5600,7 @@
                     CharProperty make() { return new Ctype(ctype);}});
         }
 
-        private static abstract class CloneableProperty
+        private abstract static class CloneableProperty
             extends CharProperty implements Cloneable
         {
             public CloneableProperty clone() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/regex/UnicodeProp.java
--- a/jdk/src/java.base/share/classes/java/util/regex/UnicodeProp.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/regex/UnicodeProp.java	Tue Sep 15 21:56:04 2015 -0700
@@ -202,8 +202,8 @@
         }
     };
 
-    private final static HashMap posix = new HashMap<>();
-    private final static HashMap aliases = new HashMap<>();
+    private static final HashMap posix = new HashMap<>();
+    private static final HashMap aliases = new HashMap<>();
     static {
         posix.put("ALPHA", "ALPHABETIC");
         posix.put("LOWER", "LOWERCASE");
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/stream/FindOps.java
--- a/jdk/src/java.base/share/classes/java/util/stream/FindOps.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/stream/FindOps.java	Tue Sep 15 21:56:04 2015 -0700
@@ -167,7 +167,7 @@
      * @param  The type of input element
      * @param  The result type, typically an optional type
      */
-    private static abstract class FindSink implements TerminalSink {
+    private abstract static class FindSink implements TerminalSink {
         boolean hasValue;
         T value;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java
--- a/jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java	Tue Sep 15 21:56:04 2015 -0700
@@ -130,7 +130,7 @@
      *
      * @param  the output type of the stream pipeline
      */
-    static abstract class ForEachOp
+    abstract static class ForEachOp
             implements TerminalOp, TerminalSink {
         private final boolean ordered;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/stream/MatchOps.java
--- a/jdk/src/java.base/share/classes/java/util/stream/MatchOps.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/stream/MatchOps.java	Tue Sep 15 21:56:04 2015 -0700
@@ -249,7 +249,7 @@
      *
      * @param  The output type of the stream pipeline
      */
-    private static abstract class BooleanTerminalSink implements Sink {
+    private abstract static class BooleanTerminalSink implements Sink {
         boolean stop;
         boolean value;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/stream/Nodes.java
--- a/jdk/src/java.base/share/classes/java/util/stream/Nodes.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/stream/Nodes.java	Tue Sep 15 21:56:04 2015 -0700
@@ -562,7 +562,7 @@
 
     // Implementations
 
-    private static abstract class EmptyNode implements Node {
+    private abstract static class EmptyNode implements Node {
         EmptyNode() { }
 
         @Override
@@ -750,7 +750,7 @@
     /**
      * Node class for an internal node with two or more children
      */
-    private static abstract class AbstractConcNode> implements Node {
+    private abstract static class AbstractConcNode> implements Node {
         protected final T_NODE left;
         protected final T_NODE right;
         private final long size;
@@ -932,7 +932,7 @@
     }
 
     /** Abstract class for spliterator for all internal node classes */
-    private static abstract class InternalNodeSpliterator,
                                                           N extends Node>
             implements Spliterator {
@@ -1114,7 +1114,7 @@
             }
         }
 
-        private static abstract class OfPrimitive,
                                                   N extends Node.OfPrimitive>
                 extends InternalNodeSpliterator
@@ -1827,7 +1827,7 @@
      * This and subclasses are not intended to be serializable
      */
     @SuppressWarnings("serial")
-    private static abstract class SizedCollectorTask,
+    private abstract static class SizedCollectorTask,
                                                      K extends SizedCollectorTask>
             extends CountedCompleter
             implements Sink {
@@ -2030,7 +2030,7 @@
     }
 
     @SuppressWarnings("serial")
-    private static abstract class ToArrayTask,
+    private abstract static class ToArrayTask,
                                               K extends ToArrayTask>
             extends CountedCompleter {
         protected final T_NODE node;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java
--- a/jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java	Tue Sep 15 21:56:04 2015 -0700
@@ -797,7 +797,7 @@
     /**
      * A sink that counts elements
      */
-    static abstract class CountingSink
+    abstract static class CountingSink
             extends Box
             implements AccumulatingSink> {
         long count;
@@ -866,7 +866,7 @@
      *
      * @param  The type of the state element
      */
-    private static abstract class Box {
+    private abstract static class Box {
         U state;
 
         Box() {} // Avoid creation of special accessor
@@ -886,7 +886,7 @@
      * @param  the result type of the reducing operation
      * @param  the type of the {@code AccumulatingSink}
      */
-    private static abstract class ReduceOp>
+    private abstract static class ReduceOp>
             implements TerminalOp {
         private final StreamShape inputShape;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/stream/Sink.java
--- a/jdk/src/java.base/share/classes/java/util/stream/Sink.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/stream/Sink.java	Tue Sep 15 21:56:04 2015 -0700
@@ -241,7 +241,7 @@
      * implementation of the {@code accept()} method must call the correct
      * {@code accept()} method on the downstream {@code Sink}.
      */
-    static abstract class ChainedReference implements Sink {
+    abstract static class ChainedReference implements Sink {
         protected final Sink downstream;
 
         public ChainedReference(Sink downstream) {
@@ -273,7 +273,7 @@
      * The implementation of the {@code accept()} method must call the correct
      * {@code accept()} method on the downstream {@code Sink}.
      */
-    static abstract class ChainedInt implements Sink.OfInt {
+    abstract static class ChainedInt implements Sink.OfInt {
         protected final Sink downstream;
 
         public ChainedInt(Sink downstream) {
@@ -305,7 +305,7 @@
      * The implementation of the {@code accept()} method must call the correct
      * {@code accept()} method on the downstream {@code Sink}.
      */
-    static abstract class ChainedLong implements Sink.OfLong {
+    abstract static class ChainedLong implements Sink.OfLong {
         protected final Sink downstream;
 
         public ChainedLong(Sink downstream) {
@@ -337,7 +337,7 @@
      * The implementation of the {@code accept()} method must call the correct
      * {@code accept()} method on the downstream {@code Sink}.
      */
-    static abstract class ChainedDouble implements Sink.OfDouble {
+    abstract static class ChainedDouble implements Sink.OfDouble {
         protected final Sink downstream;
 
         public ChainedDouble(Sink downstream) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/stream/SortedOps.java
--- a/jdk/src/java.base/share/classes/java/util/stream/SortedOps.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/stream/SortedOps.java	Tue Sep 15 21:56:04 2015 -0700
@@ -301,7 +301,7 @@
      * occur, in general (not restricted to just sorting), for short-circuiting
      * parallel pipelines.
      */
-    private static abstract class AbstractRefSortingSink extends Sink.ChainedReference {
+    private abstract static class AbstractRefSortingSink extends Sink.ChainedReference {
         protected final Comparator comparator;
         // @@@ could be a lazy final value, if/when support is added
         protected boolean cancellationWasRequested;
@@ -408,7 +408,7 @@
     /**
      * Abstract {@link Sink} for implementing sort on int streams.
      */
-    private static abstract class AbstractIntSortingSink extends Sink.ChainedInt {
+    private abstract static class AbstractIntSortingSink extends Sink.ChainedInt {
         protected boolean cancellationWasRequested;
 
         AbstractIntSortingSink(Sink downstream) {
@@ -506,7 +506,7 @@
     /**
      * Abstract {@link Sink} for implementing sort on long streams.
      */
-    private static abstract class AbstractLongSortingSink extends Sink.ChainedLong {
+    private abstract static class AbstractLongSortingSink extends Sink.ChainedLong {
         protected boolean cancellationWasRequested;
 
         AbstractLongSortingSink(Sink downstream) {
@@ -604,7 +604,7 @@
     /**
      * Abstract {@link Sink} for implementing sort on long streams.
      */
-    private static abstract class AbstractDoubleSortingSink extends Sink.ChainedDouble {
+    private abstract static class AbstractDoubleSortingSink extends Sink.ChainedDouble {
         protected boolean cancellationWasRequested;
 
         AbstractDoubleSortingSink(Sink downstream) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
--- a/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java	Tue Sep 15 21:56:04 2015 -0700
@@ -57,7 +57,7 @@
      * 
A wrapping spliterator produced from a sequential stream
      * cannot be split if there are stateful operations present.
      */
-    private static abstract class AbstractWrappingSpliterator
             implements Spliterator {
 
@@ -607,7 +607,7 @@
      * {@code SUBSIZED}.
      *
      */
-    static abstract class SliceSpliterator> {
+    abstract static class SliceSpliterator> {
         // The start index of the slice
         final long sliceOrigin;
         // One past the last index of the slice
@@ -753,7 +753,7 @@
             }
         }
 
-        static abstract class OfPrimitive,
                 T_CONS>
                 extends SliceSpliterator
@@ -899,7 +899,7 @@
      * collected to a {@code Node}. It is the order of the pipeline stage
      * that governs whether the this slice spliterator is to be used or not.
      */
-    static abstract class UnorderedSliceSpliterator> {
+    abstract static class UnorderedSliceSpliterator> {
         static final int CHUNK_SIZE = 1 << 7;
 
         // The spliterator to slice
@@ -1060,7 +1060,7 @@
          * @param  the type of the spined buffer. Must also be a type of
          *        {@code T_CONS}.
          */
-        static abstract class OfPrimitive<
+        abstract static class OfPrimitive<
                 T,
                 T_CONS,
                 T_BUFF extends ArrayBuffer.OfPrimitive,
@@ -1324,7 +1324,7 @@
      * The {@code tryAdvance} method always returns true.
      *
      */
-    static abstract class InfiniteSupplyingSpliterator implements Spliterator {
+    abstract static class InfiniteSupplyingSpliterator implements Spliterator {
         long estimate;
 
         protected InfiniteSupplyingSpliterator(long estimate) {
@@ -1442,7 +1442,7 @@
     }
 
     // @@@ Consolidate with Node.Builder
-    static abstract class ArrayBuffer {
+    abstract static class ArrayBuffer {
         int index;
 
         void reset() {
@@ -1470,7 +1470,7 @@
             }
         }
 
-        static abstract class OfPrimitive extends ArrayBuffer {
+        abstract static class OfPrimitive extends ArrayBuffer {
             int index;
 
             @Override
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/stream/Streams.java
--- a/jdk/src/java.base/share/classes/java/util/stream/Streams.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/stream/Streams.java	Tue Sep 15 21:56:04 2015 -0700
@@ -298,7 +298,7 @@
         }
     }
 
-    private static abstract class AbstractStreamBuilderImpl> implements Spliterator {
+    private abstract static class AbstractStreamBuilderImpl> implements Spliterator {
         // >= 0 when building, < 0 when built
         // -1 == no elements
         // -2 == one element, held by first
@@ -782,7 +782,7 @@
             }
         }
 
-        private static abstract class OfPrimitive>
+        private abstract static class OfPrimitive>
                 extends ConcatSpliterator
                 implements Spliterator.OfPrimitive {
             private OfPrimitive(T_SPLITR aSpliterator, T_SPLITR bSpliterator) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/stream/WhileOps.java
--- a/jdk/src/java.base/share/classes/java/util/stream/WhileOps.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/stream/WhileOps.java	Tue Sep 15 21:56:04 2015 -0700
@@ -649,7 +649,7 @@
      * @param  the type of elements returned by this spliterator
      * @param  the type of the spliterator
      */
-    static abstract class UnorderedWhileSpliterator> implements Spliterator {
+    abstract static class UnorderedWhileSpliterator> implements Spliterator {
         // Power of two constant minus one used for modulus of count
         static final int CANCEL_CHECK_COUNT = (1 << 6) - 1;
 
@@ -715,7 +715,7 @@
 
         abstract T_SPLITR makeSpliterator(T_SPLITR s);
 
-        static abstract class OfRef extends UnorderedWhileSpliterator> implements Consumer {
+        abstract static class OfRef extends UnorderedWhileSpliterator> implements Consumer {
             final Predicate p;
             T t;
 
@@ -820,7 +820,7 @@
             }
         }
 
-        static abstract class OfInt extends UnorderedWhileSpliterator implements IntConsumer, Spliterator.OfInt {
+        abstract static class OfInt extends UnorderedWhileSpliterator implements IntConsumer, Spliterator.OfInt {
             final IntPredicate p;
             int t;
 
@@ -925,7 +925,7 @@
             }
         }
 
-        static abstract class OfLong extends UnorderedWhileSpliterator implements LongConsumer, Spliterator.OfLong {
+        abstract static class OfLong extends UnorderedWhileSpliterator implements LongConsumer, Spliterator.OfLong {
             final LongPredicate p;
             long t;
 
@@ -1030,7 +1030,7 @@
             }
         }
 
-        static abstract class OfDouble extends UnorderedWhileSpliterator implements DoubleConsumer, Spliterator.OfDouble {
+        abstract static class OfDouble extends UnorderedWhileSpliterator implements DoubleConsumer, Spliterator.OfDouble {
             final DoublePredicate p;
             double t;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/zip/Adler32.java
--- a/jdk/src/java.base/share/classes/java/util/zip/Adler32.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/zip/Adler32.java	Tue Sep 15 21:56:04 2015 -0700
@@ -127,12 +127,12 @@
         return (long)adler & 0xffffffffL;
     }
 
-    private native static int update(int adler, int b);
+    private static native int update(int adler, int b);
 
     @HotSpotIntrinsicCandidate
-    private native static int updateBytes(int adler, byte[] b, int off,
+    private static native int updateBytes(int adler, byte[] b, int off,
                                           int len);
     @HotSpotIntrinsicCandidate
-    private native static int updateByteBuffer(int adler, long addr,
+    private static native int updateByteBuffer(int adler, long addr,
                                                int off, int len);
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/zip/CRC32.java
--- a/jdk/src/java.base/share/classes/java/util/zip/CRC32.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/zip/CRC32.java	Tue Sep 15 21:56:04 2015 -0700
@@ -127,7 +127,7 @@
     }
 
     @HotSpotIntrinsicCandidate
-    private native static int update(int crc, int b);
+    private static native int update(int crc, int b);
 
     private static int updateBytes(int crc, byte[] b, int off, int len) {
         updateBytesCheck(b, off, len);
@@ -135,7 +135,7 @@
     }
 
     @HotSpotIntrinsicCandidate
-    private native static int updateBytes0(int crc, byte[] b, int off, int len);
+    private static native int updateBytes0(int crc, byte[] b, int off, int len);
 
     private static void updateBytesCheck(byte[] b, int off, int len) {
         if (len <= 0) {
@@ -161,7 +161,7 @@
     }
 
     @HotSpotIntrinsicCandidate
-    private native static int updateByteBuffer0(int alder, long addr,
+    private static native int updateByteBuffer0(int alder, long addr,
                                                 int off, int len);
 
     private static void updateByteBufferCheck(long addr) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/zip/Deflater.java
--- a/jdk/src/java.base/share/classes/java/util/zip/Deflater.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/zip/Deflater.java	Tue Sep 15 21:56:04 2015 -0700
@@ -558,11 +558,11 @@
     }
 
     private static native void initIDs();
-    private native static long init(int level, int strategy, boolean nowrap);
-    private native static void setDictionary(long addr, byte[] b, int off, int len);
+    private static native long init(int level, int strategy, boolean nowrap);
+    private static native void setDictionary(long addr, byte[] b, int off, int len);
     private native int deflateBytes(long addr, byte[] b, int off, int len,
                                     int flush);
-    private native static int getAdler(long addr);
-    private native static void reset(long addr);
-    private native static void end(long addr);
+    private static native int getAdler(long addr);
+    private static native void reset(long addr);
+    private static native void end(long addr);
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java
--- a/jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -142,16 +142,16 @@
     /**
      * GZIP header magic number.
      */
-    public final static int GZIP_MAGIC = 0x8b1f;
+    public static final int GZIP_MAGIC = 0x8b1f;
 
     /*
      * File header flags.
      */
-    private final static int FTEXT      = 1;    // Extra text
-    private final static int FHCRC      = 2;    // Header CRC
-    private final static int FEXTRA     = 4;    // Extra field
-    private final static int FNAME      = 8;    // File name
-    private final static int FCOMMENT   = 16;   // File comment
+    private static final int FTEXT      = 1;    // Extra text
+    private static final int FHCRC      = 2;    // Header CRC
+    private static final int FEXTRA     = 4;    // Extra field
+    private static final int FNAME      = 8;    // File name
+    private static final int FCOMMENT   = 16;   // File comment
 
     /*
      * Reads GZIP member header and returns the total byte number
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java
--- a/jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -44,13 +44,13 @@
     /*
      * GZIP header magic number.
      */
-    private final static int GZIP_MAGIC = 0x8b1f;
+    private static final int GZIP_MAGIC = 0x8b1f;
 
     /*
      * Trailer size in bytes.
      *
      */
-    private final static int TRAILER_SIZE = 8;
+    private static final int TRAILER_SIZE = 8;
 
     /**
      * Creates a new output stream with the specified buffer size.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/java/util/zip/Inflater.java
--- a/jdk/src/java.base/share/classes/java/util/zip/Inflater.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/util/zip/Inflater.java	Tue Sep 15 21:56:04 2015 -0700
@@ -395,13 +395,13 @@
         }
     }
 
-    private native static void initIDs();
-    private native static long init(boolean nowrap);
-    private native static void setDictionary(long addr, byte[] b, int off,
+    private static native void initIDs();
+    private static native long init(boolean nowrap);
+    private static native void setDictionary(long addr, byte[] b, int off,
                                              int len);
     private native int inflateBytes(long addr, byte[] b, int off, int len)
             throws DataFormatException;
-    private native static int getAdler(long addr);
-    private native static void reset(long addr);
-    private native static void end(long addr);
+    private static native int getAdler(long addr);
+    private static native void reset(long addr);
+    private static native void end(long addr);
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/javax/crypto/Cipher.java
--- a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java	Tue Sep 15 21:56:04 2015 -0700
@@ -336,15 +336,15 @@
     }
 
     // Provider attribute name for supported chaining mode
-    private final static String ATTR_MODE = "SupportedModes";
+    private static final String ATTR_MODE = "SupportedModes";
     // Provider attribute name for supported padding names
-    private final static String ATTR_PAD  = "SupportedPaddings";
+    private static final String ATTR_PAD  = "SupportedPaddings";
 
     // constants indicating whether the provider supports
     // a given mode or padding
-    private final static int S_NO    = 0;       // does not support
-    private final static int S_MAYBE = 1;       // unable to determine
-    private final static int S_YES   = 2;       // does support
+    private static final int S_NO    = 0;       // does not support
+    private static final int S_MAYBE = 1;       // unable to determine
+    private static final int S_YES   = 2;       // does support
 
     /**
      * Nested class to deal with modes and paddings.
@@ -410,7 +410,7 @@
         }
 
         // ConcurrentMap for previously compiled patterns
-        private final static ConcurrentMap patternCache =
+        private static final ConcurrentMap patternCache =
             new ConcurrentHashMap();
 
         private static boolean matches(String regexp, String str) {
@@ -787,10 +787,10 @@
         }
     }
 
-    private final static int I_KEY       = 1;
-    private final static int I_PARAMSPEC = 2;
-    private final static int I_PARAMS    = 3;
-    private final static int I_CERT      = 4;
+    private static final int I_KEY       = 1;
+    private static final int I_PARAMSPEC = 2;
+    private static final int I_PARAMS    = 3;
+    private static final int I_CERT      = 4;
 
     private void implInit(CipherSpi thisSpi, int type, int opmode, Key key,
             AlgorithmParameterSpec paramSpec, AlgorithmParameters params,
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java
--- a/jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java	Tue Sep 15 21:56:04 2015 -0700
@@ -57,11 +57,11 @@
     // Map of the providers we already have verified
     // value == PROVIDER_VERIFIED is successfully verified
     // value is failure cause Exception in error case
-    private final static Map verificationResults =
+    private static final Map verificationResults =
             new IdentityHashMap<>();
 
     // Map of the providers currently being verified
-    private final static Map verifyingProviders =
+    private static final Map verifyingProviders =
             new IdentityHashMap<>();
 
     // Set the default value. May be changed in the static initializer.
@@ -162,7 +162,7 @@
         pv.verify();
     }
 
-    private final static Object PROVIDER_VERIFIED = Boolean.TRUE;
+    private static final Object PROVIDER_VERIFIED = Boolean.TRUE;
 
     /*
      * Verify that the provider JAR files are signed properly, which
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java
--- a/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java	Tue Sep 15 21:56:04 2015 -0700
@@ -336,8 +336,8 @@
         }
     }
 
-    private final static int I_NO_PARAMS = 1;
-    private final static int I_PARAMS    = 2;
+    private static final int I_NO_PARAMS = 1;
+    private static final int I_PARAMS    = 2;
 
     private void implInit(KeyAgreementSpi spi, int type, Key key,
             AlgorithmParameterSpec params, SecureRandom random)
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java
--- a/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -116,10 +116,10 @@
 
     // see java.security.KeyPairGenerator for failover notes
 
-    private final static int I_NONE   = 1;
-    private final static int I_RANDOM = 2;
-    private final static int I_PARAMS = 3;
-    private final static int I_SIZE   = 4;
+    private static final int I_NONE   = 1;
+    private static final int I_RANDOM = 2;
+    private static final int I_PARAMS = 3;
+    private static final int I_SIZE   = 4;
 
     // The provider
     private Provider provider;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java
--- a/jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java	Tue Sep 15 21:56:04 2015 -0700
@@ -52,7 +52,7 @@
  *
  * @since 1.4
  */
-abstract public
+public abstract
 class HttpsURLConnection extends HttpURLConnection
 {
     /**
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java
--- a/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java	Tue Sep 15 21:56:04 2015 -0700
@@ -61,7 +61,7 @@
      *          {@code ssl.KeyManagerFactory.algorithm} security property, or an
      *          implementation-specific default if no such property exists.
      */
-    public final static String getDefaultAlgorithm() {
+    public static final String getDefaultAlgorithm() {
         String type;
         type = AccessController.doPrivileged(new PrivilegedAction<>() {
             @Override
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java
--- a/jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java	Tue Sep 15 21:56:04 2015 -0700
@@ -321,7 +321,7 @@
         }
     }
 
-    private final static class SNIHostNameMatcher extends SNIMatcher {
+    private static final class SNIHostNameMatcher extends SNIMatcher {
 
         // the compiled representation of a regular expression.
         private final Pattern pattern;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java
--- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java	Tue Sep 15 21:56:04 2015 -0700
@@ -243,7 +243,7 @@
      *
      * @return  the return value
      */
-    final public Status getStatus() {
+    public final Status getStatus() {
         return status;
     }
 
@@ -253,7 +253,7 @@
      *
      * @return  the handshake status
      */
-    final public HandshakeStatus getHandshakeStatus() {
+    public final HandshakeStatus getHandshakeStatus() {
         return handshakeStatus;
     }
 
@@ -262,7 +262,7 @@
      *
      * @return  the number of bytes consumed.
      */
-    final public int bytesConsumed() {
+    public final int bytesConsumed() {
         return bytesConsumed;
     }
 
@@ -271,7 +271,7 @@
      *
      * @return  the number of bytes produced
      */
-    final public int bytesProduced() {
+    public final int bytesProduced() {
         return bytesProduced;
     }
 
@@ -306,7 +306,7 @@
      *
      * @since   9
      */
-    final public long sequenceNumber() {
+    public final long sequenceNumber() {
         return sequenceNumber;
     }
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
--- a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java	Tue Sep 15 21:56:04 2015 -0700
@@ -73,7 +73,7 @@
      * {@code ssl.TrustManagerFactory.algorithm} security property, or an
      * implementation-specific default if no such property exists.
      */
-    public final static String getDefaultAlgorithm() {
+    public static final String getDefaultAlgorithm() {
         String type;
         type = AccessController.doPrivileged(new PrivilegedAction<>() {
             @Override
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/javax/security/auth/Policy.java
--- a/jdk/src/java.base/share/classes/javax/security/auth/Policy.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/javax/security/auth/Policy.java	Tue Sep 15 21:56:04 2015 -0700
@@ -159,7 +159,7 @@
 public abstract class Policy {
 
     private static Policy policy;
-    private final static String AUTH_POLICY =
+    private static final String AUTH_POLICY =
         "sun.security.provider.AuthPolicyFile";
 
     private final java.security.AccessControlContext acc =
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java	Tue Sep 15 21:56:04 2015 -0700
@@ -35,7 +35,7 @@
     public static final String BOOT_NAME = "bootmodules";
     public static final String BOOT_IMAGE_NAME = BOOT_NAME + IMAGE_EXT;
 
-    private final static int RETRY_LIMIT = 1000;
+    private static final int RETRY_LIMIT = 1000;
 
     private ByteOrder byteOrder;
     private ImageStringsWriter strings;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java	Tue Sep 15 21:56:04 2015 -0700
@@ -26,15 +26,15 @@
 package jdk.internal.jimage;
 
 public class ImageLocationBase {
-    final static int ATTRIBUTE_END = 0;
-    final static int ATTRIBUTE_MODULE = 1;
-    final static int ATTRIBUTE_PARENT = 2;
-    final static int ATTRIBUTE_BASE = 3;
-    final static int ATTRIBUTE_EXTENSION = 4;
-    final static int ATTRIBUTE_OFFSET = 5;
-    final static int ATTRIBUTE_COMPRESSED = 6;
-    final static int ATTRIBUTE_UNCOMPRESSED = 7;
-    final static int ATTRIBUTE_COUNT = 8;
+    static final int ATTRIBUTE_END = 0;
+    static final int ATTRIBUTE_MODULE = 1;
+    static final int ATTRIBUTE_PARENT = 2;
+    static final int ATTRIBUTE_BASE = 3;
+    static final int ATTRIBUTE_EXTENSION = 4;
+    static final int ATTRIBUTE_OFFSET = 5;
+    static final int ATTRIBUTE_COMPRESSED = 6;
+    static final int ATTRIBUTE_UNCOMPRESSED = 7;
+    static final int ATTRIBUTE_COUNT = 8;
 
     protected final long[] attributes;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java	Tue Sep 15 21:56:04 2015 -0700
@@ -63,19 +63,19 @@
  *        Offset to package name in string table
  */
 
-final public class ImageModuleData {
-    public final static String META_DATA_EXTENSION = ".jdata";
-    public final static String SEPARATOR = "\t";
-    public final static int NOT_FOUND = -1;
-    private final static int ptmCountOffset = 0;
-    private final static int mtpCountOffset = 1;
-    private final static int ptmRedirectOffset = 2;
-    private final static int dataNameOffset = 0;
-    private final static int ptmDataWidth = 2;
-    private final static int ptmDataModuleOffset = 1;
-    private final static int mtpDataWidth = 3;
-    private final static int mtpDataCountOffset = 1;
-    private final static int mtpDataOffsetOffset = 2;
+public final class ImageModuleData {
+    public static final String META_DATA_EXTENSION = ".jdata";
+    public static final String SEPARATOR = "\t";
+    public static final int NOT_FOUND = -1;
+    private static final int ptmCountOffset = 0;
+    private static final int mtpCountOffset = 1;
+    private static final int ptmRedirectOffset = 2;
+    private static final int dataNameOffset = 0;
+    private static final int ptmDataWidth = 2;
+    private static final int ptmDataModuleOffset = 1;
+    private static final int mtpDataWidth = 3;
+    private static final int mtpDataCountOffset = 1;
+    private static final int mtpDataOffsetOffset = 2;
 
     private final BasicImageReader reader;
     private final IntBuffer intBuffer;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java	Tue Sep 15 21:56:04 2015 -0700
@@ -49,32 +49,32 @@
     private final long indexAddress;
     private final long dataAddress;
 
-    native static long openImage(String imagePath, boolean bigEndian);
-    native static void closeImage(long id);
-    native static long getIndexAddress(long id);
-    native static long getDataAddress(long id);
-    native static boolean readCompressed(long id, long offset,
+    static native long openImage(String imagePath, boolean bigEndian);
+    static native void closeImage(long id);
+    static native long getIndexAddress(long id);
+    static native long getDataAddress(long id);
+    static native boolean readCompressed(long id, long offset,
             ByteBuffer compressedBuffer, long compressedSize,
             ByteBuffer uncompressedBuffer, long uncompressedSize);
-    native static boolean read(long id, long offset,
+    static native boolean read(long id, long offset,
             ByteBuffer uncompressedBuffer, long uncompressedSize);
-    native static byte[] getStringBytes(long id, int offset);
-    native static long[] getAttributes(long id, int offset);
-    native static long[] findAttributes(long id, byte[] path);
-    native static int[] attributeOffsets(long id);
+    static native byte[] getStringBytes(long id, int offset);
+    static native long[] getAttributes(long id, int offset);
+    static native long[] findAttributes(long id, byte[] path);
+    static native int[] attributeOffsets(long id);
 
-    public native static long JIMAGE_Open(String path) throws IOException;
-    public native static void JIMAGE_Close(long jimageHandle);
-    public native static long JIMAGE_FindResource(long jimageHandle,
+    public static native long JIMAGE_Open(String path) throws IOException;
+    public static native void JIMAGE_Close(long jimageHandle);
+    public static native long JIMAGE_FindResource(long jimageHandle,
                     String moduleName, String Version, String path,
                     long[] size);
-    public native static long JIMAGE_GetResource(long jimageHandle,
+    public static native long JIMAGE_GetResource(long jimageHandle,
                     long locationHandle, byte[] buffer, long size);
     // Get an array of names that match; return the count found upto array size
-    public native static int JIMAGE_Resources(long jimageHandle,
+    public static native int JIMAGE_Resources(long jimageHandle,
                     String[] outputNames);
     // Return the module name for the package
-    public native static String JIMAGE_PackageToModule(long imageHandle,
+    public static native String JIMAGE_PackageToModule(long imageHandle,
                     String packageName);
 
     static ByteBuffer newDirectByteBuffer(long address, long capacity) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java	Tue Sep 15 21:56:04 2015 -0700
@@ -129,7 +129,7 @@
     // jimage file does not store directory structure. We build nodes
     // using the "path" strings found in the jimage file.
     // Node can be a directory or a resource
-    public static abstract class Node {
+    public abstract static class Node {
         private static final int ROOT_DIR = 0b0000_0000_0000_0001;
         private static final int PACKAGES_DIR = 0b0000_0000_0000_0010;
         private static final int MODULES_DIR = 0b0000_0000_0000_0100;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -33,7 +33,7 @@
 import java.util.Map;
 
 public class PerfectHashBuilder {
-    private final static int RETRY_LIMIT = 1000;
+    private static final int RETRY_LIMIT = 1000;
 
     private Class entryComponent;
     private Class bucketComponent;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
--- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java	Tue Sep 15 21:56:04 2015 -0700
@@ -71,25 +71,25 @@
      * A type path step that steps into the element type of an array type. See
      * {@link #getStep getStep}.
      */
-    public final static int ARRAY_ELEMENT = 0;
+    public static final int ARRAY_ELEMENT = 0;
 
     /**
      * A type path step that steps into the nested type of a class type. See
      * {@link #getStep getStep}.
      */
-    public final static int INNER_TYPE = 1;
+    public static final int INNER_TYPE = 1;
 
     /**
      * A type path step that steps into the bound of a wildcard type. See
      * {@link #getStep getStep}.
      */
-    public final static int WILDCARD_BOUND = 2;
+    public static final int WILDCARD_BOUND = 2;
 
     /**
      * A type path step that steps into a type argument of a generic type. See
      * {@link #getStep getStep}.
      */
-    public final static int TYPE_ARGUMENT = 3;
+    public static final int TYPE_ARGUMENT = 3;
 
     /**
      * The byte array where the path is stored, in Java class file format.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
--- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java	Tue Sep 15 21:56:04 2015 -0700
@@ -74,133 +74,133 @@
      * The sort of type references that target a type parameter of a generic
      * class. See {@link #getSort getSort}.
      */
-    public final static int CLASS_TYPE_PARAMETER = 0x00;
+    public static final int CLASS_TYPE_PARAMETER = 0x00;
 
     /**
      * The sort of type references that target a type parameter of a generic
      * method. See {@link #getSort getSort}.
      */
-    public final static int METHOD_TYPE_PARAMETER = 0x01;
+    public static final int METHOD_TYPE_PARAMETER = 0x01;
 
     /**
      * The sort of type references that target the super class of a class or one
      * of the interfaces it implements. See {@link #getSort getSort}.
      */
-    public final static int CLASS_EXTENDS = 0x10;
+    public static final int CLASS_EXTENDS = 0x10;
 
     /**
      * The sort of type references that target a bound of a type parameter of a
      * generic class. See {@link #getSort getSort}.
      */
-    public final static int CLASS_TYPE_PARAMETER_BOUND = 0x11;
+    public static final int CLASS_TYPE_PARAMETER_BOUND = 0x11;
 
     /**
      * The sort of type references that target a bound of a type parameter of a
      * generic method. See {@link #getSort getSort}.
      */
-    public final static int METHOD_TYPE_PARAMETER_BOUND = 0x12;
+    public static final int METHOD_TYPE_PARAMETER_BOUND = 0x12;
 
     /**
      * The sort of type references that target the type of a field. See
      * {@link #getSort getSort}.
      */
-    public final static int FIELD = 0x13;
+    public static final int FIELD = 0x13;
 
     /**
      * The sort of type references that target the return type of a method. See
      * {@link #getSort getSort}.
      */
-    public final static int METHOD_RETURN = 0x14;
+    public static final int METHOD_RETURN = 0x14;
 
     /**
      * The sort of type references that target the receiver type of a method.
      * See {@link #getSort getSort}.
      */
-    public final static int METHOD_RECEIVER = 0x15;
+    public static final int METHOD_RECEIVER = 0x15;
 
     /**
      * The sort of type references that target the type of a formal parameter of
      * a method. See {@link #getSort getSort}.
      */
-    public final static int METHOD_FORMAL_PARAMETER = 0x16;
+    public static final int METHOD_FORMAL_PARAMETER = 0x16;
 
     /**
      * The sort of type references that target the type of an exception declared
      * in the throws clause of a method. See {@link #getSort getSort}.
      */
-    public final static int THROWS = 0x17;
+    public static final int THROWS = 0x17;
 
     /**
      * The sort of type references that target the type of a local variable in a
      * method. See {@link #getSort getSort}.
      */
-    public final static int LOCAL_VARIABLE = 0x40;
+    public static final int LOCAL_VARIABLE = 0x40;
 
     /**
      * The sort of type references that target the type of a resource variable
      * in a method. See {@link #getSort getSort}.
      */
-    public final static int RESOURCE_VARIABLE = 0x41;
+    public static final int RESOURCE_VARIABLE = 0x41;
 
     /**
      * The sort of type references that target the type of the exception of a
      * 'catch' clause in a method. See {@link #getSort getSort}.
      */
-    public final static int EXCEPTION_PARAMETER = 0x42;
+    public static final int EXCEPTION_PARAMETER = 0x42;
 
     /**
      * The sort of type references that target the type declared in an
      * 'instanceof' instruction. See {@link #getSort getSort}.
      */
-    public final static int INSTANCEOF = 0x43;
+    public static final int INSTANCEOF = 0x43;
 
     /**
      * The sort of type references that target the type of the object created by
      * a 'new' instruction. See {@link #getSort getSort}.
      */
-    public final static int NEW = 0x44;
+    public static final int NEW = 0x44;
 
     /**
      * The sort of type references that target the receiver type of a
      * constructor reference. See {@link #getSort getSort}.
      */
-    public final static int CONSTRUCTOR_REFERENCE = 0x45;
+    public static final int CONSTRUCTOR_REFERENCE = 0x45;
 
     /**
      * The sort of type references that target the receiver type of a method
      * reference. See {@link #getSort getSort}.
      */
-    public final static int METHOD_REFERENCE = 0x46;
+    public static final int METHOD_REFERENCE = 0x46;
 
     /**
      * The sort of type references that target the type declared in an explicit
      * or implicit cast instruction. See {@link #getSort getSort}.
      */
-    public final static int CAST = 0x47;
+    public static final int CAST = 0x47;
 
     /**
      * The sort of type references that target a type parameter of a generic
      * constructor in a constructor call. See {@link #getSort getSort}.
      */
-    public final static int CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT = 0x48;
+    public static final int CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT = 0x48;
 
     /**
      * The sort of type references that target a type parameter of a generic
      * method in a method call. See {@link #getSort getSort}.
      */
-    public final static int METHOD_INVOCATION_TYPE_ARGUMENT = 0x49;
+    public static final int METHOD_INVOCATION_TYPE_ARGUMENT = 0x49;
 
     /**
      * The sort of type references that target a type parameter of a generic
      * constructor in a constructor reference. See {@link #getSort getSort}.
      */
-    public final static int CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT = 0x4A;
+    public static final int CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT = 0x4A;
 
     /**
      * The sort of type references that target a type parameter of a generic
      * method in a method reference. See {@link #getSort getSort}.
      */
-    public final static int METHOD_REFERENCE_TYPE_ARGUMENT = 0x4B;
+    public static final int METHOD_REFERENCE_TYPE_ARGUMENT = 0x4B;
 
     /**
      * The type reference value in Java class file format.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
--- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java	Tue Sep 15 21:56:04 2015 -0700
@@ -73,7 +73,7 @@
  */
 public class InstructionAdapter extends MethodVisitor {
 
-    public final static Type OBJECT_TYPE = Type.getType("Ljava/lang/Object;");
+    public static final Type OBJECT_TYPE = Type.getType("Ljava/lang/Object;");
 
     /**
      * Creates a new {@link InstructionAdapter}. Subclasses must not use this
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
--- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java	Tue Sep 15 21:56:04 2015 -0700
@@ -88,17 +88,17 @@
     /**
      * Wildcard for an "extends" type argument.
      */
-    public final static char EXTENDS = '+';
+    public static final char EXTENDS = '+';
 
     /**
      * Wildcard for a "super" type argument.
      */
-    public final static char SUPER = '-';
+    public static final char SUPER = '-';
 
     /**
      * Wildcard for a normal type argument.
      */
-    public final static char INSTANCEOF = '=';
+    public static final char INSTANCEOF = '=';
 
     /**
      * The ASM API version implemented by this visitor. The value of this field
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
--- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java	Tue Sep 15 21:56:04 2015 -0700
@@ -135,8 +135,8 @@
     ////////////////////////////////////////////////////////////////////
     // Validate while parsing
     ////////////////////////////////////////////////////////////////////
-    final static String ALLOWED_ELEMENTS = "properties, comment, entry";
-    final static String ALLOWED_COMMENT = "comment";
+    static final String ALLOWED_ELEMENTS = "properties, comment, entry";
+    static final String ALLOWED_COMMENT = "comment";
     ////////////////////////////////////////////////////////////////////
     // Handler methods
     ////////////////////////////////////////////////////////////////////
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java
--- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java	Tue Sep 15 21:56:04 2015 -0700
@@ -36,8 +36,8 @@
 public  interface XMLStreamWriter {
 
     //Defaults the XML version to 1.0, and the encoding to utf-8
-    public final static String DEFAULT_XML_VERSION = "1.0";
-    public final static String DEFAULT_ENCODING = "UTF-8";
+    public static final String DEFAULT_XML_VERSION = "1.0";
+    public static final String DEFAULT_ENCODING = "UTF-8";
 
     /**
      * Writes a start tag to the output.  All writeStartElement methods
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
--- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java	Tue Sep 15 21:56:04 2015 -0700
@@ -40,13 +40,13 @@
  */
 public abstract class Parser {
 
-    public final static String FAULT = "";
-    protected final static int BUFFSIZE_READER = 512;
-    protected final static int BUFFSIZE_PARSER = 128;
+    public static final String FAULT = "";
+    protected static final int BUFFSIZE_READER = 512;
+    protected static final int BUFFSIZE_PARSER = 128;
     /**
      * The end of stream character.
      */
-    public final static char EOS = 0xffff;
+    public static final char EOS = 0xffff;
     private Pair mNoNS; // there is no namespace
     private Pair mXml;  // the xml namespace
     private Map mEnt;  // the entities look up table
@@ -55,26 +55,26 @@
     protected boolean mIsSAloneSet;  // standalone is explicitely set
     protected boolean mIsNSAware;    // if true - namespace aware mode
     protected int mPh;  // current phase of document processing
-    protected final static int PH_BEFORE_DOC = -1;  // before parsing
-    protected final static int PH_DOC_START = 0;   // document start
-    protected final static int PH_MISC_DTD = 1;   // misc before DTD
-    protected final static int PH_DTD = 2;   // DTD
-    protected final static int PH_DTD_MISC = 3;   // misc after DTD
-    protected final static int PH_DOCELM = 4;   // document's element
-    protected final static int PH_DOCELM_MISC = 5;   // misc after element
-    protected final static int PH_AFTER_DOC = 6;   // after parsing
+    protected static final int PH_BEFORE_DOC = -1;  // before parsing
+    protected static final int PH_DOC_START = 0;   // document start
+    protected static final int PH_MISC_DTD = 1;   // misc before DTD
+    protected static final int PH_DTD = 2;   // DTD
+    protected static final int PH_DTD_MISC = 3;   // misc after DTD
+    protected static final int PH_DOCELM = 4;   // document's element
+    protected static final int PH_DOCELM_MISC = 5;   // misc after element
+    protected static final int PH_AFTER_DOC = 6;   // after parsing
     protected int mEvt;  // current event type
-    protected final static int EV_NULL = 0;   // unknown
-    protected final static int EV_ELM = 1;   // empty element
-    protected final static int EV_ELMS = 2;   // start element
-    protected final static int EV_ELME = 3;   // end element
-    protected final static int EV_TEXT = 4;   // textual content
-    protected final static int EV_WSPC = 5;   // white space content
-    protected final static int EV_PI = 6;   // processing instruction
-    protected final static int EV_CDAT = 7;   // character data
-    protected final static int EV_COMM = 8;   // comment
-    protected final static int EV_DTD = 9;   // document type definition
-    protected final static int EV_ENT = 10;  // skipped entity
+    protected static final int EV_NULL = 0;   // unknown
+    protected static final int EV_ELM = 1;   // empty element
+    protected static final int EV_ELMS = 2;   // start element
+    protected static final int EV_ELME = 3;   // end element
+    protected static final int EV_TEXT = 4;   // textual content
+    protected static final int EV_WSPC = 5;   // white space content
+    protected static final int EV_PI = 6;   // processing instruction
+    protected static final int EV_CDAT = 7;   // character data
+    protected static final int EV_COMM = 8;   // comment
+    protected static final int EV_DTD = 9;   // document type definition
+    protected static final int EV_ENT = 10;  // skipped entity
     private char mESt; // built-in entity recognizer state
     // mESt values:
     //   0x100   : the initial state
@@ -120,9 +120,9 @@
     /**
      * Default prefixes
      */
-    private final static char NONS[];
-    private final static char XML[];
-    private final static char XMLNS[];
+    private static final char NONS[];
+    private static final char XML[];
+    private static final char XMLNS[];
 
     static {
         NONS = new char[1];
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java
--- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java	Tue Sep 15 21:56:04 2015 -0700
@@ -56,9 +56,9 @@
 final class ParserSAX
     extends Parser implements XMLReader, Locator
 {
-    public final static String FEATURE_NS =
+    public static final String FEATURE_NS =
             "http://xml.org/sax/features/namespaces";
-    public final static String FEATURE_PREF =
+    public static final String FEATURE_PREF =
             "http://xml.org/sax/features/namespace-prefixes";
     //          SAX feature flags
     private boolean mFNamespaces;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/jdk/net/Sockets.java
--- a/jdk/src/java.base/share/classes/jdk/net/Sockets.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/jdk/net/Sockets.java	Tue Sep 15 21:56:04 2015 -0700
@@ -58,7 +58,7 @@
 @jdk.Exported
 public class Sockets {
 
-    private final static HashMap,Set>>
+    private static final HashMap,Set>>
         options = new HashMap<>();
 
     static {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java
--- a/jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java	Tue Sep 15 21:56:04 2015 -0700
@@ -192,7 +192,7 @@
     private static sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
     // preceding line requires that this class be on the boot class path
 
-    static private final Method defineAnonymousClass;
+    private static final Method defineAnonymousClass;
     static {
         Method dac = null;
         Class unsafeClass = unsafe.getClass();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java
--- a/jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java	Tue Sep 15 21:56:04 2015 -0700
@@ -411,7 +411,7 @@
         patchArray[index] = addSemis(className, memberName, signature);
     }
 
-    static private final int CONSTANT_MemberRef_MASK =
+    private static final int CONSTANT_MemberRef_MASK =
               CONSTANT_Fieldref
             | CONSTANT_Methodref
             | CONSTANT_InterfaceMethodref;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java
--- a/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java	Tue Sep 15 21:56:04 2015 -0700
@@ -67,11 +67,11 @@
         return ptypes;
     }
 
-    static private void parseError(String str, String msg) {
+    private static void parseError(String str, String msg) {
         throw new IllegalArgumentException("bad signature: "+str+": "+msg);
     }
 
-    static private Class parseSig(String str, int[] i, int end, ClassLoader loader) {
+    private static Class parseSig(String str, int[] i, int end, ClassLoader loader) {
         if (i[0] == end)  return null;
         char c = str.charAt(i[0]++);
         if (c == 'L') {
@@ -122,7 +122,7 @@
         return sb.toString();
     }
 
-    static private void unparseSig(Class t, StringBuilder sb) {
+    private static void unparseSig(Class t, StringBuilder sb) {
         char c = Wrapper.forBasicType(t).basicTypeChar();
         if (c != 'L') {
             sb.append(c);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java
--- a/jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java	Tue Sep 15 21:56:04 2015 -0700
@@ -215,7 +215,7 @@
         return unbox(type, 3);
     }
 
-    static private final Integer ZERO_INT = 0, ONE_INT = 1;
+    private static final Integer ZERO_INT = 0, ONE_INT = 1;
 
     /// Primitive conversions
     /**
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java
--- a/jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java	Tue Sep 15 21:56:04 2015 -0700
@@ -69,7 +69,7 @@
                 "0x"+Integer.toHexString(format));
     }
 
-    private static abstract class Format {
+    private abstract static class Format {
         static final int SLOT_SHIFT = 0, SIZE_SHIFT = 2, KIND_SHIFT = 12;
         static final int
                 SIGNED   = (-1) << KIND_SHIFT,
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java
--- a/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java	Tue Sep 15 21:56:04 2015 -0700
@@ -88,7 +88,7 @@
 
     // sync with java.c and sun.misc.VM
     private static final String diagprop = "sun.java.launcher.diag";
-    final static boolean trace = sun.misc.VM.getSavedProperty(diagprop) != null;
+    static final boolean trace = sun.misc.VM.getSavedProperty(diagprop) != null;
 
     private static final String defaultBundleName =
             "sun.launcher.resources.launcher";
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/BASE64Decoder.java
--- a/jdk/src/java.base/share/classes/sun/misc/BASE64Decoder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/BASE64Decoder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -74,7 +74,7 @@
      * This character array provides the character to value map
      * based on RFC1521.
      */
-    private final static char pem_array[] = {
+    private static final char pem_array[] = {
         //       0   1   2   3   4   5   6   7
                 'A','B','C','D','E','F','G','H', // 0
                 'I','J','K','L','M','N','O','P', // 1
@@ -86,7 +86,7 @@
                 '4','5','6','7','8','9','+','/'  // 7
         };
 
-    private final static byte pem_convert_array[] = new byte[256];
+    private static final byte pem_convert_array[] = new byte[256];
 
     static {
         for (int i = 0; i < 255; i++) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/BASE64Encoder.java
--- a/jdk/src/java.base/share/classes/sun/misc/BASE64Encoder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/BASE64Encoder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -61,7 +61,7 @@
     }
 
     /** This array maps the characters to their 6 bit values */
-    private final static char pem_array[] = {
+    private static final char pem_array[] = {
         //       0   1   2   3   4   5   6   7
                 'A','B','C','D','E','F','G','H', // 0
                 'I','J','K','L','M','N','O','P', // 1
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java
--- a/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -88,10 +88,10 @@
 public abstract class CharacterDecoder {
 
     /** Return the number of bytes per atom of decoding */
-    abstract protected int bytesPerAtom();
+    protected abstract int bytesPerAtom();
 
     /** Return the maximum number of bytes that can be encoded per line */
-    abstract protected int bytesPerLine();
+    protected abstract int bytesPerLine();
 
     /** decode the beginning of the buffer, by default this is a NOP. */
     protected void decodeBufferPrefix(PushbackInputStream aStream, OutputStream bStream) throws IOException { }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java
--- a/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -79,10 +79,10 @@
     protected PrintStream pStream;
 
     /** Return the number of bytes per atom of encoding */
-    abstract protected int bytesPerAtom();
+    protected abstract int bytesPerAtom();
 
     /** Return the number of bytes that can be encoded per line */
-    abstract protected int bytesPerLine();
+    protected abstract int bytesPerLine();
 
     /**
      * Encode the prefix for the entire buffer. By default is simply
@@ -114,7 +114,7 @@
     }
 
     /** Encode one "atom" of information into characters. */
-    abstract protected void encodeAtom(OutputStream aStream, byte someBytes[],
+    protected abstract void encodeAtom(OutputStream aStream, byte someBytes[],
                 int anOffset, int aLength) throws IOException;
 
     /**
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/Cleaner.java
--- a/jdk/src/java.base/share/classes/sun/misc/Cleaner.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/Cleaner.java	Tue Sep 15 21:56:04 2015 -0700
@@ -69,7 +69,7 @@
     // Doubly-linked list of live cleaners, which prevents the cleaners
     // themselves from being GC'd before their referents
     //
-    static private Cleaner first = null;
+    private static Cleaner first = null;
 
     private Cleaner
         next = null,
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java
--- a/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java	Tue Sep 15 21:56:04 2015 -0700
@@ -144,7 +144,7 @@
     }
 
     // Constant for casting an int to a long via bitwise AND.
-    private final static long LONG_MASK = 0xffffffffL;
+    private static final long LONG_MASK = 0xffffffffL;
 
     //@ spec_public non_null;
     private int data[];  // value: data[0] is least significant
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java
--- a/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java	Tue Sep 15 21:56:04 2015 -0700
@@ -187,7 +187,7 @@
      * and infinite values.
      */
     private static class ExceptionalBinaryToASCIIBuffer implements BinaryToASCIIConverter {
-        final private String image;
+        private final String image;
         private boolean isNegative;
 
         public ExceptionalBinaryToASCIIBuffer(String image, boolean isNegative) {
@@ -1003,8 +1003,8 @@
      * A ASCIIToBinaryConverter container for a double.
      */
     static class PreparedASCIIToBinaryBuffer implements ASCIIToBinaryConverter {
-        final private double doubleVal;
-        final private float floatVal;
+        private final double doubleVal;
+        private final float floatVal;
 
         public PreparedASCIIToBinaryBuffer(double doubleVal, float floatVal) {
             this.doubleVal = doubleVal;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/LRUCache.java
--- a/jdk/src/java.base/share/classes/sun/misc/LRUCache.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/LRUCache.java	Tue Sep 15 21:56:04 2015 -0700
@@ -39,9 +39,9 @@
         this.size = size;
     }
 
-    abstract protected V create(N name);
+    protected abstract V create(N name);
 
-    abstract protected boolean hasName(V ob, N name);
+    protected abstract boolean hasName(V ob, N name);
 
     public static void moveToFront(Object[] oa, int i) {
         Object ob = oa[i];
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/PerfCounter.java
--- a/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java	Tue Sep 15 21:56:04 2015 -0700
@@ -52,10 +52,10 @@
         AccessController.doPrivileged(new Perf.GetPerfAction());
 
     // Must match values defined in hotspot/src/share/vm/runtime/perfdata.hpp
-    private final static int V_Constant  = 1;
-    private final static int V_Monotonic = 2;
-    private final static int V_Variable  = 3;
-    private final static int U_None      = 1;
+    private static final int V_Constant  = 1;
+    private static final int V_Monotonic = 2;
+    private static final int V_Variable  = 3;
+    private static final int U_None      = 1;
 
     private final String name;
     private final LongBuffer lb;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java
--- a/jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -305,13 +305,13 @@
     // end of constants copied from sun.tools.java.RuntimeConstants
 
     /** name of the superclass of proxy classes */
-    private final static String superclassName = "java/lang/reflect/Proxy";
+    private static final String superclassName = "java/lang/reflect/Proxy";
 
     /** name of field for storing a proxy instance's invocation handler */
-    private final static String handlerFieldName = "h";
+    private static final String handlerFieldName = "h";
 
     /** debugging flag for saving generated class files */
-    private final static boolean saveGeneratedFiles =
+    private static final boolean saveGeneratedFiles =
         java.security.AccessController.doPrivileged(
             new GetBooleanAction(
                 "sun.misc.ProxyGenerator.saveGeneratedFiles")).booleanValue();
@@ -1913,7 +1913,7 @@
          * that can be stored in the "pool" list; its purpose is to define a
          * common method for writing constant pool entries to a class file.
          */
-        private static abstract class Entry {
+        private abstract static class Entry {
             public abstract void write(DataOutputStream out)
                 throws IOException;
         }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/Request.java
--- a/jdk/src/java.base/share/classes/sun/misc/Request.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/Request.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,10 +32,10 @@
  * @author      Steven B. Byrne
  */
 
-abstract public class Request {
+public abstract class Request {
     /**
      * The main task of the Request object is to be exectuted from a request
      * queue.
      */
-    abstract public void execute();
+    public abstract void execute();
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/SoftCache.java
--- a/jdk/src/java.base/share/classes/sun/misc/SoftCache.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/SoftCache.java	Tue Sep 15 21:56:04 2015 -0700
@@ -117,9 +117,9 @@
      */
 
 
-    static private class ValueCell extends SoftReference {
-        static private Object INVALID_KEY = new Object();
-        static private int dropped = 0;
+    private static class ValueCell extends SoftReference {
+        private static Object INVALID_KEY = new Object();
+        private static int dropped = 0;
         private Object key;
 
         private ValueCell(Object key, Object value, ReferenceQueue queue) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/UCDecoder.java
--- a/jdk/src/java.base/share/classes/sun/misc/UCDecoder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/UCDecoder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -95,7 +95,7 @@
     }
 
     /* this is the UCE mapping of 0-63 to characters .. */
-    private final static byte map_array[] = {
+    private static final byte map_array[] = {
         //     0         1         2         3         4         5         6         7
         (byte)'0',(byte)'1',(byte)'2',(byte)'3',(byte)'4',(byte)'5',(byte)'6',(byte)'7', // 0
         (byte)'8',(byte)'9',(byte)'A',(byte)'B',(byte)'C',(byte)'D',(byte)'E',(byte)'F', // 1
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/UCEncoder.java
--- a/jdk/src/java.base/share/classes/sun/misc/UCEncoder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/UCEncoder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -86,7 +86,7 @@
     }
 
     /* this is the UCE mapping of 0-63 to characters .. */
-    private final static byte map_array[] = {
+    private static final byte map_array[] = {
         //     0         1         2         3         4         5         6         7
         (byte)'0',(byte)'1',(byte)'2',(byte)'3',(byte)'4',(byte)'5',(byte)'6',(byte)'7', // 0
         (byte)'8',(byte)'9',(byte)'A',(byte)'B',(byte)'C',(byte)'D',(byte)'E',(byte)'F', // 1
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/misc/VM.java
--- a/jdk/src/java.base/share/classes/sun/misc/VM.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/misc/VM.java	Tue Sep 15 21:56:04 2015 -0700
@@ -354,12 +354,12 @@
      * in the hotspot implementation. Its value is set according to
      * the JVM TI specification GetThreadState function.
      */
-    private final static int JVMTI_THREAD_STATE_ALIVE = 0x0001;
-    private final static int JVMTI_THREAD_STATE_TERMINATED = 0x0002;
-    private final static int JVMTI_THREAD_STATE_RUNNABLE = 0x0004;
-    private final static int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
-    private final static int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
-    private final static int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
+    private static final int JVMTI_THREAD_STATE_ALIVE = 0x0001;
+    private static final int JVMTI_THREAD_STATE_TERMINATED = 0x0002;
+    private static final int JVMTI_THREAD_STATE_RUNNABLE = 0x0004;
+    private static final int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
+    private static final int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
+    private static final int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
 
     /*
      * Returns the first non-null class loader up the execution stack,
@@ -435,5 +435,5 @@
     static {
         initialize();
     }
-    private native static void initialize();
+    private static native void initialize();
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/NetProperties.java
--- a/jdk/src/java.base/share/classes/sun/net/NetProperties.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/NetProperties.java	Tue Sep 15 21:56:04 2015 -0700
@@ -39,7 +39,7 @@
  */
 
 public class NetProperties {
-    static private Properties props = new Properties();
+    private static Properties props = new Properties();
     static {
         AccessController.doPrivileged(
             new PrivilegedAction() {
@@ -56,7 +56,7 @@
      * Loads the default networking system properties
      * the file is in jre/lib/net.properties
      */
-    static private void loadDefaultProperties() {
+    private static void loadDefaultProperties() {
         String fname = System.getProperty("java.home");
         if (fname == null) {
             throw new Error("Can't find java.home ??");
@@ -86,7 +86,7 @@
      * @return the String value for the property,
      *         or null
      */
-    static public String get(String key) {
+    public static String get(String key) {
         String def = props.getProperty(key);
         try {
             return System.getProperty(key, def);
@@ -108,7 +108,7 @@
      * @return the Integer value for the property,
      *         or null
      */
-    static public Integer getInteger(String key, int defval) {
+    public static Integer getInteger(String key, int defval) {
         String val = null;
 
         try {
@@ -137,7 +137,7 @@
      * @return the Boolean value for the property,
      *         or null
      */
-    static public Boolean getBoolean(String key) {
+    public static Boolean getBoolean(String key) {
         String val = null;
 
         try {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/NetworkServer.java
--- a/jdk/src/java.base/share/classes/sun/net/NetworkServer.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/NetworkServer.java	Tue Sep 15 21:56:04 2015 -0700
@@ -62,7 +62,7 @@
         return clientSocket != null;
     }
 
-    final public void run() {
+    public final void run() {
         if (serverSocket != null) {
             Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
             // System.out.print("Server starts " + serverSocket + "\n");
@@ -106,7 +106,7 @@
 
     /** Start a server on port port.  It will call serviceRequest()
         for each new connection. */
-    final public void startServer(int port) throws IOException {
+    public final void startServer(int port) throws IOException {
         serverSocket = new ServerSocket(port, 50);
         serverInstance = new ManagedLocalsThread(this);
         serverInstance.start();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
--- a/jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java	Tue Sep 15 21:56:04 2015 -0700
@@ -84,7 +84,7 @@
      * Options representing certain resolver variables of
      * a {@link ResolverConfiguration}.
      */
-    public static abstract class Options {
+    public abstract static class Options {
 
         /**
          * Returns the maximum number of attempts the resolver
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java
--- a/jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java	Tue Sep 15 21:56:04 2015 -0700
@@ -72,7 +72,7 @@
      *
      * Note that the socksProxy should *always* be the last on the list
      */
-    final static String[][] props = {
+    static final String[][] props = {
         /*
          * protocol, Property prefix 1, Property prefix 2, ...
          */
@@ -353,7 +353,7 @@
         }
     }
 
-    private native static boolean init();
+    private static native boolean init();
     private synchronized native Proxy getSystemProxy(String protocol, String host);
 
     /**
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java
--- a/jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java	Tue Sep 15 21:56:04 2015 -0700
@@ -26,9 +26,9 @@
 package sun.net.util;
 
 public class IPAddressUtil {
-    private final static int INADDR4SZ = 4;
-    private final static int INADDR16SZ = 16;
-    private final static int INT16SZ = 2;
+    private static final int INADDR4SZ = 4;
+    private static final int INADDR16SZ = 16;
+    private static final int INT16SZ = 2;
 
     /*
      * Converts IPv4 address in its textual presentation form
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java
--- a/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java	Tue Sep 15 21:56:04 2015 -0700
@@ -504,7 +504,7 @@
         }
     }
 
-    private final static char[] hexDigits = {
+    private static final char[] hexDigits = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
     };
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/URLConnection.java
--- a/jdk/src/java.base/share/classes/sun/net/www/URLConnection.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/URLConnection.java	Tue Sep 15 21:56:04 2015 -0700
@@ -34,7 +34,7 @@
  * @author  James Gosling
  */
 
-abstract public class URLConnection extends java.net.URLConnection {
+public abstract class URLConnection extends java.net.URLConnection {
 
     /** The URL that it is connected to */
 
@@ -236,11 +236,11 @@
 
     private static HashMap proxiedHosts = new HashMap<>();
 
-    public synchronized static void setProxiedHost(String host) {
+    public static synchronized void setProxiedHost(String host) {
         proxiedHosts.put(host.toLowerCase(), null);
     }
 
-    public synchronized static boolean isProxiedHost(String host) {
+    public static synchronized boolean isProxiedHost(String host) {
         return proxiedHosts.containsKey(host.toLowerCase());
     }
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java
--- a/jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -128,7 +128,7 @@
     /*
      * Maximum chunk header size of 2KB + 2 bytes for CRLF
      */
-    private final static int MAX_CHUNK_HEADER_SIZE = 2050;
+    private static final int MAX_CHUNK_HEADER_SIZE = 2050;
 
     /**
      * State to indicate that next field should be :-
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java
--- a/jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java	Tue Sep 15 21:56:04 2015 -0700
@@ -70,7 +70,7 @@
     /** return default port number (subclasses may override) */
     protected int getDefaultPort () { return httpPortNumber; }
 
-    static private int getDefaultPort(String proto) {
+    private static int getDefaultPort(String proto) {
         if ("http".equalsIgnoreCase(proto))
             return 80;
         if ("https".equalsIgnoreCase(proto))
@@ -211,7 +211,7 @@
         openServer();
     }
 
-    static protected Proxy newHttpProxy(String proxyHost, int proxyPort,
+    protected static Proxy newHttpProxy(String proxyHost, int proxyPort,
                                       String proto) {
         if (proxyHost == null || proto == null)
             return Proxy.NO_PROXY;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java	Tue Sep 15 21:56:04 2015 -0700
@@ -47,7 +47,7 @@
     /**
      * Caches authentication info entered by user.  See cacheKey()
      */
-    static protected AuthCache cache = new AuthCacheImpl();
+    protected static AuthCache cache = new AuthCacheImpl();
 
     public static void setAuthCache (AuthCache map) {
         cache = map;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java	Tue Sep 15 21:56:04 2015 -0700
@@ -74,7 +74,7 @@
 
     /* AuthCacheValue: */
 
-    transient protected PasswordAuthentication pw;
+    protected transient PasswordAuthentication pw;
 
     public PasswordAuthentication credentials() {
         return pw;
@@ -113,13 +113,13 @@
      * at the same time, then all but the first will block until
      * the first completes its authentication.
      */
-    static private HashMap requests = new HashMap<>();
+    private static HashMap requests = new HashMap<>();
 
     /* check if a request for this destination is in progress
      * return false immediately if not. Otherwise block until
      * request is finished and return true
      */
-    static private boolean requestIsInProgress (String key) {
+    private static boolean requestIsInProgress (String key) {
         if (!serializeAuth) {
             /* behavior is disabled. Revert to concurrent requests */
             return false;
@@ -147,7 +147,7 @@
     /* signal completion of an authentication (whether it succeeded or not)
      * so that other threads can continue.
      */
-    static private void requestCompleted (String key) {
+    private static void requestCompleted (String key) {
         synchronized (requests) {
             Thread thread = requests.get(key);
             if (thread != null && thread == Thread.currentThread()) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java	Tue Sep 15 21:56:04 2015 -0700
@@ -54,7 +54,7 @@
 
     private String authMethod;
 
-    private final static String compatPropName = "http.auth.digest." +
+    private static final String compatPropName = "http.auth.digest." +
         "quoteParameters";
 
     // true if http.auth.digest.quoteParameters Net property is true
@@ -507,12 +507,12 @@
         return finalHash;
     }
 
-    private final static char charArray[] = {
+    private static final char charArray[] = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
     };
 
-    private final static String zeroPad[] = {
+    private static final String zeroPad[] = {
         // 0         1          2         3        4       5      6     7
         "00000000", "0000000", "000000", "00000", "0000", "000", "00", "0"
     };
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java	Tue Sep 15 21:56:04 2015 -0700
@@ -42,13 +42,13 @@
  *
  * 2. Schemed: With the scheme field filled, can be used in JGSS-API calls.
  */
-final public class HttpCallerInfo {
+public final class HttpCallerInfo {
     // All info that an Authenticator needs.
-    final public URL url;
-    final public String host, protocol, prompt, scheme;
-    final public int port;
-    final public InetAddress addr;
-    final public RequestorType authType;
+    public final URL url;
+    public final String host, protocol, prompt, scheme;
+    public final int port;
+    public final InetAddress addr;
+    public final RequestorType authType;
 
     /**
      * Create a schemed object based on an un-schemed one.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	Tue Sep 15 21:56:04 2015 -0700
@@ -106,11 +106,11 @@
     static final boolean validateServer;
 
     private StreamingOutputStream strOutputStream;
-    private final static String RETRY_MSG1 =
+    private static final String RETRY_MSG1 =
         "cannot retry due to proxy authentication, in streaming mode";
-    private final static String RETRY_MSG2 =
+    private static final String RETRY_MSG2 =
         "cannot retry due to server authentication, in streaming mode";
-    private final static String RETRY_MSG3 =
+    private static final String RETRY_MSG3 =
         "cannot retry due to redirection, in streaming mode";
 
     /*
@@ -2857,8 +2857,8 @@
     }
 
     // constant strings represent set-cookie header names
-    private final static String SET_COOKIE = "set-cookie";
-    private final static String SET_COOKIE2 = "set-cookie2";
+    private static final String SET_COOKIE = "set-cookie";
+    private static final String SET_COOKIE2 = "set-cookie2";
 
     /**
      * Returns a filtered version of the given headers value.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java	Tue Sep 15 21:56:04 2015 -0700
@@ -47,7 +47,7 @@
     private static final long serialVersionUID = 100L;
     private static final PlatformLogger logger = HttpURLConnection.getHttpLogger();
 
-    final private HttpCallerInfo hci;
+    private final HttpCallerInfo hci;
 
     // These maps are used to manage the GSS availability for diffrent
     // hosts. The key for both maps is the host name.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java	Tue Sep 15 21:56:04 2015 -0700
@@ -38,7 +38,7 @@
  *
  * @author Xuelei Fan
  */
-final public class DefaultHostnameVerifier implements HostnameVerifier {
+public final class DefaultHostnameVerifier implements HostnameVerifier {
     public boolean verify(String hostname, SSLSession session) {
         return false;
     }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/nio/ch/Net.java
--- a/jdk/src/java.base/share/classes/sun/nio/ch/Net.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/nio/ch/Net.java	Tue Sep 15 21:56:04 2015 -0700
@@ -460,9 +460,9 @@
         throws IOException;
 
 
-    public final static int SHUT_RD = 0;
-    public final static int SHUT_WR = 1;
-    public final static int SHUT_RDWR = 2;
+    public static final int SHUT_RD = 0;
+    public static final int SHUT_WR = 1;
+    public static final int SHUT_RDWR = 2;
 
     static native void shutdown(FileDescriptor fd, int how) throws IOException;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
--- a/jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -159,6 +159,6 @@
 
     protected abstract void implDereg(SelectionKeyImpl ski) throws IOException;
 
-    abstract public Selector wakeup();
+    public abstract Selector wakeup();
 
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
--- a/jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java	Tue Sep 15 21:56:04 2015 -0700
@@ -91,7 +91,7 @@
     }
 
     private static class DefaultThreadPoolHolder {
-        final static ThreadPool defaultThreadPool = createDefault();
+        static final ThreadPool defaultThreadPool = createDefault();
     }
 
     // return the default (system-wide) thread pool
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java
--- a/jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java	Tue Sep 15 21:56:04 2015 -0700
@@ -36,8 +36,8 @@
 import java.security.*;
 
 public class CharsetMapping {
-    public final static char UNMAPPABLE_DECODING = '\uFFFD';
-    public final static int  UNMAPPABLE_ENCODING = 0xFFFD;
+    public static final char UNMAPPABLE_DECODING = '\uFFFD';
+    public static final int  UNMAPPABLE_ENCODING = 0xFFFD;
 
     char[] b2cSB;                //singlebyte b->c
     char[] b2cDB1;               //dobulebyte b->c /db1
@@ -195,13 +195,13 @@
 
     /*****************************************************************************/
     // tags of different charset mapping tables
-    private final static int MAP_SINGLEBYTE      = 0x1; // 0..256  : c
-    private final static int MAP_DOUBLEBYTE1     = 0x2; // min..max: c
-    private final static int MAP_DOUBLEBYTE2     = 0x3; // min..max: c [DB2]
-    private final static int MAP_SUPPLEMENT      = 0x5; //           db,c
-    private final static int MAP_SUPPLEMENT_C2B  = 0x6; //           c,db
-    private final static int MAP_COMPOSITE       = 0x7; //           db,base,cc
-    private final static int MAP_INDEXC2B        = 0x8; // index table of c->bb
+    private static final int MAP_SINGLEBYTE      = 0x1; // 0..256  : c
+    private static final int MAP_DOUBLEBYTE1     = 0x2; // min..max: c
+    private static final int MAP_DOUBLEBYTE2     = 0x3; // min..max: c [DB2]
+    private static final int MAP_SUPPLEMENT      = 0x5; //           db,c
+    private static final int MAP_SUPPLEMENT_C2B  = 0x6; //           c,db
+    private static final int MAP_COMPOSITE       = 0x7; //           db,base,cc
+    private static final int MAP_INDEXC2B        = 0x8; // index table of c->bb
 
     private static final boolean readNBytes(InputStream in, byte[] bb, int N)
         throws IOException
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
--- a/jdk/src/java.base/share/classes/sun/nio/cs/DoubleByte.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/nio/cs/DoubleByte.java	Tue Sep 15 21:56:04 2015 -0700
@@ -102,7 +102,7 @@
 
 public class DoubleByte {
 
-    public final static char[] B2C_UNMAPPABLE;
+    public static final char[] B2C_UNMAPPABLE;
     static {
         B2C_UNMAPPABLE = new char[0x100];
         Arrays.fill(B2C_UNMAPPABLE, UNMAPPABLE_DECODING);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java
--- a/jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java	Tue Sep 15 21:56:04 2015 -0700
@@ -46,7 +46,7 @@
         return cr;
     }
 
-    final public static class Decoder extends CharsetDecoder
+    public static final class Decoder extends CharsetDecoder
                                       implements ArrayDecoder {
         private final char[] b2c;
 
@@ -131,7 +131,7 @@
         }
     }
 
-    final public static class Encoder extends CharsetEncoder
+    public static final class Encoder extends CharsetEncoder
                                       implements ArrayEncoder {
         private Surrogate.Parser sgp;
         private final char[] c2b;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java
--- a/jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java	Tue Sep 15 21:56:04 2015 -0700
@@ -37,7 +37,7 @@
 
     private static final int CACHE_SIZE = 3;
 
-    private static abstract class Cache {
+    private abstract static class Cache {
 
         // Thread-local reference to array of cached objects, in LRU order
         private ThreadLocal cache = new ThreadLocal<>();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java
--- a/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -31,7 +31,7 @@
 import sun.misc.Unsafe;
 
 /** Base class for sun.misc.Unsafe-based FieldAccessors for final or
-    volatile static fields.  */
+    static volatile fields.  */
 
 abstract class UnsafeQualifiedStaticFieldAccessorImpl
     extends UnsafeStaticFieldAccessorImpl
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
--- a/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java	Tue Sep 15 21:56:04 2015 -0700
@@ -50,14 +50,14 @@
      * implementations) used to send the active negotiated version. The
      * system property below allows to toggle the behavior.
      */
-    private final static String PROP_NAME =
+    private static final String PROP_NAME =
                                 "com.sun.net.ssl.rsaPreMasterSecretFix";
 
     /*
      * Default is "false" (old behavior) for compatibility reasons in
      * SSLv3/TLSv1.  Later protocols (TLSv1.1+) do not use this property.
      */
-    private final static boolean rsaPreMasterSecretFix =
+    private static final boolean rsaPreMasterSecretFix =
             AccessController.doPrivileged(new PrivilegedAction() {
                 public Boolean run() {
                     String value = System.getProperty(PROP_NAME);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java
--- a/jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java	Tue Sep 15 21:56:04 2015 -0700
@@ -49,7 +49,7 @@
 
     // size of the temporary arrays we use. Should fit into the CPU's 1st
     // level cache and could be adjusted based on the platform
-    private final static int ARRAY_SIZE = 4096;
+    private static final int ARRAY_SIZE = 4096;
 
     /**
      * Get the size of a temporary buffer array to use in order to be
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java
--- a/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java	Tue Sep 15 21:56:04 2015 -0700
@@ -43,7 +43,7 @@
  */
 final class ProviderConfig {
 
-    private final static sun.security.util.Debug debug =
+    private static final sun.security.util.Debug debug =
         sun.security.util.Debug.getInstance("jca", "ProviderConfig");
 
     // suffix for identifying the SunPKCS11-Solaris provider
@@ -54,7 +54,7 @@
         "${java.home}/conf/security/sunpkcs11-solaris.cfg";
 
     // maximum number of times to try loading a provider before giving up
-    private final static int MAX_LOAD_TRIES = 30;
+    private static final int MAX_LOAD_TRIES = 30;
 
     // could be provider name (module) or provider class name (legacy)
     private final String provName;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
--- a/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java	Tue Sep 15 21:56:04 2015 -0700
@@ -55,12 +55,12 @@
  */
 public final class ProviderList {
 
-    final static sun.security.util.Debug debug =
+    static final sun.security.util.Debug debug =
         sun.security.util.Debug.getInstance("jca", "ProviderList");
 
-    private final static ProviderConfig[] PC0 = new ProviderConfig[0];
+    private static final ProviderConfig[] PC0 = new ProviderConfig[0];
 
-    private final static Provider[] P0 = new Provider[0];
+    private static final Provider[] P0 = new Provider[0];
 
     // constant for an ProviderList with no elements
     static final ProviderList EMPTY = new ProviderList(PC0, true);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
--- a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java	Tue Sep 15 21:56:04 2015 -0700
@@ -186,7 +186,7 @@
      */
     static final ObjectIdentifier[] PKCS9_OIDS = new ObjectIdentifier[18];
 
-    private final static Class BYTE_ARRAY_CLASS;
+    private static final Class BYTE_ARRAY_CLASS;
 
     static {   // static initializer for PKCS9_OIDS
         for (int i = 1; i < PKCS9_OIDS.length - 2; i++) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java	Tue Sep 15 21:56:04 2015 -0700
@@ -71,7 +71,7 @@
     // implemented using a software trap and therefore very slow)
     private static final boolean bigEndian;
 
-    private final static int byteArrayOfs = unsafe.arrayBaseOffset(byte[].class);
+    private static final int byteArrayOfs = unsafe.arrayBaseOffset(byte[].class);
 
     static {
         boolean scaleOK = ((unsafe.arrayIndexScale(byte[].class) == 1)
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java	Tue Sep 15 21:56:04 2015 -0700
@@ -112,7 +112,7 @@
         spi.engineRefresh();
     }
 
-    public final static class Spi extends ConfigurationSpi {
+    public static final class Spi extends ConfigurationSpi {
 
         private URL url;
         private boolean expandProp = true;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/MD2.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/MD2.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/MD2.java	Tue Sep 15 21:56:04 2015 -0700
@@ -109,7 +109,7 @@
     }
 
     // substitution table derived from Pi. Copied from the RFC.
-    private final static int[] S = new int[] {
+    private static final int[] S = new int[] {
         41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
         19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188,
         76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24,
@@ -133,7 +133,7 @@
     // digest padding. 17 element array.
     // padding[0] is null
     // padding[i] is an array of i time the byte value i (i = 1..16)
-    private final static byte[][] PADDING;
+    private static final byte[][] PADDING;
 
     static {
         PADDING = new byte[17][];
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/MD4.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/MD4.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/MD4.java	Tue Sep 15 21:56:04 2015 -0700
@@ -62,7 +62,7 @@
     private static final int S33 = 11;
     private static final int S34 = 15;
 
-    private final static Provider md4Provider;
+    private static final Provider md4Provider;
 
     static {
         md4Provider = new Provider("MD4Provider", 1.9d, "MD4 MessageDigest") {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java	Tue Sep 15 21:56:04 2015 -0700
@@ -50,10 +50,10 @@
     }
 
     // cache of DSA parameters
-    private final static Map dsaCache;
+    private static final Map dsaCache;
 
     // cache of DH parameters
-    private final static Map dhCache;
+    private static final Map dhCache;
 
     /**
      * Return cached DSA parameters for the given length combination of
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/SHA.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/SHA.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SHA.java	Tue Sep 15 21:56:04 2015 -0700
@@ -104,10 +104,10 @@
     }
 
     // Constants for each round
-    private final static int round1_kt = 0x5a827999;
-    private final static int round2_kt = 0x6ed9eba1;
-    private final static int round3_kt = 0x8f1bbcdc;
-    private final static int round4_kt = 0xca62c1d6;
+    private static final int round1_kt = 0x5a827999;
+    private static final int round2_kt = 0x6ed9eba1;
+    private static final int round3_kt = 0x8f1bbcdc;
+    private static final int round4_kt = 0xca62c1d6;
 
     /**
      * Compute a the hash for the current block.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java	Tue Sep 15 21:56:04 2015 -0700
@@ -148,7 +148,7 @@
      * @param seed the seed.
      */
     @Override
-    synchronized public void engineSetSeed(byte[] seed) {
+    public synchronized void engineSetSeed(byte[] seed) {
         if (state != null) {
             digest.update(state);
             for (int i = 0; i < state.length; i++) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -141,7 +141,7 @@
     /**
      * Fill result with bytes from the queue. Wait for it if it isn't ready.
      */
-    static public void generateSeed(byte[] result) {
+    public static void generateSeed(byte[] result) {
         instance.getSeedBytes(result);
     }
 
@@ -322,7 +322,7 @@
          * pushes them into the queue.
          */
         @Override
-        final public void run() {
+        public final void run() {
             try {
                 while (true) {
                     // Queue full? Wait till there's room.
@@ -466,7 +466,7 @@
          */
         private static class BogusThread implements Runnable {
             @Override
-            final public void run() {
+            public final void run() {
                 try {
                     for (int i = 0; i < 5; i++) {
                         Thread.sleep(50);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java	Tue Sep 15 21:56:04 2015 -0700
@@ -310,12 +310,12 @@
     }
 
     // name of the *System* property, takes precedence over PROP_RNDSOURCE
-    private final static String PROP_EGD = "java.security.egd";
+    private static final String PROP_EGD = "java.security.egd";
     // name of the *Security* property
-    private final static String PROP_RNDSOURCE = "securerandom.source";
+    private static final String PROP_RNDSOURCE = "securerandom.source";
 
-    final static String URL_DEV_RANDOM = "file:/dev/random";
-    final static String URL_DEV_URANDOM = "file:/dev/urandom";
+    static final String URL_DEV_RANDOM = "file:/dev/random";
+    static final String URL_DEV_URANDOM = "file:/dev/urandom";
 
     private static final String seedSource;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java	Tue Sep 15 21:56:04 2015 -0700
@@ -68,16 +68,16 @@
  * @see PKIXCertPathChecker
  * @see PKIXParameters
  */
-final public class AlgorithmChecker extends PKIXCertPathChecker {
+public final class AlgorithmChecker extends PKIXCertPathChecker {
 
     private final AlgorithmConstraints constraints;
     private final PublicKey trustedPubKey;
     private PublicKey prevPubKey;
 
-    private final static Set SIGNATURE_PRIMITIVE_SET =
+    private static final Set SIGNATURE_PRIMITIVE_SET =
         Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.SIGNATURE));
 
-    private final static DisabledAlgorithmConstraints
+    private static final DisabledAlgorithmConstraints
         certPathDefaultConstraints = new DisabledAlgorithmConstraints(
             DisabledAlgorithmConstraints.PROPERTY_CERTPATH_DISABLED_ALGS);
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -63,7 +63,7 @@
      * Authority Information Access extension shall be enabled. Currently
      * disabled by default for compatibility reasons.
      */
-    final static boolean USE_AIA = AccessController.doPrivileged
+    static final boolean USE_AIA = AccessController.doPrivileged
         (new GetBooleanAction("com.sun.security.enableAIAcaIssuers"));
 
     /**
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java	Tue Sep 15 21:56:04 2015 -0700
@@ -433,7 +433,7 @@
      */
     static class PKIXCertComparator implements Comparator {
 
-        final static String METHOD_NME = "PKIXCertComparator.compare()";
+        static final String METHOD_NME = "PKIXCertComparator.compare()";
 
         private final Set trustedSubjectDNs;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java	Tue Sep 15 21:56:04 2015 -0700
@@ -760,7 +760,7 @@
     /*
      * A class representing a single OCSP response.
      */
-    public final static class SingleResponse implements OCSP.RevocationStatus {
+    public static final class SingleResponse implements OCSP.RevocationStatus {
         private final CertId certId;
         private final CertStatus certStatus;
         private final Date thisUpdate;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java	Tue Sep 15 21:56:04 2015 -0700
@@ -91,10 +91,10 @@
 
     // interval between checks for update of cached Certificates/CRLs
     // (30 seconds)
-    private final static int CHECK_INTERVAL = 30 * 1000;
+    private static final int CHECK_INTERVAL = 30 * 1000;
 
     // size of the cache (see Cache class for sizing recommendations)
-    private final static int CACHE_SIZE = 185;
+    private static final int CACHE_SIZE = 185;
 
     // X.509 certificate factory instance
     private final CertificateFactory factory;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java	Tue Sep 15 21:56:04 2015 -0700
@@ -41,7 +41,7 @@
  * @see PKIXCertPathChecker
  * @see PKIXParameters
  */
-final public class UntrustedChecker extends PKIXCertPathChecker {
+public final class UntrustedChecker extends PKIXCertPathChecker {
 
     private static final Debug debug = Debug.getInstance("certpath");
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java	Tue Sep 15 21:56:04 2015 -0700
@@ -61,9 +61,9 @@
 public final class SSLServerCertStore extends CertStoreSpi {
 
     private final URI uri;
-    private final static GetChainTrustManager trustManager;
-    private final static SSLSocketFactory socketFactory;
-    private final static HostnameVerifier hostnameVerifier;
+    private static final GetChainTrustManager trustManager;
+    private static final SSLSocketFactory socketFactory;
+    private static final HostnameVerifier hostnameVerifier;
 
     static {
         trustManager = new GetChainTrustManager();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java	Tue Sep 15 21:56:04 2015 -0700
@@ -51,12 +51,12 @@
 public final class RSACore {
 
     // globally enable/disable use of blinding
-    private final static boolean ENABLE_BLINDING = true;
+    private static final boolean ENABLE_BLINDING = true;
 
     // cache for blinding parameters. Map
     // use a weak hashmap so that cached values are automatically cleared
     // when the modulus is GC'ed
-    private final static Map
+    private static final Map
                 blindingCache = new WeakHashMap<>();
 
     private RSACore() {
@@ -311,7 +311,7 @@
      *
      * The total performance cost is small.
      */
-    private final static class BlindingRandomPair {
+    private static final class BlindingRandomPair {
         final BigInteger u;
         final BigInteger v;
 
@@ -332,8 +332,8 @@
      * since sharing moduli is fundamentally broken and insecure, this
      * does not matter.
      */
-    private final static class BlindingParameters {
-        private final static BigInteger BIG_TWO = BigInteger.valueOf(2L);
+    private static final class BlindingParameters {
+        private static final BigInteger BIG_TWO = BigInteger.valueOf(2L);
 
         // RSA public exponent
         private final BigInteger e;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java	Tue Sep 15 21:56:04 2015 -0700
@@ -60,18 +60,18 @@
  */
 public final class RSAKeyFactory extends KeyFactorySpi {
 
-    private final static Class rsaPublicKeySpecClass =
+    private static final Class rsaPublicKeySpecClass =
                                                 RSAPublicKeySpec.class;
-    private final static Class rsaPrivateKeySpecClass =
+    private static final Class rsaPrivateKeySpecClass =
                                                 RSAPrivateKeySpec.class;
-    private final static Class rsaPrivateCrtKeySpecClass =
+    private static final Class rsaPrivateCrtKeySpecClass =
                                                 RSAPrivateCrtKeySpec.class;
 
-    private final static Class x509KeySpecClass  = X509EncodedKeySpec.class;
-    private final static Class pkcs8KeySpecClass = PKCS8EncodedKeySpec.class;
+    private static final Class x509KeySpecClass  = X509EncodedKeySpec.class;
+    private static final Class pkcs8KeySpecClass = PKCS8EncodedKeySpec.class;
 
-    public final static int MIN_MODLEN = 512;
-    public final static int MAX_MODLEN = 16384;
+    public static final int MIN_MODLEN = 512;
+    public static final int MAX_MODLEN = 16384;
 
     /*
      * If the modulus length is above this value, restrict the size of
@@ -80,8 +80,8 @@
      * this approach allows flexibility in case impls would like to use
      * larger module and exponent values.
      */
-    public final static int MAX_MODLEN_RESTRICT_EXP = 3072;
-    public final static int MAX_RESTRICTED_EXPLEN = 64;
+    public static final int MAX_MODLEN_RESTRICT_EXP = 3072;
+    public static final int MAX_RESTRICTED_EXPLEN = 64;
 
     private static final boolean restrictExpLen =
         "true".equalsIgnoreCase(AccessController.doPrivileged(
@@ -89,7 +89,7 @@
                 "sun.security.rsa.restrictRSAExponent", "true")));
 
     // instance used for static translateKey();
-    private final static RSAKeyFactory INSTANCE = new RSAKeyFactory();
+    private static final RSAKeyFactory INSTANCE = new RSAKeyFactory();
 
     public RSAKeyFactory() {
         // empty
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java	Tue Sep 15 21:56:04 2015 -0700
@@ -85,13 +85,13 @@
     // file. Do not change without coordinating the update
 
     // PKCS#1 v1.5 padding, blocktype 1 (signing)
-    public final static int PAD_BLOCKTYPE_1    = 1;
+    public static final int PAD_BLOCKTYPE_1    = 1;
     // PKCS#1 v1.5 padding, blocktype 2 (encryption)
-    public final static int PAD_BLOCKTYPE_2    = 2;
+    public static final int PAD_BLOCKTYPE_2    = 2;
     // nopadding. Does not do anything, but allows simpler RSACipher code
-    public final static int PAD_NONE           = 3;
+    public static final int PAD_NONE           = 3;
     // PKCS#1 v2.1 OAEP padding
-    public final static int PAD_OAEP_MGF1 = 4;
+    public static final int PAD_OAEP_MGF1 = 4;
 
     // type, one of PAD_*
     private final int type;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -63,7 +63,7 @@
     private BigInteger coeff;   // CRT coeffcient
 
     // algorithmId used to identify RSA keys
-    final static AlgorithmId rsaId =
+    static final AlgorithmId rsaId =
         new AlgorithmId(AlgorithmId.RSAEncryption_oid);
 
     /**
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -49,7 +49,7 @@
      * Write the data out, NOW.
      */
     @Override
-    synchronized public void write(byte[] b, int off, int len)
+    public synchronized void write(byte[] b, int off, int len)
             throws IOException {
         if (b == null) {
             throw new NullPointerException();
@@ -76,7 +76,7 @@
      * Write one byte now.
      */
     @Override
-    synchronized public void write(int i) throws IOException {
+    public synchronized void write(int i) throws IOException {
         oneByte[0] = (byte)i;
         write(oneByte, 0, 1);
     }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -244,7 +244,7 @@
         return copy;
     }
 
-    final static long toLong(byte[] recordEnS) {
+    static final long toLong(byte[] recordEnS) {
         if (recordEnS != null && recordEnS.length == 8) {
             return ((recordEnS[0] & 0xFFL) << 56) |
                    ((recordEnS[1] & 0xFFL) << 48) |
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -55,8 +55,8 @@
      * recurse infinitely ... e.g. close() calling itself, or doing
      * I/O in terms of our own streams.
      */
-    final private Socket self;
-    final private InputStream consumedInput;
+    private final Socket self;
+    private final InputStream consumedInput;
 
     BaseSSLSocketImpl() {
         super();
@@ -88,10 +88,10 @@
      *
      * The default is "false", i.e. tolerate the broken behavior.
      */
-    private final static String PROP_NAME =
+    private static final String PROP_NAME =
                                 "com.sun.net.ssl.requireCloseNotify";
 
-    final static boolean requireCloseNotify =
+    static final boolean requireCloseNotify =
                                 Debug.getBooleanProperty(PROP_NAME, false);
 
     //
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java	Tue Sep 15 21:56:04 2015 -0700
@@ -93,7 +93,7 @@
 final class CipherBox {
 
     // A CipherBox that implements the identity operation
-    final static CipherBox NULL = new CipherBox();
+    static final CipherBox NULL = new CipherBox();
 
     /* Class and subclass dynamic debugging support */
     private static final Debug debug = Debug.getInstance("ssl");
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java	Tue Sep 15 21:56:04 2015 -0700
@@ -72,27 +72,27 @@
 final class CipherSuite implements Comparable {
 
     // minimum priority for supported CipherSuites
-    final static int SUPPORTED_SUITES_PRIORITY = 1;
+    static final int SUPPORTED_SUITES_PRIORITY = 1;
 
     // minimum priority for default enabled CipherSuites
-    final static int DEFAULT_SUITES_PRIORITY = 300;
+    static final int DEFAULT_SUITES_PRIORITY = 300;
 
     // Flag indicating if CipherSuite availability can change dynamically.
     // This is the case when we rely on a JCE cipher implementation that
     // may not be available in the installed JCE providers.
     // It is true because we might not have an ECC implementation.
-    final static boolean DYNAMIC_AVAILABILITY = true;
+    static final boolean DYNAMIC_AVAILABILITY = true;
 
-    private final static boolean ALLOW_ECC = Debug.getBooleanProperty
+    private static final boolean ALLOW_ECC = Debug.getBooleanProperty
         ("com.sun.net.ssl.enableECC", true);
 
     // Map Integer(id) -> CipherSuite
     // contains all known CipherSuites
-    private final static Map idMap;
+    private static final Map idMap;
 
     // Map String(name) -> CipherSuite
     // contains only supported CipherSuites (i.e. allowed == true)
-    private final static Map nameMap;
+    private static final Map nameMap;
 
     // Protocol defined CipherSuite name, e.g. SSL_RSA_WITH_RC4_128_MD5
     // we use TLS_* only for new CipherSuites, still SSL_* for old ones
@@ -474,7 +474,7 @@
         B_AES_256_GCM(CIPHER_AES_GCM, AEAD_CIPHER, 32, 12, 4, true);
 
         // Map BulkCipher -> Boolean(available)
-        private final static Map availableCache =
+        private static final Map availableCache =
                                             new HashMap<>(8);
 
         // descriptive name including key size, e.g. AES/128
@@ -518,7 +518,7 @@
         final int tagSize = 16;
 
         // The secure random used to detect the cipher availability.
-        private final static SecureRandom secureRandom;
+        private static final SecureRandom secureRandom;
 
         static {
             try {
@@ -1437,8 +1437,8 @@
     }
 
     // ciphersuite SSL_NULL_WITH_NULL_NULL
-    final static CipherSuite C_NULL = CipherSuite.valueOf(0, 0);
+    static final CipherSuite C_NULL = CipherSuite.valueOf(0, 0);
 
     // ciphersuite TLS_EMPTY_RENEGOTIATION_INFO_SCSV
-    final static CipherSuite C_SCSV = CipherSuite.valueOf(0x00, 0xff);
+    static final CipherSuite C_SCSV = CipherSuite.valueOf(0x00, 0xff);
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/Ciphertext.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/Ciphertext.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/Ciphertext.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,7 +32,7 @@
  * enumeration of record type
  */
 final class Ciphertext {
-    final static Ciphertext CIPHERTEXT_NULL = new Ciphertext();
+    static final Ciphertext CIPHERTEXT_NULL = new Ciphertext();
 
     RecordType recordType;
     long recordSN;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java	Tue Sep 15 21:56:04 2015 -0700
@@ -60,8 +60,8 @@
 final class ClientHandshaker extends Handshaker {
 
     // constants for subject alt names of type DNS and IP
-    private final static int ALTNAME_DNS = 2;
-    private final static int ALTNAME_IP  = 7;
+    private static final int ALTNAME_DNS = 2;
+    private static final int ALTNAME_IP  = 7;
 
     // the server's public key from its certificate.
     private PublicKey serverKey;
@@ -98,7 +98,7 @@
     private ProtocolVersion maxProtocolVersion;
 
     // To switch off the SNI extension.
-    private final static boolean enableSNIExtension =
+    private static final boolean enableSNIExtension =
             Debug.getBooleanProperty("jsse.enableSNIExtension", true);
 
     /*
@@ -144,11 +144,11 @@
      * If the system property is set to "true" explicitly, the restriction on
      * server certificate change in renegotiation is disabled.
      */
-    private final static boolean allowUnsafeServerCertChange =
+    private static final boolean allowUnsafeServerCertChange =
         Debug.getBooleanProperty("jdk.tls.allowUnsafeServerCertChange", false);
 
     // To switch off the max_fragment_length extension.
-    private final static boolean enableMFLExtension =
+    private static final boolean enableMFLExtension =
             Debug.getBooleanProperty("jsse.enableMFLExtension", false);
 
     private List requestedServerNames =
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java	Tue Sep 15 21:56:04 2015 -0700
@@ -44,17 +44,17 @@
     }
 
     @Override
-    abstract public int messageLength();
+    public abstract int messageLength();
 
     @Override
-    abstract public void send(HandshakeOutStream s) throws IOException;
+    public abstract void send(HandshakeOutStream s) throws IOException;
 
     @Override
-    abstract public void print(PrintStream s) throws IOException;
+    public abstract void print(PrintStream s) throws IOException;
 
-    abstract public SecretKey clientKeyExchange();
+    public abstract SecretKey clientKeyExchange();
 
-    abstract public Principal getPeerPrincipal();
+    public abstract Principal getPeerPrincipal();
 
-    abstract public Principal getLocalPrincipal();
+    public abstract Principal getLocalPrincipal();
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java	Tue Sep 15 21:56:04 2015 -0700
@@ -77,7 +77,7 @@
     }
 
     @Override
-    synchronized public void close() throws IOException {
+    public synchronized void close() throws IOException {
         if (!isClosed) {
             prevReadCipher.dispose();
             super.close();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java	Tue Sep 15 21:56:04 2015 -0700
@@ -36,8 +36,8 @@
 final class EphemeralKeyManager {
 
     // indices for the keys array below
-    private final static int INDEX_RSA512 = 0;
-    private final static int INDEX_RSA1024 = 1;
+    private static final int INDEX_RSA512 = 0;
+    private static final int INDEX_RSA1024 = 1;
 
     /*
      * Current cached RSA KeyPairs. Elements are never null.
@@ -87,10 +87,10 @@
     private static class EphemeralKeyPair {
 
         // maximum number of times a KeyPair is used
-        private final static int MAX_USE = 200;
+        private static final int MAX_USE = 200;
 
         // maximum time interval in which the keypair is used (1 hour in ms)
-        private final static long USE_INTERVAL = 3600*1000;
+        private static final long USE_INTERVAL = 3600*1000;
 
         private KeyPair keyPair;
         private int uses;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java	Tue Sep 15 21:56:04 2015 -0700
@@ -62,46 +62,46 @@
     }
 
     // extensions defined in RFC 3546
-    final static ExtensionType EXT_SERVER_NAME =
+    static final ExtensionType EXT_SERVER_NAME =
             e(0x0000, "server_name");            // IANA registry value: 0
-    final static ExtensionType EXT_MAX_FRAGMENT_LENGTH =
+    static final ExtensionType EXT_MAX_FRAGMENT_LENGTH =
             e(0x0001, "max_fragment_length");    // IANA registry value: 1
-    final static ExtensionType EXT_CLIENT_CERTIFICATE_URL =
+    static final ExtensionType EXT_CLIENT_CERTIFICATE_URL =
             e(0x0002, "client_certificate_url"); // IANA registry value: 2
-    final static ExtensionType EXT_TRUSTED_CA_KEYS =
+    static final ExtensionType EXT_TRUSTED_CA_KEYS =
             e(0x0003, "trusted_ca_keys");        // IANA registry value: 3
-    final static ExtensionType EXT_TRUNCATED_HMAC =
+    static final ExtensionType EXT_TRUNCATED_HMAC =
             e(0x0004, "truncated_hmac");         // IANA registry value: 4
-    final static ExtensionType EXT_STATUS_REQUEST =
+    static final ExtensionType EXT_STATUS_REQUEST =
             e(0x0005, "status_request");         // IANA registry value: 5
 
     // extensions defined in RFC 4681
-    final static ExtensionType EXT_USER_MAPPING =
+    static final ExtensionType EXT_USER_MAPPING =
             e(0x0006, "user_mapping");           // IANA registry value: 6
 
     // extensions defined in RFC 5081
-    final static ExtensionType EXT_CERT_TYPE =
+    static final ExtensionType EXT_CERT_TYPE =
             e(0x0009, "cert_type");              // IANA registry value: 9
 
     // extensions defined in RFC 4492 (ECC)
-    final static ExtensionType EXT_ELLIPTIC_CURVES =
+    static final ExtensionType EXT_ELLIPTIC_CURVES =
             e(0x000A, "elliptic_curves");        // IANA registry value: 10
-    final static ExtensionType EXT_EC_POINT_FORMATS =
+    static final ExtensionType EXT_EC_POINT_FORMATS =
             e(0x000B, "ec_point_formats");       // IANA registry value: 11
 
     // extensions defined in RFC 5054
-    final static ExtensionType EXT_SRP =
+    static final ExtensionType EXT_SRP =
             e(0x000C, "srp");                    // IANA registry value: 12
 
     // extensions defined in RFC 5246
-    final static ExtensionType EXT_SIGNATURE_ALGORITHMS =
+    static final ExtensionType EXT_SIGNATURE_ALGORITHMS =
             e(0x000D, "signature_algorithms");   // IANA registry value: 13
 
     // extensions defined in RFC 6961
-    final static ExtensionType EXT_STATUS_REQUEST_V2 =
+    static final ExtensionType EXT_STATUS_REQUEST_V2 =
             e(0x0011, "status_request_v2");      // IANA registry value: 17
 
     // extensions defined in RFC 5746
-    final static ExtensionType EXT_RENEGOTIATION_INFO =
+    static final ExtensionType EXT_RENEGOTIATION_INFO =
             e(0xff01, "renegotiation_info");     // IANA registry value: 65281
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java	Tue Sep 15 21:56:04 2015 -0700
@@ -297,7 +297,7 @@
 
     HelloExtensions extensions = new HelloExtensions();
 
-    private final static byte[]  NULL_COMPRESSION = new byte[] {0};
+    private static final byte[]  NULL_COMPRESSION = new byte[] {0};
 
     ClientHello(SecureRandom generator, ProtocolVersion protocolVersion,
             SessionId sessionId, CipherSuiteList cipherSuites,
@@ -924,7 +924,7 @@
  * exchange the premaster secret.  That's how RSA_EXPORT often works,
  * as well as how the DHE_* flavors work.
  */
-static abstract class ServerKeyExchange extends HandshakeMessage
+abstract static class ServerKeyExchange extends HandshakeMessage
 {
     @Override
     int messageType() { return ht_server_key_exchange; }
@@ -1077,7 +1077,7 @@
 class DH_ServerKeyExchange extends ServerKeyExchange
 {
     // Fix message encoding, see 4348279
-    private final static boolean dhKeyExchangeFix =
+    private static final boolean dhKeyExchangeFix =
         Debug.getBooleanProperty("com.sun.net.ssl.dhKeyExchangeFix", true);
 
     private byte[]                dh_p;        // 1 to 2^16 - 1 bytes
@@ -1362,9 +1362,9 @@
 class ECDH_ServerKeyExchange extends ServerKeyExchange {
 
     // constants for ECCurveType
-    private final static int CURVE_EXPLICIT_PRIME = 1;
-    private final static int CURVE_EXPLICIT_CHAR2 = 2;
-    private final static int CURVE_NAMED_CURVE    = 3;
+    private static final int CURVE_EXPLICIT_PRIME = 1;
+    private static final int CURVE_EXPLICIT_CHAR2 = 2;
+    private static final int CURVE_NAMED_CURVE    = 3;
 
     // id of the curve we are using
     private int curveId;
@@ -1660,8 +1660,8 @@
     static final int    cct_rsa_fixed_ecdh   = 65;
     static final int    cct_ecdsa_fixed_ecdh = 66;
 
-    private final static byte[] TYPES_NO_ECC = { cct_rsa_sign, cct_dss_sign };
-    private final static byte[] TYPES_ECC =
+    private static final byte[] TYPES_NO_ECC = { cct_rsa_sign, cct_dss_sign };
+    private static final byte[] TYPES_ECC =
         { cct_rsa_sign, cct_dss_sign, cct_ecdsa_sign };
 
     byte[]                types;               // 1 to 255 types
@@ -2119,8 +2119,8 @@
         md.update(temp);
     }
 
-    private final static Class delegate;
-    private final static Field spiField;
+    private static final Class delegate;
+    private static final Field spiField;
 
     static {
         try {
@@ -2143,12 +2143,12 @@
     }
 
     // ConcurrentHashMap does not allow null values, use this marker object
-    private final static Object NULL_OBJECT = new Object();
+    private static final Object NULL_OBJECT = new Object();
 
     // cache Method objects per Spi class
     // Note that this will prevent the Spi classes from being GC'd. We assume
     // that is not a problem.
-    private final static Map,Object> methodCache =
+    private static final Map,Object> methodCache =
                                         new ConcurrentHashMap<>();
 
     private static void digestKey(MessageDigest md, SecretKey key) {
@@ -2241,10 +2241,10 @@
 static final class Finished extends HandshakeMessage {
 
     // constant for a Finished message sent by the client
-    final static int CLIENT = 1;
+    static final int CLIENT = 1;
 
     // constant for a Finished message sent by the server
-    final static int SERVER = 2;
+    static final int SERVER = 2;
 
     // enum Sender:  "CLNT" and "SRVR"
     private static final byte[] SSL_CLIENT = { 0x43, 0x4C, 0x4E, 0x54 };
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java	Tue Sep 15 21:56:04 2015 -0700
@@ -218,9 +218,9 @@
 
     private boolean isDTLS;
 
-    private final static boolean debugIsOn;
+    private static final boolean debugIsOn;
 
-    private final static HashMap handshakeTypes;
+    private static final HashMap handshakeTypes;
 
     static {
         debugIsOn = (Handshaker.debug != null) &&
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java	Tue Sep 15 21:56:04 2015 -0700
@@ -585,7 +585,7 @@
      *
      * Does not check if the required server certificates are available.
      */
-    final static boolean isNegotiable(CipherSuiteList proposed, CipherSuite s) {
+    static final boolean isNegotiable(CipherSuiteList proposed, CipherSuite s) {
         return proposed.contains(s) && s.isNegotiable();
     }
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java	Tue Sep 15 21:56:04 2015 -0700
@@ -123,7 +123,7 @@
      * and flag the record as holding no data.
      */
     @Override
-    synchronized public void close() throws IOException {
+    public synchronized void close() throws IOException {
         if (!isClosed) {
             isClosed = true;
             readCipher.dispose();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java	Tue Sep 15 21:56:04 2015 -0700
@@ -53,7 +53,7 @@
  */
 final class JsseJce {
 
-    private final static ProviderList fipsProviderList;
+    private static final ProviderList fipsProviderList;
 
     // Flag indicating whether EC crypto is available.
     // If null, then we have not checked yet.
@@ -62,7 +62,7 @@
 
     // Flag indicating whether Kerberos crypto is available.
     // If true, then all the Kerberos-based crypto we need is available.
-    private final static boolean kerberosAvailable;
+    private static final boolean kerberosAvailable;
     static {
         ClientKeyExchangeService p =
                 ClientKeyExchangeService.find("KRB5");
@@ -119,68 +119,68 @@
      * JCE transformation string for RSA with PKCS#1 v1.5 padding.
      * Can be used for encryption, decryption, signing, verifying.
      */
-    final static String CIPHER_RSA_PKCS1 = "RSA/ECB/PKCS1Padding";
+    static final String CIPHER_RSA_PKCS1 = "RSA/ECB/PKCS1Padding";
     /**
      * JCE transformation string for the stream cipher RC4.
      */
-    final static String CIPHER_RC4 = "RC4";
+    static final String CIPHER_RC4 = "RC4";
     /**
      * JCE transformation string for DES in CBC mode without padding.
      */
-    final static String CIPHER_DES = "DES/CBC/NoPadding";
+    static final String CIPHER_DES = "DES/CBC/NoPadding";
     /**
      * JCE transformation string for (3-key) Triple DES in CBC mode
      * without padding.
      */
-    final static String CIPHER_3DES = "DESede/CBC/NoPadding";
+    static final String CIPHER_3DES = "DESede/CBC/NoPadding";
     /**
      * JCE transformation string for AES in CBC mode
      * without padding.
      */
-    final static String CIPHER_AES = "AES/CBC/NoPadding";
+    static final String CIPHER_AES = "AES/CBC/NoPadding";
     /**
      * JCE transformation string for AES in GCM mode
      * without padding.
      */
-    final static String CIPHER_AES_GCM = "AES/GCM/NoPadding";
+    static final String CIPHER_AES_GCM = "AES/GCM/NoPadding";
     /**
      * JCA identifier string for DSA, i.e. a DSA with SHA-1.
      */
-    final static String SIGNATURE_DSA = "DSA";
+    static final String SIGNATURE_DSA = "DSA";
     /**
      * JCA identifier string for ECDSA, i.e. a ECDSA with SHA-1.
      */
-    final static String SIGNATURE_ECDSA = "SHA1withECDSA";
+    static final String SIGNATURE_ECDSA = "SHA1withECDSA";
     /**
      * JCA identifier string for Raw DSA, i.e. a DSA signature without
      * hashing where the application provides the SHA-1 hash of the data.
      * Note that the standard name is "NONEwithDSA" but we use "RawDSA"
      * for compatibility.
      */
-    final static String SIGNATURE_RAWDSA = "RawDSA";
+    static final String SIGNATURE_RAWDSA = "RawDSA";
     /**
      * JCA identifier string for Raw ECDSA, i.e. a DSA signature without
      * hashing where the application provides the SHA-1 hash of the data.
      */
-    final static String SIGNATURE_RAWECDSA = "NONEwithECDSA";
+    static final String SIGNATURE_RAWECDSA = "NONEwithECDSA";
     /**
      * JCA identifier string for Raw RSA, i.e. a RSA PKCS#1 v1.5 signature
      * without hashing where the application provides the hash of the data.
      * Used for RSA client authentication with a 36 byte hash.
      */
-    final static String SIGNATURE_RAWRSA = "NONEwithRSA";
+    static final String SIGNATURE_RAWRSA = "NONEwithRSA";
     /**
      * JCA identifier string for the SSL/TLS style RSA Signature. I.e.
      * an signature using RSA with PKCS#1 v1.5 padding signing a
      * concatenation of an MD5 and SHA-1 digest.
      */
-    final static String SIGNATURE_SSLRSA = "MD5andSHA1withRSA";
+    static final String SIGNATURE_SSLRSA = "MD5andSHA1withRSA";
 
     private JsseJce() {
         // no instantiation of this class
     }
 
-    synchronized static boolean isEcAvailable() {
+    static synchronized boolean isEcAvailable() {
         if (ecAvailable == null) {
             try {
                 JsseJce.getSignature(SIGNATURE_ECDSA);
@@ -196,7 +196,7 @@
         return ecAvailable;
     }
 
-    synchronized static void clearEcAvailable() {
+    static synchronized void clearEcAvailable() {
         ecAvailable = null;
     }
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/MAC.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/MAC.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/MAC.java	Tue Sep 15 21:56:04 2015 -0700
@@ -49,7 +49,7 @@
  */
 final class MAC extends Authenticator {
 
-    final static MAC TLS_NULL = new MAC(false);
+    static final MAC TLS_NULL = new MAC(false);
 
     // Value of the null MAC is fixed
     private static final byte[] nullMAC = new byte[0];
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java	Tue Sep 15 21:56:04 2015 -0700
@@ -195,7 +195,7 @@
     }
 
     @Override
-    synchronized public void close() throws IOException {
+    public synchronized void close() throws IOException {
         if (!isClosed) {
             isClosed = true;
             writeCipher.dispose();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/Plaintext.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/Plaintext.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/Plaintext.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,7 +32,7 @@
  * Plaintext
  */
 final class Plaintext {
-    final static Plaintext PLAINTEXT_NULL = new Plaintext();
+    static final Plaintext PLAINTEXT_NULL = new Plaintext();
 
     byte            contentType;
     byte            majorVersion;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java	Tue Sep 15 21:56:04 2015 -0700
@@ -54,33 +54,33 @@
 public final class ProtocolVersion implements Comparable {
 
     // The limit of maximum protocol version
-    final static int LIMIT_MAX_VALUE = 0xFFFF;
+    static final int LIMIT_MAX_VALUE = 0xFFFF;
 
     // The limit of minimum protocol version
-    final static int LIMIT_MIN_VALUE = 0x0000;
+    static final int LIMIT_MIN_VALUE = 0x0000;
 
     // Dummy protocol version value for invalid SSLSession
-    final static ProtocolVersion NONE = new ProtocolVersion(-1, "NONE");
+    static final ProtocolVersion NONE = new ProtocolVersion(-1, "NONE");
 
     // If enabled, send/accept SSLv2 hello messages
-    final static ProtocolVersion SSL20Hello =
+    static final ProtocolVersion SSL20Hello =
                                 new ProtocolVersion(0x0002, "SSLv2Hello");
 
     // SSL 3.0
-    final static ProtocolVersion SSL30 = new ProtocolVersion(0x0300, "SSLv3");
+    static final ProtocolVersion SSL30 = new ProtocolVersion(0x0300, "SSLv3");
 
     // TLS 1.0
-    final static ProtocolVersion TLS10 = new ProtocolVersion(0x0301, "TLSv1");
+    static final ProtocolVersion TLS10 = new ProtocolVersion(0x0301, "TLSv1");
 
     // TLS 1.1
-    final static ProtocolVersion TLS11 = new ProtocolVersion(0x0302, "TLSv1.1");
+    static final ProtocolVersion TLS11 = new ProtocolVersion(0x0302, "TLSv1.1");
 
     // TLS 1.2
-    final static ProtocolVersion TLS12 = new ProtocolVersion(0x0303, "TLSv1.2");
+    static final ProtocolVersion TLS12 = new ProtocolVersion(0x0303, "TLSv1.2");
 
     // DTLS 1.0
     // {254, 255}, the version value of DTLS 1.0.
-    final static ProtocolVersion DTLS10 =
+    static final ProtocolVersion DTLS10 =
                                 new ProtocolVersion(0xFEFF, "DTLSv1.0");
 
     // No DTLS 1.1, that version number was skipped in order to harmonize
@@ -88,30 +88,30 @@
 
     // DTLS 1.2
     // {254, 253}, the version value of DTLS 1.2.
-    final static ProtocolVersion DTLS12 =
+    static final ProtocolVersion DTLS12 =
                                 new ProtocolVersion(0xFEFD, "DTLSv1.2");
 
     private static final boolean FIPS = SunJSSE.isFIPS();
 
     // minimum version we implement (SSL 3.0)
-    final static ProtocolVersion MIN = FIPS ? TLS10 : SSL30;
+    static final ProtocolVersion MIN = FIPS ? TLS10 : SSL30;
 
     // maximum version we implement (TLS 1.2)
-    final static ProtocolVersion MAX = TLS12;
+    static final ProtocolVersion MAX = TLS12;
 
     // SSL/TLS ProtocolVersion to use by default (TLS 1.2)
-    final static ProtocolVersion DEFAULT_TLS = TLS12;
+    static final ProtocolVersion DEFAULT_TLS = TLS12;
 
     // DTLS ProtocolVersion to use by default (TLS 1.2)
-    final static ProtocolVersion DEFAULT_DTLS = DTLS12;
+    static final ProtocolVersion DEFAULT_DTLS = DTLS12;
 
     // Default version for hello messages (SSLv2Hello)
-    final static ProtocolVersion DEFAULT_HELLO = FIPS ? TLS10 : SSL30;
+    static final ProtocolVersion DEFAULT_HELLO = FIPS ? TLS10 : SSL30;
 
     // Available protocols
     //
     // Including all supported protocols except the disabled ones.
-    final static Set availableProtocols;
+    static final Set availableProtocols;
 
     // version in 16 bit MSB format as it appears in records and
     // messages, i.e. 0x0301 for TLS 1.0
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java	Tue Sep 15 21:56:04 2015 -0700
@@ -47,11 +47,11 @@
  */
 final class SSLAlgorithmConstraints implements AlgorithmConstraints {
 
-    private final static AlgorithmConstraints tlsDisabledAlgConstraints =
+    private static final AlgorithmConstraints tlsDisabledAlgConstraints =
             new DisabledAlgorithmConstraints(PROPERTY_TLS_DISABLED_ALGS,
                     new SSLAlgorithmDecomposer());
 
-    private final static AlgorithmConstraints x509DisabledAlgConstraints =
+    private static final AlgorithmConstraints x509DisabledAlgConstraints =
             new DisabledAlgorithmConstraints(PROPERTY_CERTPATH_DISABLED_ALGS,
                     new SSLAlgorithmDecomposer(true));
 
@@ -61,11 +61,11 @@
     private boolean enabledX509DisabledAlgConstraints = true;
 
     // the default algorithm constraints
-    final static AlgorithmConstraints DEFAULT =
+    static final AlgorithmConstraints DEFAULT =
                         new SSLAlgorithmConstraints(null);
 
     // the default SSL only algorithm constraints
-    final static AlgorithmConstraints DEFAULT_SSL_ONLY =
+    static final AlgorithmConstraints DEFAULT_SSL_ONLY =
                         new SSLAlgorithmConstraints((SSLSocket)null, false);
 
     SSLAlgorithmConstraints(AlgorithmConstraints algorithmConstraints) {
@@ -207,7 +207,7 @@
     }
 
 
-    static private class SupportedSignatureAlgorithmConstraints
+    private static class SupportedSignatureAlgorithmConstraints
                                     implements AlgorithmConstraints {
         // supported signature algorithms
         private String[] supportedAlgorithms;
@@ -255,12 +255,12 @@
         }
 
         @Override
-        final public boolean permits(Set primitives, Key key) {
+        public final boolean permits(Set primitives, Key key) {
             return true;
         }
 
         @Override
-        final public boolean permits(Set primitives,
+        public final boolean permits(Set primitives,
                 String algorithm, Key key, AlgorithmParameters parameters) {
 
             if (algorithm == null || algorithm.length() == 0) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -657,7 +657,7 @@
      * @see SSLContext
      */
     private static class CustomizedSSLProtocols {
-        private final static String PROPERTY_NAME = "jdk.tls.client.protocols";
+        private static final String PROPERTY_NAME = "jdk.tls.client.protocols";
         static IllegalArgumentException reservedException = null;
         static ArrayList
                                 customizedProtocols = new ArrayList<>();
@@ -1028,7 +1028,7 @@
      * @see SSLContext
      */
     public static final class DTLS10Context extends AbstractDTLSContext {
-        private final static SSLParameters defaultClientSSLParams;
+        private static final SSLParameters defaultClientSSLParams;
 
         static {
             // candidates for available protocols
@@ -1053,7 +1053,7 @@
      * @see SSLContext
      */
     public static final class DTLS12Context extends AbstractDTLSContext {
-        private final static SSLParameters defaultClientSSLParams;
+        private static final SSLParameters defaultClientSSLParams;
 
         static {
             // candidates for available protocols
@@ -1079,7 +1079,7 @@
      * @see SSLContext
      */
     private static class CustomizedDTLSContext extends AbstractDTLSContext {
-        private final static SSLParameters defaultClientSSLParams;
+        private static final SSLParameters defaultClientSSLParams;
         private static IllegalArgumentException reservedException = null;
 
         // Don't want a java.lang.LinkageError for illegal system property.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -56,7 +56,7 @@
  *
  * @author Brad Wetmore
  */
-final public class SSLEngineImpl extends SSLEngine {
+public final class SSLEngineImpl extends SSLEngine {
 
     //
     // Fields and global comments
@@ -475,7 +475,7 @@
         }
     }
 
-    synchronized private void checkTaskThrown() throws SSLException {
+    private synchronized void checkTaskThrown() throws SSLException {
         if (handshaker != null) {
             handshaker.checkThrown();
         }
@@ -489,11 +489,11 @@
      * Provides "this" synchronization for connection state.
      * Otherwise, you can access it directly.
      */
-    synchronized private int getConnectionState() {
+    private synchronized int getConnectionState() {
         return connectionState;
     }
 
-    synchronized private void setConnectionState(int state) {
+    private synchronized void setConnectionState(int state) {
         connectionState = state;
     }
 
@@ -1513,7 +1513,7 @@
     }
 
     @Override
-    synchronized public void closeOutbound() {
+    public synchronized void closeOutbound() {
         /*
          * Dump out a close_notify to the remote side
          */
@@ -1569,7 +1569,7 @@
      * We do check for truncation attacks.
      */
     @Override
-    synchronized public void closeInbound() throws SSLException {
+    public synchronized void closeInbound() throws SSLException {
         /*
          * Currently closes the outbound side as well.  The IETF TLS
          * working group has expressed the opinion that 1/2 open
@@ -1602,7 +1602,7 @@
      * Returns the network inbound data closure state
      */
     @Override
-    synchronized public boolean isInboundDone() {
+    public synchronized boolean isInboundDone() {
         return inboundDone;
     }
 
@@ -1620,12 +1620,12 @@
      * entire login session for some user.
      */
     @Override
-    synchronized public SSLSession getSession() {
+    public synchronized SSLSession getSession() {
         return sess;
     }
 
     @Override
-    synchronized public SSLSession getHandshakeSession() {
+    public synchronized SSLSession getHandshakeSession() {
         return handshakeSession;
     }
 
@@ -1642,7 +1642,7 @@
      * this SSLEngine.
      */
     @Override
-    synchronized public Runnable getDelegatedTask() {
+    public synchronized Runnable getDelegatedTask() {
         if (handshaker != null) {
             return handshaker.getTask();
         }
@@ -1882,7 +1882,7 @@
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setEnableSessionCreation(boolean flag) {
+    public synchronized void setEnableSessionCreation(boolean flag) {
         enableSessionCreation = flag;
 
         if ((handshaker != null) && !handshaker.activated()) {
@@ -1895,7 +1895,7 @@
      * sessions.
      */
     @Override
-    synchronized public boolean getEnableSessionCreation() {
+    public synchronized boolean getEnableSessionCreation() {
         return enableSessionCreation;
     }
 
@@ -1909,7 +1909,7 @@
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setNeedClientAuth(boolean flag) {
+    public synchronized void setNeedClientAuth(boolean flag) {
         doClientAuth = (flag ?
                 ClientAuthType.CLIENT_AUTH_REQUIRED :
                 ClientAuthType.CLIENT_AUTH_NONE);
@@ -1922,7 +1922,7 @@
     }
 
     @Override
-    synchronized public boolean getNeedClientAuth() {
+    public synchronized boolean getNeedClientAuth() {
         return (doClientAuth == ClientAuthType.CLIENT_AUTH_REQUIRED);
     }
 
@@ -1935,7 +1935,7 @@
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setWantClientAuth(boolean flag) {
+    public synchronized void setWantClientAuth(boolean flag) {
         doClientAuth = (flag ?
                 ClientAuthType.CLIENT_AUTH_REQUESTED :
                 ClientAuthType.CLIENT_AUTH_NONE);
@@ -1948,7 +1948,7 @@
     }
 
     @Override
-    synchronized public boolean getWantClientAuth() {
+    public synchronized boolean getWantClientAuth() {
         return (doClientAuth == ClientAuthType.CLIENT_AUTH_REQUESTED);
     }
 
@@ -1960,7 +1960,7 @@
      */
     @Override
     @SuppressWarnings("fallthrough")
-    synchronized public void setUseClientMode(boolean flag) {
+    public synchronized void setUseClientMode(boolean flag) {
         switch (connectionState) {
 
         case cs_START:
@@ -2040,7 +2040,7 @@
     }
 
     @Override
-    synchronized public boolean getUseClientMode() {
+    public synchronized boolean getUseClientMode() {
         return !roleIsServer;
     }
 
@@ -2070,7 +2070,7 @@
      * @param suites Names of all the cipher suites to enable.
      */
     @Override
-    synchronized public void setEnabledCipherSuites(String[] suites) {
+    public synchronized void setEnabledCipherSuites(String[] suites) {
         enabledCipherSuites = new CipherSuiteList(suites);
         if ((handshaker != null) && !handshaker.activated()) {
             handshaker.setEnabledCipherSuites(enabledCipherSuites);
@@ -2088,7 +2088,7 @@
      * @return an array of cipher suite names
      */
     @Override
-    synchronized public String[] getEnabledCipherSuites() {
+    public synchronized String[] getEnabledCipherSuites() {
         return enabledCipherSuites.toStringArray();
     }
 
@@ -2113,7 +2113,7 @@
      *  named by the parameter is not supported.
      */
     @Override
-    synchronized public void setEnabledProtocols(String[] protocols) {
+    public synchronized void setEnabledProtocols(String[] protocols) {
         enabledProtocols = new ProtocolList(protocols);
         if ((handshaker != null) && !handshaker.activated()) {
             handshaker.setEnabledProtocols(enabledProtocols);
@@ -2121,7 +2121,7 @@
     }
 
     @Override
-    synchronized public String[] getEnabledProtocols() {
+    public synchronized String[] getEnabledProtocols() {
         return enabledProtocols.toStringArray();
     }
 
@@ -2129,7 +2129,7 @@
      * Returns the SSLParameters in effect for this SSLEngine.
      */
     @Override
-    synchronized public SSLParameters getSSLParameters() {
+    public synchronized SSLParameters getSSLParameters() {
         SSLParameters params = super.getSSLParameters();
 
         // the super implementation does not handle the following parameters
@@ -2148,7 +2148,7 @@
      * Applies SSLParameters to this engine.
      */
     @Override
-    synchronized public void setSSLParameters(SSLParameters params) {
+    public synchronized void setSSLParameters(SSLParameters params) {
         super.setSSLParameters(params);
 
         // the super implementation does not handle the following parameters
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java	Tue Sep 15 21:56:04 2015 -0700
@@ -54,7 +54,7 @@
     }
 
     @Override
-    synchronized public void close() throws IOException {
+    public synchronized void close() throws IOException {
         if (!isClosed) {
             if (alertMemos != null && !alertMemos.isEmpty()) {
                 isCloseWaiting = true;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -184,7 +184,7 @@
      * that the system defaults are in effect.
      */
     @Override
-    synchronized public String[] getEnabledCipherSuites() {
+    public synchronized String[] getEnabledCipherSuites() {
         return enabledCipherSuites.toStringArray();
     }
 
@@ -196,7 +196,7 @@
      *  means to accept system defaults.
      */
     @Override
-    synchronized public void setEnabledCipherSuites(String[] suites) {
+    public synchronized void setEnabledCipherSuites(String[] suites) {
         enabledCipherSuites = new CipherSuiteList(suites);
     }
 
@@ -215,12 +215,12 @@
      *  named by the parameter is not supported.
      */
     @Override
-    synchronized public void setEnabledProtocols(String[] protocols) {
+    public synchronized void setEnabledProtocols(String[] protocols) {
         enabledProtocols = new ProtocolList(protocols);
     }
 
     @Override
-    synchronized public String[] getEnabledProtocols() {
+    public synchronized String[] getEnabledProtocols() {
         return enabledProtocols.toStringArray();
     }
 
@@ -303,7 +303,7 @@
      * Returns the SSLParameters in effect for newly accepted connections.
      */
     @Override
-    synchronized public SSLParameters getSSLParameters() {
+    public synchronized SSLParameters getSSLParameters() {
         SSLParameters params = super.getSSLParameters();
 
         // the super implementation does not handle the following parameters
@@ -320,7 +320,7 @@
      * Applies SSLParameters to newly accepted connections.
      */
     @Override
-    synchronized public void setSSLParameters(SSLParameters params) {
+    public synchronized void setSSLParameters(SSLParameters params) {
         super.setSSLParameters(params);
 
         // the super implementation does not handle the following parameters
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -677,7 +677,7 @@
      * no connections will be able to rejoin this session.
      */
     @Override
-    synchronized public void invalidate() {
+    public synchronized void invalidate() {
         //
         // Can't invalidate the NULL session -- this would be
         // attempted when we get a handshaking error on a brand
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -41,7 +41,7 @@
  *
  * @author David Brownell
  */
-final public class SSLSocketFactoryImpl extends SSLSocketFactory {
+public final class SSLSocketFactoryImpl extends SSLSocketFactory {
 
     private SSLContextImpl context;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -64,7 +64,7 @@
  *
  * @author David Brownell
  */
-final public class SSLSocketImpl extends BaseSSLSocketImpl {
+public final class SSLSocketImpl extends BaseSSLSocketImpl {
 
     /*
      * ERROR HANDLING GUIDELINES
@@ -281,9 +281,9 @@
      * This is necessary so that processing of close_notify alerts
      * from the peer are handled properly.
      */
-    final private Object        handshakeLock = new Object();
+    private final Object        handshakeLock = new Object();
     final ReentrantLock         writeLock = new ReentrantLock();
-    final private Object        readLock = new Object();
+    private final Object        readLock = new Object();
 
     InputRecord                 inputRecord;
     OutputRecord                outputRecord;
@@ -673,11 +673,11 @@
         initHandshaker();
     }
 
-    synchronized private int getConnectionState() {
+    private synchronized int getConnectionState() {
         return connectionState;
     }
 
-    synchronized private void setConnectionState(int state) {
+    private synchronized void setConnectionState(int state) {
         connectionState = state;
     }
 
@@ -1802,7 +1802,7 @@
      *          reserved for exceptions like timeout; otherwise, the socket
      *          will be closed, no further communications could be done.
      */
-    synchronized private void handleException(Exception e, boolean resumable)
+    private synchronized void handleException(Exception e, boolean resumable)
         throws IOException {
         if ((debug != null) && Debug.isOn("ssl")) {
             System.out.println(Thread.currentThread().getName() +
@@ -2114,7 +2114,7 @@
     // Please NOTE that this method MUST be called before calling to
     // SSLSocket.setSSLParameters(). Otherwise, the {@code host} parameter
     // may override SNIHostName in the customized server name indication.
-    synchronized public void setHost(String host) {
+    public synchronized void setHost(String host) {
         this.host = host;
         this.serverNames =
             Utilities.addToSNIServerNameList(this.serverNames, this.host);
@@ -2126,7 +2126,7 @@
      * transit, and will usually have been confidentiality protected.
      */
     @Override
-    synchronized public InputStream getInputStream() throws IOException {
+    public synchronized InputStream getInputStream() throws IOException {
         if (isClosed()) {
             throw new SocketException("Socket is closed");
         }
@@ -2148,7 +2148,7 @@
      * will usually be confidentiality protected.
      */
     @Override
-    synchronized public OutputStream getOutputStream() throws IOException {
+    public synchronized OutputStream getOutputStream() throws IOException {
         if (isClosed()) {
             throw new SocketException("Socket is closed");
         }
@@ -2192,7 +2192,7 @@
     }
 
     @Override
-    synchronized public SSLSession getHandshakeSession() {
+    public synchronized SSLSession getHandshakeSession() {
         return handshakeSession;
     }
 
@@ -2213,7 +2213,7 @@
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setEnableSessionCreation(boolean flag) {
+    public synchronized void setEnableSessionCreation(boolean flag) {
         enableSessionCreation = flag;
 
         if ((handshaker != null) && !handshaker.activated()) {
@@ -2226,7 +2226,7 @@
      * sessions.
      */
     @Override
-    synchronized public boolean getEnableSessionCreation() {
+    public synchronized boolean getEnableSessionCreation() {
         return enableSessionCreation;
     }
 
@@ -2240,7 +2240,7 @@
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setNeedClientAuth(boolean flag) {
+    public synchronized void setNeedClientAuth(boolean flag) {
         doClientAuth = (flag ? ClientAuthType.CLIENT_AUTH_REQUIRED :
                 ClientAuthType.CLIENT_AUTH_NONE);
 
@@ -2252,7 +2252,7 @@
     }
 
     @Override
-    synchronized public boolean getNeedClientAuth() {
+    public synchronized boolean getNeedClientAuth() {
         return (doClientAuth == ClientAuthType.CLIENT_AUTH_REQUIRED);
     }
 
@@ -2265,7 +2265,7 @@
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setWantClientAuth(boolean flag) {
+    public synchronized void setWantClientAuth(boolean flag) {
         doClientAuth = (flag ? ClientAuthType.CLIENT_AUTH_REQUESTED :
                 ClientAuthType.CLIENT_AUTH_NONE);
 
@@ -2277,7 +2277,7 @@
     }
 
     @Override
-    synchronized public boolean getWantClientAuth() {
+    public synchronized boolean getWantClientAuth() {
         return (doClientAuth == ClientAuthType.CLIENT_AUTH_REQUESTED);
     }
 
@@ -2289,7 +2289,7 @@
      */
     @Override
     @SuppressWarnings("fallthrough")
-    synchronized public void setUseClientMode(boolean flag) {
+    public synchronized void setUseClientMode(boolean flag) {
         switch (connectionState) {
 
         case cs_START:
@@ -2363,7 +2363,7 @@
     }
 
     @Override
-    synchronized public boolean getUseClientMode() {
+    public synchronized boolean getUseClientMode() {
         return !roleIsServer;
     }
 
@@ -2393,7 +2393,7 @@
      * @param suites Names of all the cipher suites to enable.
      */
     @Override
-    synchronized public void setEnabledCipherSuites(String[] suites) {
+    public synchronized void setEnabledCipherSuites(String[] suites) {
         enabledCipherSuites = new CipherSuiteList(suites);
         if ((handshaker != null) && !handshaker.activated()) {
             handshaker.setEnabledCipherSuites(enabledCipherSuites);
@@ -2411,7 +2411,7 @@
      * @return an array of cipher suite names
      */
     @Override
-    synchronized public String[] getEnabledCipherSuites() {
+    public synchronized String[] getEnabledCipherSuites() {
         return enabledCipherSuites.toStringArray();
     }
 
@@ -2436,7 +2436,7 @@
      *  named by the parameter is not supported.
      */
     @Override
-    synchronized public void setEnabledProtocols(String[] protocols) {
+    public synchronized void setEnabledProtocols(String[] protocols) {
         enabledProtocols = new ProtocolList(protocols);
         if ((handshaker != null) && !handshaker.activated()) {
             handshaker.setEnabledProtocols(enabledProtocols);
@@ -2444,7 +2444,7 @@
     }
 
     @Override
-    synchronized public String[] getEnabledProtocols() {
+    public synchronized String[] getEnabledProtocols() {
         return enabledProtocols.toStringArray();
     }
 
@@ -2501,7 +2501,7 @@
      * Returns the SSLParameters in effect for this SSLSocket.
      */
     @Override
-    synchronized public SSLParameters getSSLParameters() {
+    public synchronized SSLParameters getSSLParameters() {
         SSLParameters params = super.getSSLParameters();
 
         // the super implementation does not handle the following parameters
@@ -2521,7 +2521,7 @@
      * Applies SSLParameters to this socket.
      */
     @Override
-    synchronized public void setSSLParameters(SSLParameters params) {
+    public synchronized void setSSLParameters(SSLParameters params) {
         super.setSSLParameters(params);
 
         // the super implementation does not handle the following parameters
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java	Tue Sep 15 21:56:04 2015 -0700
@@ -119,7 +119,7 @@
                     new SSLAlgorithmDecomposer());
 
     // To switch off the status_request[_v2] extensions
-    private final static boolean enableStatusRequestExtension =
+    private static final boolean enableStatusRequestExtension =
             Debug.getBooleanProperty(
                     "jdk.tls.server.enableStatusRequestExtension", false);
     private boolean staplingActive = false;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java	Tue Sep 15 21:56:04 2015 -0700
@@ -68,7 +68,7 @@
 
     // For backward compatibility, all future data structures associated with
     // new NameTypes MUST begin with a 16-bit length field.
-    final static int NAME_HEADER_LENGTH = 3;    // NameType: 1 byte
+    static final int NAME_HEADER_LENGTH = 3;    // NameType: 1 byte
                                                 // Name length: 2 bytes
     private Map sniMap;
     private int listLength;     // ServerNameList length
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java	Tue Sep 15 21:56:04 2015 -0700
@@ -65,15 +65,15 @@
 final class SignatureAndHashAlgorithm {
 
     // minimum priority for default enabled algorithms
-    final static int SUPPORTED_ALG_PRIORITY_MAX_NUM = 0x00F0;
+    static final int SUPPORTED_ALG_PRIORITY_MAX_NUM = 0x00F0;
 
     // performance optimization
-    private final static Set SIGNATURE_PRIMITIVE_SET =
+    private static final Set SIGNATURE_PRIMITIVE_SET =
         Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.SIGNATURE));
 
     // supported pairs of signature and hash algorithm
-    private final static Map supportedMap;
-    private final static Map priorityMap;
+    private static final Map supportedMap;
+    private static final Map priorityMap;
 
     // the hash algorithm
     private HashAlgorithm hash;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/StatusRequestType.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/StatusRequestType.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/StatusRequestType.java	Tue Sep 15 21:56:04 2015 -0700
@@ -61,6 +61,6 @@
     }
 
     // Status request types defined in RFC 6066 and 6961
-    final static StatusRequestType OCSP = e(0x01, "ocsp");
-    final static StatusRequestType OCSP_MULTI = e(0x02, "ocsp_multi");
+    static final StatusRequestType OCSP = e(0x01, "ocsp");
+    static final StatusRequestType OCSP_MULTI = e(0x02, "ocsp_multi");
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java	Tue Sep 15 21:56:04 2015 -0700
@@ -173,11 +173,11 @@
         return null;
     }
 
-    private final static int ARBITRARY_PRIME = 0xff01;
-    private final static int ARBITRARY_CHAR2 = 0xff02;
+    private static final int ARBITRARY_PRIME = 0xff01;
+    private static final int ARBITRARY_CHAR2 = 0xff02;
 
     // See sun.security.util.NamedCurve for the OIDs
-    private final static String[] NAMED_CURVE_OID_TABLE = new String[] {
+    private static final String[] NAMED_CURVE_OID_TABLE = new String[] {
         null,                   //  (0) unused
         "1.3.132.0.1",          //  (1) sect163k1, NIST K-163
         "1.3.132.0.2",          //  (2) sect163r1
@@ -206,7 +206,7 @@
         "1.3.132.0.35",         // (25) secp521r1, NIST P-521
     };
 
-    private final static Map curveIndices;
+    private static final Map curveIndices;
 
     static {
         curveIndices = new HashMap();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java	Tue Sep 15 21:56:04 2015 -0700
@@ -33,9 +33,9 @@
 
 final class SupportedEllipticPointFormatsExtension extends HelloExtension {
 
-    final static int FMT_UNCOMPRESSED = 0;
-    final static int FMT_ANSIX962_COMPRESSED_PRIME = 1;
-    final static int FMT_ANSIX962_COMPRESSED_CHAR2 = 2;
+    static final int FMT_UNCOMPRESSED = 0;
+    static final int FMT_ANSIX962_COMPRESSED_PRIME = 1;
+    static final int FMT_ANSIX962_COMPRESSED_CHAR2 = 2;
 
     static final HelloExtension DEFAULT =
         new SupportedEllipticPointFormatsExtension(
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -62,7 +62,7 @@
 
     private static final Debug debug = Debug.getInstance("ssl");
 
-    private final static boolean useDebug =
+    private static final boolean useDebug =
                             (debug != null) && Debug.isOn("keymanager");
 
     // for unit testing only, set via privileged reflection
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java
--- a/jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java	Tue Sep 15 21:56:04 2015 -0700
@@ -374,7 +374,7 @@
         }
     }
 
-    final static class TimestampException extends IOException {
+    static final class TimestampException extends IOException {
         private static final long serialVersionUID = -1631631794891940953L;
 
         TimestampException(String message) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/util/Cache.java
--- a/jdk/src/java.base/share/classes/sun/security/util/Cache.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/Cache.java	Tue Sep 15 21:56:04 2015 -0700
@@ -202,7 +202,7 @@
 
 class NullCache extends Cache {
 
-    final static Cache INSTANCE = new NullCache<>();
+    static final Cache INSTANCE = new NullCache<>();
 
     private NullCache() {
         // empty
@@ -244,10 +244,10 @@
 
 class MemoryCache extends Cache {
 
-    private final static float LOAD_FACTOR = 0.75f;
+    private static final float LOAD_FACTOR = 0.75f;
 
     // XXXX
-    private final static boolean DEBUG = false;
+    private static final boolean DEBUG = false;
 
     private final Map> cacheMap;
     private int maxSize;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/util/CurveDB.java
--- a/jdk/src/java.base/share/classes/sun/security/util/CurveDB.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/CurveDB.java	Tue Sep 15 21:56:04 2015 -0700
@@ -40,10 +40,10 @@
  * @author  Andreas Sterbenz
  */
 public class CurveDB {
-    private final static int P  = 1; // prime curve
-    private final static int B  = 2; // binary curve
-    private final static int PD = 5; // prime curve, mark as default
-    private final static int BD = 6; // binary curve, mark as default
+    private static final int P  = 1; // prime curve
+    private static final int B  = 2; // binary curve
+    private static final int PD = 5; // prime curve, mark as default
+    private static final int BD = 6; // binary curve, mark as default
 
     private static final Map oidMap =
         new LinkedHashMap();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/util/Debug.java
--- a/jdk/src/java.base/share/classes/sun/security/util/Debug.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/Debug.java	Tue Sep 15 21:56:04 2015 -0700
@@ -293,7 +293,7 @@
         return null;
     }
 
-    private final static char[] hexDigits = "0123456789abcdef".toCharArray();
+    private static final char[] hexDigits = "0123456789abcdef".toCharArray();
 
     public static String toString(byte[] b) {
         if (b == null) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/util/DerValue.java
--- a/jdk/src/java.base/share/classes/sun/security/util/DerValue.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/DerValue.java	Tue Sep 15 21:56:04 2015 -0700
@@ -84,52 +84,52 @@
      */
 
     /** Tag value indicating an ASN.1 "BOOLEAN" value. */
-    public final static byte    tag_Boolean = 0x01;
+    public static final byte    tag_Boolean = 0x01;
 
     /** Tag value indicating an ASN.1 "INTEGER" value. */
-    public final static byte    tag_Integer = 0x02;
+    public static final byte    tag_Integer = 0x02;
 
     /** Tag value indicating an ASN.1 "BIT STRING" value. */
-    public final static byte    tag_BitString = 0x03;
+    public static final byte    tag_BitString = 0x03;
 
     /** Tag value indicating an ASN.1 "OCTET STRING" value. */
-    public final static byte    tag_OctetString = 0x04;
+    public static final byte    tag_OctetString = 0x04;
 
     /** Tag value indicating an ASN.1 "NULL" value. */
-    public final static byte    tag_Null = 0x05;
+    public static final byte    tag_Null = 0x05;
 
     /** Tag value indicating an ASN.1 "OBJECT IDENTIFIER" value. */
-    public final static byte    tag_ObjectId = 0x06;
+    public static final byte    tag_ObjectId = 0x06;
 
     /** Tag value including an ASN.1 "ENUMERATED" value */
-    public final static byte    tag_Enumerated = 0x0A;
+    public static final byte    tag_Enumerated = 0x0A;
 
     /** Tag value indicating an ASN.1 "UTF8String" value. */
-    public final static byte    tag_UTF8String = 0x0C;
+    public static final byte    tag_UTF8String = 0x0C;
 
     /** Tag value including a "printable" string */
-    public final static byte    tag_PrintableString = 0x13;
+    public static final byte    tag_PrintableString = 0x13;
 
     /** Tag value including a "teletype" string */
-    public final static byte    tag_T61String = 0x14;
+    public static final byte    tag_T61String = 0x14;
 
     /** Tag value including an ASCII string */
-    public final static byte    tag_IA5String = 0x16;
+    public static final byte    tag_IA5String = 0x16;
 
     /** Tag value indicating an ASN.1 "UTCTime" value. */
-    public final static byte    tag_UtcTime = 0x17;
+    public static final byte    tag_UtcTime = 0x17;
 
     /** Tag value indicating an ASN.1 "GeneralizedTime" value. */
-    public final static byte    tag_GeneralizedTime = 0x18;
+    public static final byte    tag_GeneralizedTime = 0x18;
 
     /** Tag value indicating an ASN.1 "GenerallString" value. */
-    public final static byte    tag_GeneralString = 0x1B;
+    public static final byte    tag_GeneralString = 0x1B;
 
     /** Tag value indicating an ASN.1 "UniversalString" value. */
-    public final static byte    tag_UniversalString = 0x1C;
+    public static final byte    tag_UniversalString = 0x1C;
 
     /** Tag value indicating an ASN.1 "BMPString" value. */
-    public final static byte    tag_BMPString = 0x1E;
+    public static final byte    tag_BMPString = 0x1E;
 
     // CONSTRUCTED seq/set
 
@@ -137,25 +137,25 @@
      * Tag value indicating an ASN.1
      * "SEQUENCE" (zero to N elements, order is significant).
      */
-    public final static byte    tag_Sequence = 0x30;
+    public static final byte    tag_Sequence = 0x30;
 
     /**
      * Tag value indicating an ASN.1
      * "SEQUENCE OF" (one to N elements, order is significant).
      */
-    public final static byte    tag_SequenceOf = 0x30;
+    public static final byte    tag_SequenceOf = 0x30;
 
     /**
      * Tag value indicating an ASN.1
      * "SET" (zero to N members, order does not matter).
      */
-    public final static byte    tag_Set = 0x31;
+    public static final byte    tag_Set = 0x31;
 
     /**
      * Tag value indicating an ASN.1
      * "SET OF" (one to N members, order does not matter).
      */
-    public final static byte    tag_SetOf = 0x31;
+    public static final byte    tag_SetOf = 0x31;
 
     /*
      * These values are the high order bits for the other kinds of tags.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
--- a/jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	Tue Sep 15 21:56:04 2015 -0700
@@ -46,16 +46,16 @@
 public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
 
     // the known security property, jdk.certpath.disabledAlgorithms
-    public final static String PROPERTY_CERTPATH_DISABLED_ALGS =
+    public static final String PROPERTY_CERTPATH_DISABLED_ALGS =
             "jdk.certpath.disabledAlgorithms";
 
     // the known security property, jdk.tls.disabledAlgorithms
-    public final static String PROPERTY_TLS_DISABLED_ALGS =
+    public static final String PROPERTY_TLS_DISABLED_ALGS =
             "jdk.tls.disabledAlgorithms";
 
-    private final static Map disabledAlgorithmsMap =
+    private static final Map disabledAlgorithmsMap =
                                                             new HashMap<>();
-    private final static Map keySizeConstraintsMap =
+    private static final Map keySizeConstraintsMap =
                                                             new HashMap<>();
 
     private final String[] disabledAlgorithms;
@@ -80,7 +80,7 @@
     }
 
     @Override
-    final public boolean permits(Set primitives,
+    public final boolean permits(Set primitives,
             String algorithm, AlgorithmParameters parameters) {
 
         if (primitives == null || primitives.isEmpty()) {
@@ -92,12 +92,12 @@
     }
 
     @Override
-    final public boolean permits(Set primitives, Key key) {
+    public final boolean permits(Set primitives, Key key) {
         return checkConstraints(primitives, "", key, null);
     }
 
     @Override
-    final public boolean permits(Set primitives,
+    public final boolean permits(Set primitives,
             String algorithm, Key key, AlgorithmParameters parameters) {
 
         if (algorithm == null || algorithm.length() == 0) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java
--- a/jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java	Tue Sep 15 21:56:04 2015 -0700
@@ -48,18 +48,18 @@
 public class HostnameChecker {
 
     // Constant for a HostnameChecker for TLS
-    public final static byte TYPE_TLS = 1;
-    private final static HostnameChecker INSTANCE_TLS =
+    public static final byte TYPE_TLS = 1;
+    private static final HostnameChecker INSTANCE_TLS =
                                         new HostnameChecker(TYPE_TLS);
 
     // Constant for a HostnameChecker for LDAP
-    public final static byte TYPE_LDAP = 2;
-    private final static HostnameChecker INSTANCE_LDAP =
+    public static final byte TYPE_LDAP = 2;
+    private static final HostnameChecker INSTANCE_LDAP =
                                         new HostnameChecker(TYPE_LDAP);
 
     // constants for subject alt names of type DNS and IP
-    private final static int ALTNAME_DNS = 2;
-    private final static int ALTNAME_IP  = 7;
+    private static final int ALTNAME_DNS = 2;
+    private static final int ALTNAME_IP  = 7;
 
     // the algorithm to follow to perform the check. Currently unused.
     private final byte checkType;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java
--- a/jdk/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java	Tue Sep 15 21:56:04 2015 -0700
@@ -39,10 +39,10 @@
 public class LegacyAlgorithmConstraints extends AbstractAlgorithmConstraints {
 
     // the known security property, jdk.tls.legacyAlgorithms
-    public final static String PROPERTY_TLS_LEGACY_ALGS =
+    public static final String PROPERTY_TLS_LEGACY_ALGS =
             "jdk.tls.legacyAlgorithms";
 
-    private final static Map legacyAlgorithmsMap =
+    private static final Map legacyAlgorithmsMap =
                                                           new HashMap<>();
 
     private final String[] legacyAlgorithms;
@@ -54,18 +54,18 @@
     }
 
     @Override
-    final public boolean permits(Set primitives,
+    public final boolean permits(Set primitives,
             String algorithm, AlgorithmParameters parameters) {
         return checkAlgorithm(legacyAlgorithms, algorithm, decomposer);
     }
 
     @Override
-    final public boolean permits(Set primitives, Key key) {
+    public final boolean permits(Set primitives, Key key) {
         return true;
     }
 
     @Override
-    final public boolean permits(Set primitives,
+    public final boolean permits(Set primitives,
             String algorithm, Key key, AlgorithmParameters parameters) {
         return checkAlgorithm(legacyAlgorithms, algorithm, decomposer);
     }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
--- a/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java	Tue Sep 15 21:56:04 2015 -0700
@@ -50,7 +50,7 @@
  * @author Hemma Prafullchandra
  */
 
-final public
+public final
 class ObjectIdentifier implements Serializable
 {
     /**
@@ -104,7 +104,7 @@
     private int         componentLen = -1;            // how much is used.
 
     // Is the components field calculated?
-    transient private boolean   componentsCalculated = false;
+    private transient boolean   componentsCalculated = false;
 
     private void readObject(ObjectInputStream is)
             throws IOException, ClassNotFoundException {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java
--- a/jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java	Tue Sep 15 21:56:04 2015 -0700
@@ -68,53 +68,53 @@
     // extended key usage OIDs for TLS server, TLS client, code signing
     // and any usage
 
-    private final static String OID_EXTENDED_KEY_USAGE =
+    private static final String OID_EXTENDED_KEY_USAGE =
                                 SimpleValidator.OID_EXTENDED_KEY_USAGE;
 
-    private final static String OID_EKU_TLS_SERVER = "1.3.6.1.5.5.7.3.1";
+    private static final String OID_EKU_TLS_SERVER = "1.3.6.1.5.5.7.3.1";
 
-    private final static String OID_EKU_TLS_CLIENT = "1.3.6.1.5.5.7.3.2";
+    private static final String OID_EKU_TLS_CLIENT = "1.3.6.1.5.5.7.3.2";
 
-    private final static String OID_EKU_CODE_SIGNING = "1.3.6.1.5.5.7.3.3";
+    private static final String OID_EKU_CODE_SIGNING = "1.3.6.1.5.5.7.3.3";
 
-    private final static String OID_EKU_TIME_STAMPING = "1.3.6.1.5.5.7.3.8";
+    private static final String OID_EKU_TIME_STAMPING = "1.3.6.1.5.5.7.3.8";
 
-    private final static String OID_EKU_ANY_USAGE = "2.5.29.37.0";
+    private static final String OID_EKU_ANY_USAGE = "2.5.29.37.0";
 
     // the Netscape Server-Gated-Cryptography EKU extension OID
-    private final static String OID_EKU_NS_SGC = "2.16.840.1.113730.4.1";
+    private static final String OID_EKU_NS_SGC = "2.16.840.1.113730.4.1";
 
     // the Microsoft Server-Gated-Cryptography EKU extension OID
-    private final static String OID_EKU_MS_SGC = "1.3.6.1.4.1.311.10.3.3";
+    private static final String OID_EKU_MS_SGC = "1.3.6.1.4.1.311.10.3.3";
 
     // the recognized extension OIDs
-    private final static String OID_SUBJECT_ALT_NAME = "2.5.29.17";
+    private static final String OID_SUBJECT_ALT_NAME = "2.5.29.17";
 
-    private final static String NSCT_SSL_CLIENT =
+    private static final String NSCT_SSL_CLIENT =
                                 NetscapeCertTypeExtension.SSL_CLIENT;
 
-    private final static String NSCT_SSL_SERVER =
+    private static final String NSCT_SSL_SERVER =
                                 NetscapeCertTypeExtension.SSL_SERVER;
 
-    private final static String NSCT_CODE_SIGNING =
+    private static final String NSCT_CODE_SIGNING =
                                 NetscapeCertTypeExtension.OBJECT_SIGNING;
 
     // bit numbers in the key usage extension
-    private final static int KU_SIGNATURE = 0;
-    private final static int KU_KEY_ENCIPHERMENT = 2;
-    private final static int KU_KEY_AGREEMENT = 4;
+    private static final int KU_SIGNATURE = 0;
+    private static final int KU_KEY_ENCIPHERMENT = 2;
+    private static final int KU_KEY_AGREEMENT = 4;
 
     // TLS key exchange algorithms requiring digitalSignature key usage
-    private final static Collection KU_SERVER_SIGNATURE =
+    private static final Collection KU_SERVER_SIGNATURE =
         Arrays.asList("DHE_DSS", "DHE_RSA", "ECDHE_ECDSA", "ECDHE_RSA",
             "RSA_EXPORT", "UNKNOWN");
 
     // TLS key exchange algorithms requiring keyEncipherment key usage
-    private final static Collection KU_SERVER_ENCRYPTION =
+    private static final Collection KU_SERVER_ENCRYPTION =
         Arrays.asList("RSA");
 
     // TLS key exchange algorithms requiring keyAgreement key usage
-    private final static Collection KU_SERVER_KEY_AGREEMENT =
+    private static final Collection KU_SERVER_KEY_AGREEMENT =
         Arrays.asList("DH_DSS", "DH_RSA", "ECDH_ECDSA", "ECDH_RSA");
 
     // variant of this end entity cert checker
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/validator/KeyStores.java
--- a/jdk/src/java.base/share/classes/sun/security/validator/KeyStores.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/validator/KeyStores.java	Tue Sep 15 21:56:04 2015 -0700
@@ -48,10 +48,10 @@
     // in the future, all accesses to the system cacerts keystore should
     // go through this class. but not right now.
 /*
-    private final static String javaHome =
+    private static final String javaHome =
         (String)AccessController.doPrivileged(new GetPropertyAction("java.home"));
 
-    private final static char SEP = File.separatorChar;
+    private static final char SEP = File.separatorChar;
 
     private static KeyStore caCerts;
 
@@ -79,7 +79,7 @@
      * The file is only opened once per JVM invocation and the contents
      * cached subsequently.
      *
-    public synchronized static KeyStore getCaCerts() throws IOException {
+    public static synchronized KeyStore getCaCerts() throws IOException {
         if (caCerts != null) {
             return caCerts;
         }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java
--- a/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -56,7 +56,7 @@
      * manager. Typically, this will only work if the PKIX implementation
      * supports CRL distribution points as we do not manually setup CertStores.
      */
-    private final static boolean checkTLSRevocation =
+    private static final boolean checkTLSRevocation =
         AccessController.doPrivileged
             (new GetBooleanAction("com.sun.net.ssl.checkRevocation"));
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java
--- a/jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -59,23 +59,23 @@
 
     // Constants for the OIDs we need
 
-    final static String OID_BASIC_CONSTRAINTS = "2.5.29.19";
+    static final String OID_BASIC_CONSTRAINTS = "2.5.29.19";
 
-    final static String OID_NETSCAPE_CERT_TYPE = "2.16.840.1.113730.1.1";
+    static final String OID_NETSCAPE_CERT_TYPE = "2.16.840.1.113730.1.1";
 
-    final static String OID_KEY_USAGE = "2.5.29.15";
+    static final String OID_KEY_USAGE = "2.5.29.15";
 
-    final static String OID_EXTENDED_KEY_USAGE = "2.5.29.37";
+    static final String OID_EXTENDED_KEY_USAGE = "2.5.29.37";
 
-    final static String OID_EKU_ANY_USAGE = "2.5.29.37.0";
+    static final String OID_EKU_ANY_USAGE = "2.5.29.37.0";
 
-    final static ObjectIdentifier OBJID_NETSCAPE_CERT_TYPE =
+    static final ObjectIdentifier OBJID_NETSCAPE_CERT_TYPE =
         NetscapeCertTypeExtension.NetscapeCertType_Id;
 
-    private final static String NSCT_SSL_CA =
+    private static final String NSCT_SSL_CA =
                                 NetscapeCertTypeExtension.SSL_CA;
 
-    private final static String NSCT_CODE_SIGNING_CA =
+    private static final String NSCT_CODE_SIGNING_CA =
                                 NetscapeCertTypeExtension.OBJECT_SIGNING_CA;
 
     /**
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/validator/Validator.java
--- a/jdk/src/java.base/share/classes/sun/security/validator/Validator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/validator/Validator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -86,62 +86,62 @@
  */
 public abstract class Validator {
 
-    final static X509Certificate[] CHAIN0 = {};
+    static final X509Certificate[] CHAIN0 = {};
 
     /**
      * Constant for a validator of type Simple.
      * @see #getInstance
      */
-    public final static String TYPE_SIMPLE = "Simple";
+    public static final String TYPE_SIMPLE = "Simple";
 
     /**
      * Constant for a validator of type PKIX.
      * @see #getInstance
      */
-    public final static String TYPE_PKIX = "PKIX";
+    public static final String TYPE_PKIX = "PKIX";
 
     /**
      * Constant for a Generic variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_GENERIC = "generic";
+    public static final String VAR_GENERIC = "generic";
 
     /**
      * Constant for a Code Signing variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_CODE_SIGNING = "code signing";
+    public static final String VAR_CODE_SIGNING = "code signing";
 
     /**
      * Constant for a JCE Code Signing variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_JCE_SIGNING = "jce signing";
+    public static final String VAR_JCE_SIGNING = "jce signing";
 
     /**
      * Constant for a TLS Client variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_TLS_CLIENT = "tls client";
+    public static final String VAR_TLS_CLIENT = "tls client";
 
     /**
      * Constant for a TLS Server variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_TLS_SERVER = "tls server";
+    public static final String VAR_TLS_SERVER = "tls server";
 
     /**
      * Constant for a TSA Server variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_TSA_SERVER = "tsa server";
+    public static final String VAR_TSA_SERVER = "tsa server";
 
     /**
      * Constant for a Code Signing variant of a validator for use by
      * the J2SE Plugin/WebStart code.
      * @see #getInstance
      */
-    public final static String VAR_PLUGIN_CODE_SIGNING = "plugin code signing";
+    public static final String VAR_PLUGIN_CODE_SIGNING = "plugin code signing";
 
     private final String type;
     final EndEntityChecker endEntityChecker;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java
--- a/jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java	Tue Sep 15 21:56:04 2015 -0700
@@ -37,28 +37,28 @@
 
     private static final long serialVersionUID = -2836879718282292155L;
 
-    public final static Object T_NO_TRUST_ANCHOR =
+    public static final Object T_NO_TRUST_ANCHOR =
         "No trusted certificate found";
 
-    public final static Object T_EE_EXTENSIONS =
+    public static final Object T_EE_EXTENSIONS =
         "End entity certificate extension check failed";
 
-    public final static Object T_CA_EXTENSIONS =
+    public static final Object T_CA_EXTENSIONS =
         "CA certificate extension check failed";
 
-    public final static Object T_CERT_EXPIRED =
+    public static final Object T_CERT_EXPIRED =
         "Certificate expired";
 
-    public final static Object T_SIGNATURE_ERROR =
+    public static final Object T_SIGNATURE_ERROR =
         "Certificate signature validation failed";
 
-    public final static Object T_NAME_CHAINING =
+    public static final Object T_NAME_CHAINING =
         "Certificate chaining error";
 
-    public final static Object T_ALGORITHM_DISABLED =
+    public static final Object T_ALGORITHM_DISABLED =
         "Certificate signature algorithm disabled";
 
-    public final static Object T_UNTRUSTED_CERT =
+    public static final Object T_UNTRUSTED_CERT =
         "Untrusted certificate";
 
     private Object type;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/x509/AVA.java
--- a/jdk/src/java.base/share/classes/sun/security/x509/AVA.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AVA.java	Tue Sep 15 21:56:04 2015 -0700
@@ -72,15 +72,15 @@
      * DEFAULT format allows both RFC1779 and RFC2253 syntax and
      * additional keywords.
      */
-    final static int DEFAULT = 1;
+    static final int DEFAULT = 1;
     /**
      * RFC1779 specifies format according to RFC1779.
      */
-    final static int RFC1779 = 2;
+    static final int RFC1779 = 2;
     /**
      * RFC2253 specifies format according to RFC2253.
      */
-    final static int RFC2253 = 3;
+    static final int RFC2253 = 3;
 
     // currently not private, accessed directly from RDN
     final ObjectIdentifier oid;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java
--- a/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java	Tue Sep 15 21:56:04 2015 -0700
@@ -97,14 +97,14 @@
 
     // reason flag bits
     // NOTE that these are NOT quite the same as the CRL reason code extension
-    public final static int KEY_COMPROMISE         = 1;
-    public final static int CA_COMPROMISE          = 2;
-    public final static int AFFILIATION_CHANGED    = 3;
-    public final static int SUPERSEDED             = 4;
-    public final static int CESSATION_OF_OPERATION = 5;
-    public final static int CERTIFICATE_HOLD       = 6;
-    public final static int PRIVILEGE_WITHDRAWN    = 7;
-    public final static int AA_COMPROMISE          = 8;
+    public static final int KEY_COMPROMISE         = 1;
+    public static final int CA_COMPROMISE          = 2;
+    public static final int AFFILIATION_CHANGED    = 3;
+    public static final int SUPERSEDED             = 4;
+    public static final int CESSATION_OF_OPERATION = 5;
+    public static final int CERTIFICATE_HOLD       = 6;
+    public static final int PRIVILEGE_WITHDRAWN    = 7;
+    public static final int AA_COMPROMISE          = 8;
 
     private static final String[] REASON_STRINGS = {
         null,
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java
--- a/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java	Tue Sep 15 21:56:04 2015 -0700
@@ -183,7 +183,7 @@
      *             be 32 bytes long, otherwise 16.
      * @throws IOException on error
      */
-    private final static int MASKSIZE = 16;
+    private static final int MASKSIZE = 16;
     private void parseIPv6(String name) throws IOException {
 
         int slashNdx = name.indexOf('/');
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java
--- a/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java	Tue Sep 15 21:56:04 2015 -0700
@@ -106,10 +106,10 @@
         { 2, 16, 840, 1, 113730, 1, 1 };
 
     /** Map ObjectIdentifier(oid) -> OIDInfo(info) */
-    private final static Map oidMap;
+    private static final Map oidMap;
 
     /** Map String(friendly name) -> OIDInfo(info) */
-    private final static Map nameMap;
+    private static final Map nameMap;
 
     static {
         oidMap = new HashMap();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java
--- a/jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java	Tue Sep 15 21:56:04 2015 -0700
@@ -69,7 +69,7 @@
     public static final String PRIVILEGE_WITHDRAWN = "privilege_withdrawn";
     public static final String AA_COMPROMISE = "aa_compromise";
 
-    private final static String[] NAMES = {
+    private static final String[] NAMES = {
         UNUSED,
         KEY_COMPROMISE,
         CA_COMPROMISE,
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -76,7 +76,7 @@
     private byte[] revokedCert = null;
     private X500Principal certIssuer;
 
-    private final static boolean isExplicit = false;
+    private static final boolean isExplicit = false;
     private static final long YR_2050 = 2524636800000L;
 
     /**
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -107,7 +107,7 @@
     private Map revokedMap = new TreeMap<>();
     private List revokedList = new LinkedList<>();
     private CRLExtensions    extensions = null;
-    private final static boolean isExplicit = true;
+    private static final boolean isExplicit = true;
     private static final long YR_2050 = 2524636800000L;
 
     private boolean readOnly = false;
@@ -1286,7 +1286,7 @@
     /**
      * Immutable X.509 Certificate Issuer DN and serial number pair
      */
-    private final static class X509IssuerSerial
+    private static final class X509IssuerSerial
             implements Comparable {
         final X500Principal issuer;
         final BigInteger serial;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/text/CompactByteArray.java
--- a/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java	Tue Sep 15 21:56:04 2015 -0700
@@ -212,7 +212,7 @@
      * @param len the length to compare.
      * The start indices and start+len must be valid.
      */
-    final static boolean arrayRegionMatches(byte[] source, int sourceStart,
+    static final boolean arrayRegionMatches(byte[] source, int sourceStart,
                                             byte[] target, int targetStart,
                                             int len)
     {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java	Tue Sep 15 21:56:04 2015 -0700
@@ -98,7 +98,7 @@
 
     // Intermediate class:
     // Has NormalizerImpl and does boilerplate argument checking and setup.
-    public static abstract class Normalizer2WithImpl extends Normalizer2 {
+    public abstract static class Normalizer2WithImpl extends Normalizer2 {
         public Normalizer2WithImpl(NormalizerImpl ni) {
             impl=ni;
         }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java	Tue Sep 15 21:56:04 2015 -0700
@@ -249,7 +249,7 @@
      * and any fields or methods should not be called or overridden by users.
      * @stable ICU 2.8
      */
-    public static abstract class Mode {
+    public abstract static class Mode {
 
         /**
          * Sole constructor
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/text/normalizer/Trie2.java
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/Trie2.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/Trie2.java	Tue Sep 15 21:56:04 2015 -0700
@@ -193,7 +193,7 @@
      * @param codePoint the code point
      * @return the value
      */
-    abstract public int get(int codePoint);
+    public abstract int get(int codePoint);
 
     /**
      * Get the trie value for a UTF-16 code unit.
@@ -230,7 +230,7 @@
      * @param c the code point or lead surrogate value.
      * @return the value
      */
-    abstract public int getFromU16SingleLead(char c);
+    public abstract int getFromU16SingleLead(char c);
 
     /**
      * When iterating over the contents of a Trie2, Elements of this type are produced.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java	Tue Sep 15 21:56:04 2015 -0700
@@ -108,7 +108,7 @@
     }
 
     // implement ICUBinary.Authenticate
-    private final static class IsAcceptable implements ICUBinary.Authenticate {
+    private static final class IsAcceptable implements ICUBinary.Authenticate {
         public boolean isDataVersionAcceptable(byte version[]) {
             return version[0]==2;
         }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java	Tue Sep 15 21:56:04 2015 -0700
@@ -61,7 +61,7 @@
     }
 
     /* This map must be in ASCENDING ORDER OF THE ESCAPE CODE */
-    static private final char[] UNESCAPE_MAP = {
+    private static final char[] UNESCAPE_MAP = {
         /*"   0x22, 0x22 */
         /*'   0x27, 0x27 */
         /*?   0x3F, 0x3F */
@@ -207,7 +207,7 @@
     /**
      * Supplies a zero-padded hex representation of an integer (without 0x)
      */
-    static public String hex(long i, int places) {
+    public static String hex(long i, int places) {
         if (i == Long.MIN_VALUE) return "-8000000000000000";
         boolean negative = i < 0;
         if (negative) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java
--- a/jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java	Tue Sep 15 21:56:04 2015 -0700
@@ -76,7 +76,7 @@
 
     /////////////////////// Calendar Factory Methods /////////////////////////
 
-    private volatile static boolean initialized = false;
+    private static volatile boolean initialized = false;
 
     // Map of calendar names and calendar class names
     private static ConcurrentMap names;
@@ -118,7 +118,7 @@
         }
     }
 
-    private final static Gregorian GREGORIAN_INSTANCE = new Gregorian();
+    private static final Gregorian GREGORIAN_INSTANCE = new Gregorian();
 
     /**
      * Returns the singleton instance of the Gregorian
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java
--- a/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java	Tue Sep 15 21:56:04 2015 -0700
@@ -170,7 +170,7 @@
     /**
      * True if the object has been modified after its instantiation.
      */
-    transient private boolean dirty = false;
+    private transient boolean dirty = false;
 
     private static final long serialVersionUID = 2653134537216586139L;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
--- a/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java	Tue Sep 15 21:56:04 2015 -0700
@@ -206,7 +206,7 @@
     }
 
     private static String versionId;
-    private final static Map zones = new ConcurrentHashMap<>();
+    private static final Map zones = new ConcurrentHashMap<>();
     private static Map aliases = new HashMap<>();
 
     private static byte[][] ruleArray;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java	Tue Sep 15 21:56:04 2015 -0700
@@ -39,8 +39,8 @@
  * @author Naoto Sato
  */
 public class CalendarDataUtility {
-    public final static String FIRST_DAY_OF_WEEK = "firstDayOfWeek";
-    public final static String MINIMAL_DAYS_IN_FIRST_WEEK = "minimalDaysInFirstWeek";
+    public static final String FIRST_DAY_OF_WEEK = "firstDayOfWeek";
+    public static final String MINIMAL_DAYS_IN_FIRST_WEEK = "minimalDaysInFirstWeek";
 
     // No instantiation
     private CalendarDataUtility() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java	Tue Sep 15 21:56:04 2015 -0700
@@ -47,7 +47,7 @@
  * @author             Helena Shih, Mark Davis
  */
 final class CollationRules {
-    final static String DEFAULTRULES =
+    static final String DEFAULTRULES =
         "" // no FRENCH accent order by default, add in French Delta
         // IGNORABLES (up to first < character)
         // COMPLETELY IGNORE format characters
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java
--- a/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java	Tue Sep 15 21:56:04 2015 -0700
@@ -408,7 +408,7 @@
     /**
      * Abstract base class for logging support, defining the API and common field.
      */
-    private static abstract class LoggerProxy {
+    private abstract static class LoggerProxy {
         final String name;
 
         protected LoggerProxy(String name) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java
--- a/jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java	Tue Sep 15 21:56:04 2015 -0700
@@ -118,7 +118,7 @@
     /**
      * See ListResourceBundle class description.
      */
-    abstract protected Object[][] getContents();
+    protected abstract Object[][] getContents();
 
     /**
      * Load lookup tables if they haven't been loaded already.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java
--- a/jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java	Tue Sep 15 21:56:04 2015 -0700
@@ -124,7 +124,7 @@
 
     // A class hiding the byteArray-String duality of
     // text data on Unixoid operating systems.
-    private static abstract class ExternalData {
+    private abstract static class ExternalData {
         protected final String str;
         protected final byte[] bytes;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java
--- a/jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -135,5 +135,5 @@
     /**
      * Perform class load-time initializations.
      */
-    private native static void init();
+    private static native void init();
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/unix/classes/sun/net/NetHooks.java
--- a/jdk/src/java.base/unix/classes/sun/net/NetHooks.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/unix/classes/sun/net/NetHooks.java	Tue Sep 15 21:56:04 2015 -0700
@@ -45,7 +45,7 @@
      * 
 Concrete implementations of this class should define a zero-argument
      * constructor and implement the abstract methods specified below.
      */
-    public static abstract class Provider {
+    public abstract static class Provider {
         /**
          * Initializes a new instance of this class.
          */
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/unix/classes/sun/net/PortConfig.java
--- a/jdk/src/java.base/unix/classes/sun/net/PortConfig.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/unix/classes/sun/net/PortConfig.java	Tue Sep 15 21:56:04 2015 -0700
@@ -36,7 +36,7 @@
 public final class PortConfig {
 
     private static int defaultUpper, defaultLower;
-    private final static int upper, lower;
+    private static final int upper, lower;
 
     private PortConfig() {}
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
--- a/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -43,7 +43,7 @@
     extends AsynchronousServerSocketChannelImpl
     implements Port.PollableChannel
 {
-    private final static NativeDispatcher nd = new SocketDispatcher();
+    private static final NativeDispatcher nd = new SocketDispatcher();
 
     private final Port port;
     private final int fdVal;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
--- a/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -42,7 +42,7 @@
 class UnixAsynchronousSocketChannelImpl
     extends AsynchronousSocketChannelImpl implements Port.PollableChannel
 {
-    private final static NativeDispatcher nd = new SocketDispatcher();
+    private static final NativeDispatcher nd = new SocketDispatcher();
     private static enum OpType { CONNECT, READ, WRITE };
 
     private static final boolean disableSynchronousRead;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java
--- a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java	Tue Sep 15 21:56:04 2015 -0700
@@ -242,7 +242,7 @@
    private static final long L_PATH = L_PCHAR | lowMask(";/");
    private static final long H_PATH = H_PCHAR | highMask(";/");
 
-   private final static char[] hexDigits = {
+   private static final char[] hexDigits = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
     };
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java
--- a/jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java	Tue Sep 15 21:56:04 2015 -0700
@@ -331,10 +331,10 @@
         // we buffer data we read from the "next" file for efficiency,
         // but we limit the lifetime to avoid using stale bits
         // lifetime in ms, currently 100 ms (0.1 s)
-        private final static long MAX_BUFFER_TIME = 100;
+        private static final long MAX_BUFFER_TIME = 100;
 
         // size of the "next" buffer
-        private final static int BUFFER_SIZE = 32;
+        private static final int BUFFER_SIZE = 32;
 
         // Holder for the seedFile.  Used if we ever add seed material.
         File seedFile;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java
--- a/jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java	Tue Sep 15 21:56:04 2015 -0700
@@ -45,7 +45,7 @@
 
 class DefaultDatagramSocketImplFactory
 {
-    private final static Class prefixImplClass;
+    private static final Class prefixImplClass;
 
     /* the windows version. */
     private static float version;
@@ -54,13 +54,13 @@
     private static boolean preferIPv4Stack = false;
 
     /* If the version supports a dual stack TCP implementation */
-    private final static boolean useDualStackImpl;
+    private static final boolean useDualStackImpl;
 
     /* sun.net.useExclusiveBind */
     private static String exclBindProp;
 
     /* True if exclusive binding is on for Windows */
-    private final static boolean exclusiveBind;
+    private static final boolean exclusiveBind;
 
     static {
         Class prefixImplClassLocal = null;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java
--- a/jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -212,5 +212,5 @@
     /**
      * Perform class load-time initializations.
      */
-    private native static void init();
+    private static native void init();
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/windows/classes/sun/net/PortConfig.java
--- a/jdk/src/java.base/windows/classes/sun/net/PortConfig.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/windows/classes/sun/net/PortConfig.java	Tue Sep 15 21:56:04 2015 -0700
@@ -36,7 +36,7 @@
 public final class PortConfig {
 
     private static int defaultUpper, defaultLower;
-    private final static int upper, lower;
+    private static final int upper, lower;
 
     static {
         AccessController.doPrivileged(
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
--- a/jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java	Tue Sep 15 21:56:04 2015 -0700
@@ -87,7 +87,7 @@
         return status.sequenceComplete;
     }
 
-    private native static void initFirst (Class clazz);
+    private static native void initFirst (Class clazz);
 
     private native long getCredentialsHandle (String user, String domain, String password);
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
--- a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -54,7 +54,7 @@
     private final int INIT_CAP = 8;
     // Maximum number of sockets for select().
     // Should be INIT_CAP times a power of 2
-    private final static int MAX_SELECTABLE_FDS = 1024;
+    private static final int MAX_SELECTABLE_FDS = 1024;
 
     // The list of SelectableChannels serviced by this Selector. Every mod
     // MAX_SELECTABLE_FDS entry is bogus, to align this array with the poll
@@ -85,7 +85,7 @@
     private Object closeLock = new Object();
 
     // Maps file descriptors to their indices in  pollArray
-    private final static class FdMap extends HashMap {
+    private static final class FdMap extends HashMap {
         static final long serialVersionUID = 0L;
         private MapEntry get(int desc) {
             return get(new Integer(desc));
@@ -103,7 +103,7 @@
     }
 
     // class for fdMap entries
-    private final static class MapEntry {
+    private static final class MapEntry {
         SelectionKeyImpl ski;
         long updateCount = 0;
         long clearedCount = 0;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java
--- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java	Tue Sep 15 21:56:04 2015 -0700
@@ -119,11 +119,11 @@
     public static final int FILE_NOTIFY_CHANGE_SECURITY    = 0x00000100;
 
     // notify actions
-    public final static int FILE_ACTION_ADDED              = 0x00000001;
-    public final static int FILE_ACTION_REMOVED            = 0x00000002;
-    public final static int FILE_ACTION_MODIFIED           = 0x00000003;
-    public final static int FILE_ACTION_RENAMED_OLD_NAME   = 0x00000004;
-    public final static int FILE_ACTION_RENAMED_NEW_NAME   = 0x00000005;
+    public static final int FILE_ACTION_ADDED              = 0x00000001;
+    public static final int FILE_ACTION_REMOVED            = 0x00000002;
+    public static final int FILE_ACTION_MODIFIED           = 0x00000003;
+    public static final int FILE_ACTION_RENAMED_OLD_NAME   = 0x00000004;
+    public static final int FILE_ACTION_RENAMED_NEW_NAME   = 0x00000005;
 
     // copy flags
     public static final int COPY_FILE_FAIL_IF_EXISTS       = 0x00000001;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
--- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java	Tue Sep 15 21:56:04 2015 -0700
@@ -48,7 +48,7 @@
 class WindowsWatchService
     extends AbstractWatchService
 {
-    private final static int WAKEUP_COMPLETION_KEY = 0;
+    private static final int WAKEUP_COMPLETION_KEY = 0;
 
     // background thread to service I/O completion port
     private final Poller poller;
@@ -242,7 +242,7 @@
      * Background thread to service I/O completion port.
      */
     private static class Poller extends AbstractPoller {
-        private final static Unsafe UNSAFE = Unsafe.getUnsafe();
+        private static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
         /*
          * typedef struct _OVERLAPPED {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
--- a/jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -128,7 +128,7 @@
         }
         supportedLocaleSet = Collections.unmodifiableSet(tmpSet);
     }
-    private final static Locale[] supportedLocale = supportedLocaleSet.toArray(new Locale[0]);
+    private static final Locale[] supportedLocale = supportedLocaleSet.toArray(new Locale[0]);
 
     public static DateFormatProvider getDateFormatProvider() {
         return new DateFormatProvider() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/File/MaxPathLength.java
--- a/jdk/test/java/io/File/MaxPathLength.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/File/MaxPathLength.java	Tue Sep 15 21:56:04 2015 -0700
@@ -39,7 +39,7 @@
                  "areallylongfilenamethatsforsur";
     private static boolean isWindows = false;
 
-    private final static int MAX_LENGTH = 256;
+    private static final int MAX_LENGTH = 256;
 
     private static int counter = 0;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/File/SymLinks.java
--- a/jdk/test/java/io/File/SymLinks.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/File/SymLinks.java	Tue Sep 15 21:56:04 2015 -0700
@@ -34,22 +34,22 @@
 import static java.nio.file.LinkOption.*;
 
 public class SymLinks {
-    final static PrintStream out = System.out;
+    static final PrintStream out = System.out;
 
-    final static File top = new File(System.getProperty("test.dir", "."));
+    static final File top = new File(System.getProperty("test.dir", "."));
 
     // files used by the test
 
-    final static File file              = new File(top, "foofile");
-    final static File link2file         = new File(top, "link2file");
-    final static File link2link2file    = new File(top, "link2link2file");
+    static final File file              = new File(top, "foofile");
+    static final File link2file         = new File(top, "link2file");
+    static final File link2link2file    = new File(top, "link2link2file");
 
-    final static File dir               = new File(top, "foodir");
-    final static File link2dir          = new File(top, "link2dir");
-    final static File link2link2dir     = new File(top, "link2link2dir");
+    static final File dir               = new File(top, "foodir");
+    static final File link2dir          = new File(top, "link2dir");
+    static final File link2link2dir     = new File(top, "link2link2dir");
 
-    final static File link2nobody       = new File(top, "link2nobody");
-    final static File link2link2nobody  = new File(top, "link2link2nobody");
+    static final File link2nobody       = new File(top, "link2nobody");
+    static final File link2link2nobody  = new File(top, "link2link2nobody");
 
     /**
      * Setup files, directories, and sym links used by test.
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/FileDescriptor/Sharing.java
--- a/jdk/test/java/io/FileDescriptor/Sharing.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/FileDescriptor/Sharing.java	Tue Sep 15 21:56:04 2015 -0700
@@ -35,8 +35,8 @@
 
 public class Sharing {
 
-    final static int numFiles = 10;
-    volatile static boolean fail;
+    static final int numFiles = 10;
+    static volatile boolean fail;
 
     public static void main(String[] args) throws Exception {
         TestFinalizer();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/IOException/LastErrorString.java
--- a/jdk/test/java/io/IOException/LastErrorString.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/IOException/LastErrorString.java	Tue Sep 15 21:56:04 2015 -0700
@@ -65,7 +65,7 @@
     }
 
 
-    static abstract class Test {
+    abstract static class Test {
 
         String name;
 
@@ -73,7 +73,7 @@
             this.name = name;
         }
 
-        abstract public void run() throws IOException;
+        public abstract void run() throws IOException;
 
         public void go() throws IOException {
             try {
@@ -88,7 +88,7 @@
 
     }
 
-    static abstract class ClosedFISTest extends Test {
+    abstract static class ClosedFISTest extends Test {
 
         FileInputStream in;
 
@@ -104,7 +104,7 @@
 
     }
 
-    static abstract class ClosedFOSTest extends Test {
+    abstract static class ClosedFOSTest extends Test {
 
         FileOutputStream out;
 
@@ -120,7 +120,7 @@
 
     }
 
-    static abstract class ClosedRAFTest extends Test {
+    abstract static class ClosedRAFTest extends Test {
 
         RandomAccessFile raf;
 
@@ -136,7 +136,7 @@
 
     }
 
-    static abstract class ReadOnlyRAFTest extends Test {
+    abstract static class ReadOnlyRAFTest extends Test {
 
         RandomAccessFile raf;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/InputStreamReader/One.java
--- a/jdk/test/java/io/InputStreamReader/One.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/InputStreamReader/One.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,7 +32,7 @@
 
 public class One {
 
-    private static abstract class Test {
+    private abstract static class Test {
 
         InputStreamReader isr;
         StringBuffer sb;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/PrintStream/OversynchronizedTest.java
--- a/jdk/test/java/io/PrintStream/OversynchronizedTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/PrintStream/OversynchronizedTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -87,7 +87,7 @@
         System.out.println("In test().");
     }
 
-    synchronized public String toString() {
+    public synchronized String toString() {
         System.out.println("Calling toString\n");
         return mStr;
     }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/PrintWriter/OversynchronizedTest.java
--- a/jdk/test/java/io/PrintWriter/OversynchronizedTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/PrintWriter/OversynchronizedTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -87,7 +87,7 @@
         writer.println("In test().");
     }
 
-    synchronized public String toString() {
+    public synchronized String toString() {
         writer.println("Calling toString\n");
         return mStr;
     }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/Serializable/defaulted/GetFieldRead.java
--- a/jdk/test/java/io/Serializable/defaulted/GetFieldRead.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/defaulted/GetFieldRead.java	Tue Sep 15 21:56:04 2015 -0700
@@ -35,7 +35,7 @@
     private static final long serialVersionUID=5748652654655279289L;
 
     // Fields to be serialized.
-    private final static ObjectStreamField[] serialPersistentFields = {
+    private static final ObjectStreamField[] serialPersistentFields = {
         new ObjectStreamField("objectI", Integer.class),
         new ObjectStreamField("primitiveI", Integer.TYPE),
         new ObjectStreamField("foo", Foo.class)
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/Serializable/defaulted/GetFieldWrite.java
--- a/jdk/test/java/io/Serializable/defaulted/GetFieldWrite.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/defaulted/GetFieldWrite.java	Tue Sep 15 21:56:04 2015 -0700
@@ -42,7 +42,7 @@
     private static final long serialVersionUID = 5748652654655279289L;
 
     // Fields to be serialized.
-    private final static ObjectStreamField[] serialPersistentFields = {
+    private static final ObjectStreamField[] serialPersistentFields = {
         new ObjectStreamField("objectI", Integer.class)};
 
     Integer objectI;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java
--- a/jdk/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -28,7 +28,7 @@
 
 public class ExtendedObjectInputStream extends ObjectInputStream {
 
-    static private Hashtable renamedClassMap;
+    private static Hashtable renamedClassMap;
 
     public ExtendedObjectInputStream(InputStream si)
         throws IOException, StreamCorruptedException
@@ -49,7 +49,7 @@
         return super.resolveClass(v);
     }
 
-    static public void addRenamedClassName(String oldName, String newName)
+    public static void addRenamedClassName(String oldName, String newName)
         throws ClassNotFoundException
     {
         Class cl = null;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/Serializable/oldTests/CheckingEquality.java
--- a/jdk/test/java/io/Serializable/oldTests/CheckingEquality.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/oldTests/CheckingEquality.java	Tue Sep 15 21:56:04 2015 -0700
@@ -181,7 +181,7 @@
 
     private static int seven[];
     protected byte eight = (byte)9;
-    final static byte dcare = (byte) 128;
+    static final byte dcare = (byte) 128;
     private short nine = 8888;
     long ten;
     java.util.Enumeration zero;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/Serializable/subclass/AbstractObjectInputStream.java
--- a/jdk/test/java/io/Serializable/subclass/AbstractObjectInputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/subclass/AbstractObjectInputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -143,7 +143,7 @@
  * @see java.io.ext.AbstractObjectOutputStream
  * @since   JDK1.2
  */
-abstract public class AbstractObjectInputStream extends ObjectInputStream
+public abstract class AbstractObjectInputStream extends ObjectInputStream
 {
     protected InputStream in;
     /**
@@ -167,7 +167,7 @@
             this.in = in;
         }
 
-    abstract public void close() throws IOException;
+    public abstract void close() throws IOException;
 
     /***************************************************************/
     /* Read an object from the stream. */
@@ -230,7 +230,7 @@
      * @exception ClassNotFoundException if no corresponding local class can be
      *                                   found in the local JVM.
      */
-    abstract public void defaultReadObject()
+    public abstract void defaultReadObject()
         throws IOException, ClassNotFoundException, NotActiveException;
 
     /**
@@ -252,7 +252,7 @@
      *            ofClass.
      * @exception InstantiationException  TBD.
      */
-    final protected native Object
+    protected final native Object
         allocateNewObject(Class ofClass, Class ctorClass)
         throws InstantiationException, IllegalAccessException;
 
@@ -270,7 +270,7 @@
      * @exception IllegalAccessException  TBD.
      * @exception InstantiationException  TBD.
      */
-    final protected native Object
+    protected final native Object
         allocateNewArray(Class componentClass, int length)
         throws InstantiationException, IllegalAccessException;
 
@@ -283,12 +283,12 @@
      * @exception IOException        if an I/O error occurs.
      * @exception NotActiveException if readObject() is not currently active.
      */
-    abstract public ObjectInputStream.GetField readFields()
+    public abstract ObjectInputStream.GetField readFields()
         throws IOException, ClassNotFoundException, NotActiveException;
 
-    abstract protected boolean enableResolveObject(boolean enable) throws SecurityException;
+    protected abstract boolean enableResolveObject(boolean enable) throws SecurityException;
 
-    abstract public void registerValidation(ObjectInputValidation obj,
+    public abstract void registerValidation(ObjectInputValidation obj,
                                             int prio)
         throws NotActiveException, InvalidObjectException;
 
@@ -297,25 +297,25 @@
 
     /* Use DataInput methods to read primitive data from the stream. */
 
-    abstract public int read() throws IOException;
-    abstract public int read(byte[] data, int offset, int length)
+    public abstract int read() throws IOException;
+    public abstract int read(byte[] data, int offset, int length)
         throws IOException;
-    abstract public boolean readBoolean() throws IOException;
-    abstract public byte readByte() throws IOException;
-    abstract public int readUnsignedByte()  throws IOException;
-    abstract public short readShort()  throws IOException;
-    abstract public int readUnsignedShort() throws IOException;
-    abstract public char readChar()  throws IOException;
-    abstract public int readInt()  throws IOException;
-    abstract public long readLong()  throws IOException;
-    abstract public float readFloat() throws IOException;
-    abstract public double readDouble() throws IOException;
-    abstract public void readFully(byte[] data) throws IOException;
-    abstract public void readFully(byte[] data, int offset, int size) throws IOException;
-    abstract public String readUTF() throws IOException;
-    abstract public int available() throws IOException;
-    abstract public int skipBytes(int len) throws IOException;
+    public abstract boolean readBoolean() throws IOException;
+    public abstract byte readByte() throws IOException;
+    public abstract int readUnsignedByte()  throws IOException;
+    public abstract short readShort()  throws IOException;
+    public abstract int readUnsignedShort() throws IOException;
+    public abstract char readChar()  throws IOException;
+    public abstract int readInt()  throws IOException;
+    public abstract long readLong()  throws IOException;
+    public abstract float readFloat() throws IOException;
+    public abstract double readDouble() throws IOException;
+    public abstract void readFully(byte[] data) throws IOException;
+    public abstract void readFully(byte[] data, int offset, int size) throws IOException;
+    public abstract String readUTF() throws IOException;
+    public abstract int available() throws IOException;
+    public abstract int skipBytes(int len) throws IOException;
 
     /* @deprecated */
-    abstract public String readLine() throws IOException;
+    public abstract String readLine() throws IOException;
 };
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java
--- a/jdk/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -134,7 +134,7 @@
  *
  * @since       JDK1.2
  */
-abstract public class AbstractObjectOutputStream extends ObjectOutputStream
+public abstract class AbstractObjectOutputStream extends ObjectOutputStream
 {
     protected OutputStream out;
     /* Stream Management Methods. */
@@ -156,9 +156,9 @@
         this.out = out;
     }
 
-    abstract public void reset() throws IOException;
-    abstract protected void drain() throws IOException;
-    abstract public void close() throws IOException;
+    public abstract void reset() throws IOException;
+    protected abstract void drain() throws IOException;
+    public abstract void close() throws IOException;
 
     /*******************************************************************/
 
@@ -214,14 +214,14 @@
      * @exception NotActiveException  Thrown if a writeObject method is not
      *                                active.
      */
-    abstract public void defaultWriteObject() throws IOException;
+    public abstract void defaultWriteObject() throws IOException;
 
     /*************************************************************/
     /* Use the methods of PutField to map between Serializable fields
      * and actual fields of a Serializable class.
      */
 
-    abstract public ObjectOutputStream.PutField putFields() throws IOException;
+    public abstract ObjectOutputStream.PutField putFields() throws IOException;
 
     /**
      * Note: The PutField being serialized is not passed to this method.
@@ -229,25 +229,25 @@
      *       the state of the last putFields call and
      *       only allowed this method to be invoked for that PutFields object.
      */
-    abstract public void writeFields() throws IOException;
+    public abstract void writeFields() throws IOException;
 
-    abstract protected boolean enableReplaceObject(boolean enable) throws SecurityException;
+    protected abstract boolean enableReplaceObject(boolean enable) throws SecurityException;
 
     /*******************************************************************/
     /* Write Primitive Data to stream.  DataOutput methods. */
 
-    abstract public void write(int data) throws IOException;
-    abstract public void write(byte b[]) throws IOException;
-    abstract public void write(byte b[], int off, int len) throws IOException;
-    abstract public void writeBoolean(boolean data) throws IOException;
-    abstract public void writeByte(int data) throws IOException;
-    abstract public void writeShort(int data)  throws IOException;
-    abstract public void writeChar(int data)  throws IOException;
-    abstract public void writeInt(int data)  throws IOException;
-    abstract public void writeLong(long data)  throws IOException;
-    abstract public void writeFloat(float data) throws IOException;
-    abstract public void writeDouble(double data) throws IOException;
-    abstract public void writeBytes(String data) throws IOException;
-    abstract public void writeChars(String data) throws IOException;
-    abstract public void writeUTF(String data) throws IOException;
+    public abstract void write(int data) throws IOException;
+    public abstract void write(byte b[]) throws IOException;
+    public abstract void write(byte b[], int off, int len) throws IOException;
+    public abstract void writeBoolean(boolean data) throws IOException;
+    public abstract void writeByte(int data) throws IOException;
+    public abstract void writeShort(int data)  throws IOException;
+    public abstract void writeChar(int data)  throws IOException;
+    public abstract void writeInt(int data)  throws IOException;
+    public abstract void writeLong(long data)  throws IOException;
+    public abstract void writeFloat(float data) throws IOException;
+    public abstract void writeDouble(double data) throws IOException;
+    public abstract void writeBytes(String data) throws IOException;
+    public abstract void writeChars(String data) throws IOException;
+    public abstract void writeUTF(String data) throws IOException;
 };
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/Serializable/subclass/Test.java
--- a/jdk/test/java/io/Serializable/subclass/Test.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/subclass/Test.java	Tue Sep 15 21:56:04 2015 -0700
@@ -49,7 +49,7 @@
  */
 class B implements Serializable {
     public int publicIntField;
-    static public int numWriteObjectCalled = 0;
+    public static int numWriteObjectCalled = 0;
     B(int v) {
         publicIntField = v;
     }
@@ -73,7 +73,7 @@
 class C implements Serializable {
     public int xx1;
     public int xx2;
-    final static ObjectStreamField[] serialPersistentFields = {
+    static final ObjectStreamField[] serialPersistentFields = {
         new ObjectStreamField("x1", Integer.TYPE),
         new ObjectStreamField("x2", Integer.TYPE),
         new ObjectStreamField("x3", Integer.TYPE),
@@ -112,7 +112,7 @@
 };
 
 public class Test {
-    static public void main(String argv[])
+    public static void main(String argv[])
         throws IOException, ClassNotFoundException
     {
         boolean expectSecurityException = false;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/Serializable/subclass/XObjectInputStream.java
--- a/jdk/test/java/io/Serializable/subclass/XObjectInputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/subclass/XObjectInputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -37,12 +37,12 @@
             dis = new DataInputStream(in);
         }
 
-    final public void defaultReadObject()
+    public final void defaultReadObject()
         throws IOException, ClassNotFoundException, NotActiveException
     {
     }
 
-    final protected Object readObjectOverride()
+    protected final Object readObjectOverride()
         throws OptionalDataException, ClassNotFoundException, IOException {
 
         Object readResult = null;
@@ -256,7 +256,7 @@
      * Set the accessible flag on it here. ObjectOutputStream
      * will call it as necessary.
      */
-    static public Method getReadObjectMethod(final Class cl) {
+    public static Method getReadObjectMethod(final Class cl) {
 
         Method readObjectMethod = (Method)
             java.security.AccessController.doPrivileged
@@ -286,7 +286,7 @@
     /*************************************************************/
 
     /* taken verbatim from ObjectInputStream. */
-    static private void invokeMethod(final Object obj, final Method m,
+    private static void invokeMethod(final Object obj, final Method m,
                                         final Object[] argList)
         throws IOException
     {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/Serializable/subclass/XObjectOutputStream.java
--- a/jdk/test/java/io/Serializable/subclass/XObjectOutputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/subclass/XObjectOutputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -53,7 +53,7 @@
         super.writeStreamHeader();
     }
 
-    final protected void writeObjectOverride(Object obj) throws IOException {
+    protected final void writeObjectOverride(Object obj) throws IOException {
         Object prevCurrentObject = currentObject;
         currentObject = obj;
         System.out.println("writeObjectOverride(" + obj.toString() + ")");
@@ -300,7 +300,7 @@
      * Set the accessible flag on it here.
      * Subclass of AbstractObjectOutputStream will call it as necessary.
      */
-    static public Method getWriteObjectMethod(final Class cl) {
+    public static Method getWriteObjectMethod(final Class cl) {
 
         Method writeObjectMethod = (Method)
             java.security.AccessController.doPrivileged
@@ -330,7 +330,7 @@
     /*************************************************************/
 
     /* CODE LIFTED FROM ObjectOutputStream. */
-    static private void invokeMethod(final Object obj, final Method m,
+    private static void invokeMethod(final Object obj, final Method m,
                                         final Object[] argList)
         throws IOException
     {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java
--- a/jdk/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java	Tue Sep 15 21:56:04 2015 -0700
@@ -39,9 +39,9 @@
         this.value = value;
     }
 
-    final public static TypeSafeEnum FIRST = new TypeSafeEnum("First");
-    final public static TypeSafeEnum SECOND = new TypeSafeEnum("Second");
-    final public static TypeSafeEnum THIRD = new TypeSafeEnum("Third");
+    public static final TypeSafeEnum FIRST = new TypeSafeEnum("First");
+    public static final TypeSafeEnum SECOND = new TypeSafeEnum("Second");
+    public static final TypeSafeEnum THIRD = new TypeSafeEnum("Third");
     static int numReadResolve = 0;
     static int numWriteReplace = 0;
     static boolean verbose = false;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/io/StreamTokenizer/ReadAhead.java
--- a/jdk/test/java/io/StreamTokenizer/ReadAhead.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/StreamTokenizer/ReadAhead.java	Tue Sep 15 21:56:04 2015 -0700
@@ -39,7 +39,7 @@
 
 
     /* An InputStream subclass that cannot read past a given limit */
-    static private class LimitedInputStream extends InputStream {
+    private static class LimitedInputStream extends InputStream {
 
         private String input;
         private int limit;      /* Do not allow input[limit] to be read */
@@ -60,7 +60,7 @@
 
 
     /* A Reader subclass that cannot read past a given limit */
-    static private class LimitedReader extends Reader {
+    private static class LimitedReader extends Reader {
 
         private String input;
         private int limit;      /* Do not allow input[limit] to be read */
@@ -95,11 +95,11 @@
 
     /* Interface for objects that can create new StreamTokenizers
        with a given limited input */
-    static private interface StreamTokenizerMaker {
+    private static interface StreamTokenizerMaker {
         public StreamTokenizer create(String input, int limit);
     }
 
-    static private void fail(String why) throws Exception {
+    private static void fail(String why) throws Exception {
         throw new Exception(why);
     }
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java
--- a/jdk/test/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -135,7 +135,7 @@
     }
 
     // A Helper class to build a set of permissions.
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
--- a/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -301,7 +301,7 @@
     }
 
     // A Helper class to build a set of permissions.
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/Enum/ValueOf.java
--- a/jdk/test/java/lang/Enum/ValueOf.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/Enum/ValueOf.java	Tue Sep 15 21:56:04 2015 -0700
@@ -219,7 +219,7 @@
         FOO {
             public void foo() {}
         };
-        abstract public void foo();
+        public abstract void foo();
     };
 
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/ProcessBuilder/Basic.java
--- a/jdk/test/java/lang/ProcessBuilder/Basic.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/ProcessBuilder/Basic.java	Tue Sep 15 21:56:04 2015 -0700
@@ -653,7 +653,7 @@
     }
 
     static class EnglishUnix {
-        private final static Boolean is =
+        private static final Boolean is =
             (! Windows.is() && isEnglish("LANG") && isEnglish("LC_ALL"));
 
         private static boolean isEnglish(String envvar) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/Runtime/exec/ExitValue.java
--- a/jdk/test/java/lang/Runtime/exec/ExitValue.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/Runtime/exec/ExitValue.java	Tue Sep 15 21:56:04 2015 -0700
@@ -72,7 +72,7 @@
                        expectedExitValue);
     }
 
-    final static int EXIT_CODE = 5;
+    static final int EXIT_CODE = 5;
 
     public static void main(String[] args) throws Exception {
         if (! UnixCommands.isUnix) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/SecurityManager/CheckPackageMatching.java
--- a/jdk/test/java/lang/SecurityManager/CheckPackageMatching.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/SecurityManager/CheckPackageMatching.java	Tue Sep 15 21:56:04 2015 -0700
@@ -55,7 +55,7 @@
      * PackageMatcher implements a state machine that matches package
      * names against packages parsed from the package access list.
      */
-    private static abstract class PackageMatcher {
+    private abstract static class PackageMatcher {
         // For each state, chars[state] contains the chars that matches.
         private final char[][] chars;
         // For each state, states[state][i] contains the next state to go
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/String/StringContentEqualsBug.java
--- a/jdk/test/java/lang/String/StringContentEqualsBug.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/String/StringContentEqualsBug.java	Tue Sep 15 21:56:04 2015 -0700
@@ -28,7 +28,7 @@
  */
 public class StringContentEqualsBug {
 
-    static abstract class Task extends Thread {
+    abstract static class Task extends Thread {
         volatile StringBuffer sb;
         volatile Exception exception;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/String/StringJoinTest.java
--- a/jdk/test/java/lang/String/StringJoinTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/String/StringJoinTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -34,17 +34,17 @@
 
 @Test(groups = {"unit","string","lang","libs"})
 public class StringJoinTest {
-    private final static String DASH = "-";
-    private final static String BEGIN = "Hi there";
-    private final static String JIM = "Jim";
-    private final static String JOHN = "John";
-    private final static String AND_JOE = "and Joe";
-    private final static String BILL = "Bill";
-    private final static String BOB = "Bob";
-    private final static String AND_BO = "and Bo";
-    private final static String ZEKE = "Zeke";
-    private final static String ZACK = "Zack";
-    private final static String AND_ZOE = "and Zoe";
+    private static final String DASH = "-";
+    private static final String BEGIN = "Hi there";
+    private static final String JIM = "Jim";
+    private static final String JOHN = "John";
+    private static final String AND_JOE = "and Joe";
+    private static final String BILL = "Bill";
+    private static final String BOB = "Bob";
+    private static final String AND_BO = "and Bo";
+    private static final String ZEKE = "Zeke";
+    private static final String ZACK = "Zack";
+    private static final String AND_ZOE = "and Zoe";
 
     /**
      * Tests the join() methods on String
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/StringBuffer/BufferForwarding.java
--- a/jdk/test/java/lang/StringBuffer/BufferForwarding.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/StringBuffer/BufferForwarding.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,10 +32,10 @@
 import java.util.List;
 
 public class BufferForwarding {
-    private final static String A_STRING_BUFFER_VAL = "aStringBuffer";
-    private final static String A_STRING_BUILDER_VAL = "aStringBuilder";
-    private final static String A_STRING_VAL = "aString";
-    private final static String NON_EMPTY_VAL = "NonEmpty";
+    private static final String A_STRING_BUFFER_VAL = "aStringBuffer";
+    private static final String A_STRING_BUILDER_VAL = "aStringBuilder";
+    private static final String A_STRING_VAL = "aString";
+    private static final String NON_EMPTY_VAL = "NonEmpty";
 
     public BufferForwarding() {
         System.out.println( "Starting BufferForwarding");
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/StringBuilder/BuilderForwarding.java
--- a/jdk/test/java/lang/StringBuilder/BuilderForwarding.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/StringBuilder/BuilderForwarding.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,10 +32,10 @@
 import java.util.List;
 
 public class BuilderForwarding {
-    private final static String A_STRING_BUFFER_VAL = "aStringBuffer";
-    private final static String A_STRING_BUILDER_VAL = "aStringBuilder";
-    private final static String A_STRING_VAL = "aString";
-    private final static String NON_EMPTY_VAL = "NonEmpty";
+    private static final String A_STRING_BUFFER_VAL = "aStringBuffer";
+    private static final String A_STRING_BUILDER_VAL = "aStringBuilder";
+    private static final String A_STRING_VAL = "aString";
+    private static final String NON_EMPTY_VAL = "NonEmpty";
 
     public BuilderForwarding() {
         System.out.println( "Starting BuilderForwarding");
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/System/finalization/FinThreads.java
--- a/jdk/test/java/lang/System/finalization/FinThreads.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/System/finalization/FinThreads.java	Tue Sep 15 21:56:04 2015 -0700
@@ -44,7 +44,7 @@
         /* Instances are only created in an auxiliary thread, in order to
            guard against stray references from the current thread's stack
          */
-        static public void create(final boolean catchFinalizer)
+        public static void create(final boolean catchFinalizer)
             throws InterruptedException
         {
             Thread t = new Thread(new Runnable() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/Thread/GenerifyStackTraces.java
--- a/jdk/test/java/lang/Thread/GenerifyStackTraces.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/Thread/GenerifyStackTraces.java	Tue Sep 15 21:56:04 2015 -0700
@@ -120,7 +120,7 @@
     }
 
 
-    static private void waitForDump() {
+    private static void waitForDump() {
         synchronized(go) {
             try {
                go.wait();
@@ -130,7 +130,7 @@
         }
     }
 
-    static private void finishDump() {
+    private static void finishDump() {
         synchronized(go) {
             try {
                go.notifyAll();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/ThreadLocal/ImmutableLocal.java
--- a/jdk/test/java/lang/ThreadLocal/ImmutableLocal.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/ThreadLocal/ImmutableLocal.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,13 +32,13 @@
     /**
      * {@link ThreadLocal} guaranteed to always return the same reference.
      */
-    abstract public static class ImmutableThreadLocal extends ThreadLocal {
+    public abstract static class ImmutableThreadLocal extends ThreadLocal {
         public void set(final Object value) {
             throw new RuntimeException("ImmutableThreadLocal set called");
         }
 
         // force override
-        abstract protected Object initialValue();
+        protected abstract Object initialValue();
     }
 
     private static final ThreadLocal cache = new ImmutableThreadLocal() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java
--- a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java	Tue Sep 15 21:56:04 2015 -0700
@@ -76,5 +76,5 @@
 
     interface If {}
 
-    static abstract class Clz {}
+    abstract static class Clz {}
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java
--- a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java	Tue Sep 15 21:56:04 2015 -0700
@@ -94,5 +94,5 @@
 
     interface If {}
 
-    static abstract class Clz {}
+    abstract static class Clz {}
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/instrument/ATestCaseScaffold.java
--- a/jdk/test/java/lang/instrument/ATestCaseScaffold.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/instrument/ATestCaseScaffold.java	Tue Sep 15 21:56:04 2015 -0700
@@ -169,7 +169,7 @@
         assertEquals("Expected equality", expected, actual);
     }
 
-    public final static class
+    public static final class
     TestCaseScaffoldException extends RuntimeException {
         public
         TestCaseScaffoldException() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/6998541/Test6998541.java
--- a/jdk/test/java/lang/invoke/6998541/Test6998541.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/6998541/Test6998541.java	Tue Sep 15 21:56:04 2015 -0700
@@ -136,7 +136,7 @@
         throw new AssertionError();
     }
 
-    private final static MethodHandles.Lookup lookup = MethodHandles.lookup();
+    private static final MethodHandles.Lookup lookup = MethodHandles.lookup();
 
     private static MethodHandle mh(Class ret, Class... args) {
         try {
@@ -191,14 +191,14 @@
 
     private static MethodHandle mh_z(Class ret) { return mh(ret, boolean.class); }
 
-    private final static MethodHandle mh_zz = mh_z(boolean.class);
-    private final static MethodHandle mh_bz = mh_z(byte.class   );
-    private final static MethodHandle mh_cz = mh_z(char.class   );
-    private final static MethodHandle mh_sz = mh_z(short.class  );
-    private final static MethodHandle mh_iz = mh_z(int.class    );
-    private final static MethodHandle mh_jz = mh_z(long.class   );
-    private final static MethodHandle mh_fz = mh_z(float.class  );
-    private final static MethodHandle mh_dz = mh_z(double.class );
+    private static final MethodHandle mh_zz = mh_z(boolean.class);
+    private static final MethodHandle mh_bz = mh_z(byte.class   );
+    private static final MethodHandle mh_cz = mh_z(char.class   );
+    private static final MethodHandle mh_sz = mh_z(short.class  );
+    private static final MethodHandle mh_iz = mh_z(int.class    );
+    private static final MethodHandle mh_jz = mh_z(long.class   );
+    private static final MethodHandle mh_fz = mh_z(float.class  );
+    private static final MethodHandle mh_dz = mh_z(double.class );
 
     private static void boolean2prim(boolean x) throws Throwable {
         int i = x ? 1 : 0;
@@ -225,14 +225,14 @@
 
     private static MethodHandle mh_b(Class ret) { return mh(ret, byte.class); }
 
-    private final static MethodHandle mh_zb = mh_b(boolean.class);
-    private final static MethodHandle mh_bb = mh_b(byte.class   );
-    private final static MethodHandle mh_cb = mh_b(char.class   );
-    private final static MethodHandle mh_sb = mh_b(short.class  );
-    private final static MethodHandle mh_ib = mh_b(int.class    );
-    private final static MethodHandle mh_jb = mh_b(long.class   );
-    private final static MethodHandle mh_fb = mh_b(float.class  );
-    private final static MethodHandle mh_db = mh_b(double.class );
+    private static final MethodHandle mh_zb = mh_b(boolean.class);
+    private static final MethodHandle mh_bb = mh_b(byte.class   );
+    private static final MethodHandle mh_cb = mh_b(char.class   );
+    private static final MethodHandle mh_sb = mh_b(short.class  );
+    private static final MethodHandle mh_ib = mh_b(int.class    );
+    private static final MethodHandle mh_jb = mh_b(long.class   );
+    private static final MethodHandle mh_fb = mh_b(float.class  );
+    private static final MethodHandle mh_db = mh_b(double.class );
 
     private static void byte2prim(byte x) throws Throwable {
         assertEquals((byte)    x, (byte)    mh_bb.invokeExact(x));  // byte -> byte
@@ -254,14 +254,14 @@
 
     private static MethodHandle mh_c(Class ret) { return mh(ret, char.class); }
 
-    private final static MethodHandle mh_zc = mh_c(boolean.class);
-    private final static MethodHandle mh_bc = mh_c(byte.class   );
-    private final static MethodHandle mh_cc = mh_c(char.class   );
-    private final static MethodHandle mh_sc = mh_c(short.class  );
-    private final static MethodHandle mh_ic = mh_c(int.class    );
-    private final static MethodHandle mh_jc = mh_c(long.class   );
-    private final static MethodHandle mh_fc = mh_c(float.class  );
-    private final static MethodHandle mh_dc = mh_c(double.class );
+    private static final MethodHandle mh_zc = mh_c(boolean.class);
+    private static final MethodHandle mh_bc = mh_c(byte.class   );
+    private static final MethodHandle mh_cc = mh_c(char.class   );
+    private static final MethodHandle mh_sc = mh_c(short.class  );
+    private static final MethodHandle mh_ic = mh_c(int.class    );
+    private static final MethodHandle mh_jc = mh_c(long.class   );
+    private static final MethodHandle mh_fc = mh_c(float.class  );
+    private static final MethodHandle mh_dc = mh_c(double.class );
 
     private static void char2prim(char x) throws Throwable {
         assertEquals((char)    x, (char)    mh_cc.invokeExact(x));  // char -> char
@@ -284,14 +284,14 @@
 
     private static MethodHandle mh_s(Class ret) { return mh(ret, short.class); }
 
-    private final static MethodHandle mh_zs = mh_s(boolean.class);
-    private final static MethodHandle mh_bs = mh_s(byte.class   );
-    private final static MethodHandle mh_cs = mh_s(char.class   );
-    private final static MethodHandle mh_ss = mh_s(short.class  );
-    private final static MethodHandle mh_is = mh_s(int.class    );
-    private final static MethodHandle mh_js = mh_s(long.class   );
-    private final static MethodHandle mh_fs = mh_s(float.class  );
-    private final static MethodHandle mh_ds = mh_s(double.class );
+    private static final MethodHandle mh_zs = mh_s(boolean.class);
+    private static final MethodHandle mh_bs = mh_s(byte.class   );
+    private static final MethodHandle mh_cs = mh_s(char.class   );
+    private static final MethodHandle mh_ss = mh_s(short.class  );
+    private static final MethodHandle mh_is = mh_s(int.class    );
+    private static final MethodHandle mh_js = mh_s(long.class   );
+    private static final MethodHandle mh_fs = mh_s(float.class  );
+    private static final MethodHandle mh_ds = mh_s(double.class );
 
     private static void short2prim(short x) throws Throwable {
         assertEquals((short)   x, (short)   mh_ss.invokeExact(x));  // short -> short
@@ -314,14 +314,14 @@
 
     private static MethodHandle mh_i(Class ret) { return mh(ret, int.class); }
 
-    private final static MethodHandle mh_zi = mh_i(boolean.class);
-    private final static MethodHandle mh_bi = mh_i(byte.class   );
-    private final static MethodHandle mh_ci = mh_i(char.class   );
-    private final static MethodHandle mh_si = mh_i(short.class  );
-    private final static MethodHandle mh_ii = mh_i(int.class    );
-    private final static MethodHandle mh_ji = mh_i(long.class   );
-    private final static MethodHandle mh_fi = mh_i(float.class  );
-    private final static MethodHandle mh_di = mh_i(double.class );
+    private static final MethodHandle mh_zi = mh_i(boolean.class);
+    private static final MethodHandle mh_bi = mh_i(byte.class   );
+    private static final MethodHandle mh_ci = mh_i(char.class   );
+    private static final MethodHandle mh_si = mh_i(short.class  );
+    private static final MethodHandle mh_ii = mh_i(int.class    );
+    private static final MethodHandle mh_ji = mh_i(long.class   );
+    private static final MethodHandle mh_fi = mh_i(float.class  );
+    private static final MethodHandle mh_di = mh_i(double.class );
 
     private static void int2prim(int x) throws Throwable {
         assertEquals((int)     x, (int)     mh_ii.invokeExact(x));  // int -> int
@@ -345,14 +345,14 @@
 
     private static MethodHandle mh_j(Class ret) { return mh(ret, long.class); }
 
-    private final static MethodHandle mh_zj = mh_j(boolean.class);
-    private final static MethodHandle mh_bj = mh_j(byte.class   );
-    private final static MethodHandle mh_cj = mh_j(char.class   );
-    private final static MethodHandle mh_sj = mh_j(short.class  );
-    private final static MethodHandle mh_ij = mh_j(int.class    );
-    private final static MethodHandle mh_jj = mh_j(long.class   );
-    private final static MethodHandle mh_fj = mh_j(float.class  );
-    private final static MethodHandle mh_dj = mh_j(double.class );
+    private static final MethodHandle mh_zj = mh_j(boolean.class);
+    private static final MethodHandle mh_bj = mh_j(byte.class   );
+    private static final MethodHandle mh_cj = mh_j(char.class   );
+    private static final MethodHandle mh_sj = mh_j(short.class  );
+    private static final MethodHandle mh_ij = mh_j(int.class    );
+    private static final MethodHandle mh_jj = mh_j(long.class   );
+    private static final MethodHandle mh_fj = mh_j(float.class  );
+    private static final MethodHandle mh_dj = mh_j(double.class );
 
     private static void long2prim(long x) throws Throwable {
         assertEquals((long)   x, (long)    mh_jj.invokeExact(x));  // long -> long
@@ -377,14 +377,14 @@
 
     private static MethodHandle mh_f(Class ret) { return mh(ret, float.class); }
 
-    private final static MethodHandle mh_zf = mh_f(boolean.class);
-    private final static MethodHandle mh_bf = mh_f(byte.class   );
-    private final static MethodHandle mh_cf = mh_f(char.class   );
-    private final static MethodHandle mh_sf = mh_f(short.class  );
-    private final static MethodHandle mh_if = mh_f(int.class    );
-    private final static MethodHandle mh_jf = mh_f(long.class   );
-    private final static MethodHandle mh_ff = mh_f(float.class  );
-    private final static MethodHandle mh_df = mh_f(double.class );
+    private static final MethodHandle mh_zf = mh_f(boolean.class);
+    private static final MethodHandle mh_bf = mh_f(byte.class   );
+    private static final MethodHandle mh_cf = mh_f(char.class   );
+    private static final MethodHandle mh_sf = mh_f(short.class  );
+    private static final MethodHandle mh_if = mh_f(int.class    );
+    private static final MethodHandle mh_jf = mh_f(long.class   );
+    private static final MethodHandle mh_ff = mh_f(float.class  );
+    private static final MethodHandle mh_df = mh_f(double.class );
 
     private static void float2prim(float x) throws Throwable {
         assertEquals((float)   x, (float)   mh_ff.invokeExact(x));  // float -> float
@@ -410,14 +410,14 @@
 
     private static MethodHandle mh_d(Class ret) { return mh(ret, double.class); }
 
-    private final static MethodHandle mh_zd = mh_d(boolean.class);
-    private final static MethodHandle mh_bd = mh_d(byte.class   );
-    private final static MethodHandle mh_cd = mh_d(char.class   );
-    private final static MethodHandle mh_sd = mh_d(short.class  );
-    private final static MethodHandle mh_id = mh_d(int.class    );
-    private final static MethodHandle mh_jd = mh_d(long.class   );
-    private final static MethodHandle mh_fd = mh_d(float.class  );
-    private final static MethodHandle mh_dd = mh_d(double.class );
+    private static final MethodHandle mh_zd = mh_d(boolean.class);
+    private static final MethodHandle mh_bd = mh_d(byte.class   );
+    private static final MethodHandle mh_cd = mh_d(char.class   );
+    private static final MethodHandle mh_sd = mh_d(short.class  );
+    private static final MethodHandle mh_id = mh_d(int.class    );
+    private static final MethodHandle mh_jd = mh_d(long.class   );
+    private static final MethodHandle mh_fd = mh_d(float.class  );
+    private static final MethodHandle mh_dd = mh_d(double.class );
 
     private static void double2prim(double x) throws Throwable {
         assertEquals((double) x, (double)  mh_dd.invokeExact(x));  // double -> double
@@ -442,14 +442,14 @@
         try { float   y = (float)   mh_fd.invokeExact(x); fail(); } catch (ClassCastException expected) {}  // double -> float
     }
 
-    private final static MethodHandle mh_zv = mh(boolean.class);
-    private final static MethodHandle mh_bv = mh(byte.class   );
-    private final static MethodHandle mh_cv = mh(char.class   );
-    private final static MethodHandle mh_sv = mh(short.class  );
-    private final static MethodHandle mh_iv = mh(int.class    );
-    private final static MethodHandle mh_jv = mh(long.class   );
-    private final static MethodHandle mh_fv = mh(float.class  );
-    private final static MethodHandle mh_dv = mh(double.class );
+    private static final MethodHandle mh_zv = mh(boolean.class);
+    private static final MethodHandle mh_bv = mh(byte.class   );
+    private static final MethodHandle mh_cv = mh(char.class   );
+    private static final MethodHandle mh_sv = mh(short.class  );
+    private static final MethodHandle mh_iv = mh(int.class    );
+    private static final MethodHandle mh_jv = mh(long.class   );
+    private static final MethodHandle mh_fv = mh(float.class  );
+    private static final MethodHandle mh_dv = mh(double.class );
 
     private static void void2prim(int i) throws Throwable {
         assertEquals(        false, (boolean) mh_zv.invokeExact());  // void -> boolean
@@ -468,14 +468,14 @@
 
     private static MethodHandle mh_v(Class arg) { return mh(void.class, arg); }
 
-    private final static MethodHandle mh_vz = mh_v(boolean.class);
-    private final static MethodHandle mh_vb = mh_v(byte.class   );
-    private final static MethodHandle mh_vc = mh_v(char.class   );
-    private final static MethodHandle mh_vs = mh_v(short.class  );
-    private final static MethodHandle mh_vi = mh_v(int.class    );
-    private final static MethodHandle mh_vj = mh_v(long.class   );
-    private final static MethodHandle mh_vf = mh_v(float.class  );
-    private final static MethodHandle mh_vd = mh_v(double.class );
+    private static final MethodHandle mh_vz = mh_v(boolean.class);
+    private static final MethodHandle mh_vb = mh_v(byte.class   );
+    private static final MethodHandle mh_vc = mh_v(char.class   );
+    private static final MethodHandle mh_vs = mh_v(short.class  );
+    private static final MethodHandle mh_vi = mh_v(int.class    );
+    private static final MethodHandle mh_vj = mh_v(long.class   );
+    private static final MethodHandle mh_vf = mh_v(float.class  );
+    private static final MethodHandle mh_vd = mh_v(double.class );
 
     private static void prim2void(int x) throws Throwable {
         boolean z = ((x & 1) != 0);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/7157574/Test7157574.java
--- a/jdk/test/java/lang/invoke/7157574/Test7157574.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/7157574/Test7157574.java	Tue Sep 15 21:56:04 2015 -0700
@@ -50,8 +50,8 @@
 import static java.lang.invoke.MethodType.*;
 public class Test7157574 {
     interface Intf { void ig1(); void ig2(); void ig3(); void ig4(); void m1(); }
-    static abstract class Super implements Intf { public abstract void m2(); public int f2; }
-    static abstract class Sub extends Super { }
+    abstract static class Super implements Intf { public abstract void m2(); public int f2; }
+    abstract static class Sub extends Super { }
     public static void main(String... av) throws Throwable {
         MethodHandle m1 = lookup().findVirtual(Sub.class, "m1", methodType(void.class));
         System.out.println(m1);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/7196190/ClassForNameTest.java
--- a/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -35,7 +35,7 @@
 import java.util.Arrays;
 
 public class ClassForNameTest {
-    final static String NAME = ClassForNameTest.class.getName();
+    static final String NAME = ClassForNameTest.class.getName();
 
     public static void main(String[] args) throws Throwable {
         {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java
--- a/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -35,7 +35,7 @@
 import java.util.Arrays;
 
 public class GetUnsafeTest {
-    final static String NAME = "sun.misc.Unsafe";
+    static final String NAME = "sun.misc.Unsafe";
 
     private static boolean isTestFailed = false;
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/AccessControlTest.java
--- a/jdk/test/java/lang/invoke/AccessControlTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/AccessControlTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -459,29 +459,29 @@
     static Lookup lookup_in_self() {
         return MethodHandles.lookup();
     }
-    static public      void pub_in_self() { }
-    static protected   void pro_in_self() { }
+    public static      void pub_in_self() { }
+    protected static   void pro_in_self() { }
     static /*package*/ void pkg_in_self() { }
-    static private     void pri_in_self() { }
+    private static     void pri_in_self() { }
 
     static class Inner_nestmate {
         static Lookup lookup_in_nestmate() {
             return MethodHandles.lookup();
         }
-        static public      void pub_in_nestmate() { }
-        static protected   void pro_in_nestmate() { }
+        public static      void pub_in_nestmate() { }
+        protected static   void pro_in_nestmate() { }
         static /*package*/ void pkg_in_nestmate() { }
-        static private     void pri_in_nestmate() { }
+        private static     void pri_in_nestmate() { }
     }
 }
 class AccessControlTest_sibling {
     static Lookup lookup_in_sibling() {
         return MethodHandles.lookup();
     }
-    static public      void pub_in_sibling() { }
-    static protected   void pro_in_sibling() { }
+    public static      void pub_in_sibling() { }
+    protected static   void pro_in_sibling() { }
     static /*package*/ void pkg_in_sibling() { }
-    static private     void pri_in_sibling() { }
+    private static     void pri_in_sibling() { }
 }
 
 // This guy tests access from outside the package:
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java
--- a/jdk/test/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java	Tue Sep 15 21:56:04 2015 -0700
@@ -16,27 +16,27 @@
     public static Lookup lookup_in_remote() {
         return MethodHandles.lookup();
     }
-    static public      void pub_in_remote() { }
-    static protected   void pro_in_remote() { }
+    public static      void pub_in_remote() { }
+    protected static   void pro_in_remote() { }
     static /*package*/ void pkg_in_remote() { }
-    static private     void pri_in_remote() { }
+    private static     void pri_in_remote() { }
 
-    static public class Remote_subclass extends AccessControlTest {
+    public static class Remote_subclass extends AccessControlTest {
         static Lookup lookup_in_subclass() {
             return MethodHandles.lookup();
         }
-        static public      void pub_in_subclass() { }
-        static protected   void pro_in_subclass() { }
+        public static      void pub_in_subclass() { }
+        protected static   void pro_in_subclass() { }
         static /*package*/ void pkg_in_subclass() { }
-        static private     void pri_in_subclass() { }
+        private static     void pri_in_subclass() { }
     }
     static /*package*/ class Remote_hidden {
         static Lookup lookup_in_hidden() {
             return MethodHandles.lookup();
         }
-        static public      void pub_in_hidden() { }
-        static protected   void pro_in_hidden() { }
+        public static      void pub_in_hidden() { }
+        protected static   void pro_in_hidden() { }
         static /*package*/ void pkg_in_hidden() { }
-        static private     void pri_in_hidden() { }
+        private static     void pri_in_hidden() { }
     }
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/CallSiteTest.java
--- a/jdk/test/java/lang/invoke/CallSiteTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/CallSiteTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -43,7 +43,7 @@
 import static java.lang.invoke.MethodType.*;
 
 public class CallSiteTest {
-    private final static Class CLASS = CallSiteTest.class;
+    private static final Class CLASS = CallSiteTest.class;
 
     private static CallSite mcs;
     private static CallSite vcs;
@@ -66,9 +66,9 @@
         testVolatileCallSite();
     }
 
-    private final static int N = Integer.MAX_VALUE / 100;
-    private final static int RESULT1 = 762786192;
-    private final static int RESULT2 = -21474836;
+    private static final int N = Integer.MAX_VALUE / 100;
+    private static final int RESULT1 = 762786192;
+    private static final int RESULT2 = -21474836;
 
     private static void assertEquals(int expected, int actual) {
         if (expected != actual)
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/JavaDocExamplesTest.java
--- a/jdk/test/java/lang/invoke/JavaDocExamplesTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/JavaDocExamplesTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -75,14 +75,14 @@
 
 
 {}
-static final private Lookup LOOKUP = lookup();
+private static final Lookup LOOKUP = lookup();
 // static final private MethodHandle CONCAT_1 = LOOKUP.findVirtual(String.class,
 //     "concat", methodType(String.class, String.class));
 // static final private MethodHandle HASHCODE_1 = LOOKUP.findVirtual(Object.class,
 //     "hashCode", methodType(int.class));
 
 // form required if ReflectiveOperationException is intercepted:
-    static final private MethodHandle CONCAT_2, HASHCODE_2, ADD_2, SUB_2;
+    private static final MethodHandle CONCAT_2, HASHCODE_2, ADD_2, SUB_2;
 static {
   try {
     Class THIS_CLASS = LOOKUP.lookupClass();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java
--- a/jdk/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java	Tue Sep 15 21:56:04 2015 -0700
@@ -50,9 +50,9 @@
      * Reflection link to {@code j.l.i.MethodHandle.internalForm} method. It is
      * used to get a lambda form from a method handle.
      */
-    protected final static Method INTERNAL_FORM;
-    protected final static Field DEBUG_NAME;
-    protected final static Field REF_FIELD;
+    protected static final Method INTERNAL_FORM;
+    protected static final Field DEBUG_NAME;
+    protected static final Field REF_FIELD;
     private static final List gcInfo;
 
     private static long gcCount() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/MethodHandles/TestCatchException.java
--- a/jdk/test/java/lang/invoke/MethodHandles/TestCatchException.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/MethodHandles/TestCatchException.java	Tue Sep 15 21:56:04 2015 -0700
@@ -35,8 +35,8 @@
 import static org.junit.Assert.*;
 
 public class TestCatchException {
-    final static MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
-    final static MethodType M_TYPE = MethodType.methodType(int.class, Object.class, Object.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class);
+    static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+    static final MethodType M_TYPE = MethodType.methodType(int.class, Object.class, Object.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class);
 
     private static int noThrow(Object o1, Object o2, int i1, int i2, int i3, int i4, int i5, int i6, int i7) {
         return 42;
@@ -72,8 +72,8 @@
         assertEquals(x, 17);
     }
 
-    final static Object masterParam = new Object();
-    final static Object[] masterTail = new Object[] { "str" };
+    static final Object masterParam = new Object();
+    static final Object[] masterTail = new Object[] { "str" };
     static Exception masterEx = new Exception();
 
     public static Object m1(Object o1, Object o2, Object o3, Object o4, Object o5,
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/MethodHandlesTest.java
--- a/jdk/test/java/lang/invoke/MethodHandlesTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/MethodHandlesTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -497,7 +497,7 @@
     }
 
     /** Is findVirtual (etc.) of "<init<" supposed to elicit a NoSuchMethodException? */
-    final static boolean INIT_REF_CAUSES_NSME = true;
+    static final boolean INIT_REF_CAUSES_NSME = true;
 
     @Test
     public void testFindStatic() throws Throwable {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/invoke/indify/Indify.java
--- a/jdk/test/java/lang/invoke/indify/Indify.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/invoke/indify/Indify.java	Tue Sep 15 21:56:04 2015 -0700
@@ -1220,7 +1220,7 @@
         for (Object x : data)  writeOutput(out, x);
     }
 
-    public static abstract class Outer {
+    public abstract static class Outer {
         public abstract List inners();
         protected void linkInners() {
             for (Inner i : inners()) {
@@ -1250,7 +1250,7 @@
         }
     }
     public interface Inner { Outer outer(); void linkOuter(Outer o); }
-    public static abstract class InnerOuter extends Outer implements Inner {
+    public abstract static class InnerOuter extends Outer implements Inner {
         public Outer outer;
         public Outer outer() { return outer; }
         public void linkOuter(Outer o) { assert(outer == null); outer = o; }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java
--- a/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java	Tue Sep 15 21:56:04 2015 -0700
@@ -35,7 +35,7 @@
 import javax.management.*;
 
 public class GetMBeanInfo {
-    private final static int EXPECTED_NOTIF_TYPES = 2;
+    private static final int EXPECTED_NOTIF_TYPES = 2;
     private static int count = 0;
 
     public static void main(String argv[]) throws Exception {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/management/MemoryMXBean/Pending.java
--- a/jdk/test/java/lang/management/MemoryMXBean/Pending.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/management/MemoryMXBean/Pending.java	Tue Sep 15 21:56:04 2015 -0700
@@ -39,9 +39,9 @@
 import java.lang.management.*;
 
 public class Pending {
-    final static int NO_REF_COUNT = 600;
-    final static int REF_COUNT = 500;
-    final static int TOTAL_FINALIZABLE = (NO_REF_COUNT + REF_COUNT);
+    static final int NO_REF_COUNT = 600;
+    static final int REF_COUNT = 500;
+    static final int TOTAL_FINALIZABLE = (NO_REF_COUNT + REF_COUNT);
     private static int finalized = 0;
     private static MemoryMXBean mbean
         = ManagementFactory.getMemoryMXBean();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/management/RuntimeMXBean/UpTime.java
--- a/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,9 +32,9 @@
 import java.lang.management.*;
 
 public class UpTime {
-    final static long DELAY = 5; // Seconds
-    final static long TIMEOUT = 30; // Minutes
-    final static long MULTIPLIER = 1000; // millisecond ticks
+    static final long DELAY = 5; // Seconds
+    static final long TIMEOUT = 30; // Minutes
+    static final long MULTIPLIER = 1000; // millisecond ticks
 
     private static final RuntimeMXBean metrics
         = ManagementFactory.getRuntimeMXBean();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java
--- a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java	Tue Sep 15 21:56:04 2015 -0700
@@ -57,9 +57,9 @@
         }
     }
 
-    final static int DAEMON_THREADS = 20;
-    final static int USER_THREADS = 5;
-    final static int ALL_THREADS = DAEMON_THREADS + USER_THREADS;
+    static final int DAEMON_THREADS = 20;
+    static final int USER_THREADS = 5;
+    static final int ALL_THREADS = DAEMON_THREADS + USER_THREADS;
     private static final boolean live[] = new boolean[ALL_THREADS];
     private static final Thread allThreads[] = new Thread[ALL_THREADS];
     private static final ThreadMXBean mbean = ManagementFactory.getThreadMXBean();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java	Tue Sep 15 21:56:04 2015 -0700
@@ -35,8 +35,8 @@
 import java.util.concurrent.Phaser;
 
 public class ThreadBlockedCount {
-        final static long EXPECTED_BLOCKED_COUNT = 3;
-    final static int  DEPTH = 10;
+        static final long EXPECTED_BLOCKED_COUNT = 3;
+    static final int  DEPTH = 10;
     private static final ThreadMXBean mbean
         = ManagementFactory.getThreadMXBean();
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java	Tue Sep 15 21:56:04 2015 -0700
@@ -37,11 +37,11 @@
 import java.lang.management.*;
 
 public class ThreadCounts {
-    final static int DAEMON_THREADS = 21;
-    final static int USER_THREADS_1 = 11;
-    final static int USER_THREADS_2 = 9;
-    final static int USER_THREADS = USER_THREADS_1 + USER_THREADS_2;
-    final static int ALL_THREADS = DAEMON_THREADS + USER_THREADS;
+    static final int DAEMON_THREADS = 21;
+    static final int USER_THREADS_1 = 11;
+    static final int USER_THREADS_2 = 9;
+    static final int USER_THREADS = USER_THREADS_1 + USER_THREADS_2;
+    static final int ALL_THREADS = DAEMON_THREADS + USER_THREADS;
     private static volatile boolean live[] = new boolean[ALL_THREADS];
     private ThreadMXBean mbean = ManagementFactory.getThreadMXBean();
     private static boolean testFailed = false;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/ref/ReferenceEnqueuePending.java
--- a/jdk/test/java/lang/ref/ReferenceEnqueuePending.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/ref/ReferenceEnqueuePending.java	Tue Sep 15 21:56:04 2015 -0700
@@ -38,9 +38,9 @@
         }
     }
 
-    final static boolean debug = System.getProperty("test.debug") != null;
-    final static int iterations = 1000;
-    final static int gc_trigger = 99;
+    static final boolean debug = System.getProperty("test.debug") != null;
+    static final int iterations = 1000;
+    static final int gc_trigger = 99;
     static int[] a = new int[2 * iterations];
     // Keep all weak references alive with the following array.
     static NumberedWeakReference[] b = new NumberedWeakReference[iterations];
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/ref/SoftReference/Bash.java
--- a/jdk/test/java/lang/ref/SoftReference/Bash.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/ref/SoftReference/Bash.java	Tue Sep 15 21:56:04 2015 -0700
@@ -49,8 +49,8 @@
     }
 
 
-    final static int NUM_BLOCKS = 2048;
-    final static int BLOCK_SIZE = 32768;
+    static final int NUM_BLOCKS = 2048;
+    static final int BLOCK_SIZE = 32768;
 
 
     public static void main(String[] args) throws Exception {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/ref/SoftReference/Pin.java
--- a/jdk/test/java/lang/ref/SoftReference/Pin.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/ref/SoftReference/Pin.java	Tue Sep 15 21:56:04 2015 -0700
@@ -34,8 +34,8 @@
 
 public class Pin {
 
-    final static int NUM_BLOCKS = 128;
-    final static int BLOCK_SIZE = 32768;
+    static final int NUM_BLOCKS = 128;
+    static final int BLOCK_SIZE = 32768;
 
     public static void main(String[] args) throws Exception {
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/reflect/Field/GenericStringTest.java
--- a/jdk/test/java/lang/reflect/Field/GenericStringTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/reflect/Field/GenericStringTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -64,7 +64,7 @@
         int field1;
 
     @ExpectedString("private static java.lang.String TestClass1.field2")
-        static private String field2;
+        private static String field2;
 }
 
 class TestClass2 {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java
--- a/jdk/test/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java	Tue Sep 15 21:56:04 2015 -0700
@@ -145,7 +145,7 @@
 
 abstract class Base {
     @ExpectedModel(modifiers=PUBLIC|ABSTRACT, declaringClass=Base.class)
-    abstract public void baz();
+    public abstract void baz();
 
     @ExpectedModel(declaringClass=Base.class)
     public void quux() {;}
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java
--- a/jdk/test/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java	Tue Sep 15 21:56:04 2015 -0700
@@ -127,7 +127,7 @@
         return policy.grant;
     }
 
-    private final static String NEW_PROXY_IN_PKG = "newProxyInPackage.";
+    private static final String NEW_PROXY_IN_PKG = "newProxyInPackage.";
     private void newProxyInstance() {
         // expect newProxyInstance to succeed if it's in the same runtime package
         int i = proxyClass.getName().lastIndexOf('.');
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Arrays/ParallelPrefix.java
--- a/jdk/test/java/util/Arrays/ParallelPrefix.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Arrays/ParallelPrefix.java	Tue Sep 15 21:56:04 2015 -0700
@@ -43,18 +43,18 @@
 
 public class ParallelPrefix {
     //Array size less than MIN_PARTITION
-    private final static int SMALL_ARRAY_SIZE = 1 << 3;
+    private static final int SMALL_ARRAY_SIZE = 1 << 3;
 
     //Array size equals MIN_PARTITION
-    private final static int THRESHOLD_ARRAY_SIZE = 1 << 4;
+    private static final int THRESHOLD_ARRAY_SIZE = 1 << 4;
 
     //Array size greater than MIN_PARTITION
-    private final static int MEDIUM_ARRAY_SIZE = 1 << 8;
+    private static final int MEDIUM_ARRAY_SIZE = 1 << 8;
 
     //Array size much greater than MIN_PARTITION
-    private final static int LARGE_ARRAY_SIZE = 1 << 14;
+    private static final int LARGE_ARRAY_SIZE = 1 << 14;
 
-    private final static int[] ARRAY_SIZE_COLLECTION  = new int[]{
+    private static final int[] ARRAY_SIZE_COLLECTION  = new int[]{
         SMALL_ARRAY_SIZE,
         THRESHOLD_ARRAY_SIZE,
         MEDIUM_ARRAY_SIZE,
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Calendar/Bug8007038.java
--- a/jdk/test/java/util/Calendar/Bug8007038.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Calendar/Bug8007038.java	Tue Sep 15 21:56:04 2015 -0700
@@ -36,14 +36,14 @@
 import sun.util.locale.provider.CalendarDataUtility;
 
 public class Bug8007038 {
-    private final static String[] calTypes = {
+    private static final String[] calTypes = {
         "gregory",
         "buddhist",
         "japanese",
         "roc",
         "islamic",
     };
-    private final static int[][] eraMinMax = {
+    private static final int[][] eraMinMax = {
         {GregorianCalendar.BC, GregorianCalendar.AD},
         {0, 1},
         {0, 4},
@@ -51,7 +51,7 @@
         {0, 1},
         {0, 1},
     };
-    private final static Locale[] testLocs = {
+    private static final Locale[] testLocs = {
         Locale.ROOT,
         Locale.forLanguageTag("ja-JP-u-ca-japanese"),
         Locale.forLanguageTag("th-TH"),
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Collection/BiggernYours.java
--- a/jdk/test/java/util/Collection/BiggernYours.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Collection/BiggernYours.java	Tue Sep 15 21:56:04 2015 -0700
@@ -82,9 +82,9 @@
                            s2.tailSet(Integer.MIN_VALUE));
     }
 
-    static abstract class MapFrobber { abstract void frob(Map m); }
-    static abstract class SetFrobber { abstract void frob(Set s); }
-    static abstract class ColFrobber { abstract void frob(Collection c); }
+    abstract static class MapFrobber { abstract void frob(Map m); }
+    abstract static class SetFrobber { abstract void frob(Set s); }
+    abstract static class ColFrobber { abstract void frob(Collection c); }
 
     static ColFrobber adder(final int i) {
         return new ColFrobber() {void frob(Collection c) { c.add(i); }};
@@ -236,7 +236,7 @@
         try {realMain(args);} catch (Throwable t) {unexpected(t);}
         System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
         if (failed > 0) throw new AssertionError("Some tests failed");}
-    private static abstract class CheckedThread extends Thread {
+    private abstract static class CheckedThread extends Thread {
         abstract void realRun() throws Throwable;
         public void run() {
             try {realRun();} catch (Throwable t) {unexpected(t);}}}
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Collection/HotPotatoes.java
--- a/jdk/test/java/util/Collection/HotPotatoes.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Collection/HotPotatoes.java	Tue Sep 15 21:56:04 2015 -0700
@@ -99,7 +99,7 @@
         try {realMain(args);} catch (Throwable t) {unexpected(t);}
         System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
         if (failed > 0) throw new AssertionError("Some tests failed");}
-    private static abstract class CheckedThread extends Thread {
+    private abstract static class CheckedThread extends Thread {
         public abstract void realRun() throws Throwable;
         public void run() {
             try { realRun(); } catch (Throwable t) { unexpected(t); }}}
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Collections/AddAll.java
--- a/jdk/test/java/util/Collections/AddAll.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Collections/AddAll.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,7 +32,7 @@
 import java.util.*;
 
 public class AddAll {
-    final static int N = 100;
+    static final int N = 100;
     public static void main(String args[]) {
         test(new ArrayList());
         test(new LinkedList());
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Collections/Disjoint.java
--- a/jdk/test/java/util/Collections/Disjoint.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Collections/Disjoint.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,7 +32,7 @@
 import java.util.*;
 
 public class Disjoint {
-    final static int N = 20;
+    static final int N = 20;
 
     public static void main(String args[]) {
         // Make an array of lists each of which shares a single element
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Collections/Frequency.java
--- a/jdk/test/java/util/Collections/Frequency.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Collections/Frequency.java	Tue Sep 15 21:56:04 2015 -0700
@@ -31,7 +31,7 @@
 import java.util.*;
 
 public class Frequency {
-    final static int N = 100;
+    static final int N = 100;
     public static void main(String args[]) {
         test(new ArrayList());
         test(new LinkedList());
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Collections/RacingCollections.java
--- a/jdk/test/java/util/Collections/RacingCollections.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Collections/RacingCollections.java	Tue Sep 15 21:56:04 2015 -0700
@@ -38,15 +38,15 @@
      * Turn this up to some higher value like 1000 for stress testing:
      * java -Dmillis=1000 RacingCollections
      */
-    final static long defaultWorkTimeMillis = Long.getLong("millis", 10L);
+    static final long defaultWorkTimeMillis = Long.getLong("millis", 10L);
 
     /**
      * Whether to print debug information.
      */
-    final static boolean debug = Boolean.getBoolean("debug");
+    static final boolean debug = Boolean.getBoolean("debug");
 
-    final static Integer one = 1;
-    final static Integer two = 2;
+    static final Integer one = 1;
+    static final Integer two = 2;
 
     /**
      * A thread that mutates an object forever, alternating between
@@ -340,7 +340,7 @@
         try {realMain(args);} catch (Throwable t) {unexpected(t);}
         System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
         if (failed > 0) throw new AssertionError("Some tests failed");}
-    private static abstract class CheckedThread extends Thread {
+    private abstract static class CheckedThread extends Thread {
         abstract void realRun() throws Throwable;
         public void run() {
             try { realRun(); } catch (Throwable t) { unexpected(t); }}}
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Collections/ReverseOrder2.java
--- a/jdk/test/java/util/Collections/ReverseOrder2.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Collections/ReverseOrder2.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,7 +32,7 @@
 import java.io.*;
 
 public class ReverseOrder2 {
-    final static int N = 100;
+    static final int N = 100;
 
     static void realMain(String[] args) throws Throwable {
         check(Collections.reverseOrder()
@@ -75,7 +75,7 @@
         }
     };
 
-    private final static List golden = new ArrayList(N);
+    private static final List golden = new ArrayList(N);
     static {
         for (int i = N-1; i >= 0; i--)
             golden.add(String.valueOf(i));
@@ -89,7 +89,7 @@
         equal(list, golden2);
     }
 
-    private final static List golden2 = new ArrayList(N);
+    private static final List golden2 = new ArrayList(N);
     static {
         for (int i = N-1; i >= 0; i--)
             golden2.add(i);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Deque/ChorusLine.java
--- a/jdk/test/java/util/Deque/ChorusLine.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Deque/ChorusLine.java	Tue Sep 15 21:56:04 2015 -0700
@@ -36,7 +36,7 @@
         void run(Deque deq);
     }
 
-    private final static Tweaker[] tweakers = {
+    private static final Tweaker[] tweakers = {
         new Tweaker() { public void run(Deque deq) {
             for (int i = 0; i < 7; i++)
                 deq.addLast(i);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/LinkedHashMap/Basic.java
--- a/jdk/test/java/util/LinkedHashMap/Basic.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/LinkedHashMap/Basic.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,8 +32,8 @@
 import java.io.*;
 
 public class Basic {
-    final static Random rnd = new Random(666);
-    final static Integer nil = new Integer(0);
+    static final Random rnd = new Random(666);
+    static final Integer nil = new Integer(0);
 
     public static void main(String[] args)  throws Exception {
         int numItr =  500;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Locale/tools/EquivMapsGenerator.java
--- a/jdk/test/java/util/Locale/tools/EquivMapsGenerator.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Locale/tools/EquivMapsGenerator.java	Tue Sep 15 21:56:04 2015 -0700
@@ -205,7 +205,7 @@
         System.out.println();
     }
 
-    private final static String headerText =
+    private static final String headerText =
         "final class LocaleEquivalentMaps {\n\n"
         + "    static final Map singleEquivMap;\n"
         + "    static final Map multiEquivsMap;\n"
@@ -216,7 +216,7 @@
         + "        regionVariantEquivMap = new HashMap<>();\n\n"
         + "        // This is an auto-generated file and should not be manually edited.\n";
 
-    private final static String footerText =
+    private static final String footerText =
         "    }\n\n"
         + "}";
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Map/Collisions.java
--- a/jdk/test/java/util/Map/Collisions.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Map/Collisions.java	Tue Sep 15 21:56:04 2015 -0700
@@ -39,7 +39,7 @@
      */
     private static final int TEST_SIZE = 5000;
 
-    final static class HashableInteger implements Comparable {
+    static final class HashableInteger implements Comparable {
 
         final int value;
         final int hashmask; //yes duplication
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Map/FunctionalCMEs.java
--- a/jdk/test/java/util/Map/FunctionalCMEs.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Map/FunctionalCMEs.java	Tue Sep 15 21:56:04 2015 -0700
@@ -43,7 +43,7 @@
  * @run testng FunctionalCMEs
  */
 public class FunctionalCMEs {
-    final static String KEY = "key";
+    static final String KEY = "key";
 
     @DataProvider(name = "Maps", parallel = true)
     private static Iterator makeMaps() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Map/InPlaceOpsCollisions.java
--- a/jdk/test/java/util/Map/InPlaceOpsCollisions.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Map/InPlaceOpsCollisions.java	Tue Sep 15 21:56:04 2015 -0700
@@ -38,7 +38,7 @@
      */
     private static final int TEST_SIZE = 5000;
 
-    final static class HashableInteger implements Comparable {
+    static final class HashableInteger implements Comparable {
 
         final int value;
         final int hashmask; //yes duplication
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Map/MapBinToFromTreeTest.java
--- a/jdk/test/java/util/Map/MapBinToFromTreeTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Map/MapBinToFromTreeTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -186,7 +186,7 @@
         }
     }
 
-    final static class HashCodeInteger implements Comparable {
+    static final class HashCodeInteger implements Comparable {
         final int value;
 
         final int hashcode;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/NavigableMap/LockStep.java
--- a/jdk/test/java/util/NavigableMap/LockStep.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/NavigableMap/LockStep.java	Tue Sep 15 21:56:04 2015 -0700
@@ -534,8 +534,8 @@
         }
     }
 
-    static abstract class MapFrobber { abstract void frob(NavigableMap m); }
-    static abstract class SetFrobber { abstract void frob(NavigableSet m); }
+    abstract static class MapFrobber { abstract void frob(NavigableMap m); }
+    abstract static class SetFrobber { abstract void frob(NavigableSet m); }
 
     static MapFrobber randomAdder(NavigableMap m) {
         final Integer k = unusedKey(m);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/ResourceBundle/Bug6190861.java
--- a/jdk/test/java/util/ResourceBundle/Bug6190861.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/ResourceBundle/Bug6190861.java	Tue Sep 15 21:56:04 2015 -0700
@@ -31,7 +31,7 @@
 
 public class Bug6190861 {
 
-    static public void main(String[] args) {
+    public static void main(String[] args) {
         Locale reservedLocale = Locale.getDefault();
         try {
             Locale.setDefault(new Locale("en", "US"));
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/ResourceBundle/Bug6204853.java
--- a/jdk/test/java/util/ResourceBundle/Bug6204853.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/ResourceBundle/Bug6204853.java	Tue Sep 15 21:56:04 2015 -0700
@@ -79,7 +79,7 @@
         return keyValueArray;
     }
 
-    public final static void main(String[] args) {
+    public static final void main(String[] args) {
         new Bug6204853();
     }
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/ResourceBundle/Bug6355009.java
--- a/jdk/test/java/util/ResourceBundle/Bug6355009.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/ResourceBundle/Bug6355009.java	Tue Sep 15 21:56:04 2015 -0700
@@ -32,7 +32,7 @@
 public final strictfp class Bug6355009 {
     private final ResourceBundle bundle = ResourceBundle.getBundle(Bug6355009.class.getName());
 
-    public final static void main(String[] args) {
+    public static final void main(String[] args) {
         try {
             new Bug6355009();
         } catch (MissingResourceException e) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/ResourceBundle/Bug6356571.java
--- a/jdk/test/java/util/ResourceBundle/Bug6356571.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/ResourceBundle/Bug6356571.java	Tue Sep 15 21:56:04 2015 -0700
@@ -41,7 +41,7 @@
         }
     }
 
-    public final static void main(String[] args) {
+    public static final void main(String[] args) {
         new Bug6356571().check();
     }
 }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/ResourceBundle/Control/StressTest.java
--- a/jdk/test/java/util/ResourceBundle/Control/StressTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/ResourceBundle/Control/StressTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -51,7 +51,7 @@
         "U.S.A.", // StressOut_en_CA.properties is empty.
         "Korea"
     };
-    final static long startTime = System.currentTimeMillis();
+    static final long startTime = System.currentTimeMillis();
 
     // increment each element when one getBundle call is done.
     static AtomicIntegerArray counters;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/ResourceBundle/Test4300693.java
--- a/jdk/test/java/util/ResourceBundle/Test4300693.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/ResourceBundle/Test4300693.java	Tue Sep 15 21:56:04 2015 -0700
@@ -37,9 +37,9 @@
 
 public class Test4300693 {
 
-   static private ResourceBundle rb = ResourceBundle.getBundle("Test4300693RB");
+   private static ResourceBundle rb = ResourceBundle.getBundle("Test4300693RB");
 
-   static public void main(String[] args) {
+   public static void main(String[] args) {
        System.out.println(rb.getString("test result"));
    }
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java
--- a/jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java	Tue Sep 15 21:56:04 2015 -0700
@@ -37,8 +37,8 @@
  */
 public class TestGetBaseBundleName {
 
-    final static String PROPERTY_BUNDLE_NAME = "resources/PropertyBundle";
-    final static String LIST_BUNDLE_NAME = "resources.ListBundle";
+    static final String PROPERTY_BUNDLE_NAME = "resources/PropertyBundle";
+    static final String LIST_BUNDLE_NAME = "resources.ListBundle";
 
     public static String getBaseName(ResourceBundle bundle) {
         return bundle == null ? null : bundle.getBaseBundleName();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/ServiceLoader/Basic.java
--- a/jdk/test/java/util/ServiceLoader/Basic.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/ServiceLoader/Basic.java	Tue Sep 15 21:56:04 2015 -0700
@@ -44,7 +44,7 @@
                                                      eq, s1, s2));
     }
 
-    static abstract class TestLoader {
+    abstract static class TestLoader {
         String name;
 
         TestLoader(String name) { this.name = name; }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/ServiceLoader/NPE.java
--- a/jdk/test/java/util/ServiceLoader/NPE.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/ServiceLoader/NPE.java	Tue Sep 15 21:56:04 2015 -0700
@@ -30,7 +30,7 @@
 import java.util.Arrays;
 
 public final class NPE {
-    static abstract class Test {
+    abstract static class Test {
         String name;
 
         Test(String name) { this.name = name; }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/Spliterator/SpliteratorCollisions.java
--- a/jdk/test/java/util/Spliterator/SpliteratorCollisions.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/Spliterator/SpliteratorCollisions.java	Tue Sep 15 21:56:04 2015 -0700
@@ -165,7 +165,7 @@
         return spliteratorDataProviderWithNull = data.toArray(new Object[0][]);
     }
 
-    final static class HashableInteger implements Comparable {
+    static final class HashableInteger implements Comparable {
 
         final int value;
         final int hashmask; //yes duplication
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/StringJoiner/MergeTest.java
--- a/jdk/test/java/util/StringJoiner/MergeTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/StringJoiner/MergeTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -36,8 +36,8 @@
 
 @Test
 public class MergeTest {
-    private final static String[] PREFIXES = {"", "{", "@#$%"};
-    private final static String[] SUFFIXES = {"", "}", "*&%$"};
+    private static final String[] PREFIXES = {"", "{", "@#$%"};
+    private static final String[] SUFFIXES = {"", "}", "*&%$"};
 
     private static class Fixes {
         public String pre0, suf0;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/TreeMap/ContainsValue.java
--- a/jdk/test/java/util/TreeMap/ContainsValue.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/TreeMap/ContainsValue.java	Tue Sep 15 21:56:04 2015 -0700
@@ -30,7 +30,7 @@
 import java.util.*;
 
 public class ContainsValue {
-    static public void main (String[] args) {
+    public static void main (String[] args) {
         Map map = new TreeMap();
 
         if (map.containsValue ("gemutlichkeit"))
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java
--- a/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java	Tue Sep 15 21:56:04 2015 -0700
@@ -93,7 +93,7 @@
             protected boolean quittingTime(long i) {
                 return (i % 1024) == 0 && quittingTime();
             }
-            abstract protected void realRun();
+            protected abstract void realRun();
             public void run() {
                 try { realRun(); } catch (Throwable t) { unexpected(t); }
             }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java
--- a/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java	Tue Sep 15 21:56:04 2015 -0700
@@ -89,7 +89,7 @@
             protected boolean quittingTime(long i) {
                 return (i % 1024) == 0 && quittingTime();
             }
-            abstract protected void realRun();
+            protected abstract void realRun();
             public void run() {
                 try { realRun(); } catch (Throwable t) { unexpected(t); }
             }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java
--- a/jdk/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java	Tue Sep 15 21:56:04 2015 -0700
@@ -44,7 +44,7 @@
     final long testDurationMillis;
 
     static class PublicFutureTask extends FutureTask {
-        final static Runnable noop = new Runnable() { public void run() {} };
+        static final Runnable noop = new Runnable() { public void run() {} };
         PublicFutureTask() { super(noop, null); }
         public void set(Boolean v) { super.set(v); }
         public void setException(Throwable t) { super.setException(t); }
@@ -81,7 +81,7 @@
             protected boolean quittingTime(long i) {
                 return (i % 1024) == 0 && quittingTime();
             }
-            abstract protected void realRun() throws Exception;
+            protected abstract void realRun() throws Exception;
             public void run() {
                 try { realRun(); } catch (Throwable t) { unexpected(t); }
             }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/concurrent/Phaser/Basic.java
--- a/jdk/test/java/util/concurrent/Phaser/Basic.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/concurrent/Phaser/Basic.java	Tue Sep 15 21:56:04 2015 -0700
@@ -111,7 +111,7 @@
     // Convenience methods for creating threads that call arrive,
     // awaitAdvance, arriveAndAwaitAdvance, awaitAdvanceInterruptibly
     //----------------------------------------------------------------
-    private static abstract class Arriver extends Thread {
+    private abstract static class Arriver extends Thread {
         static AtomicInteger count = new AtomicInteger(1);
 
         Arriver() {
@@ -131,7 +131,7 @@
         public int phase() { return this.phase; }
     }
 
-    private static abstract class Awaiter extends Arriver {
+    private abstract static class Awaiter extends Arriver {
         Awaiter() { super("Awaiter"); }
         Awaiter(String name) { super(name); }
     }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/concurrent/locks/StampedLock/Basic.java
--- a/jdk/test/java/util/concurrent/locks/StampedLock/Basic.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/concurrent/locks/StampedLock/Basic.java	Tue Sep 15 21:56:04 2015 -0700
@@ -75,7 +75,7 @@
         }
     }
 
-    static abstract class Locker extends Thread {
+    abstract static class Locker extends Thread {
         static AtomicInteger count = new AtomicInteger(1);
         private volatile Throwable thrown;
         private volatile long stamp;;
@@ -94,7 +94,7 @@
         }
     }
 
-    static abstract class Reader extends Locker {
+    abstract static class Reader extends Locker {
         Reader() { super("Reader"); }
         Reader(String name) { super(name); }
     }
@@ -173,7 +173,7 @@
                     : interruptibleReader(sl, timeout, unit, gate);
     }
 
-    static abstract class Writer extends Locker {
+    abstract static class Writer extends Locker {
         Writer() { super("Writer"); }
         Writer(String name) { super(name); }
     }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/jar/JarEntry/GetMethodsReturnClones.java
--- a/jdk/test/java/util/jar/JarEntry/GetMethodsReturnClones.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/jar/JarEntry/GetMethodsReturnClones.java	Tue Sep 15 21:56:04 2015 -0700
@@ -36,7 +36,7 @@
 
 public class GetMethodsReturnClones {
 
-    private final static String BASE = System.getProperty("test.src", ".") +
+    private static final String BASE = System.getProperty("test.src", ".") +
         System.getProperty("file.separator");
 
     public static void main(String[] args) throws Exception {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/jar/TestExtra.java
--- a/jdk/test/java/util/jar/TestExtra.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/jar/TestExtra.java	Tue Sep 15 21:56:04 2015 -0700
@@ -42,13 +42,13 @@
  * TestJarExtra checks JAR files.
  */
 public class TestExtra {
-    final static int JAR_MAGIC = 0xcafe; // private IN JarOutputStream.java
-    final static int TEST_HEADER = 0xbabe;
+    static final int JAR_MAGIC = 0xcafe; // private IN JarOutputStream.java
+    static final int TEST_HEADER = 0xbabe;
 
-    final static Charset ascii = Charset.forName("ASCII");
+    static final Charset ascii = Charset.forName("ASCII");
 
     // ZipEntry extra data
-    final static byte[][] extra = new byte[][] {
+    static final byte[][] extra = new byte[][] {
         ascii.encode("hello, world").array(),
         ascii.encode("foo bar").array()
     };
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/AnonymousLogger/TestAnonymousLogger.java
--- a/jdk/test/java/util/logging/AnonymousLogger/TestAnonymousLogger.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/AnonymousLogger/TestAnonymousLogger.java	Tue Sep 15 21:56:04 2015 -0700
@@ -43,7 +43,7 @@
  */
 public class TestAnonymousLogger {
 
-    final public static class TestHandler extends Handler {
+    public static final class TestHandler extends Handler {
         @Override
         public void publish(LogRecord record) {
             System.out.println(new SimpleFormatter().format(record));
@@ -58,14 +58,14 @@
         }
     }
 
-    final public static class TestFilter implements Filter {
+    public static final class TestFilter implements Filter {
         @Override
         public boolean isLoggable(LogRecord record) {
             return true;
         }
     }
 
-    final public static class TestBundle extends ResourceBundle {
+    public static final class TestBundle extends ResourceBundle {
         Set keys = Collections.synchronizedSet(new LinkedHashSet<>());
         @Override
         protected Object handleGetObject(String key) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/DrainFindDeadlockTest.java
--- a/jdk/test/java/util/logging/DrainFindDeadlockTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/DrainFindDeadlockTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -47,14 +47,14 @@
  */
 public class DrainFindDeadlockTest {
     private LogManager mgr = LogManager.getLogManager();
-    private final static int MAX_ITERATIONS = 100;
+    private static final int MAX_ITERATIONS = 100;
 
     // Get a ThreadMXBean so we can check for deadlock.  N.B. this may
     // not be supported on all platforms, which means we will have to
     // resort to the traditional test timeout method. However, if
     // we have the support we'll get the deadlock details if one
     // is detected.
-    private final static ThreadMXBean threadMXBean =
+    private static final ThreadMXBean threadMXBean =
             ManagementFactory.getThreadMXBean();
     private final boolean threadMXBeanDeadlockSupported =
             threadMXBean.isSynchronizerUsageSupported();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/FileHandlerLongLimit.java
--- a/jdk/test/java/util/logging/FileHandlerLongLimit.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/FileHandlerLongLimit.java	Tue Sep 15 21:56:04 2015 -0700
@@ -441,7 +441,7 @@
     }
 
 
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/FileHandlerPath.java
--- a/jdk/test/java/util/logging/FileHandlerPath.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/FileHandlerPath.java	Tue Sep 15 21:56:04 2015 -0700
@@ -77,11 +77,11 @@
 
 
     // Use a random name provided by UUID to avoid collision with other tests
-    final static String logFile = FileHandlerPath.class.getSimpleName() + "_"
+    static final String logFile = FileHandlerPath.class.getSimpleName() + "_"
                 + UUID.randomUUID().toString() + ".log";
-    final static String tmpLogFile;
-    final static String userDir = System.getProperty("user.dir");
-    final static String tmpDir = System.getProperty("java.io.tmpdir");
+    static final String tmpLogFile;
+    static final String userDir = System.getProperty("user.dir");
+    static final String tmpDir = System.getProperty("java.io.tmpdir");
     private static final List properties;
     static {
         tmpLogFile = new File(tmpDir, logFile).toString();
@@ -241,7 +241,7 @@
     }
 
 
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/FileHandlerPatternExceptions.java
--- a/jdk/test/java/util/logging/FileHandlerPatternExceptions.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/FileHandlerPatternExceptions.java	Tue Sep 15 21:56:04 2015 -0700
@@ -265,7 +265,7 @@
     }
 
 
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java
--- a/jdk/test/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java	Tue Sep 15 21:56:04 2015 -0700
@@ -137,7 +137,7 @@
      * different java version can be deserialized in the current java version.
      * (see Jdk8SerializedLog and Jdk9SerializedLog below)
      */
-    public static abstract class SerializedLog {
+    public abstract static class SerializedLog {
         public abstract String getBase64();
         public abstract String getString();
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java
--- a/jdk/test/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java	Tue Sep 15 21:56:04 2015 -0700
@@ -121,7 +121,7 @@
         }
     }
 
-    final static List properties;
+    static final List properties;
     static {
         Properties props1 = new Properties();
         props1.setProperty("test.name", "with XML nano element (default)");
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java
--- a/jdk/test/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java	Tue Sep 15 21:56:04 2015 -0700
@@ -451,7 +451,7 @@
     }
 
 
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java
--- a/jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java	Tue Sep 15 21:56:04 2015 -0700
@@ -197,7 +197,7 @@
         }
     }
 
-    final static class ResetConf extends Thread {
+    static final class ResetConf extends Thread {
 
         public ResetConf() {
             setDaemon(true);
@@ -228,7 +228,7 @@
         }
     }
 
-    final static class ReadConf extends Thread {
+    static final class ReadConf extends Thread {
 
         public ReadConf() {
             setDaemon(true);
@@ -259,7 +259,7 @@
         }
     }
 
-    final static class AddLogger extends Thread {
+    static final class AddLogger extends Thread {
 
         public AddLogger() {
             setDaemon(true);
@@ -293,7 +293,7 @@
         }
     }
 
-    final static class DeadlockDetector extends Thread {
+    static final class DeadlockDetector extends Thread {
 
         @Override
         public void run() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/LogManagerAppContextDeadlock.java
--- a/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java	Tue Sep 15 21:56:04 2015 -0700
@@ -63,7 +63,7 @@
     // Emulate AppContext
     static class FakeAppContext {
 
-        final static AtomicInteger numAppContexts = new AtomicInteger(0);
+        static final AtomicInteger numAppContexts = new AtomicInteger(0);
         static final class FakeAppContextLock {}
         static final FakeAppContextLock lock = new FakeAppContextLock();
         static volatile FakeAppContext appContext;
@@ -220,7 +220,7 @@
     }
 
     // A thread that detect deadlocks.
-    final static class DeadlockDetector extends Thread {
+    static final class DeadlockDetector extends Thread {
 
         public DeadlockDetector() {
             this.setDaemon(true);
@@ -302,7 +302,7 @@
     }
 
     // A Helper class to build a set of permissions.
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java
--- a/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java	Tue Sep 15 21:56:04 2015 -0700
@@ -43,7 +43,7 @@
  */
 public class LoggerEnteringWithParams {
 
-    final static Object[] data = {
+    static final Object[] data = {
         "one", "two", "three", "four", "five", "six", "seven", "eight"
     };
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobal.java
--- a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobal.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobal.java	Tue Sep 15 21:56:04 2015 -0700
@@ -45,7 +45,7 @@
  */
 public class TestGetGlobal {
 
-    final static String[] messages = {
+    static final String[] messages = {
         "1. This message should not appear on the console.",
         "2. This message should appear on the console.",
         "3. This message should now appear on the console too."
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java
--- a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java	Tue Sep 15 21:56:04 2015 -0700
@@ -45,7 +45,7 @@
  */
 public class TestGetGlobalByName {
 
-    final static String[] messages = {
+    static final String[] messages = {
         "1. This message should not appear on the console.",
         "2. This message should appear on the console.",
         "3. This message should now appear on the console too."
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java
--- a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java	Tue Sep 15 21:56:04 2015 -0700
@@ -46,7 +46,7 @@
  */
 public class TestGetGlobalConcurrent {
 
-    final static String[] messages = {
+    static final String[] messages = {
         "1. This message should not appear on the console.",
         "2. This message should appear on the console.",
         "3. This message should now appear on the console too.",
@@ -135,16 +135,16 @@
           }
     }
 
-    final static class Run1 implements Runnable {
+    static final class Run1 implements Runnable {
         public void run() { test1(); }
     }
-    final static class Run2 implements Runnable {
+    static final class Run2 implements Runnable {
         public void run() { test2(); }
     }
-    final static class Run3 implements Runnable {
+    static final class Run3 implements Runnable {
         public void run() { test3(); }
     }
-    final static class Run4 implements Runnable {
+    static final class Run4 implements Runnable {
         public void run() { test4(); }
     }
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java
--- a/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java	Tue Sep 15 21:56:04 2015 -0700
@@ -33,7 +33,7 @@
  */
 public class HandlerImpl extends ConsoleHandler {
 
-    public final static List received = new CopyOnWriteArrayList<>();
+    public static final List received = new CopyOnWriteArrayList<>();
 
     public HandlerImpl() {
     }
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java
--- a/jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java	Tue Sep 15 21:56:04 2015 -0700
@@ -40,8 +40,8 @@
  */
 public class TestLogrbResourceBundle {
 
-    final static String LIST_BUNDLE_NAME = "resources.ListBundle";
-    final static String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
+    static final String LIST_BUNDLE_NAME = "resources.ListBundle";
+    static final String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
 
     /**
      * A dummy handler class that we can use to check the bundle/bundle name
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java
--- a/jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java	Tue Sep 15 21:56:04 2015 -0700
@@ -49,8 +49,8 @@
  */
 public class TestSetResourceBundle {
 
-    final static String LIST_BUNDLE_NAME = "resources.ListBundle";
-    final static String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
+    static final String LIST_BUNDLE_NAME = "resources.ListBundle";
+    static final String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
 
     /**
      * A dummy handler class that we can use to check the bundle/bundle name
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/LoggerResourceBundleRace.java
--- a/jdk/test/java/util/logging/LoggerResourceBundleRace.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/LoggerResourceBundleRace.java	Tue Sep 15 21:56:04 2015 -0700
@@ -38,17 +38,17 @@
 
 
 public class LoggerResourceBundleRace extends RacingThreadsTest {
-    private final static int N_LOOPS   = 500000;   // # of race loops
-    private final static int N_SECS    = 15;       // # of secs to run test
+    private static final int N_LOOPS   = 500000;   // # of race loops
+    private static final int N_SECS    = 15;       // # of secs to run test
     // # of parallel threads; must match number of MyResources inner classes
-    private final static int N_THREADS = 3;
+    private static final int N_THREADS = 3;
 
-    private final static String LOGGER_PREFIX = "myLogger-";
-    private final static String RESOURCE_PREFIX
+    private static final String LOGGER_PREFIX = "myLogger-";
+    private static final String RESOURCE_PREFIX
         = "LoggerResourceBundleRace$MyResources";
     // these counters are AtomicInteger since any worker thread can increment
-    private final static AtomicInteger iaeCnt = new AtomicInteger();
-    private final static AtomicInteger worksCnt = new AtomicInteger();
+    private static final AtomicInteger iaeCnt = new AtomicInteger();
+    private static final AtomicInteger worksCnt = new AtomicInteger();
 
     Logger dummy;   // dummy Logger
 
@@ -156,7 +156,7 @@
     // N_THREADS above must match number of MyResources inner classes
     //
     public static class MyResources0 extends ListResourceBundle {
-        final static Object[][] contents = {
+        static final Object[][] contents = {
             {"sample1", "translation #1 for sample1"},
             {"sample2", "translation #1 for sample2"},
         };
@@ -167,7 +167,7 @@
     }
 
     public static class MyResources1 extends ListResourceBundle {
-        final static Object[][] contents = {
+        static final Object[][] contents = {
             {"sample1", "translation #2 for sample1"},
             {"sample2", "translation #2 for sample2"},
         };
@@ -178,7 +178,7 @@
     }
 
     public static class MyResources2 extends ListResourceBundle {
-        final static Object[][] contents = {
+        static final Object[][] contents = {
             {"sample1", "translation #3 for sample1"},
             {"sample2", "translation #3 for sample2"},
         };
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java
--- a/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java	Tue Sep 15 21:56:04 2015 -0700
@@ -49,7 +49,7 @@
  */
 public class RootLevelInConfigFile {
 
-    public final static String CONFIG_FILE_KEY = "java.util.logging.config.file";
+    public static final String CONFIG_FILE_KEY = "java.util.logging.config.file";
 
     public static void main(String[] args) throws IOException {
         System.setProperty(CONFIG_FILE_KEY,
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/TestAppletLoggerContext.java
--- a/jdk/test/java/util/logging/TestAppletLoggerContext.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/TestAppletLoggerContext.java	Tue Sep 15 21:56:04 2015 -0700
@@ -116,7 +116,7 @@
             public Object getAppletContext() { return active ? exc : null; }
         }
 
-        final static JavaAWTAccessStub javaAwtAccess = new JavaAWTAccessStub();
+        static final JavaAWTAccessStub javaAwtAccess = new JavaAWTAccessStub();
         public static void init() {
             SharedSecrets.setJavaAWTAccess(javaAwtAccess);
             if (System.getProperty("test.security", "on").equals("on")) {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/TestConfigurationListeners.java
--- a/jdk/test/java/util/logging/TestConfigurationListeners.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/TestConfigurationListeners.java	Tue Sep 15 21:56:04 2015 -0700
@@ -429,7 +429,7 @@
     }
 
 
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/TestLogConfigurationDeadLock.java
--- a/jdk/test/java/util/logging/TestLogConfigurationDeadLock.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/TestLogConfigurationDeadLock.java	Tue Sep 15 21:56:04 2015 -0700
@@ -148,7 +148,7 @@
     }
 
 
-    final static class ReadConf extends Thread {
+    static final class ReadConf extends Thread {
         @Override
         public void run() {
             while (goOn) {
@@ -163,7 +163,7 @@
         }
     }
 
-    final static class AddLogger extends Thread {
+    static final class AddLogger extends Thread {
         @Override
         public void run() {
             try {
@@ -184,7 +184,7 @@
         }
     }
 
-    final static class DeadlockDetector extends Thread {
+    static final class DeadlockDetector extends Thread {
 
         @Override
         public void run() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java
--- a/jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java	Tue Sep 15 21:56:04 2015 -0700
@@ -219,7 +219,7 @@
         }
     }
 
-    final static class ReadConf extends DaemonThread {
+    static final class ReadConf extends DaemonThread {
         @Override
         public void run() {
             while (goOn) {
@@ -234,7 +234,7 @@
         }
     }
 
-    final static class AddLogger extends DaemonThread {
+    static final class AddLogger extends DaemonThread {
         @Override
         public void run() {
             try {
@@ -254,7 +254,7 @@
         }
     }
 
-    final static class DeadlockDetector extends Thread {
+    static final class DeadlockDetector extends Thread {
 
         final Set deadlocked = Collections.synchronizedSet(new HashSet());
 
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/TestLoggerBundleSync.java
--- a/jdk/test/java/util/logging/TestLoggerBundleSync.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/TestLoggerBundleSync.java	Tue Sep 15 21:56:04 2015 -0700
@@ -192,7 +192,7 @@
 
     }
 
-    final static class GetRB extends Thread {
+    static final class GetRB extends Thread {
         final class MyHandler extends Handler {
             volatile ResourceBundle rb;
             volatile String rbName;
@@ -327,10 +327,10 @@
         }
     }
 
-    final static class SetRB extends Thread {
+    static final class SetRB extends Thread {
         final Class type;
-        final static ExecutorService executor = Executors.newSingleThreadExecutor();
-        final static class CheckRBTask implements Callable {
+        static final ExecutorService executor = Executors.newSingleThreadExecutor();
+        static final class CheckRBTask implements Callable {
             final Logger logger;
             volatile String rbName;
             volatile ResourceBundle rb;
@@ -431,11 +431,11 @@
         }
     }
 
-    final static class SetRBName extends Thread {
+    static final class SetRBName extends Thread {
         int nexti = 0;
         final Class type;
-        final static ExecutorService executor = Executors.newSingleThreadExecutor();
-        final static class CheckRBNameTask implements Callable {
+        static final ExecutorService executor = Executors.newSingleThreadExecutor();
+        static final class CheckRBNameTask implements Callable {
             final Logger logger;
             volatile String rbName;
 
@@ -535,7 +535,7 @@
         }
     }
 
-    final static class DeadlockDetector extends Thread {
+    static final class DeadlockDetector extends Thread {
 
         @Override
         public void run() {
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java
--- a/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java	Tue Sep 15 21:56:04 2015 -0700
@@ -38,7 +38,7 @@
  */
 public class IndirectlyLoadABundle {
 
-    private final static String rbName = "CallerSearchableResource";
+    private static final String rbName = "CallerSearchableResource";
 
     public boolean loadAndTest() throws Throwable {
         // Make sure we can find it via the URLClassLoader
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/bundlesearch/LoadItUp2.java
--- a/jdk/test/java/util/logging/bundlesearch/LoadItUp2.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/bundlesearch/LoadItUp2.java	Tue Sep 15 21:56:04 2015 -0700
@@ -34,7 +34,7 @@
  */
 public class LoadItUp2 {
 
-    private final static boolean DEBUG = false;
+    private static final boolean DEBUG = false;
 
     public Boolean test(String rbName) throws Exception {
         // we should not be able to find the resource in this directory via
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java
--- a/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -47,11 +47,11 @@
  */
 public class ResourceBundleSearchTest {
 
-    private final static boolean DEBUG = false;
-    private final static String LOGGER_PREFIX = "myLogger.";
+    private static final boolean DEBUG = false;
+    private static final String LOGGER_PREFIX = "myLogger.";
     private static int loggerNum = 0;
-    private final static String PROP_RB_NAME = "ClassPathTestBundle";
-    private final static String TCCL_TEST_BUNDLE = "ContextClassLoaderTestBundle";
+    private static final String PROP_RB_NAME = "ClassPathTestBundle";
+    private static final String TCCL_TEST_BUNDLE = "ContextClassLoaderTestBundle";
 
     private static int numPass = 0;
     private static int numFail = 0;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java
--- a/jdk/test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java	Tue Sep 15 21:56:04 2015 -0700
@@ -37,7 +37,7 @@
  */
 public class TwiceIndirectlyLoadABundle {
 
-    private final static String rbName = "StackSearchableResource";
+    private static final String rbName = "StackSearchableResource";
 
     public boolean loadAndTest() throws Throwable {
         // Find out where we are running from so we can setup the URLClassLoader URLs
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/regex/POSIX_Unicode.java
--- a/jdk/test/java/util/regex/POSIX_Unicode.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/regex/POSIX_Unicode.java	Tue Sep 15 21:56:04 2015 -0700
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Locale;
 
-final public class POSIX_Unicode {
+public final class POSIX_Unicode {
 
     public static boolean isAlpha(int ch) {
         return Character.isAlphabetic(ch);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -77,7 +77,7 @@
  */
 public class CollectorsTest extends OpTestCase {
 
-    private static abstract class CollectorAssertion {
+    private abstract static class CollectorAssertion {
         abstract void assertValue(U value,
                                   Supplier> source,
                                   boolean ordered) throws ReflectiveOperationException;
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/zip/ChecksumBase.java
--- a/jdk/test/java/util/zip/ChecksumBase.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/zip/ChecksumBase.java	Tue Sep 15 21:56:04 2015 -0700
@@ -31,7 +31,7 @@
 
 public class ChecksumBase {
 
-    private final static byte[] BYTES_123456789 = "123456789".getBytes(StandardCharsets.US_ASCII);
+    private static final byte[] BYTES_123456789 = "123456789".getBytes(StandardCharsets.US_ASCII);
 
     public static void testAll(Checksum checksum, long expected) {
         testBytes(checksum, expected);
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/zip/FlaterCriticalArray.java
--- a/jdk/test/java/util/zip/FlaterCriticalArray.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/zip/FlaterCriticalArray.java	Tue Sep 15 21:56:04 2015 -0700
@@ -71,7 +71,7 @@
     /*
      * Base class for individual test cases
      */
-    abstract static private class TestCase {
+    private abstract static class TestCase {
         protected String name;  // For information in debug messages
         protected byte data[];  // Data to be deflated and subsequently inflated
         protected int level;    // Compression level for deflater
@@ -110,9 +110,9 @@
             debug(name, inOut, duration, length);
         }
 
-        abstract protected byte[] deflate(byte data[], int level) throws Throwable;
+        protected abstract byte[] deflate(byte data[], int level) throws Throwable;
 
-        abstract protected byte[] inflate(byte deflated[]) throws Throwable;
+        protected abstract byte[] inflate(byte deflated[]) throws Throwable;
     }
 
     /*
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/zip/FlaterTest.java
--- a/jdk/test/java/util/zip/FlaterTest.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/zip/FlaterTest.java	Tue Sep 15 21:56:04 2015 -0700
@@ -92,7 +92,7 @@
         new FlaterTest().go(numThreads);
     }
 
-    synchronized private void go(int numThreads) throws Throwable {
+    private synchronized void go(int numThreads) throws Throwable {
         int deflatedLength = getDeflatedLength();
 
         long time = System.currentTimeMillis();
diff -r 1fa861caf840 -r 2ee9017c7597 jdk/test/java/util/zip/ZipFile/FinalizeZipFile.java
--- a/jdk/test/java/util/zip/ZipFile/FinalizeZipFile.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/util/zip/ZipFile/FinalizeZipFile.java	Tue Sep 15 21:56:04 2015 -0700
@@ -34,7 +34,7 @@
 
 public class FinalizeZipFile {
 
-    private final static CountDownLatch finalizersDone = new CountDownLatch(3);
+    private static final CountDownLatch finalizersDone = new CountDownLatch(3);
 
     private static class InstrumentedZipFile extends ZipFile {