changeset 12798:d11f25ce3c54 jdk9-b83

Merge
author lana
date Fri, 18 Sep 2015 14:20:39 -0700
parents 970baebaffd0 50292d486635
children 1edfa4abd77a 34ed7c05fef7
files src/java.base/share/native/libfdlibm/e_pow.c src/java.base/share/native/libfdlibm/w_pow.c src/java.base/share/native/libjava/Image.c src/java.desktop/share/classes/sun/awt/image/AbstractMultiResolutionImage.java src/java.desktop/share/classes/sun/awt/image/MultiResolutionImage.java src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java test/javax/management/remote/mandatory/connection/NoIIOP.java test/sun/security/tools/jarsigner/warnings.sh
diffstat 597 files changed, 11515 insertions(+), 5816 deletions(-) [+]
line wrap: on
line diff
--- a/make/lib/CoreLibraries.gmk	Fri Sep 18 10:46:43 2015 -0700
+++ b/make/lib/CoreLibraries.gmk	Fri Sep 18 14:20:39 2015 -0700
@@ -239,6 +239,53 @@
 
 ##########################################################################################
 
+ifeq ($(OPENJDK_TARGET_OS), aix)
+  LIBJIMAGE_TOOLCHAIN := TOOLCHAIN_LINK_CXX
+endif # OPENJDK_TARGET_OS aix
+
+$(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \
+    LIBRARY := jimage, \
+    TOOLCHAIN := $(LIBJIMAGE_TOOLCHAIN), \
+    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+    OPTIMIZATION := LOW, \
+    SRC := $(JDK_TOPDIR)/src/java.base/share/native/libjimage \
+        $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \
+    EXCLUDES := $(LIBJIMAGE_EXCLUDES), \
+    CFLAGS := $(CFLAGS_JDKLIB) \
+        $(JIMAGELIB_CPPFLAGS) \
+        -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
+        -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
+        -I$(JDK_TOPDIR)/src/java.base/share/native/libjimage \
+        -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
+    CFLAGS_unix := -UDEBUG, \
+    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \
+    LDFLAGS := $(LDFLAGS_JDKLIB) \
+        $(call SET_SHARED_LIBRARY_ORIGIN) \
+        $(EXPORT_JIMAGE_FUNCS), \
+    LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \
+        -export:JIMAGE_PackageToModule \
+        -export:JIMAGE_FindResource -export:JIMAGE_GetResource \
+        -export:JIMAGE_ResourceIterator, \
+    LDFLAGS_SUFFIX_unix := -ljvm -ldl $(LIBCXX), \
+    LDFLAGS_SUFFIX_linux := , \
+    LDFLAGS_SUFFIX_solaris := -lc, \
+    LDFLAGS_SUFFIX_aix := ,\
+    LDFLAGS_SUFFIX_macosx := -lc++, \
+    LDFLAGS_SUFFIX_windows := jvm.lib, \
+    VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
+    RC_FLAGS := $(RC_FLAGS) \
+        -D "JDK_FNAME=jimage.dll" \
+        -D "JDK_INTERNAL_NAME=jimage" \
+        -D "JDK_FTYPE=0x2L", \
+    OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjimage, \
+    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+$(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA)
+
+TARGETS += $(BUILD_LIBJIMAGE)
+
+##########################################################################################
+
 LIBJLI_SRC_DIRS := $(call FindSrcDirsForLib, java.base, jli)
 
 LIBJLI_CFLAGS := $(CFLAGS_JDKLIB)
--- a/make/mapfiles/libjava/mapfile-vers	Fri Sep 18 10:46:43 2015 -0700
+++ b/make/mapfiles/libjava/mapfile-vers	Fri Sep 18 14:20:39 2015 -0700
@@ -150,7 +150,6 @@
 		Java_java_lang_StrictMath_exp;
 		Java_java_lang_StrictMath_log;
 		Java_java_lang_StrictMath_log10;
-		Java_java_lang_StrictMath_pow;
 		Java_java_lang_StrictMath_sin;
 		Java_java_lang_StrictMath_sqrt;
 		Java_java_lang_StrictMath_cbrt;
@@ -240,16 +239,6 @@
 		Java_java_util_TimeZone_getSystemTimeZoneID;
 		Java_java_util_TimeZone_getSystemGMTOffsetID;
 		Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8;
-                Java_jdk_internal_jimage_ImageNativeSubstrate_openImage;
-                Java_jdk_internal_jimage_ImageNativeSubstrate_closeImage;
-                Java_jdk_internal_jimage_ImageNativeSubstrate_getIndexAddress;
-                Java_jdk_internal_jimage_ImageNativeSubstrate_getDataAddress;
-                Java_jdk_internal_jimage_ImageNativeSubstrate_read;
-                Java_jdk_internal_jimage_ImageNativeSubstrate_readCompressed;
-                Java_jdk_internal_jimage_ImageNativeSubstrate_getStringBytes;
-                Java_jdk_internal_jimage_ImageNativeSubstrate_getAttributes;
-                Java_jdk_internal_jimage_ImageNativeSubstrate_findAttributes;
-                Java_jdk_internal_jimage_ImageNativeSubstrate_attributeOffsets;
 		Java_sun_misc_MessageUtils_toStderr;
 		Java_sun_misc_MessageUtils_toStdout;
 		Java_sun_misc_NativeSignalHandler_handle0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/mapfiles/libjimage/mapfile-vers	Fri Sep 18 14:20:39 2015 -0700
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Define public interface.
+
+SUNWprivate_1.1 {
+    global:
+        JNI_OnLoad;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_openImage;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_closeImage;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_getIndexAddress;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_getDataAddress;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_read;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_readCompressed;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_getStringBytes;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_getAttributes;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_findAttributes;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_attributeOffsets;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_JIMAGE_1Open;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_JIMAGE_1Close;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_JIMAGE_1FindResource;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_JIMAGE_1GetResource;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_JIMAGE_1PackageToModule;
+        Java_jdk_internal_jimage_ImageNativeSubstrate_JIMAGE_1Resources;
+        JIMAGE_Open;
+        JIMAGE_Close;
+        JIMAGE_PackageToModule;
+        JIMAGE_FindResource;
+        JIMAGE_GetResource;
+        JIMAGE_ResourceIterator;
+    local:
+        *;
+};
--- a/make/mapfiles/libzip/reorder-sparc	Fri Sep 18 10:46:43 2015 -0700
+++ b/make/mapfiles/libzip/reorder-sparc	Fri Sep 18 14:20:39 2015 -0700
@@ -12,6 +12,7 @@
 text: .text%addMetaName: OUTPUTDIR/zip_util.o;
 text: .text%ZIP_FindEntry;
 text: .text%ZIP_GetEntry;
+text: .text%ZIP_InflateFully;
 text: .text%ZIP_Lock;
 text: .text%ZIP_Unlock;
 text: .text%ZIP_FreeEntry;
--- a/make/mapfiles/libzip/reorder-sparcv9	Fri Sep 18 10:46:43 2015 -0700
+++ b/make/mapfiles/libzip/reorder-sparcv9	Fri Sep 18 14:20:39 2015 -0700
@@ -11,6 +11,7 @@
 text: .text%addMetaName: OUTPUTDIR/zip_util.o;
 text: .text%ZIP_FindEntry;
 text: .text%ZIP_GetEntry;
+text: .text%ZIP_InflateFully;
 text: .text%ZIP_Lock;
 text: .text%ZIP_Unlock;
 text: .text%ZIP_FreeEntry;
--- a/make/mapfiles/libzip/reorder-x86	Fri Sep 18 10:46:43 2015 -0700
+++ b/make/mapfiles/libzip/reorder-x86	Fri Sep 18 14:20:39 2015 -0700
@@ -12,6 +12,7 @@
 text: .text%addMetaName: OUTPUTDIR/zip_util.o;
 text: .text%ZIP_FindEntry;
 text: .text%ZIP_GetEntry;
+text: .text%ZIP_InflateFully;
 text: .text%ZIP_Lock;
 text: .text%ZIP_Unlock;
 text: .text%ZIP_FreeEntry;
--- a/make/netbeans/jmx/build.xml	Fri Sep 18 10:46:43 2015 -0700
+++ b/make/netbeans/jmx/build.xml	Fri Sep 18 14:20:39 2015 -0700
@@ -63,8 +63,8 @@
     <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~ -->
     <!-- Call rmic-jmx subtargets -->
 
-    <target name="-rmic-jmx" depends="-init,-rmic-jmx-jrmp,-rmic-jmx-iiop"
-	    description="Calls -init,-rmic-jmx-jrmp,-rmic-jmx-iiop"
+    <target name="-rmic-jmx" depends="-init,-rmic-jmx-jrmp"
+	    description="Calls -init,-rmic-jmx-jrmp"
     />
 
 
@@ -90,44 +90,6 @@
 
     </target>
 
-
-    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-    <!-- Generate RMI IIOP stub class files for remote objects -->
-
-    <target name="-rmic-jmx-iiop" depends="-init,-check-jmx-iiop-uptodate" unless="jmx-iiop-uptodate"
-            description="Generate RMI IIOP stub class files for remote objects. Do not keep generated java files." >
-
-	<rmic 	base="${classes.dir}"
-		includeAntRuntime="no"
-		includeJavaRuntime="no"
-		stubversion="1.2"
-		iiop="yes"
-		>
-	    <include name="javax/management/remote/rmi/RMIConnectionImpl.class" />
-	    <include name="javax/management/remote/rmi/RMIServerImpl.class" />
-	</rmic>
-
-    </target>
-
-
-    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-    <!-- Check if jmx rmic generated IIOP stub and tie class files are up to date -->
-
-    <target name="-check-jmx-iiop-uptodate" depends="-init">
-
-	<uptodate property="jmx-iiop-uptodate"
-		   srcfile="${classes.dir}/javax/management/remote/rmi/RMIConnectionImpl.class"
-		targetfile="${classes.dir}/org/omg/stub/javax/management/remote/rmi/_RMIConnectionImpl_Tie.class"
-	/>
-	<uptodate property="jmx-iiop-uptodate"
-		   srcfile="${classes.dir}/javax/management/remote/rmi/RMIServerImpl.class"
-		targetfile="${classes.dir}/org/omg/stub/javax/management/remote/rmi/_RMIServerImpl_Tie.class"
-	/>
-
-	<echo message="jmx-iiop-uptodate=${jmx-iiop-uptodate}" />
-
-    </target>
-
     <target name="-post-compile" depends="-init,-rmic-jmx"
             description="Jar JMX class files (including RMI stubs)" >
        <mkdir dir="${dist.dir}/lib"/>
--- a/make/rmic/Rmic-java.management.gmk	Fri Sep 18 10:46:43 2015 -0700
+++ b/make/rmic/Rmic-java.management.gmk	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,38 +32,31 @@
 # Generate RMI stubs
 #
 
-# For RMI/IIOP call rmic a second time with -standardPackage option
-# so that *_tie classes are generated in package without the prefix
-# org.omg.stub (6375696)
 JMX_RMI_CLASSES := javax.management.remote.rmi.RMIConnectionImpl \
     javax.management.remote.rmi.RMIServerImpl
-GENRMIIIOPCLASSES :=
-ifneq ($(RMICONNECTOR_IIOP), false)
-  GENRMIIIOPCLASSES := $(RMICONNECTOR_IIOP)
-endif
-$(eval $(call SetupRMICompilation,RMI_IIOP, \
+
+# Generate into gensrc dir where sources get picked up for javadoc, then move the classes
+# into the stub classes dir.
+$(eval $(call SetupRMICompilation,RMI_GEN, \
     CLASSES := $(JMX_RMI_CLASSES), \
     CLASSES_DIR := $(CLASSES_DIR)/java.management, \
-    STUB_CLASSES_DIR := $(STUB_CLASSES_DIR)/java.management, \
+    STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR), \
     RUN_V12 := true, \
-    RUN_IIOP := $(GENRMIIIOPCLASSES), \
-    RUN_IIOP_STDPKG := $(GENRMIIIOPCLASSES)))
+    KEEP_GENERATED := true, \
+))
 
-# Keep generated RMI/JRMP Stub source files and copy them to RMIC_GENSRC_DIR
-# so that javadoc can include them in the API (4997471)
-$(eval $(call SetupRMICompilation,RMI_SRC, \
-    CLASSES := $(JMX_RMI_CLASSES), \
-    CLASSES_DIR := $(CLASSES_DIR)/java.management, \
-    STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR)/java.management, \
-    RUN_V12 := true, \
-    KEEP_GENERATED := true))
+# Find all classes generated and move them from the gensrc dir to the stub classes dir
+$(RMIC_GENSRC_DIR)/_classes.moved: $(RMI_GEN)
+	$(eval classfiles := $(shell $(FIND) $(RMIC_GENSRC_DIR) -name "*.class"))
+	$(foreach src, $(classfiles), \
+	    $(eval target := $(patsubst $(RMIC_GENSRC_DIR)/%, \
+	        $(STUB_CLASSES_DIR)/java.management/%, $(src))) \
+	    $(MKDIR) -p $(dir $(target)) ; \
+	    $(MV) $(src) $(target) $(NEWLINE))
+	$(TOUCH) $@
 
 ##########################################################################################
 
-$(RMIC_GENSRC_DIR)/_the.classes.removed: $(RMI_IIOP) $(RMI_SRC)
-	$(FIND) $(RMIC_GENSRC_DIR) -name "*.class" $(FIND_DELETE)
-	$(TOUCH) $@
-
-all: $(RMIC_GENSRC_DIR)/_the.classes.removed $(RMI_IIOP) $(RMI_SRC)
+all: $(RMIC_GENSRC_DIR)/_classes.moved $(RMI_GEN)
 
 .PHONY: all
--- a/src/java.base/macosx/classes/java/net/DefaultInterface.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/macosx/classes/java/net/DefaultInterface.java	Fri Sep 18 14:20:39 2015 -0700
@@ -42,7 +42,7 @@
 
 class DefaultInterface {
 
-    private final static NetworkInterface defaultInterface =
+    private static final NetworkInterface defaultInterface =
         chooseDefaultInterface();
 
     static NetworkInterface getDefault() {
--- a/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java	Fri Sep 18 14:20:39 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) {
--- a/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m	Fri Sep 18 14:20:39 2015 -0700
@@ -508,7 +508,7 @@
     SecKeychainRef defaultKeychain = NULL;
     SecKeychainCopyDefault(&defaultKeychain);
 
-    SecExternalItemType dataType = (isCertificate == JNI_TRUE ? kSecFormatX509Cert : kSecFormatWrappedPKCS8);
+    SecExternalFormat dataFormat = (isCertificate == JNI_TRUE ? kSecFormatX509Cert : kSecFormatWrappedPKCS8);
 
     // Convert the password obj into a CFStringRef that the keychain importer can use for encryption.
     SecKeyImportExportParameters paramBlock;
@@ -533,7 +533,7 @@
     paramBlock.keyUsage = CSSM_KEYUSE_ANY;
     paramBlock.keyAttributes = CSSM_KEYATTR_RETURN_DEFAULT;
 
-    err = SecKeychainItemImport(cfDataToImport, NULL, &dataType, NULL,
+    err = SecKeychainItemImport(cfDataToImport, NULL, &dataFormat, NULL,
                                 0, &paramBlock, defaultKeychain, &createdItems);
 
     if (err == noErr) {
--- a/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -864,7 +864,9 @@
                         if (computed[i] != actual[i]) {
                             throw new IOException(
                                 "Keystore was tampered with, or "
-                                + "password was incorrect");
+                                        + "password was incorrect",
+                                    new UnrecoverableKeyException(
+                                            "Password verification failed"));
                         }
                     }
                 }
--- a/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java	Fri Sep 18 14:20:39 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,
--- a/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java	Fri Sep 18 14:20:39 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,
--- a/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java	Fri Sep 18 14:20:39 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")
--- a/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java	Fri Sep 18 14:20:39 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")
--- a/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java	Fri Sep 18 14:20:39 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);
         }
--- a/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java	Fri Sep 18 14:20:39 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")
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java	Fri Sep 18 14:20:39 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) {
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java	Fri Sep 18 14:20:39 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<Coding, Integer> basicCodingIndexes;
+    private static final Map<Coding, Integer> 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++) {
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java	Fri Sep 18 14:20:39 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);
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1139,7 +1139,7 @@
         }
     }
 
-    static private
+    private static
     String pct(double num, double den) {
         return (Math.round((num / den)*10000)/100.0)+"%";
     }
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	Fri Sep 18 14:20:39 2015 -0700
@@ -194,7 +194,7 @@
 
 
     /** Entries in the constant pool. */
-    public static abstract
+    public abstract static
     class Entry implements Comparable<Object> {
         protected final byte tag;       // a CONSTANT_foo code
         protected int valueHash;        // cached hashCode
@@ -338,7 +338,7 @@
         return (REF_getField <= refKind && refKind <= REF_invokeInterface);
     }
 
-    public static abstract
+    public abstract static
     class LiteralEntry extends Entry {
         protected LiteralEntry(byte tag) {
             super(tag);
@@ -785,7 +785,7 @@
         return new String(sig);
     }
 
-    static private int skipTo(char semi, String sig, int i) {
+    private static int skipTo(char semi, String sig, int i) {
         i = sig.indexOf(semi, i);
         return (i >= 0) ? i : sig.length();
     }
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java	Fri Sep 18 14:20:39 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<Object> 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<Object> 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 "<init>".  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;
 }
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java	Fri Sep 18 14:20:39 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();
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java	Fri Sep 18 14:20:39 2015 -0700
@@ -218,7 +218,7 @@
         return sum;
     }
 
-    static private
+    private static
     double round(double x, double scale) {
         return Math.round(x * scale) / scale;
     }
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java	Fri Sep 18 14:20:39 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;
     }
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java	Fri Sep 18 14:20:39 2015 -0700
@@ -990,7 +990,7 @@
     }
 
     // Helper for building InnerClasses attributes.
-    static private
+    private static
     void visitInnerClassRefs(Collection<InnerClass> innerClasses, int mode, Collection<Entry> refs) {
         if (innerClasses == null) {
             return;  // no attribute; nothing to do
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java	Fri Sep 18 14:20:39 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(); }
--- a/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java	Fri Sep 18 14:20:39 2015 -0700
@@ -46,7 +46,7 @@
  *      replaced by {@link javax.net.ssl.HttpsURLConnection}.
  */
 @Deprecated
-abstract public
+public abstract
 class HttpsURLConnection extends HttpURLConnection
 {
     /*
--- a/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java	Fri Sep 18 14:20:39 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() {
--- a/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java	Fri Sep 18 14:20:39 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() {
--- a/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java	Fri Sep 18 14:20:39 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
     {
--- a/src/java.base/share/classes/com/sun/security/ntlm/Client.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/security/ntlm/Client.java	Fri Sep 18 14:20:39 2015 -0700
@@ -43,8 +43,8 @@
  * </pre>
  */
 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;
--- a/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java	Fri Sep 18 14:20:39 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;
 
--- a/src/java.base/share/classes/com/sun/security/ntlm/Server.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/com/sun/security/ntlm/Server.java	Fri Sep 18 14:20:39 2015 -0700
@@ -49,8 +49,8 @@
  * </pre>
  */
 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:
--- a/src/java.base/share/classes/java/io/Console.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/io/Console.java	Fri Sep 18 14:20:39 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();
--- a/src/java.base/share/classes/java/io/DataInputStream.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/io/DataInputStream.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/java/io/File.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/io/File.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/io/FilePermission.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/io/FilePermission.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/java/io/ObjectOutputStream.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/io/ObjectOutputStream.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/java/io/ObjectStreamClass.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/io/ObjectStreamConstants.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/io/ObjectStreamConstants.java	Fri Sep 18 14:20:39 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. <p>
@@ -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;
 }
--- a/src/java.base/share/classes/java/io/Reader.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/io/Reader.java	Fri Sep 18 14:20:39 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;
 
 }
--- a/src/java.base/share/classes/java/io/Writer.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/io/Writer.java	Fri Sep 18 14:20:39 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;
 
 }
--- a/src/java.base/share/classes/java/lang/Class.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/Class.java	Fri Sep 18 14:20:39 2015 -0700
@@ -469,8 +469,8 @@
             return null;
         }
     }
-    private volatile transient Constructor<T> cachedConstructor;
-    private volatile transient Class<?>       newInstanceCallerCache;
+    private transient volatile Constructor<T> 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<T>> reflectionData;
+    private transient volatile SoftReference<ReflectionData<T>> 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<T> 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<String, T> enumConstantDirectory = null;
+    private transient volatile Map<String, T> 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);
--- a/src/java.base/share/classes/java/lang/ClassLoader.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java	Fri Sep 18 14:20:39 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 = {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/java/lang/FdLibm.java	Fri Sep 18 14:20:39 2015 -0700
@@ -0,0 +1,383 @@
+/*
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.lang;
+
+/**
+ * Port of the "Freely Distributable Math Library", version 5.3, from C to Java.
+ *
+ * <p>The C version of fdlibm relied on the idiom of pointer aliasing
+ * a 64-bit double floating-point value as a two-element array of
+ * 32-bit integers and reading and writing the two halves of the
+ * double independently. This coding pattern was problematic to C
+ * optimizers and not directly expressible in Java. Therefore, rather
+ * than a memory level overlay, if portions of a double need to be
+ * operated on as integer values, the standard library methods for
+ * bitwise floating-point to integer conversion,
+ * Double.longBitsToDouble and Double.doubleToRawLongBits, are directly
+ * or indirectly used .
+ *
+ * <p>The C version of fdlibm also took some pains to signal the
+ * correct IEEE 754 exceptional conditions divide by zero, invalid,
+ * overflow and underflow. For example, overflow would be signaled by
+ * {@code huge * huge} where {@code huge} was a large constant that
+ * would overflow when squared. Since IEEE floating-point exceptional
+ * handling is not supported natively in the JVM, such coding patterns
+ * have been omitted from this port. For example, rather than {@code
+ * return huge * huge}, this port will use {@code return INFINITY}.
+ */
+class FdLibm {
+    // Constants used by multiple algorithms
+    private static final double INFINITY = Double.POSITIVE_INFINITY;
+
+    private FdLibm() {
+        throw new UnsupportedOperationException("No instances for you.");
+    }
+
+    /**
+     * Return the low-order 32 bits of the double argument as an int.
+     */
+    private static int __LO(double x) {
+        long transducer = Double.doubleToRawLongBits(x);
+        return (int)transducer;
+    }
+
+    /**
+     * Return a double with its low-order bits of the second argument
+     * and the high-order bits of the first argument..
+     */
+    private static double __LO(double x, int low) {
+        long transX = Double.doubleToRawLongBits(x);
+        return Double.longBitsToDouble((transX & 0xFFFF_FFFF_0000_0000L)|low );
+    }
+
+    /**
+     * Return the high-order 32 bits of the double argument as an int.
+     */
+    private static int __HI(double x) {
+        long transducer = Double.doubleToRawLongBits(x);
+        return (int)(transducer >> 32);
+    }
+
+    /**
+     * Return a double with its high-order bits of the second argument
+     * and the low-order bits of the first argument..
+     */
+    private static double __HI(double x, int high) {
+        long transX = Double.doubleToRawLongBits(x);
+        return Double.longBitsToDouble((transX & 0x0000_0000_FFFF_FFFFL)|( ((long)high)) << 32 );
+    }
+
+    /**
+     * Compute x**y
+     *                    n
+     * Method:  Let x =  2   * (1+f)
+     *      1. Compute and return log2(x) in two pieces:
+     *              log2(x) = w1 + w2,
+     *         where w1 has 53 - 24 = 29 bit trailing zeros.
+     *      2. Perform y*log2(x) = n+y' by simulating muti-precision
+     *         arithmetic, where |y'| <= 0.5.
+     *      3. Return x**y = 2**n*exp(y'*log2)
+     *
+     * Special cases:
+     *      1.  (anything) ** 0  is 1
+     *      2.  (anything) ** 1  is itself
+     *      3.  (anything) ** NAN is NAN
+     *      4.  NAN ** (anything except 0) is NAN
+     *      5.  +-(|x| > 1) **  +INF is +INF
+     *      6.  +-(|x| > 1) **  -INF is +0
+     *      7.  +-(|x| < 1) **  +INF is +0
+     *      8.  +-(|x| < 1) **  -INF is +INF
+     *      9.  +-1         ** +-INF is NAN
+     *      10. +0 ** (+anything except 0, NAN)               is +0
+     *      11. -0 ** (+anything except 0, NAN, odd integer)  is +0
+     *      12. +0 ** (-anything except 0, NAN)               is +INF
+     *      13. -0 ** (-anything except 0, NAN, odd integer)  is +INF
+     *      14. -0 ** (odd integer) = -( +0 ** (odd integer) )
+     *      15. +INF ** (+anything except 0,NAN) is +INF
+     *      16. +INF ** (-anything except 0,NAN) is +0
+     *      17. -INF ** (anything)  = -0 ** (-anything)
+     *      18. (-anything) ** (integer) is (-1)**(integer)*(+anything**integer)
+     *      19. (-anything except 0 and inf) ** (non-integer) is NAN
+     *
+     * Accuracy:
+     *      pow(x,y) returns x**y nearly rounded. In particular
+     *                      pow(integer,integer)
+     *      always returns the correct integer provided it is
+     *      representable.
+     */
+    public static class Pow {
+        public static strictfp double compute(final double x, final double y) {
+            double z;
+            double r, s, t, u, v, w;
+            int i, j, k, n;
+
+            // y == zero: x**0 = 1
+            if (y == 0.0)
+                return 1.0;
+
+            // +/-NaN return x + y to propagate NaN significands
+            if (Double.isNaN(x) || Double.isNaN(y))
+                return x + y;
+
+            final double y_abs = Math.abs(y);
+            double x_abs   = Math.abs(x);
+            // Special values of y
+            if (y == 2.0) {
+                return x * x;
+            } else if (y == 0.5) {
+                if (x >= -Double.MAX_VALUE) // Handle x == -infinity later
+                    return Math.sqrt(x + 0.0); // Add 0.0 to properly handle x == -0.0
+            } else if (y_abs == 1.0) {        // y is  +/-1
+                return (y == 1.0) ? x : 1.0 / x;
+            } else if (y_abs == INFINITY) {       // y is +/-infinity
+                if (x_abs == 1.0)
+                    return  y - y;         // inf**+/-1 is NaN
+                else if (x_abs > 1.0) // (|x| > 1)**+/-inf = inf, 0
+                    return (y >= 0) ? y : 0.0;
+                else                       // (|x| < 1)**-/+inf = inf, 0
+                    return (y < 0) ? -y : 0.0;
+            }
+
+            final int hx = __HI(x);
+            int ix = hx & 0x7fffffff;
+
+            /*
+             * When x < 0, determine if y is an odd integer:
+             * y_is_int = 0       ... y is not an integer
+             * y_is_int = 1       ... y is an odd int
+             * y_is_int = 2       ... y is an even int
+             */
+            int y_is_int  = 0;
+            if (hx < 0) {
+                if (y_abs >= 0x1.0p53)   // |y| >= 2^53 = 9.007199254740992E15
+                    y_is_int = 2; // y is an even integer since ulp(2^53) = 2.0
+                else if (y_abs >= 1.0) { // |y| >= 1.0
+                    long y_abs_as_long = (long) y_abs;
+                    if ( ((double) y_abs_as_long) == y_abs) {
+                        y_is_int = 2 -  (int)(y_abs_as_long & 0x1L);
+                    }
+                }
+            }
+
+            // Special value of x
+            if (x_abs == 0.0 ||
+                x_abs == INFINITY ||
+                x_abs == 1.0) {
+                z = x_abs;                 // x is +/-0, +/-inf, +/-1
+                if (y < 0.0)
+                    z = 1.0/z;     // z = (1/|x|)
+                if (hx < 0) {
+                    if (((ix - 0x3ff00000) | y_is_int) == 0) {
+                        z = (z-z)/(z-z); // (-1)**non-int is NaN
+                    } else if (y_is_int == 1)
+                        z = -1.0 * z;             // (x < 0)**odd = -(|x|**odd)
+                }
+                return z;
+            }
+
+            n = (hx >> 31) + 1;
+
+            // (x < 0)**(non-int) is NaN
+            if ((n | y_is_int) == 0)
+                return (x-x)/(x-x);
+
+            s = 1.0; // s (sign of result -ve**odd) = -1 else = 1
+            if ( (n | (y_is_int - 1)) == 0)
+                s = -1.0; // (-ve)**(odd int)
+
+            double p_h, p_l, t1, t2;
+            // |y| is huge
+            if (y_abs > 0x1.0p31) { // if |y| > 2**31
+                final double INV_LN2   =  0x1.7154_7652_b82fep0;   //  1.44269504088896338700e+00 = 1/ln2
+                final double INV_LN2_H =  0x1.715476p0;            //  1.44269502162933349609e+00 = 24 bits of 1/ln2
+                final double INV_LN2_L =  0x1.4ae0_bf85_ddf44p-26; //  1.92596299112661746887e-08 = 1/ln2 tail
+
+                // Over/underflow if x is not close to one
+                if (x_abs < 0x1.fffffp-1) // |x| < 0.9999995231628418
+                    return (y < 0.0) ? s * INFINITY : s * 0.0;
+                if (x_abs > 1.0)         // |x| > 1.0
+                    return (y > 0.0) ? s * INFINITY : s * 0.0;
+                /*
+                 * now |1-x| is tiny <= 2**-20, sufficient to compute
+                 * log(x) by x - x^2/2 + x^3/3 - x^4/4
+                 */
+                t = x_abs - 1.0;        // t has 20 trailing zeros
+                w = (t * t) * (0.5 - t * (0.3333333333333333333333 - t * 0.25));
+                u = INV_LN2_H * t;      // INV_LN2_H has 21 sig. bits
+                v =  t * INV_LN2_L - w * INV_LN2;
+                t1 = u + v;
+                t1 =__LO(t1, 0);
+                t2 = v - (t1 - u);
+            } else {
+                final double CP      =  0x1.ec70_9dc3_a03fdp-1;  //  9.61796693925975554329e-01 = 2/(3ln2)
+                final double CP_H    =  0x1.ec709ep-1;           //  9.61796700954437255859e-01 = (float)cp
+                final double CP_L    = -0x1.e2fe_0145_b01f5p-28; // -7.02846165095275826516e-09 = tail of CP_H
+
+                double z_h, z_l, ss, s2, s_h, s_l, t_h, t_l;
+                n = 0;
+                // Take care of subnormal numbers
+                if (ix < 0x00100000) {
+                    x_abs *= 0x1.0p53; // 2^53 = 9007199254740992.0
+                    n -= 53;
+                    ix = __HI(x_abs);
+                }
+                n  += ((ix) >> 20) - 0x3ff;
+                j  = ix & 0x000fffff;
+                // Determine interval
+                ix = j | 0x3ff00000;          // Normalize ix
+                if (j <= 0x3988E)
+                    k = 0;         // |x| <sqrt(3/2)
+                else if (j < 0xBB67A)
+                    k = 1;         // |x| <sqrt(3)
+                else {
+                    k = 0;
+                    n += 1;
+                    ix -= 0x00100000;
+                }
+                x_abs = __HI(x_abs, ix);
+
+                // Compute ss = s_h + s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5)
+
+                final double BP[]    = {1.0,
+                                       1.5};
+                final double DP_H[]  = {0.0,
+                                        0x1.2b80_34p-1};        // 5.84962487220764160156e-01
+                final double DP_L[]  = {0.0,
+                                        0x1.cfde_b43c_fd006p-27};// 1.35003920212974897128e-08
+
+                // Poly coefs for (3/2)*(log(x)-2s-2/3*s**3
+                final double L1      =  0x1.3333_3333_33303p-1;  //  5.99999999999994648725e-01
+                final double L2      =  0x1.b6db_6db6_fabffp-2;  //  4.28571428578550184252e-01
+                final double L3      =  0x1.5555_5518_f264dp-2;  //  3.33333329818377432918e-01
+                final double L4      =  0x1.1746_0a91_d4101p-2;  //  2.72728123808534006489e-01
+                final double L5      =  0x1.d864_a93c_9db65p-3;  //  2.30660745775561754067e-01
+                final double L6      =  0x1.a7e2_84a4_54eefp-3;  //  2.06975017800338417784e-01
+                u = x_abs - BP[k];               // BP[0]=1.0, BP[1]=1.5
+                v = 1.0 / (x_abs + BP[k]);
+                ss = u * v;
+                s_h = ss;
+                s_h = __LO(s_h, 0);
+                // t_h=x_abs + BP[k] High
+                t_h = 0.0;
+                t_h = __HI(t_h, ((ix >> 1) | 0x20000000) + 0x00080000 + (k << 18) );
+                t_l = x_abs - (t_h - BP[k]);
+                s_l = v * ((u - s_h * t_h) - s_h * t_l);
+                // Compute log(x_abs)
+                s2 = ss * ss;
+                r = s2 * s2* (L1 + s2 * (L2 + s2 * (L3 + s2 * (L4 + s2 * (L5 + s2 * L6)))));
+                r += s_l * (s_h + ss);
+                s2  = s_h * s_h;
+                t_h = 3.0 + s2 + r;
+                t_h = __LO(t_h, 0);
+                t_l = r - ((t_h - 3.0) - s2);
+                // u+v = ss*(1+...)
+                u = s_h * t_h;
+                v = s_l * t_h + t_l * ss;
+                // 2/(3log2)*(ss + ...)
+                p_h = u + v;
+                p_h = __LO(p_h, 0);
+                p_l = v - (p_h - u);
+                z_h = CP_H * p_h;             // CP_H + CP_L = 2/(3*log2)
+                z_l = CP_L * p_h + p_l * CP + DP_L[k];
+                // log2(x_abs) = (ss + ..)*2/(3*log2) = n + DP_H + z_h + z_l
+                t = (double)n;
+                t1 = (((z_h + z_l) + DP_H[k]) + t);
+                t1 = __LO(t1, 0);
+                t2 = z_l - (((t1 - t) - DP_H[k]) - z_h);
+            }
+
+            // Split up y into (y1 + y2) and compute (y1 + y2) * (t1 + t2)
+            double y1  = y;
+            y1 = __LO(y1, 0);
+            p_l = (y - y1) * t1 + y * t2;
+            p_h = y1 * t1;
+            z = p_l + p_h;
+            j = __HI(z);
+            i = __LO(z);
+            if (j >= 0x40900000) {                           // z >= 1024
+                if (((j - 0x40900000) | i)!=0)               // if z > 1024
+                    return s * INFINITY;                     // Overflow
+                else {
+                    final double OVT     =  8.0085662595372944372e-0017; // -(1024-log2(ovfl+.5ulp))
+                    if (p_l + OVT > z - p_h)
+                        return s * INFINITY;   // Overflow
+                }
+            } else if ((j & 0x7fffffff) >= 0x4090cc00 ) {        // z <= -1075
+                if (((j - 0xc090cc00) | i)!=0)           // z < -1075
+                    return s * 0.0;           // Underflow
+                else {
+                    if (p_l <= z - p_h)
+                        return s * 0.0;      // Underflow
+                }
+            }
+            /*
+             * Compute 2**(p_h+p_l)
+             */
+            // Poly coefs for (3/2)*(log(x)-2s-2/3*s**3
+            final double P1      =  0x1.5555_5555_5553ep-3;  //  1.66666666666666019037e-01
+            final double P2      = -0x1.6c16_c16b_ebd93p-9;  // -2.77777777770155933842e-03
+            final double P3      =  0x1.1566_aaf2_5de2cp-14; //  6.61375632143793436117e-05
+            final double P4      = -0x1.bbd4_1c5d_26bf1p-20; // -1.65339022054652515390e-06
+            final double P5      =  0x1.6376_972b_ea4d0p-25; //  4.13813679705723846039e-08
+            final double LG2     =  0x1.62e4_2fef_a39efp-1;  //  6.93147180559945286227e-01
+            final double LG2_H   =  0x1.62e43p-1;            //  6.93147182464599609375e-01
+            final double LG2_L   = -0x1.05c6_10ca_86c39p-29; // -1.90465429995776804525e-09
+            i = j & 0x7fffffff;
+            k = (i >> 20) - 0x3ff;
+            n = 0;
+            if (i > 0x3fe00000) {              // if |z| > 0.5, set n = [z + 0.5]
+                n = j + (0x00100000 >> (k + 1));
+                k = ((n & 0x7fffffff) >> 20) - 0x3ff;     // new k for n
+                t = 0.0;
+                t = __HI(t, (n & ~(0x000fffff >> k)) );
+                n = ((n & 0x000fffff) | 0x00100000) >> (20 - k);
+                if (j < 0)
+                    n = -n;
+                p_h -= t;
+            }
+            t = p_l + p_h;
+            t = __LO(t, 0);
+            u = t * LG2_H;
+            v = (p_l - (t - p_h)) * LG2 + t * LG2_L;
+            z = u + v;
+            w = v - (z - u);
+            t  = z * z;
+            t1  = z - t * (P1 + t * (P2 + t * (P3 + t * (P4 + t * P5))));
+            r  = (z * t1)/(t1 - 2.0) - (w + z * w);
+            z  = 1.0 - (r - z);
+            j  = __HI(z);
+            j += (n << 20);
+            if ((j >> 20) <= 0)
+                z = Math.scalb(z, n); // subnormal output
+            else {
+                int z_hi = __HI(z);
+                z_hi += (n << 20);
+                z = __HI(z, z_hi);
+            }
+            return s * z;
+        }
+    }
+}
--- a/src/java.base/share/classes/java/lang/Integer.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/Integer.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/lang/Package.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/Package.java	Fri Sep 18 14:20:39 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;
 }
--- a/src/java.base/share/classes/java/lang/ProcessBuilder.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/ProcessBuilder.java	Fri Sep 18 14:20:39 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}.
          */
--- a/src/java.base/share/classes/java/lang/StrictMath.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/StrictMath.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -643,7 +643,9 @@
      * @param   b   the exponent.
      * @return  the value {@code a}<sup>{@code b}</sup>.
      */
-    public static native double pow(double a, double b);
+    public static double pow(double a, double b) {
+        return FdLibm.Pow.compute(a, b);
+    }
 
     /**
      * Returns the closest {@code int} to the argument, with ties
--- a/src/java.base/share/classes/java/lang/StringCoding.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/StringCoding.java	Fri Sep 18 14:20:39 2015 -0700
@@ -52,9 +52,9 @@
     private StringCoding() { }
 
     /** The cached coders for each thread */
-    private final static ThreadLocal<SoftReference<StringDecoder>> decoder =
+    private static final ThreadLocal<SoftReference<StringDecoder>> decoder =
         new ThreadLocal<>();
-    private final static ThreadLocal<SoftReference<StringEncoder>> encoder =
+    private static final ThreadLocal<SoftReference<StringEncoder>> encoder =
         new ThreadLocal<>();
 
     private static boolean warnUnsupportedCharset = true;
--- a/src/java.base/share/classes/java/lang/System.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/System.java	Fri Sep 18 14:20:39 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 <code>out</code>, 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.
      */
--- a/src/java.base/share/classes/java/lang/Thread.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/Thread.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/lang/VirtualMachineError.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/VirtualMachineError.java	Fri Sep 18 14:20:39 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;
 
     /**
--- a/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java	Fri Sep 18 14:20:39 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);
--- a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java	Fri Sep 18 14:20:39 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) {
--- a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	Fri Sep 18 14:20:39 2015 -0700
@@ -140,9 +140,9 @@
 
 
     /** instance counters for dumped classes */
-    private final static HashMap<String,Integer> DUMP_CLASS_FILES_COUNTERS;
+    private static final HashMap<String,Integer> 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,
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java	Fri Sep 18 14:20:39 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
      *          <a href="MethodHandle.html#maxarity">too many parameters</a>
      */
-    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
      *          <a href="MethodHandle.html#maxarity">too many parameters</a>
      */
-    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
      *          <a href="MethodHandle.html#maxarity">too many parameters</a>
      */
-    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;
--- a/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java	Fri Sep 18 14:20:39 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<MethodHandle> 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<LambdaForm> entry = lambdaForms[which];
         if (entry != null) {
--- a/src/java.base/share/classes/java/lang/ref/Reference.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java	Fri Sep 18 14:20:39 2015 -0700
@@ -107,7 +107,7 @@
      *     pending:   next element in the pending list (or null if last)
      *   otherwise:   NULL
      */
-    transient private Reference<T> discovered;  /* used by VM */
+    private transient Reference<T> 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();
 
 
--- a/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java	Fri Sep 18 14:20:39 2015 -0700
@@ -51,7 +51,7 @@
     static ReferenceQueue<Object> NULL = new Null<>();
     static ReferenceQueue<Object> ENQUEUED = new Null<>();
 
-    static private class Lock { };
+    private static class Lock { };
     private Lock lock = new Lock();
     private volatile Reference<? extends T> head = null;
     private long queueLength = 0;
--- a/src/java.base/share/classes/java/lang/ref/SoftReference.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/ref/SoftReference.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java	Fri Sep 18 14:20:39 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");
 
     /**
--- a/src/java.base/share/classes/java/math/BigDecimal.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/math/BigDecimal.java	Fri Sep 18 14:20:39 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',
--- a/src/java.base/share/classes/java/math/BigInteger.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/math/BigInteger.java	Fri Sep 18 14:20:39 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];
 
--- a/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java	Fri Sep 18 14:20:39 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;
 }
--- a/src/java.base/share/classes/java/net/Authenticator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/Authenticator.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/net/ContentHandler.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/ContentHandler.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/net/CookieHandler.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/CookieHandler.java	Fri Sep 18 14:20:39 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);
--- a/src/java.base/share/classes/java/net/CookieManager.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/CookieManager.java	Fri Sep 18 14:20:39 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) {
--- a/src/java.base/share/classes/java/net/DatagramPacket.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/DatagramPacket.java	Fri Sep 18 14:20:39 2015 -0700
@@ -384,5 +384,5 @@
     /**
      * Perform class load-time initializations.
      */
-    private native static void init();
+    private static native void init();
 }
--- a/src/java.base/share/classes/java/net/HostPortrange.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/HostPortrange.java	Fri Sep 18 14:20:39 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")) {
--- a/src/java.base/share/classes/java/net/HttpCookie.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/HttpCookie.java	Fri Sep 18 14:20:39 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 --------------
 
--- a/src/java.base/share/classes/java/net/HttpURLConnection.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/HttpURLConnection.java	Fri Sep 18 14:20:39 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 */
 
     /**
--- a/src/java.base/share/classes/java/net/Inet4Address.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/Inet4Address.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/net/Inet6Address.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/Inet6Address.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/java/net/NetworkInterface.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/NetworkInterface.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/java/net/Proxy.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/Proxy.java	Fri Sep 18 14:20:39 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() {
--- a/src/java.base/share/classes/java/net/ResponseCache.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/ResponseCache.java	Fri Sep 18 14:20:39 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);
--- a/src/java.base/share/classes/java/net/SocketInputStream.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/SocketInputStream.java	Fri Sep 18 14:20:39 2015 -0700
@@ -287,5 +287,5 @@
     /**
      * Perform class load-time initializations.
      */
-    private native static void init();
+    private static native void init();
 }
--- a/src/java.base/share/classes/java/net/SocketOptions.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/SocketOptions.java	Fri Sep 18 14:20:39 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:
      * <PRE>
@@ -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;
 }
--- a/src/java.base/share/classes/java/net/SocketOutputStream.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/SocketOutputStream.java	Fri Sep 18 14:20:39 2015 -0700
@@ -178,6 +178,6 @@
     /**
      * Perform class load-time initializations.
      */
-    private native static void init();
+    private static native void init();
 
 }
--- a/src/java.base/share/classes/java/net/SocketPermission.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/SocketPermission.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/java/net/URI.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/URI.java	Fri Sep 18 14:20:39 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'
     };
--- a/src/java.base/share/classes/java/net/URLConnection.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/URLConnection.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/java/net/URLStreamHandler.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/net/URLStreamHandler.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/nio/Bits.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/nio/Bits.java	Fri Sep 18 14:20:39 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) |
--- a/src/java.base/share/classes/java/nio/channels/Pipe.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/nio/channels/Pipe.java	Fri Sep 18 14:20:39 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
     {
--- a/src/java.base/share/classes/java/nio/charset/CoderResult.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/nio/charset/CoderResult.java	Fri Sep 18 14:20:39 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<Integer,WeakReference<CoderResult>> cache = null;
 
--- a/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,8 +70,8 @@
  * following standard {@code AlgorithmParameterGenerator} algorithms and
  * keysizes in parentheses:
  * <ul>
- * <li>{@code DiffieHellman} (1024)</li>
- * <li>{@code DSA} (1024)</li>
+ * <li>{@code DiffieHellman} (1024, 2048, 4096)</li>
+ * <li>{@code DSA} (1024, 2048)</li>
  * </ul>
  * These algorithms are described in the <a href=
  * "{@docRoot}/../technotes/guides/security/StandardNames.html#AlgorithmParameterGenerator">
--- a/src/java.base/share/classes/java/security/KeyPairGenerator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/KeyPairGenerator.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,9 +109,9 @@
  * following standard {@code KeyPairGenerator} algorithms and keysizes in
  * parentheses:
  * <ul>
- * <li>{@code DiffieHellman} (1024)</li>
- * <li>{@code DSA} (1024)</li>
- * <li>{@code RSA} (1024, 2048)</li>
+ * <li>{@code DiffieHellman} (1024, 2048, 4096)</li>
+ * <li>{@code DSA} (1024, 2048)</li>
+ * <li>{@code RSA} (1024, 2048, 4096)</li>
  * </ul>
  * These algorithms are described in the <a href=
  * "{@docRoot}/../technotes/guides/security/StandardNames.html#KeyPairGenerator">
@@ -547,9 +547,9 @@
 
         private Iterator<Service> 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;
--- a/src/java.base/share/classes/java/security/KeyStore.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/KeyStore.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/java/security/Provider.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/Provider.java	Fri Sep 18 14:20:39 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)) {
--- a/src/java.base/share/classes/java/security/SecureRandom.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/SecureRandom.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/java/security/Signature.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/Signature.java	Fri Sep 18 14:20:39 2015 -0700
@@ -102,6 +102,7 @@
  * following standard {@code Signature} algorithms:
  * <ul>
  * <li>{@code SHA1withDSA}</li>
+ * <li>{@code SHA256withDSA}</li>
  * <li>{@code SHA1withRSA}</li>
  * <li>{@code SHA256withRSA}</li>
  * </ul>
@@ -140,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.
@@ -173,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<ServiceId> rsaIds = Arrays.asList(
+    private static final List<ServiceId> rsaIds = Arrays.asList(
         new ServiceId[] {
             new ServiceId("Signature", "NONEwithRSA"),
             new ServiceId("Cipher", "RSA/ECB/PKCS1Padding"),
@@ -262,7 +263,7 @@
         return sig;
     }
 
-    private final static Map<String,Boolean> signatureInfo;
+    private static final Map<String,Boolean> signatureInfo;
 
     static {
         signatureInfo = new ConcurrentHashMap<>();
@@ -1146,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 {
--- a/src/java.base/share/classes/java/security/cert/CertPathBuilder.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/cert/CertPathBuilder.java	Fri Sep 18 14:20:39 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() {
--- a/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java	Fri Sep 18 14:20:39 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();
         }
--- a/src/java.base/share/classes/java/security/cert/CertPathValidator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/cert/CertPathValidator.java	Fri Sep 18 14:20:39 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() {
--- a/src/java.base/share/classes/java/security/cert/CertStore.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/cert/CertStore.java	Fri Sep 18 14:20:39 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() {
--- a/src/java.base/share/classes/java/security/cert/X509CertSelector.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/security/cert/X509CertSelector.java	Fri Sep 18 14:20:39 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 {
--- a/src/java.base/share/classes/java/text/AttributedString.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/AttributedString.java	Fri Sep 18 14:20:39 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<Attribute,Object> {
+    private final class AttributeMap extends AbstractMap<Attribute,Object> {
 
         int runIndex;
         int beginIndex;
--- a/src/java.base/share/classes/java/text/CollationElementIterator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/CollationElementIterator.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/java/text/CollationKey.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/CollationKey.java	Fri Sep 18 14:20:39 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;
 }
--- a/src/java.base/share/classes/java/text/Collator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/Collator.java	Fri Sep 18 14:20:39 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;
  }
--- a/src/java.base/share/classes/java/text/DateFormat.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/DateFormat.java	Fri Sep 18 14:20:39 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);
     }
 }
--- a/src/java.base/share/classes/java/text/MessageFormat.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/MessageFormat.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1168,7 +1168,7 @@
          * indicating the index in the <code>arguments</code> 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");
     }
 
--- a/src/java.base/share/classes/java/text/NumberFormat.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/NumberFormat.java	Fri Sep 18 14:20:39 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);
     }
 
--- a/src/java.base/share/classes/java/text/RBCollationTables.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/RBCollationTables.java	Fri Sep 18 14:20:39 2015 -0700
@@ -258,7 +258,7 @@
         }
     }
 
-    final static int getEntry(Vector<EntryPair> list, String name, boolean fwd) {
+    static final int getEntry(Vector<EntryPair> 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
--- a/src/java.base/share/classes/java/text/RBTableBuilder.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/RBTableBuilder.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/text/RuleBasedCollator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/RuleBasedCollator.java	Fri Sep 18 14:20:39 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;
 
--- a/src/java.base/share/classes/java/text/SimpleDateFormat.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/text/SimpleDateFormat.java	Fri Sep 18 14:20:39 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;
 
--- a/src/java.base/share/classes/java/util/AbstractList.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/AbstractList.java	Fri Sep 18 14:20:39 2015 -0700
@@ -115,7 +115,7 @@
      *
      * @throws IndexOutOfBoundsException {@inheritDoc}
      */
-    abstract public E get(int index);
+    public abstract E get(int index);
 
     /**
      * {@inheritDoc}
--- a/src/java.base/share/classes/java/util/BitSet.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/BitSet.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/java/util/Calendar.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/Calendar.java	Fri Sep 18 14:20:39 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> 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 <code>get</code> and <code>set</code> indicating the
      * minute within the hour.
      * E.g., at 10:04:15.250 PM the <code>MINUTE</code> is 4.
      */
-    public final static int MINUTE = 12;
+    public static final int MINUTE = 12;
 
     /**
      * Field number for <code>get</code> and <code>set</code> indicating the
      * second within the minute.
      * E.g., at 10:04:15.250 PM the <code>SECOND</code> is 15.
      */
-    public final static int SECOND = 13;
+    public static final int SECOND = 13;
 
     /**
      * Field number for <code>get</code> and <code>set</code> indicating the
      * millisecond within the second.
      * E.g., at 10:04:15.250 PM the <code>MILLISECOND</code> is 250.
      */
-    public final static int MILLISECOND = 14;
+    public static final int MILLISECOND = 14;
 
     /**
      * Field number for <code>get</code> and <code>set</code>
@@ -553,7 +553,7 @@
      * <code>TimeZone</code> implementation subclass supports
      * historical GMT offset changes.
      */
-    public final static int ZONE_OFFSET = 15;
+    public static final int ZONE_OFFSET = 15;
 
     /**
      * Field number for <code>get</code> and <code>set</code> indicating the
@@ -564,146 +564,146 @@
      * <code>TimeZone</code> 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 <code>get</code> and <code>set</code>.
      * Field numbers range from <code>0..FIELD_COUNT-1</code>.
      */
-    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 <code>GregorianCalendar</code>
      * 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 @@
     /**
      * <code>True</code> 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 <code>SUNDAY</code>,
@@ -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
--- a/src/java.base/share/classes/java/util/Comparators.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/Comparators.java	Fri Sep 18 14:20:39 2015 -0700
@@ -61,7 +61,7 @@
     /**
      * Null-friendly comparators
      */
-    final static class NullComparator<T> implements Comparator<T>, Serializable {
+    static final class NullComparator<T> implements Comparator<T>, Serializable {
         private static final long serialVersionUID = -7569533591570686392L;
         private final boolean nullFirst;
         // if null, non-null Ts are considered equal
--- a/src/java.base/share/classes/java/util/Currency.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/Currency.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/util/Date.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/Date.java	Fri Sep 18 14:20:39 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");
         }
--- a/src/java.base/share/classes/java/util/Dictionary.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/Dictionary.java	Fri Sep 18 14:20:39 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<K> keys();
+    public abstract Enumeration<K> 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<V> elements();
+    public abstract Enumeration<V> 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);
 }
--- a/src/java.base/share/classes/java/util/GregorianCalendar.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/GregorianCalendar.java	Fri Sep 18 14:20:39 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 <a
--- a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1551,7 +1551,7 @@
      * The fixed date corresponding to jdate. If the value is
      * Long.MIN_VALUE, the fixed date value is unknown.
      */
-    transient private long cachedFixedDate = Long.MIN_VALUE;
+    private transient long cachedFixedDate = Long.MIN_VALUE;
 
     /**
      * Converts the time value (millisecond offset from the <a
--- a/src/java.base/share/classes/java/util/ListResourceBundle.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/ListResourceBundle.java	Fri Sep 18 14:20:39 2015 -0700
@@ -180,7 +180,7 @@
      * @return an array of an <code>Object</code> array representing a
      * key-value pair.
      */
-    abstract protected Object[][] getContents();
+    protected abstract Object[][] getContents();
 
     // ==================privates====================
 
--- a/src/java.base/share/classes/java/util/Locale.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/Locale.java	Fri Sep 18 14:20:39 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;
 
--- a/src/java.base/share/classes/java/util/PropertyPermission.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/PropertyPermission.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/java/util/Random.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/Random.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/util/Scanner.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/Scanner.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,16 +25,18 @@
 
 package java.util;
 
-import java.nio.file.Path;
-import java.nio.file.Files;
-import java.util.regex.*;
 import java.io.*;
 import java.math.*;
 import java.nio.*;
 import java.nio.channels.*;
 import java.nio.charset.*;
+import java.nio.file.Path;
+import java.nio.file.Files;
 import java.text.*;
-import java.util.Locale;
+import java.util.function.Consumer;
+import java.util.regex.*;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 import sun.misc.LRUCache;
 
@@ -96,22 +98,25 @@
  * }</pre></blockquote>
  *
  * <p>The <a name="default-delimiter">default whitespace delimiter</a> used
- * by a scanner is as recognized by {@link java.lang.Character}.{@link
- * java.lang.Character#isWhitespace(char) isWhitespace}. The {@link #reset}
+ * by a scanner is as recognized by {@link Character#isWhitespace(char)
+ * Character.isWhitespace()}. The {@link #reset reset()}
  * method will reset the value of the scanner's delimiter to the default
  * whitespace delimiter regardless of whether it was previously changed.
  *
  * <p>A scanning operation may block waiting for input.
  *
  * <p>The {@link #next} and {@link #hasNext} methods and their
- * primitive-type companion methods (such as {@link #nextInt} and
+ * companion methods (such as {@link #nextInt} and
  * {@link #hasNextInt}) first skip any input that matches the delimiter
- * pattern, and then attempt to return the next token. Both {@code hasNext}
- * and {@code next} methods may block waiting for further input.  Whether a
- * {@code hasNext} method blocks has no connection to whether or not its
- * associated {@code next} method will block.
+ * pattern, and then attempt to return the next token. Both {@code hasNext()}
+ * and {@code next()} methods may block waiting for further input.  Whether a
+ * {@code hasNext()} method blocks has no connection to whether or not its
+ * associated {@code next()} method will block. The {@link #tokens} method
+ * may also block waiting for input.
  *
- * <p> The {@link #findInLine}, {@link #findWithinHorizon}, and {@link #skip}
+ * <p>The {@link #findInLine findInLine()},
+ * {@link #findWithinHorizon findWithinHorizon()},
+ * {@link #skip skip()}, and {@link #findAll findAll()}
  * methods operate independently of the delimiter pattern. These methods will
  * attempt to match the specified pattern with no regard to delimiters in the
  * input and thus can be used in special circumstances where delimiters are
@@ -129,7 +134,7 @@
  *
  * <p> A scanner can read text from any object which implements the {@link
  * java.lang.Readable} interface.  If an invocation of the underlying
- * readable's {@link java.lang.Readable#read} method throws an {@link
+ * readable's {@link java.lang.Readable#read read()} method throws an {@link
  * java.io.IOException} then the scanner assumes that the end of the input
  * has been reached.  The most recent {@code IOException} thrown by the
  * underlying readable can be retrieved via the {@link #ioException} method.
@@ -156,7 +161,7 @@
  * <a name="initial-locale">initial locale </a>is the value returned by the {@link
  * java.util.Locale#getDefault(Locale.Category)
  * Locale.getDefault(Locale.Category.FORMAT)} method; it may be changed via the {@link
- * #useLocale} method. The {@link #reset} method will reset the value of the
+ * #useLocale useLocale()} method. The {@link #reset} method will reset the value of the
  * scanner's locale to the initial locale regardless of whether it was
  * previously changed.
  *
@@ -374,6 +379,11 @@
     // A holder of the last IOException encountered
     private IOException lastException;
 
+    // Number of times this scanner's state has been modified.
+    // Generally incremented on most public APIs and checked
+    // within spliterator implementations.
+    int modCount;
+
     // A pattern for java whitespace
     private static Pattern WHITESPACE_PATTERN = Pattern.compile(
                                                 "\\p{javaWhitespace}+");
@@ -995,8 +1005,9 @@
     }
 
     // Finds the specified pattern in the buffer up to horizon.
-    // Returns a match for the specified input pattern.
-    private String findPatternInBuffer(Pattern pattern, int horizon) {
+    // Returns true if the specified input pattern was matched,
+    // and leaves the matcher field with the current match state.
+    private boolean findPatternInBuffer(Pattern pattern, int horizon) {
         matchValid = false;
         matcher.usePattern(pattern);
         int bufferLimit = buf.limit();
@@ -1014,7 +1025,7 @@
                 if (searchLimit != horizonLimit) {
                      // Hit an artificial end; try to extend the match
                     needInput = true;
-                    return null;
+                    return false;
                 }
                 // The match could go away depending on what is next
                 if ((searchLimit == horizonLimit) && matcher.requireEnd()) {
@@ -1022,27 +1033,28 @@
                     // that it is at the horizon and the end of input is
                     // required for the match.
                     needInput = true;
-                    return null;
+                    return false;
                 }
             }
             // Did not hit end, or hit real end, or hit horizon
             position = matcher.end();
-            return matcher.group();
+            return true;
         }
 
         if (sourceClosed)
-            return null;
+            return false;
 
         // If there is no specified horizon, or if we have not searched
         // to the specified horizon yet, get more input
         if ((horizon == 0) || (searchLimit != horizonLimit))
             needInput = true;
-        return null;
+        return false;
     }
 
-    // Returns a match for the specified input pattern anchored at
-    // the current position
-    private String matchPatternInBuffer(Pattern pattern) {
+    // Attempts to match a pattern anchored at the current position.
+    // Returns true if the specified input pattern was matched,
+    // and leaves the matcher field with the current match state.
+    private boolean matchPatternInBuffer(Pattern pattern) {
         matchValid = false;
         matcher.usePattern(pattern);
         matcher.region(position, buf.limit());
@@ -1050,18 +1062,18 @@
             if (matcher.hitEnd() && (!sourceClosed)) {
                 // Get more input and try again
                 needInput = true;
-                return null;
+                return false;
             }
             position = matcher.end();
-            return matcher.group();
+            return true;
         }
 
         if (sourceClosed)
-            return null;
+            return false;
 
         // Read more to find pattern
         needInput = true;
-        return null;
+        return false;
     }
 
     // Throws if the scanner is closed
@@ -1128,6 +1140,7 @@
      * @return this scanner
      */
     public Scanner useDelimiter(Pattern pattern) {
+        modCount++;
         delimPattern = pattern;
         return this;
     }
@@ -1147,6 +1160,7 @@
      * @return this scanner
      */
     public Scanner useDelimiter(String pattern) {
+        modCount++;
         delimPattern = patternCache.forName(pattern);
         return this;
     }
@@ -1181,6 +1195,7 @@
         if (locale.equals(this.locale))
             return this;
 
+        modCount++;
         this.locale = locale;
         DecimalFormat df =
             (DecimalFormat)NumberFormat.getNumberInstance(locale);
@@ -1236,8 +1251,8 @@
      * number matching regular expressions; see
      * <a href= "#localized-numbers">localized numbers</a> above.
      *
-     * <p>If the radix is less than {@code Character.MIN_RADIX}
-     * or greater than {@code Character.MAX_RADIX}, then an
+     * <p>If the radix is less than {@link Character#MIN_RADIX Character.MIN_RADIX}
+     * or greater than {@link Character#MAX_RADIX Character.MAX_RADIX}, then an
      * {@code IllegalArgumentException} is thrown.
      *
      * <p>Invoking the {@link #reset} method will set the scanner's radix to
@@ -1253,6 +1268,7 @@
 
         if (this.defaultRadix == radix)
             return this;
+        modCount++;
         this.defaultRadix = radix;
         // Force rebuilding and recompilation of radix dependent patterns
         integerPattern = null;
@@ -1275,15 +1291,15 @@
      * if no match has been performed, or if the last match was
      * not successful.
      *
-     * <p>The various {@code next}methods of {@code Scanner}
+     * <p>The various {@code next} methods of {@code Scanner}
      * make a match result available if they complete without throwing an
      * exception. For instance, after an invocation of the {@link #nextInt}
      * method that returned an int, this method returns a
      * {@code MatchResult} for the search of the
      * <a href="#Integer-regex"><i>Integer</i></a> regular expression
-     * defined above. Similarly the {@link #findInLine},
-     * {@link #findWithinHorizon}, and {@link #skip} methods will make a
-     * match available if they succeed.
+     * defined above. Similarly the {@link #findInLine findInLine()},
+     * {@link #findWithinHorizon findWithinHorizon()}, and {@link #skip skip()}
+     * methods will make a match available if they succeed.
      *
      * @return a match result for the last match operation
      * @throws IllegalStateException  If no match result is available
@@ -1333,6 +1349,7 @@
     public boolean hasNext() {
         ensureOpen();
         saveState();
+        modCount++;
         while (!sourceClosed) {
             if (hasTokenInBuffer())
                 return revertState(true);
@@ -1357,6 +1374,7 @@
     public String next() {
         ensureOpen();
         clearCaches();
+        modCount++;
 
         while (true) {
             String token = getCompleteTokenInBuffer(null);
@@ -1435,6 +1453,7 @@
             throw new NullPointerException();
         hasNextPattern = null;
         saveState();
+        modCount++;
 
         while (true) {
             if (getCompleteTokenInBuffer(pattern) != null) {
@@ -1466,6 +1485,7 @@
         if (pattern == null)
             throw new NullPointerException();
 
+        modCount++;
         // Did we already find this pattern?
         if (hasNextPattern == pattern)
             return getCachedResult();
@@ -1497,6 +1517,7 @@
     public boolean hasNextLine() {
         saveState();
 
+        modCount++;
         String result = findWithinHorizon(linePattern(), 0);
         if (result != null) {
             MatchResult mr = this.match();
@@ -1531,6 +1552,7 @@
      * @throws IllegalStateException if this scanner is closed
      */
     public String nextLine() {
+        modCount++;
         if (hasNextPattern == linePattern())
             return getCachedResult();
         clearCaches();
@@ -1589,12 +1611,12 @@
         if (pattern == null)
             throw new NullPointerException();
         clearCaches();
+        modCount++;
         // Expand buffer to include the next newline or end of input
         int endPosition = 0;
         saveState();
         while (true) {
-            String token = findPatternInBuffer(separatorPattern(), 0);
-            if (token != null) {
+            if (findPatternInBuffer(separatorPattern(), 0)) {
                 endPosition = matcher.start();
                 break; // up to next newline
             }
@@ -1623,7 +1645,7 @@
      * <p>An invocation of this method of the form
      * {@code findWithinHorizon(pattern)} behaves in exactly the same way as
      * the invocation
-     * {@code findWithinHorizon(Pattern.compile(pattern, horizon))}.
+     * {@code findWithinHorizon(Pattern.compile(pattern), horizon)}.
      *
      * @param pattern a string specifying the pattern to search for
      * @param horizon the search horizon
@@ -1673,13 +1695,13 @@
         if (horizon < 0)
             throw new IllegalArgumentException("horizon < 0");
         clearCaches();
+        modCount++;
 
         // Search for the pattern
         while (true) {
-            String token = findPatternInBuffer(pattern, horizon);
-            if (token != null) {
+            if (findPatternInBuffer(pattern, horizon)) {
                 matchValid = true;
-                return token;
+                return matcher.group();
             }
             if (needInput)
                 readInput();
@@ -1717,11 +1739,11 @@
         if (pattern == null)
             throw new NullPointerException();
         clearCaches();
+        modCount++;
 
         // Search for the pattern
         while (true) {
-            String token = matchPatternInBuffer(pattern);
-            if (token != null) {
+            if (matchPatternInBuffer(pattern)) {
                 matchValid = true;
                 position = matcher.end();
                 return this;
@@ -1932,7 +1954,7 @@
      *
      * <p> An invocation of this method of the form
      * {@code nextShort()} behaves in exactly the same way as the
-     * invocation {@code nextShort(radix)}, where {@code radix}
+     * invocation {@link #nextShort(int) nextShort(radix)}, where {@code radix}
      * is the default radix of this scanner.
      *
      * @return the {@code short} scanned from the input
@@ -2590,8 +2612,10 @@
      * Resets this scanner.
      *
      * <p> Resetting a scanner discards all of its explicit state
-     * information which may have been changed by invocations of {@link
-     * #useDelimiter}, {@link #useLocale}, or {@link #useRadix}.
+     * information which may have been changed by invocations of
+     * {@link #useDelimiter useDelimiter()},
+     * {@link #useLocale useLocale()}, or
+     * {@link #useRadix useRadix()}.
      *
      * <p> An invocation of this method of the form
      * {@code scanner.reset()} behaves in exactly the same way as the
@@ -2612,6 +2636,206 @@
         useLocale(Locale.getDefault(Locale.Category.FORMAT));
         useRadix(10);
         clearCaches();
+        modCount++;
         return this;
     }
+
+    /**
+     * Returns a stream of delimiter-separated tokens from this scanner. The
+     * stream contains the same tokens that would be returned, starting from
+     * this scanner's current state, by calling the {@link #next} method
+     * repeatedly until the {@link #hasNext} method returns false.
+     *
+     * <p>The resulting stream is sequential and ordered. All stream elements are
+     * non-null.
+     *
+     * <p>Scanning starts upon initiation of the terminal stream operation, using the
+     * current state of this scanner. Subsequent calls to any methods on this scanner
+     * other than {@link #close} and {@link #ioException} may return undefined results
+     * or may cause undefined effects on the returned stream. The returned stream's source
+     * {@code Spliterator} is <em>fail-fast</em> and will, on a best-effort basis, throw a
+     * {@link java.util.ConcurrentModificationException} if any such calls are detected
+     * during stream pipeline execution.
+     *
+     * <p>After stream pipeline execution completes, this scanner is left in an indeterminate
+     * state and cannot be reused.
+     *
+     * <p>If this scanner contains a resource that must be released, this scanner
+     * should be closed, either by calling its {@link #close} method, or by
+     * closing the returned stream. Closing the stream will close the underlying scanner.
+     * {@code IllegalStateException} is thrown if the scanner has been closed when this
+     * method is called, or if this scanner is closed during stream pipeline execution.
+     *
+     * <p>This method might block waiting for more input.
+     *
+     * @apiNote
+     * For example, the following code will create a list of
+     * comma-delimited tokens from a string:
+     *
+     * <pre>{@code
+     * List<String> result = new Scanner("abc,def,,ghi")
+     *     .useDelimiter(",")
+     *     .tokens()
+     *     .collect(Collectors.toList());
+     * }</pre>
+     *
+     * <p>The resulting list would contain {@code "abc"}, {@code "def"},
+     * the empty string, and {@code "ghi"}.
+     *
+     * @return a sequential stream of token strings
+     * @throws IllegalStateException if this scanner is closed
+     * @since 1.9
+     */
+    public Stream<String> tokens() {
+        ensureOpen();
+        Stream<String> stream = StreamSupport.stream(new TokenSpliterator(), false);
+        return stream.onClose(this::close);
+    }
+
+    class TokenSpliterator extends Spliterators.AbstractSpliterator<String> {
+        int expectedCount = -1;
+
+        TokenSpliterator() {
+            super(Long.MAX_VALUE,
+                  Spliterator.IMMUTABLE | Spliterator.NONNULL | Spliterator.ORDERED);
+        }
+
+        @Override
+        public boolean tryAdvance(Consumer<? super String> cons) {
+            if (expectedCount >= 0 && expectedCount != modCount) {
+                throw new ConcurrentModificationException();
+            }
+
+            if (hasNext()) {
+                String token = next();
+                expectedCount = modCount;
+                cons.accept(token);
+                if (expectedCount != modCount) {
+                    throw new ConcurrentModificationException();
+                }
+                return true;
+            } else {
+                expectedCount = modCount;
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Returns a stream of match results from this scanner. The stream
+     * contains the same results in the same order that would be returned by
+     * calling {@code findWithinHorizon(pattern, 0)} and then {@link #match}
+     * successively as long as {@link #findWithinHorizon findWithinHorizon()}
+     * finds matches.
+     *
+     * <p>The resulting stream is sequential and ordered. All stream elements are
+     * non-null.
+     *
+     * <p>Scanning starts upon initiation of the terminal stream operation, using the
+     * current state of this scanner. Subsequent calls to any methods on this scanner
+     * other than {@link #close} and {@link #ioException} may return undefined results
+     * or may cause undefined effects on the returned stream. The returned stream's source
+     * {@code Spliterator} is <em>fail-fast</em> and will, on a best-effort basis, throw a
+     * {@link java.util.ConcurrentModificationException} if any such calls are detected
+     * during stream pipeline execution.
+     *
+     * <p>After stream pipeline execution completes, this scanner is left in an indeterminate
+     * state and cannot be reused.
+     *
+     * <p>If this scanner contains a resource that must be released, this scanner
+     * should be closed, either by calling its {@link #close} method, or by
+     * closing the returned stream. Closing the stream will close the underlying scanner.
+     * {@code IllegalStateException} is thrown if the scanner has been closed when this
+     * method is called, or if this scanner is closed during stream pipeline execution.
+     *
+     * <p>As with the {@link #findWithinHorizon findWithinHorizon()} methods, this method
+     * might block waiting for additional input, and it might buffer an unbounded amount of
+     * input searching for a match.
+     *
+     * @apiNote
+     * For example, the following code will read a file and return a list
+     * of all sequences of characters consisting of seven or more Latin capital
+     * letters:
+     *
+     * <pre>{@code
+     * try (Scanner sc = new Scanner(Paths.get("input.txt"))) {
+     *     Pattern pat = Pattern.compile("[A-Z]{7,}");
+     *     List<String> capWords = sc.findAll(pat)
+     *                               .map(MatchResult::group)
+     *                               .collect(Collectors.toList());
+     * }
+     * }</pre>
+     *
+     * @param pattern the pattern to be matched
+     * @return a sequential stream of match results
+     * @throws NullPointerException if pattern is null
+     * @throws IllegalStateException if this scanner is closed
+     * @since 1.9
+     */
+    public Stream<MatchResult> findAll(Pattern pattern) {
+        Objects.requireNonNull(pattern);
+        ensureOpen();
+        Stream<MatchResult> stream = StreamSupport.stream(new FindSpliterator(pattern), false);
+        return stream.onClose(this::close);
+    }
+
+    /**
+     * Returns a stream of match results that match the provided pattern string.
+     * The effect is equivalent to the following code:
+     *
+     * <pre>{@code
+     *     scanner.findAll(Pattern.compile(patString))
+     * }</pre>
+     *
+     * @param patString the pattern string
+     * @return a sequential stream of match results
+     * @throws NullPointerException if patString is null
+     * @throws IllegalStateException if this scanner is closed
+     * @throws PatternSyntaxException if the regular expression's syntax is invalid
+     * @since 1.9
+     * @see java.util.regex.Pattern
+     */
+    public Stream<MatchResult> findAll(String patString) {
+        Objects.requireNonNull(patString);
+        ensureOpen();
+        return findAll(patternCache.forName(patString));
+    }
+
+    class FindSpliterator extends Spliterators.AbstractSpliterator<MatchResult> {
+        final Pattern pattern;
+        int expectedCount = -1;
+
+        FindSpliterator(Pattern pattern) {
+            super(Long.MAX_VALUE,
+                  Spliterator.IMMUTABLE | Spliterator.NONNULL | Spliterator.ORDERED);
+            this.pattern = pattern;
+        }
+
+        @Override
+        public boolean tryAdvance(Consumer<? super MatchResult> cons) {
+            ensureOpen();
+            if (expectedCount >= 0) {
+                if (expectedCount != modCount) {
+                    throw new ConcurrentModificationException();
+                }
+            } else {
+                expectedCount = modCount;
+            }
+
+            while (true) {
+                // assert expectedCount == modCount
+                if (findPatternInBuffer(pattern, 0)) { // doesn't increment modCount
+                    cons.accept(matcher.toMatchResult());
+                    if (expectedCount != modCount) {
+                        throw new ConcurrentModificationException();
+                    }
+                    return true;
+                }
+                if (needInput)
+                    readInput(); // doesn't increment modCount
+                else
+                    return false; // reached end of input
+            }
+        }
+    }
 }
--- a/src/java.base/share/classes/java/util/SimpleTimeZone.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/SimpleTimeZone.java	Fri Sep 18 14:20:39 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;
     }
--- a/src/java.base/share/classes/java/util/Spliterators.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/Spliterators.java	Fri Sep 18 14:20:39 2015 -0700
@@ -833,7 +833,7 @@
 
     // Implementations
 
-    private static abstract class EmptySpliterator<T, S extends Spliterator<T>, C> {
+    private abstract static class EmptySpliterator<T, S extends Spliterator<T>, C> {
 
         EmptySpliterator() { }
 
@@ -1253,7 +1253,7 @@
      * @see #spliterator(Iterator, long, int)
      * @since 1.8
      */
-    public static abstract class AbstractSpliterator<T> implements Spliterator<T> {
+    public abstract static class AbstractSpliterator<T> implements Spliterator<T> {
         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;
--- a/src/java.base/share/classes/java/util/TimeZone.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/TimeZone.java	Fri Sep 18 14:20:39 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 <code>TimeZone</code> for the given ID.
--- a/src/java.base/share/classes/java/util/Timer.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/Timer.java	Fri Sep 18 14:20:39 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();
     }
--- a/src/java.base/share/classes/java/util/jar/Pack200.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/jar/Pack200.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/java/util/regex/Pattern.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java	Fri Sep 18 14:20:39 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() {
--- a/src/java.base/share/classes/java/util/regex/UnicodeProp.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/regex/UnicodeProp.java	Fri Sep 18 14:20:39 2015 -0700
@@ -202,8 +202,8 @@
         }
     };
 
-    private final static HashMap<String, String> posix = new HashMap<>();
-    private final static HashMap<String, String> aliases = new HashMap<>();
+    private static final HashMap<String, String> posix = new HashMap<>();
+    private static final HashMap<String, String> aliases = new HashMap<>();
     static {
         posix.put("ALPHA", "ALPHABETIC");
         posix.put("LOWER", "LOWERCASE");
--- a/src/java.base/share/classes/java/util/stream/FindOps.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/stream/FindOps.java	Fri Sep 18 14:20:39 2015 -0700
@@ -167,7 +167,7 @@
      * @param <T> The type of input element
      * @param <O> The result type, typically an optional type
      */
-    private static abstract class FindSink<T, O> implements TerminalSink<T, O> {
+    private abstract static class FindSink<T, O> implements TerminalSink<T, O> {
         boolean hasValue;
         T value;
 
--- a/src/java.base/share/classes/java/util/stream/ForEachOps.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/stream/ForEachOps.java	Fri Sep 18 14:20:39 2015 -0700
@@ -130,7 +130,7 @@
      *
      * @param <T> the output type of the stream pipeline
      */
-    static abstract class ForEachOp<T>
+    abstract static class ForEachOp<T>
             implements TerminalOp<T, Void>, TerminalSink<T, Void> {
         private final boolean ordered;
 
--- a/src/java.base/share/classes/java/util/stream/MatchOps.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/stream/MatchOps.java	Fri Sep 18 14:20:39 2015 -0700
@@ -249,7 +249,7 @@
      *
      * @param <T> The output type of the stream pipeline
      */
-    private static abstract class BooleanTerminalSink<T> implements Sink<T> {
+    private abstract static class BooleanTerminalSink<T> implements Sink<T> {
         boolean stop;
         boolean value;
 
--- a/src/java.base/share/classes/java/util/stream/Nodes.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/stream/Nodes.java	Fri Sep 18 14:20:39 2015 -0700
@@ -562,7 +562,7 @@
 
     // Implementations
 
-    private static abstract class EmptyNode<T, T_ARR, T_CONS> implements Node<T> {
+    private abstract static class EmptyNode<T, T_ARR, T_CONS> implements Node<T> {
         EmptyNode() { }
 
         @Override
@@ -750,7 +750,7 @@
     /**
      * Node class for an internal node with two or more children
      */
-    private static abstract class AbstractConcNode<T, T_NODE extends Node<T>> implements Node<T> {
+    private abstract static class AbstractConcNode<T, T_NODE extends Node<T>> implements Node<T> {
         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<T,
+    private abstract static class InternalNodeSpliterator<T,
                                                           S extends Spliterator<T>,
                                                           N extends Node<T>>
             implements Spliterator<T> {
@@ -1114,7 +1114,7 @@
             }
         }
 
-        private static abstract class OfPrimitive<T, T_CONS, T_ARR,
+        private abstract static class OfPrimitive<T, T_CONS, T_ARR,
                                                   T_SPLITR extends Spliterator.OfPrimitive<T, T_CONS, T_SPLITR>,
                                                   N extends Node.OfPrimitive<T, T_CONS, T_ARR, T_SPLITR, N>>
                 extends InternalNodeSpliterator<T, T_SPLITR, N>
@@ -1827,7 +1827,7 @@
      * This and subclasses are not intended to be serializable
      */
     @SuppressWarnings("serial")
-    private static abstract class SizedCollectorTask<P_IN, P_OUT, T_SINK extends Sink<P_OUT>,
+    private abstract static class SizedCollectorTask<P_IN, P_OUT, T_SINK extends Sink<P_OUT>,
                                                      K extends SizedCollectorTask<P_IN, P_OUT, T_SINK, K>>
             extends CountedCompleter<Void>
             implements Sink<P_OUT> {
@@ -2030,7 +2030,7 @@
     }
 
     @SuppressWarnings("serial")
-    private static abstract class ToArrayTask<T, T_NODE extends Node<T>,
+    private abstract static class ToArrayTask<T, T_NODE extends Node<T>,
                                               K extends ToArrayTask<T, T_NODE, K>>
             extends CountedCompleter<Void> {
         protected final T_NODE node;
--- a/src/java.base/share/classes/java/util/stream/ReduceOps.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/stream/ReduceOps.java	Fri Sep 18 14:20:39 2015 -0700
@@ -797,7 +797,7 @@
     /**
      * A sink that counts elements
      */
-    static abstract class CountingSink<T>
+    abstract static class CountingSink<T>
             extends Box<Long>
             implements AccumulatingSink<T, Long, CountingSink<T>> {
         long count;
@@ -866,7 +866,7 @@
      *
      * @param <U> The type of the state element
      */
-    private static abstract class Box<U> {
+    private abstract static class Box<U> {
         U state;
 
         Box() {} // Avoid creation of special accessor
@@ -886,7 +886,7 @@
      * @param <R> the result type of the reducing operation
      * @param <S> the type of the {@code AccumulatingSink}
      */
-    private static abstract class ReduceOp<T, R, S extends AccumulatingSink<T, R, S>>
+    private abstract static class ReduceOp<T, R, S extends AccumulatingSink<T, R, S>>
             implements TerminalOp<T, R> {
         private final StreamShape inputShape;
 
--- a/src/java.base/share/classes/java/util/stream/Sink.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/stream/Sink.java	Fri Sep 18 14:20:39 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<T, E_OUT> implements Sink<T> {
+    abstract static class ChainedReference<T, E_OUT> implements Sink<T> {
         protected final Sink<? super E_OUT> downstream;
 
         public ChainedReference(Sink<? super E_OUT> 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<E_OUT> implements Sink.OfInt {
+    abstract static class ChainedInt<E_OUT> implements Sink.OfInt {
         protected final Sink<? super E_OUT> downstream;
 
         public ChainedInt(Sink<? super E_OUT> 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<E_OUT> implements Sink.OfLong {
+    abstract static class ChainedLong<E_OUT> implements Sink.OfLong {
         protected final Sink<? super E_OUT> downstream;
 
         public ChainedLong(Sink<? super E_OUT> 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<E_OUT> implements Sink.OfDouble {
+    abstract static class ChainedDouble<E_OUT> implements Sink.OfDouble {
         protected final Sink<? super E_OUT> downstream;
 
         public ChainedDouble(Sink<? super E_OUT> downstream) {
--- a/src/java.base/share/classes/java/util/stream/SortedOps.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/stream/SortedOps.java	Fri Sep 18 14:20:39 2015 -0700
@@ -301,7 +301,7 @@
      * occur, in general (not restricted to just sorting), for short-circuiting
      * parallel pipelines.
      */
-    private static abstract class AbstractRefSortingSink<T> extends Sink.ChainedReference<T, T> {
+    private abstract static class AbstractRefSortingSink<T> extends Sink.ChainedReference<T, T> {
         protected final Comparator<? super T> 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<Integer> {
+    private abstract static class AbstractIntSortingSink extends Sink.ChainedInt<Integer> {
         protected boolean cancellationWasRequested;
 
         AbstractIntSortingSink(Sink<? super Integer> downstream) {
@@ -506,7 +506,7 @@
     /**
      * Abstract {@link Sink} for implementing sort on long streams.
      */
-    private static abstract class AbstractLongSortingSink extends Sink.ChainedLong<Long> {
+    private abstract static class AbstractLongSortingSink extends Sink.ChainedLong<Long> {
         protected boolean cancellationWasRequested;
 
         AbstractLongSortingSink(Sink<? super Long> downstream) {
@@ -604,7 +604,7 @@
     /**
      * Abstract {@link Sink} for implementing sort on long streams.
      */
-    private static abstract class AbstractDoubleSortingSink extends Sink.ChainedDouble<Double> {
+    private abstract static class AbstractDoubleSortingSink extends Sink.ChainedDouble<Double> {
         protected boolean cancellationWasRequested;
 
         AbstractDoubleSortingSink(Sink<? super Double> downstream) {
--- a/src/java.base/share/classes/java/util/stream/StreamSpliterators.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/stream/StreamSpliterators.java	Fri Sep 18 14:20:39 2015 -0700
@@ -57,7 +57,7 @@
      * <p>A wrapping spliterator produced from a sequential stream
      * cannot be split if there are stateful operations present.
      */
-    private static abstract class AbstractWrappingSpliterator<P_IN, P_OUT,
+    private abstract static class AbstractWrappingSpliterator<P_IN, P_OUT,
                                                               T_BUFFER extends AbstractSpinedBuffer>
             implements Spliterator<P_OUT> {
 
@@ -607,7 +607,7 @@
      * {@code SUBSIZED}.
      *
      */
-    static abstract class SliceSpliterator<T, T_SPLITR extends Spliterator<T>> {
+    abstract static class SliceSpliterator<T, T_SPLITR extends Spliterator<T>> {
         // 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,
+        abstract static class OfPrimitive<T,
                 T_SPLITR extends Spliterator.OfPrimitive<T, T_CONS, T_SPLITR>,
                 T_CONS>
                 extends SliceSpliterator<T, T_SPLITR>
@@ -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<T, T_SPLITR extends Spliterator<T>> {
+    abstract static class UnorderedSliceSpliterator<T, T_SPLITR extends Spliterator<T>> {
         static final int CHUNK_SIZE = 1 << 7;
 
         // The spliterator to slice
@@ -1060,7 +1060,7 @@
          * @param <T_BUFF> 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<T_CONS>,
@@ -1324,7 +1324,7 @@
      * The {@code tryAdvance} method always returns true.
      *
      */
-    static abstract class InfiniteSupplyingSpliterator<T> implements Spliterator<T> {
+    abstract static class InfiniteSupplyingSpliterator<T> implements Spliterator<T> {
         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<T_CONS> extends ArrayBuffer {
+        abstract static class OfPrimitive<T_CONS> extends ArrayBuffer {
             int index;
 
             @Override
--- a/src/java.base/share/classes/java/util/stream/Streams.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/stream/Streams.java	Fri Sep 18 14:20:39 2015 -0700
@@ -298,7 +298,7 @@
         }
     }
 
-    private static abstract class AbstractStreamBuilderImpl<T, S extends Spliterator<T>> implements Spliterator<T> {
+    private abstract static class AbstractStreamBuilderImpl<T, S extends Spliterator<T>> implements Spliterator<T> {
         // >= 0 when building, < 0 when built
         // -1 == no elements
         // -2 == one element, held by first
@@ -782,7 +782,7 @@
             }
         }
 
-        private static abstract class OfPrimitive<T, T_CONS, T_SPLITR extends Spliterator.OfPrimitive<T, T_CONS, T_SPLITR>>
+        private abstract static class OfPrimitive<T, T_CONS, T_SPLITR extends Spliterator.OfPrimitive<T, T_CONS, T_SPLITR>>
                 extends ConcatSpliterator<T, T_SPLITR>
                 implements Spliterator.OfPrimitive<T, T_CONS, T_SPLITR> {
             private OfPrimitive(T_SPLITR aSpliterator, T_SPLITR bSpliterator) {
--- a/src/java.base/share/classes/java/util/stream/WhileOps.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/stream/WhileOps.java	Fri Sep 18 14:20:39 2015 -0700
@@ -649,7 +649,7 @@
      * @param <T> the type of elements returned by this spliterator
      * @param <T_SPLITR> the type of the spliterator
      */
-    static abstract class UnorderedWhileSpliterator<T, T_SPLITR extends Spliterator<T>> implements Spliterator<T> {
+    abstract static class UnorderedWhileSpliterator<T, T_SPLITR extends Spliterator<T>> implements Spliterator<T> {
         // 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<T> extends UnorderedWhileSpliterator<T, Spliterator<T>> implements Consumer<T> {
+        abstract static class OfRef<T> extends UnorderedWhileSpliterator<T, Spliterator<T>> implements Consumer<T> {
             final Predicate<? super T> p;
             T t;
 
@@ -820,7 +820,7 @@
             }
         }
 
-        static abstract class OfInt extends UnorderedWhileSpliterator<Integer, Spliterator.OfInt> implements IntConsumer, Spliterator.OfInt {
+        abstract static class OfInt extends UnorderedWhileSpliterator<Integer, Spliterator.OfInt> implements IntConsumer, Spliterator.OfInt {
             final IntPredicate p;
             int t;
 
@@ -925,7 +925,7 @@
             }
         }
 
-        static abstract class OfLong extends UnorderedWhileSpliterator<Long, Spliterator.OfLong> implements LongConsumer, Spliterator.OfLong {
+        abstract static class OfLong extends UnorderedWhileSpliterator<Long, Spliterator.OfLong> implements LongConsumer, Spliterator.OfLong {
             final LongPredicate p;
             long t;
 
@@ -1030,7 +1030,7 @@
             }
         }
 
-        static abstract class OfDouble extends UnorderedWhileSpliterator<Double, Spliterator.OfDouble> implements DoubleConsumer, Spliterator.OfDouble {
+        abstract static class OfDouble extends UnorderedWhileSpliterator<Double, Spliterator.OfDouble> implements DoubleConsumer, Spliterator.OfDouble {
             final DoublePredicate p;
             double t;
 
--- a/src/java.base/share/classes/java/util/zip/Adler32.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/zip/Adler32.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
 import java.nio.ByteBuffer;
 import sun.nio.ch.DirectBuffer;
 
+import jdk.internal.HotSpotIntrinsicCandidate;
+
 /**
  * A class that can be used to compute the Adler-32 checksum of a data
  * stream. An Adler-32 checksum is almost as reliable as a CRC-32 but
@@ -125,9 +127,12 @@
         return (long)adler & 0xffffffffL;
     }
 
-    private native static int update(int adler, int b);
-    private native static int updateBytes(int adler, byte[] b, int off,
+    private static native int update(int adler, int b);
+
+    @HotSpotIntrinsicCandidate
+    private static native int updateBytes(int adler, byte[] b, int off,
                                           int len);
-    private native static int updateByteBuffer(int adler, long addr,
+    @HotSpotIntrinsicCandidate
+    private static native int updateByteBuffer(int adler, long addr,
                                                int off, int len);
 }
--- a/src/java.base/share/classes/java/util/zip/CRC32.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/zip/CRC32.java	Fri Sep 18 14:20:39 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) {
--- a/src/java.base/share/classes/java/util/zip/Deflater.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/zip/Deflater.java	Fri Sep 18 14:20:39 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);
 }
--- a/src/java.base/share/classes/java/util/zip/GZIPInputStream.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/zip/GZIPInputStream.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/java/util/zip/Inflater.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/java/util/zip/Inflater.java	Fri Sep 18 14:20:39 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);
 }
--- a/src/java.base/share/classes/javax/crypto/Cipher.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/crypto/Cipher.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -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<String,Pattern> for previously compiled patterns
-        private final static ConcurrentMap<String, Pattern> patternCache =
+        private static final ConcurrentMap<String, Pattern> patternCache =
             new ConcurrentHashMap<String, Pattern>();
 
         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,
--- a/src/java.base/share/classes/javax/crypto/JceSecurity.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/crypto/JceSecurity.java	Fri Sep 18 14:20:39 2015 -0700
@@ -57,11 +57,11 @@
     // Map<Provider,?> 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<Provider, Object> verificationResults =
+    private static final Map<Provider, Object> verificationResults =
             new IdentityHashMap<>();
 
     // Map<Provider,?> of the providers currently being verified
-    private final static Map<Provider, Object> verifyingProviders =
+    private static final Map<Provider, Object> 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
--- a/src/java.base/share/classes/javax/crypto/KeyAgreement.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/crypto/KeyAgreement.java	Fri Sep 18 14:20:39 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)
--- a/src/java.base/share/classes/javax/crypto/KeyGenerator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/crypto/KeyGenerator.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java	Fri Sep 18 14:20:39 2015 -0700
@@ -52,7 +52,7 @@
  *
  * @since 1.4
  */
-abstract public
+public abstract
 class HttpsURLConnection extends HttpURLConnection
 {
     /**
--- a/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/javax/net/ssl/SNIHostName.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/SNIHostName.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/javax/net/ssl/SSLContext.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/SSLContext.java	Fri Sep 18 14:20:39 2015 -0700
@@ -37,11 +37,13 @@
  * secure random bytes.
  *
  * <p> Every implementation of the Java platform is required to support the
- * following standard {@code SSLContext} protocol:
+ * following standard {@code SSLContext} protocols:
  * <ul>
  * <li>{@code TLSv1}</li>
+ * <li>{@code TLSv1.1}</li>
+ * <li>{@code TLSv1.2}</li>
  * </ul>
- * This protocol is described in the <a href=
+ * These protocols are described in the <a href=
  * "{@docRoot}/../technotes/guides/security/StandardNames.html#SSLContext">
  * SSLContext section</a> of the
  * Java Cryptography Architecture Standard Algorithm Name Documentation.
--- a/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java	Fri Sep 18 14:20:39 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;
     }
 
--- a/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,19 @@
  * This class acts as a factory for trust managers based on a
  * source of trust material. Each trust manager manages a specific
  * type of trust material for use by secure sockets. The trust
- * material is based on a KeyStore and/or provider specific sources.
+ * material is based on a KeyStore and/or provider-specific sources.
+ *
+ * <p> Every implementation of the Java platform is required to support the
+ * following standard {@code TrustManagerFactory} algorithm:
+ * <ul>
+ * <li><tt>PKIX</tt></li>
+ * </ul>
+ * This algorithm is described in the <a href=
+ * "{@docRoot}/../technotes/guides/security/StandardNames.html#TrustManagerFactory">
+ * TrustManagerFactory section</a> of the
+ * Java Cryptography Architecture Standard Algorithm Name Documentation.
+ * Consult the release documentation for your implementation to see if any
+ * other algorithms are supported.
  *
  * @since 1.4
  * @see TrustManager
@@ -61,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
--- a/src/java.base/share/classes/javax/security/auth/Policy.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/javax/security/auth/Policy.java	Fri Sep 18 14:20:39 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 =
--- a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 import java.util.Comparator;
 import java.util.stream.IntStream;
 
-public class BasicImageReader {
+public class BasicImageReader implements AutoCloseable {
     private final String imagePath;
     private final ImageSubstrate substrate;
     private final ByteOrder byteOrder;
--- a/src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java	Fri Sep 18 14:20:39 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;
 
--- a/src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java	Fri Sep 18 14:20:39 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,18 @@
 import sun.misc.JavaNioAccess;
 import sun.misc.SharedSecrets;
 
-final class ImageNativeSubstrate implements ImageSubstrate {
+public final class ImageNativeSubstrate implements ImageSubstrate {
+    static {
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                @Override
+                public Void run() {
+                    System.loadLibrary("jimage");
+                    return null;
+                }
+            });
+     }
+
     private static final JavaNioAccess NIOACCESS =
             SharedSecrets.getJavaNioAccess();
 
@@ -38,19 +49,33 @@
     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 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 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 static native int JIMAGE_Resources(long jimageHandle,
+                    String[] outputNames);
+    // Return the module name for the package
+    public static native String JIMAGE_PackageToModule(long imageHandle,
+                    String packageName);
 
     static ByteBuffer newDirectByteBuffer(long address, long capacity) {
         assert capacity < Integer.MAX_VALUE;
--- a/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java	Fri Sep 18 14:20:39 2015 -0700
@@ -33,7 +33,7 @@
 import java.util.Map;
 
 public class PerfectHashBuilder<E> {
-    private final static int RETRY_LIMIT = 1000;
+    private static final int RETRY_LIMIT = 1000;
 
     private Class<?> entryComponent;
     private Class<?> bucketComponent;
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java	Fri Sep 18 14:20:39 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}. <i>Subclasses must not use this
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java	Fri Sep 18 14:20:39 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
     ////////////////////////////////////////////////////////////////////
--- a/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java	Fri Sep 18 14:20:39 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<String, Input> 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];
--- a/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/jdk/net/Sockets.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/jdk/net/Sockets.java	Fri Sep 18 14:20:39 2015 -0700
@@ -58,7 +58,7 @@
 @jdk.Exported
 public class Sockets {
 
-    private final static HashMap<Class<?>,Set<SocketOption<?>>>
+    private static final HashMap<Class<?>,Set<SocketOption<?>>>
         options = new HashMap<>();
 
     static {
--- a/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java	Fri Sep 18 14:20:39 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<? extends sun.misc.Unsafe> unsafeClass = unsafe.getClass();
--- a/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java	Fri Sep 18 14:20:39 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);
--- a/src/java.base/share/classes/sun/invoke/util/ValueConversions.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/invoke/util/ValueConversions.java	Fri Sep 18 14:20:39 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
     /**
--- a/src/java.base/share/classes/sun/invoke/util/Wrapper.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/invoke/util/Wrapper.java	Fri Sep 18 14:20:39 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,
--- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/launcher/LauncherHelper.java	Fri Sep 18 14:20:39 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";
--- a/src/java.base/share/classes/sun/misc/BASE64Decoder.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/BASE64Decoder.java	Fri Sep 18 14:20:39 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++) {
--- a/src/java.base/share/classes/sun/misc/BASE64Encoder.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/BASE64Encoder.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/sun/misc/CharacterDecoder.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/CharacterDecoder.java	Fri Sep 18 14:20:39 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 { }
--- a/src/java.base/share/classes/sun/misc/CharacterEncoder.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/CharacterEncoder.java	Fri Sep 18 14:20:39 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;
 
     /**
--- a/src/java.base/share/classes/sun/misc/Cleaner.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/Cleaner.java	Fri Sep 18 14:20:39 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,
--- a/src/java.base/share/classes/sun/misc/FDBigInteger.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/FDBigInteger.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/sun/misc/FloatingDecimal.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/FloatingDecimal.java	Fri Sep 18 14:20:39 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 <code>ASCIIToBinaryConverter</code> container for a <code>double</code>.
      */
     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;
--- a/src/java.base/share/classes/sun/misc/LRUCache.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/LRUCache.java	Fri Sep 18 14:20:39 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];
--- a/src/java.base/share/classes/sun/misc/PerfCounter.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/PerfCounter.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/sun/misc/ProxyGenerator.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/ProxyGenerator.java	Fri Sep 18 14:20:39 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;
         }
--- a/src/java.base/share/classes/sun/misc/Request.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/Request.java	Fri Sep 18 14:20:39 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();
 }
--- a/src/java.base/share/classes/sun/misc/SoftCache.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/SoftCache.java	Fri Sep 18 14:20:39 2015 -0700
@@ -117,9 +117,9 @@
      */
 
 
-    static private class ValueCell extends SoftReference<Object> {
-        static private Object INVALID_KEY = new Object();
-        static private int dropped = 0;
+    private static class ValueCell extends SoftReference<Object> {
+        private static Object INVALID_KEY = new Object();
+        private static int dropped = 0;
         private Object key;
 
         private ValueCell(Object key, Object value, ReferenceQueue<Object> queue) {
--- a/src/java.base/share/classes/sun/misc/UCDecoder.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/UCDecoder.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/sun/misc/UCEncoder.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/UCEncoder.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/sun/misc/VM.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/misc/VM.java	Fri Sep 18 14:20:39 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();
 }
--- a/src/java.base/share/classes/sun/net/NetProperties.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/NetProperties.java	Fri Sep 18 14:20:39 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<Void>() {
@@ -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 <code>String</code> value for the property,
      *         or <code>null</code>
      */
-    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 <code>Integer</code> value for the property,
      *         or <code>null</code>
      */
-    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 <code>Boolean</code> value for the property,
      *         or <code>null</code>
      */
-    static public Boolean getBoolean(String key) {
+    public static Boolean getBoolean(String key) {
         String val = null;
 
         try {
--- a/src/java.base/share/classes/sun/net/NetworkServer.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/NetworkServer.java	Fri Sep 18 14:20:39 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 <i>port</i>.  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();
--- a/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java	Fri Sep 18 14:20:39 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);
 
     /**
--- a/src/java.base/share/classes/sun/net/util/IPAddressUtil.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/util/IPAddressUtil.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/sun/net/www/ParseUtil.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/ParseUtil.java	Fri Sep 18 14:20:39 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'
     };
--- a/src/java.base/share/classes/sun/net/www/URLConnection.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/URLConnection.java	Fri Sep 18 14:20:39 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<String,Void> 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());
     }
 }
--- a/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java	Fri Sep 18 14:20:39 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 :-
--- a/src/java.base/share/classes/sun/net/www/http/HttpClient.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/http/HttpClient.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java	Fri Sep 18 14:20:39 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<String,Thread> requests = new HashMap<>();
+    private static HashMap<String,Thread> 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()) {
--- a/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java	Fri Sep 18 14:20:39 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"
     };
--- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java	Fri Sep 18 14:20:39 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.
--- a/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java	Fri Sep 18 14:20:39 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;
     }
--- a/src/java.base/share/classes/sun/nio/ch/Net.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/nio/ch/Net.java	Fri Sep 18 14:20:39 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;
 
--- a/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java	Fri Sep 18 14:20:39 2015 -0700
@@ -159,6 +159,6 @@
 
     protected abstract void implDereg(SelectionKeyImpl ski) throws IOException;
 
-    abstract public Selector wakeup();
+    public abstract Selector wakeup();
 
 }
--- a/src/java.base/share/classes/sun/nio/ch/ThreadPool.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/nio/ch/ThreadPool.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/sun/nio/cs/DoubleByte.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/nio/cs/DoubleByte.java	Fri Sep 18 14:20:39 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);
--- a/src/java.base/share/classes/sun/nio/cs/SingleByte.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/nio/cs/SingleByte.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java	Fri Sep 18 14:20:39 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<Object[]> cache = new ThreadLocal<>();
--- a/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java	Fri Sep 18 14:20:39 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<Boolean>() {
                 public Boolean run() {
                     String value = System.getProperty(PROP_NAME);
--- a/src/java.base/share/classes/sun/security/jca/JCAUtil.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/security/jca/JCAUtil.java	Fri Sep 18 14:20:39 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
--- a/src/java.base/share/classes/sun/security/jca/ProviderConfig.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/security/jca/ProviderConfig.java	Fri Sep 18 14:20:39 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;
--- a/src/java.base/share/classes/sun/security/jca/ProviderList.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/security/jca/ProviderList.java	Fri Sep 18 14:20:39 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);
--- a/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java	Fri Sep 18 14:20:39 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++) {
--- a/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java	Fri Sep 18 14:20:39 2015 -0700
@@ -51,6 +51,8 @@
 import java.util.*;
 
 import java.security.AlgorithmParameters;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
 import javax.crypto.spec.PBEParameterSpec;
 import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.SecretKeySpec;
@@ -2060,7 +2062,7 @@
                 }
 
                 if (!MessageDigest.isEqual(macData.getDigest(), macResult)) {
-                   throw new SecurityException("Failed PKCS12" +
+                   throw new UnrecoverableKeyException("Failed PKCS12" +
                                         " integrity checking");
                 }
            } catch (Exception e) {
--- a/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java	Fri Sep 18 14:20:39 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)
--- a/src/java.base/share/classes/sun/security/provider/ConfigFile.java	Fri Sep 18 10:46:43 2015 -0700
+++ b/src/java.base/share/classes/sun/security/provider/ConfigFile.java	Fri Sep 18 14:20:39 2015 -0700
@@ -112,7 +112,7 @@
         spi.engineRefresh();
     }
 
-    public final static class Spi extends ConfigurationSpi {
+    public static final