refs) {
if (innerClasses == null) {
return; // no attribute; nothing to do
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java
--- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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.
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java
--- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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(); }
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java
--- a/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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
{
/*
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java
--- a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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() {
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java
--- a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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() {
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java
--- a/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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
{
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java
--- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java Fri Sep 18 14:20:39 2015 -0700
@@ -43,8 +43,8 @@
*
*/
public final class Client extends NTLM {
- final private String hostname;
- final private String username;
+ private final String hostname;
+ private final String username;
private String domain;
private byte[] pw1, pw2;
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java
--- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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;
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java
--- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java Fri Sep 18 14:20:39 2015 -0700
@@ -49,8 +49,8 @@
*
*/
public abstract class Server extends NTLM {
- final private String domain;
- final private boolean allVersion;
+ private final String domain;
+ private final boolean allVersion;
/**
* Creates a Server instance.
* @param version the NTLM version to use, which can be:
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/io/Console.java
--- a/jdk/src/java.base/share/classes/java/io/Console.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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();
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/io/DataInputStream.java
--- a/jdk/src/java.base/share/classes/java/io/DataInputStream.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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;
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/io/File.java
--- a/jdk/src/java.base/share/classes/java/io/File.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/io/FilePermission.java
--- a/jdk/src/java.base/share/classes/java/io/FilePermission.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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;
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/io/ObjectInputStream.java
--- a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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.
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java
--- a/jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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.
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java
--- a/jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java
--- a/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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.
@@ -210,7 +210,7 @@
* @see java.io.ObjectOutputStream#useProtocolVersion(int)
* @since 1.2
*/
- public final static int PROTOCOL_VERSION_1 = 1;
+ public static final int PROTOCOL_VERSION_1 = 1;
/**
@@ -231,5 +231,5 @@
* @see #SC_BLOCK_DATA
* @since 1.2
*/
- public final static int PROTOCOL_VERSION_2 = 2;
+ public static final int PROTOCOL_VERSION_2 = 2;
}
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/io/Reader.java
--- a/jdk/src/java.base/share/classes/java/io/Reader.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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;
}
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/io/Writer.java
--- a/jdk/src/java.base/share/classes/java/io/Writer.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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;
}
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/Class.java
--- a/jdk/src/java.base/share/classes/java/lang/Class.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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 cachedConstructor;
- private volatile transient Class newInstanceCallerCache;
+ private transient volatile Constructor cachedConstructor;
+ private transient volatile Class newInstanceCallerCache;
/**
@@ -1123,7 +1123,7 @@
}
}
- private final static class EnclosingMethodInfo {
+ private static final class EnclosingMethodInfo {
private Class enclosingClass;
private String name;
private String descriptor;
@@ -2514,11 +2514,11 @@
}
}
- private volatile transient SoftReference> reflectionData;
+ private transient volatile SoftReference> reflectionData;
// Incremented by the VM on each call to JVM TI RedefineClasses()
// that redefines this class or a superclass.
- private volatile transient int classRedefinedCount = 0;
+ private transient volatile int classRedefinedCount = 0;
// Lazily create and cache ReflectionData
private ReflectionData reflectionData() {
@@ -2561,7 +2561,7 @@
private native String getGenericSignature0();
// Generic info repository; lazily initialized
- private volatile transient ClassRepository genericInfo;
+ private transient volatile ClassRepository genericInfo;
// accessor for factory
private GenericsFactory getFactory() {
@@ -3353,7 +3353,7 @@
}
return enumConstants;
}
- private volatile transient T[] enumConstants = null;
+ private transient volatile T[] enumConstants = null;
/**
* Returns a map from simple name to enum constant. This package-private
@@ -3375,7 +3375,7 @@
}
return enumConstantDirectory;
}
- private volatile transient Map enumConstantDirectory = null;
+ private transient volatile Map enumConstantDirectory = null;
/**
* Casts an object to the class or interface represented
@@ -3523,7 +3523,7 @@
// Annotations cache
@SuppressWarnings("UnusedDeclaration")
- private volatile transient AnnotationData annotationData;
+ private transient volatile AnnotationData annotationData;
private AnnotationData annotationData() {
while (true) { // retry loop
@@ -3578,7 +3578,7 @@
// Annotation types cache their internal (AnnotationType) form
@SuppressWarnings("UnusedDeclaration")
- private volatile transient AnnotationType annotationType;
+ private transient volatile AnnotationType annotationType;
boolean casAnnotationType(AnnotationType oldType, AnnotationType newType) {
return Atomic.casAnnotationType(this, oldType, newType);
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/ClassLoader.java
--- a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java
--- a/jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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 = {
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/FdLibm.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/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.
+ *
+ * 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 .
+ *
+ *
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| > 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;
+ }
+ }
+}
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/Integer.java
--- a/jdk/src/java.base/share/classes/java/lang/Integer.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/Package.java
--- a/jdk/src/java.base/share/classes/java/lang/Package.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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;
}
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java
--- a/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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}.
*/
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/StrictMath.java
--- a/jdk/src/java.base/share/classes/java/lang/StrictMath.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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}{@code b}.
*/
- 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
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/StringCoding.java
--- a/jdk/src/java.base/share/classes/java/lang/StringCoding.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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> decoder =
+ private static final ThreadLocal> decoder =
new ThreadLocal<>();
- private final static ThreadLocal> encoder =
+ private static final ThreadLocal> encoder =
new ThreadLocal<>();
private static boolean warnUnsupportedCharset = true;
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/System.java
--- a/jdk/src/java.base/share/classes/java/lang/System.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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 out, has been redirected to a file or other
* destination that is typically not continuously monitored.
*/
- public final static PrintStream err = null;
+ public static final PrintStream err = null;
/* The security manager for the system.
*/
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/Thread.java
--- a/jdk/src/java.base/share/classes/java/lang/Thread.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java
--- a/jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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;
/**
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java
--- a/jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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);
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
--- a/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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) {
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
--- a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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 DUMP_CLASS_FILES_COUNTERS;
+ private static final HashMap DUMP_CLASS_FILES_COUNTERS;
/** debugging flag for saving generated class files */
- private final static File DUMP_CLASS_FILES_DIR;
+ private static final File DUMP_CLASS_FILES_DIR;
static {
if (DUMP_CLASS_FILES) {
@@ -771,7 +771,7 @@
mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, MH, "invokeBasic", type.basicType().toMethodDescriptorString(), false);
}
- static private Class[] STATICALLY_INVOCABLE_PACKAGES = {
+ private static Class[] STATICALLY_INVOCABLE_PACKAGES = {
// Sample classes from each package we are willing to bind to statically:
java.lang.Object.class,
java.util.Arrays.class,
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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;
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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
* too many parameters
*/
- static public
+ public static
MethodHandle spreadInvoker(MethodType type, int leadingArgCount) {
if (leadingArgCount < 0 || leadingArgCount > type.parameterCount())
throw newIllegalArgumentException("bad argument count", leadingArgCount);
@@ -1927,7 +1927,7 @@
* @throws IllegalArgumentException if the resulting method handle's type would have
* too many parameters
*/
- static public
+ public static
MethodHandle exactInvoker(MethodType type) {
return type.invokers().exactInvoker();
}
@@ -1966,7 +1966,7 @@
* @throws IllegalArgumentException if the resulting method handle's type would have
* too many parameters
*/
- static public
+ public static
MethodHandle invoker(MethodType type) {
return type.invokers().genericInvoker();
}
@@ -2322,7 +2322,7 @@
return MethodHandleImpl.makeIntrinsic(mtype, lform, Intrinsic.ZERO);
}
- synchronized private static MethodHandle setCachedMethodHandle(MethodHandle[] cache, int pos, MethodHandle value) {
+ private static synchronized MethodHandle setCachedMethodHandle(MethodHandle[] cache, int pos, MethodHandle value) {
// Simulate a CAS, to avoid racy duplication of results.
MethodHandle prev = cache[pos];
if (prev != null) return prev;
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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 entry = methodHandles[which];
if (entry != null) {
@@ -130,7 +130,7 @@
return (entry != null) ? entry.get() : null;
}
- synchronized public LambdaForm setCachedLambdaForm(int which, LambdaForm form) {
+ public synchronized LambdaForm setCachedLambdaForm(int which, LambdaForm form) {
// Simulate a CAS, to avoid racy duplication of results.
SoftReference entry = lambdaForms[which];
if (entry != null) {
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/ref/Reference.java
--- a/jdk/src/java.base/share/classes/java/lang/ref/Reference.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/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 discovered; /* used by VM */
+ private transient Reference discovered; /* used by VM */
/* Object used to synchronize with the garbage collector. The collector
@@ -115,7 +115,7 @@
* therefore critical that any code holding this lock complete as quickly
* as possible, allocate no new objects, and avoid calling user code.
*/
- static private class Lock { }
+ private static class Lock { }
private static Lock lock = new Lock();
diff -r 4574d754a487 -r 05623c1ebc99 jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
--- a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java Fri Sep 18 10:46:43 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java Fri Sep 18 14:20:39 2015 -0700
@@ -51,7 +51,7 @@
static ReferenceQueue