archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8136583: Core libraries should use blessed modifier order

Browse source 
Run blessed-modifier-order script (see bug)

Reviewed-by: psandoz, chegar, alanb, plevart
This commit is contained in:
Martin Buchholz 2015-09-15 21:56:04 -07:00
parent b09c2b1601
commit a2f0fe3c94
453 changed files with 1775 additions and 1775 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java
View file

@ -42,7 +42,7 @@ import java.io.IOException;
class DefaultInterface { class DefaultInterface {
private final static NetworkInterface defaultInterface = private static final NetworkInterface defaultInterface =
chooseDefaultInterface(); chooseDefaultInterface();
static NetworkInterface getDefault() { static NetworkInterface getDefault() {

2
jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
View file

@ -106,7 +106,7 @@ public class HostLocaleProviderAdapterImpl {
tmpSet.addAll(Control.getNoFallbackControl(Control.FORMAT_DEFAULT).getCandidateLocales("", l)); tmpSet.addAll(Control.getNoFallbackControl(Control.FORMAT_DEFAULT).getCandidateLocales("", l));
supportedLocaleSet = Collections.unmodifiableSet(tmpSet); 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") @SuppressWarnings("fallthrough")
private static Locale convertMacOSXLocaleToJavaLocale(String macosxloc) { private static Locale convertMacOSXLocaleToJavaLocale(String macosxloc) {

2
jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java
View file

@ -45,7 +45,7 @@ import java.security.InvalidKeyException;
final class RC2Crypt extends SymmetricCipher { final class RC2Crypt extends SymmetricCipher {
// PITABLE from the RFC, used in key setup // 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, 0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed,
0x28, 0xe9, 0xfd, 0x79, 0x4a, 0xa0, 0xd8, 0x9d, 0x28, 0xe9, 0xfd, 0x79, 0x4a, 0xa0, 0xd8, 0x9d,
0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e, 0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e,

2
jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java
View file

@ -59,7 +59,7 @@ public final class RC2Parameters extends AlgorithmParametersSpi {
// TABLE[EKB] from section 6 of RFC 2268, used to convert effective key // TABLE[EKB] from section 6 of RFC 2268, used to convert effective key
// size to/from encoded version number // 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, 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a,
0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
0x30, 0x04, 0xb6, 0xdc, 0x7d, 0xdf, 0x32, 0x4b, 0x30, 0x04, 0xb6, 0xdc, 0x7d, 0xdf, 0x32, 0x4b,

16
jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java
View file

@ -66,23 +66,23 @@ import sun.security.util.KeyUtil;
public final class RSACipher extends CipherSpi { public final class RSACipher extends CipherSpi {
// constant for an empty byte array // 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 // 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 // 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) // 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) // 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 // 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 // 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 // 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 // current mode, one of MODE_* above. Set when init() is called
private int mode; private int mode;

2
jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
View file

@ -43,7 +43,7 @@ import static com.sun.crypto.provider.TlsPrfGenerator.*;
*/ */
public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi { 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"; + "initialized using a TlsKeyMaterialParameterSpec";
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")

2
jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java
View file

@ -43,7 +43,7 @@ import static com.sun.crypto.provider.TlsPrfGenerator.*;
*/ */
public final class TlsMasterSecretGenerator extends KeyGeneratorSpi { 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"; + "initialized using a TlsMasterSecretParameterSpec";
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")

20
jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
View file

@ -50,23 +50,23 @@ abstract class TlsPrfGenerator extends KeyGeneratorSpi {
// magic constants and utility functions, also used by other files // magic constants and utility functions, also used by other files
// in this package // 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 }; { 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 }; { 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, { 99, 108, 105, 101, 110, 116, 32, 119, 114, 105, 116, 101, 32,
107, 101, 121 }; 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, { 115, 101, 114, 118, 101, 114, 32, 119, 114, 105, 116, 101, 32,
107, 101, 121 }; 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 }; { 73, 86, 32, 98, 108, 111, 99, 107 };
/* /*
@ -79,7 +79,7 @@ abstract class TlsPrfGenerator extends KeyGeneratorSpi {
private static final byte[] HMAC_opad128 = genPad((byte)0x5c, 128); private static final byte[] HMAC_opad128 = genPad((byte)0x5c, 128);
// SSL3 magic mix constants ("A", "BB", "CCC", ...) // 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) { static byte[] genPad(byte b, int count) {
byte[] padding = new byte[count]; byte[] padding = new byte[count];
@ -109,7 +109,7 @@ abstract class TlsPrfGenerator extends KeyGeneratorSpi {
// PRF implementation // PRF implementation
private final static String MSG = "TlsPrfGenerator must be " private static final String MSG = "TlsPrfGenerator must be "
+ "initialized using a TlsPrfParameterSpec"; + "initialized using a TlsPrfParameterSpec";
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@ -368,7 +368,7 @@ abstract class TlsPrfGenerator extends KeyGeneratorSpi {
* appropriate supportsParamters() checks into KeyGenerators (not * appropriate supportsParamters() checks into KeyGenerators (not
* currently there). * currently there).
*/ */
static public class V12 extends TlsPrfGenerator { public static class V12 extends TlsPrfGenerator {
protected SecretKey engineGenerateKey() { protected SecretKey engineGenerateKey() {
return engineGenerateKey0(true); return engineGenerateKey0(true);
} }
@ -377,7 +377,7 @@ abstract class TlsPrfGenerator extends KeyGeneratorSpi {
/** /**
* A KeyGenerator implementation that supports TLS 1.0/1.1. * 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() { protected SecretKey engineGenerateKey() {
return engineGenerateKey0(false); return engineGenerateKey0(false);
} }

2
jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java
View file

@ -41,7 +41,7 @@ import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
*/ */
public final class TlsRsaPremasterSecretGenerator extends KeyGeneratorSpi { 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"; + "initialized using a TlsRsaPremasterSecretParameterSpec";
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")

20
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java
View file

@ -342,7 +342,7 @@ class Attribute implements Comparable<Attribute> {
* presence of attributes. That is, flags are a mix of modifier * presence of attributes. That is, flags are a mix of modifier
* bits and attribute indicators. * bits and attribute indicators.
*/ */
public static abstract public abstract static
class Holder { class Holder {
// We need this abstract method to interpret embedded CP refs. // We need this abstract method to interpret embedded CP refs.
@ -461,7 +461,7 @@ class Attribute implements Comparable<Attribute> {
// Lightweight interface to hide details of band structure. // Lightweight interface to hide details of band structure.
// Also used for testing. // Also used for testing.
public static abstract public abstract static
class ValueStream { class ValueStream {
public int getInt(int bandIndex) { throw undef(); } public int getInt(int bandIndex) { throw undef(); }
public void putInt(int bandIndex, int value) { throw undef(); } public void putInt(int bandIndex, int value) { throw undef(); }
@ -667,7 +667,7 @@ class Attribute implements Comparable<Attribute> {
public boolean hasCallables() { public boolean hasCallables() {
return (elems.length > 0 && elems[0].kind == EK_CBLE); return (elems.length > 0 && elems[0].kind == EK_CBLE);
} }
static private final Element[] noElems = {}; private static final Element[] noElems = {};
public Element[] getCallables() { public Element[] getCallables() {
if (hasCallables()) { if (hasCallables()) {
Element[] nelems = Arrays.copyOf(elems, elems.length); Element[] nelems = Arrays.copyOf(elems, elems.length);
@ -783,7 +783,7 @@ class Attribute implements Comparable<Attribute> {
* Replaces '\c' by the decimal code of the character c. * Replaces '\c' by the decimal code of the character c.
* Replaces '0xNNN' by the decimal code of the hex number NNN. * Replaces '0xNNN' by the decimal code of the hex number NNN.
*/ */
static public public static
String normalizeLayoutString(String layout) { String normalizeLayoutString(String layout) {
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
for (int i = 0, len = layout.length(); i < len; ) { for (int i = 0, len = layout.length(); i < len; ) {
@ -1139,7 +1139,7 @@ class Attribute implements Comparable<Attribute> {
bodies.toArray(res); bodies.toArray(res);
return res; return res;
} }
static private private static
int skipBody(String layout, int i) { int skipBody(String layout, int i) {
assert(layout.charAt(i-1) == '['); assert(layout.charAt(i-1) == '[');
if (layout.charAt(i) == ']') if (layout.charAt(i) == ']')
@ -1156,7 +1156,7 @@ class Attribute implements Comparable<Attribute> {
assert(layout.charAt(i) == ']'); assert(layout.charAt(i) == ']');
return i; // return closing bracket return i; // return closing bracket
} }
static private private static
int tokenizeUInt(Layout.Element e, String layout, int i) { int tokenizeUInt(Layout.Element e, String layout, int i) {
switch (layout.charAt(i++)) { switch (layout.charAt(i++)) {
case 'V': e.len = 0; break; case 'V': e.len = 0; break;
@ -1167,7 +1167,7 @@ class Attribute implements Comparable<Attribute> {
} }
return i; return i;
} }
static private private static
int tokenizeSInt(Layout.Element e, String layout, int i) { int tokenizeSInt(Layout.Element e, String layout, int i) {
if (layout.charAt(i) == 'S') { if (layout.charAt(i) == 'S') {
e.flags |= EF_SIGN; e.flags |= EF_SIGN;
@ -1176,7 +1176,7 @@ class Attribute implements Comparable<Attribute> {
return tokenizeUInt(e, layout, i); return tokenizeUInt(e, layout, i);
} }
static private private static
boolean isDigit(char c) { boolean isDigit(char c) {
return c >= '0' && c <= '9'; return c >= '0' && c <= '9';
} }
@ -1383,7 +1383,7 @@ class Attribute implements Comparable<Attribute> {
return e.body[lastj]; return e.body[lastj];
} }
static private private static
int parseInt(Layout.Element e, byte[] bytes, int pos, int[] buf) { int parseInt(Layout.Element e, byte[] bytes, int pos, int[] buf) {
int value = 0; int value = 0;
int loBits = e.len * 8; int loBits = e.len * 8;
@ -1483,7 +1483,7 @@ class Attribute implements Comparable<Attribute> {
} }
} }
static private private static
void unparseInt(Layout.Element e, int value, ByteArrayOutputStream out) { void unparseInt(Layout.Element e, int value, ByteArrayOutputStream out) {
int loBits = e.len * 8; int loBits = e.len * 8;
if (loBits == 0) { if (loBits == 0) {

38
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java
View file

@ -73,7 +73,7 @@ class BandStructure {
boolean optVaryCodings = !p200.getBoolean(Utils.COM_PREFIX+"no.vary.codings"); boolean optVaryCodings = !p200.getBoolean(Utils.COM_PREFIX+"no.vary.codings");
boolean optBigStrings = !p200.getBoolean(Utils.COM_PREFIX+"no.big.strings"); 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. // Local copy of highest class version.
private Package.Version highestClassVersion = null; private Package.Version highestClassVersion = null;
@ -97,27 +97,27 @@ class BandStructure {
protected BandStructure() {} 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. // Note: Tried sharper (3,16) with no post-zip benefit.
// This is best used with BCI values: // This is best used with BCI values:
final static Coding BCI5 = Coding.of(5,4); // mostly 1-byte offsets static final 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 BRANCH5 = Coding.of(5,4,2); // mostly forward branches
final static Coding UNSIGNED5 = Coding.of(5,64); static final Coding UNSIGNED5 = Coding.of(5,64);
final static Coding UDELTA5 = UNSIGNED5.getDeltaCoding(); static final Coding UDELTA5 = UNSIGNED5.getDeltaCoding();
// "sharp" (5,64) zips 0.4% better than "medium" (5,128) // "sharp" (5,64) zips 0.4% better than "medium" (5,128)
// It zips 1.1% better than "flat" (5,192) // It zips 1.1% better than "flat" (5,192)
final static Coding SIGNED5 = Coding.of(5,64,1); //sharp static final Coding SIGNED5 = Coding.of(5,64,1); //sharp
final static Coding DELTA5 = SIGNED5.getDeltaCoding(); static final Coding DELTA5 = SIGNED5.getDeltaCoding();
// Note: Tried (5,128,2) and (5,192,2) with no benefit. // 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. // Table of "Canonical BHSD Codings" from Pack200 spec.
null, // _meta_default null, // _meta_default
@ -250,7 +250,7 @@ class BandStructure {
null null
}; };
final private static Map<Coding, Integer> basicCodingIndexes; private static final Map<Coding, Integer> basicCodingIndexes;
static { static {
assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null); assert(basicCodings[_meta_canon_min] != null);
@ -362,9 +362,9 @@ class BandStructure {
protected long outputSize = -1; // cache protected long outputSize = -1; // cache
final public Coding regularCoding; public final Coding regularCoding;
final public int seqForDebug; public final int seqForDebug;
public int elementCountForDebug; public int elementCountForDebug;
@ -430,7 +430,7 @@ class BandStructure {
protected abstract long computeOutputSize(); 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. */ /** Expect a certain number of values. */
void expectLength(int l) { void expectLength(int l) {
@ -468,7 +468,7 @@ class BandStructure {
readDataFrom(in); readDataFrom(in);
readyToDisburse(); readyToDisburse();
} }
abstract protected void readDataFrom(InputStream in) throws IOException; protected abstract void readDataFrom(InputStream in) throws IOException;
protected void readyToDisburse() { protected void readyToDisburse() {
if (verbose > 1) Utils.log.fine("readyToDisburse "+this); if (verbose > 1) Utils.log.fine("readyToDisburse "+this);
setPhase(DISBURSE_PHASE); setPhase(DISBURSE_PHASE);
@ -1447,7 +1447,7 @@ class BandStructure {
return b; 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(); MultiBand all_bands = (MultiBand) new MultiBand("(package)", UNSIGNED5).init();
@ -2539,7 +2539,7 @@ class BandStructure {
return false; return false;
} }
static private boolean assertDoneDisbursing(Band b) { private static boolean assertDoneDisbursing(Band b) {
if (b.phase != DISBURSE_PHASE) { if (b.phase != DISBURSE_PHASE) {
Utils.log.warning("assertDoneDisbursing: still in phase "+b.phase+": "+b); Utils.log.warning("assertDoneDisbursing: still in phase "+b.phase+": "+b);
if (verbose() <= 1) return false; // fail now if (verbose() <= 1) return false; // fail now
@ -2562,7 +2562,7 @@ class BandStructure {
return true; return true;
} }
static private void printCDecl(Band b) { private static void printCDecl(Band b) {
if (b instanceof MultiBand) { if (b instanceof MultiBand) {
MultiBand mb = (MultiBand) b; MultiBand mb = (MultiBand) b;
for (int i = 0; i < mb.bandCount; i++) { for (int i = 0; i < mb.bandCount; i++) {

2
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java
View file

@ -56,7 +56,7 @@ class Code extends Attribute.Holder {
return m.getCPMap(); 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. // The following fields are used directly by the ClassReader, etc.
int max_stack; int max_stack;

2
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java
View file

@ -662,7 +662,7 @@ class Coding implements Comparable<Coding>, CodingMethod, Histogram.BitMetric {
return lg; return lg;
} }
static private final byte[] byteBitWidths = new byte[0x100]; private static final byte[] byteBitWidths = new byte[0x100];
static { static {
for (int b = 0; b < byteBitWidths.length; b++) { for (int b = 0; b < byteBitWidths.length; b++) {
byteBitWidths[b] = (byte) ceil_lg2(b + 1); byteBitWidths[b] = (byte) ceil_lg2(b + 1);

2
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
View file

@ -1139,7 +1139,7 @@ class CodingChooser {
} }
} }
static private private static
String pct(double num, double den) { String pct(double num, double den) {
return (Math.round((num / den)*10000)/100.0)+"%"; return (Math.round((num / den)*10000)/100.0)+"%";
} }

6
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
View file

@ -194,7 +194,7 @@ class ConstantPool {
/** Entries in the constant pool. */ /** Entries in the constant pool. */
public static abstract public abstract static
class Entry implements Comparable<Object> { class Entry implements Comparable<Object> {
protected final byte tag; // a CONSTANT_foo code protected final byte tag; // a CONSTANT_foo code
protected int valueHash; // cached hashCode protected int valueHash; // cached hashCode
@ -338,7 +338,7 @@ class ConstantPool {
return (REF_getField <= refKind && refKind <= REF_invokeInterface); return (REF_getField <= refKind && refKind <= REF_invokeInterface);
} }
public static abstract public abstract static
class LiteralEntry extends Entry { class LiteralEntry extends Entry {
protected LiteralEntry(byte tag) { protected LiteralEntry(byte tag) {
super(tag); super(tag);
@ -785,7 +785,7 @@ class ConstantPool {
return new String(sig); 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); i = sig.indexOf(semi, i);
return (i >= 0) ? i : sig.length(); return (i >= 0) ? i : sig.length();
} }

190
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java
View file

@ -36,7 +36,7 @@ class Constants {
private Constants(){} private Constants(){}
public final static int JAVA_MAGIC = 0xCAFEBABE; public static final int JAVA_MAGIC = 0xCAFEBABE;
/* /*
Java Class Version numbers history Java Class Version numbers history
@ -48,93 +48,93 @@ class Constants {
1.8 to 1.7.x 52,0 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); 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); 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); 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); 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); 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); 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); 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); 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); Package.Version.of(171, 0);
// upper limit, should point to the latest class version // 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; JAVA8_MAX_CLASS_VERSION;
// upper limit should point to the latest package version, for version info!. // 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; JAVA7_PACKAGE_VERSION;
public final static int CONSTANT_POOL_INDEX_LIMIT = 0x10000; public static final int CONSTANT_POOL_INDEX_LIMIT = 0x10000;
public final static int CONSTANT_POOL_NARROW_LIMIT = 0x00100; 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 static final byte CONSTANT_Utf8 = 1;
public final static byte CONSTANT_unused2 = 2; // unused, was Unicode public static final byte CONSTANT_unused2 = 2; // unused, was Unicode
public final static byte CONSTANT_Integer = 3; public static final byte CONSTANT_Integer = 3;
public final static byte CONSTANT_Float = 4; public static final byte CONSTANT_Float = 4;
public final static byte CONSTANT_Long = 5; public static final byte CONSTANT_Long = 5;
public final static byte CONSTANT_Double = 6; public static final byte CONSTANT_Double = 6;
public final static byte CONSTANT_Class = 7; public static final byte CONSTANT_Class = 7;
public final static byte CONSTANT_String = 8; public static final byte CONSTANT_String = 8;
public final static byte CONSTANT_Fieldref = 9; public static final byte CONSTANT_Fieldref = 9;
public final static byte CONSTANT_Methodref = 10; public static final byte CONSTANT_Methodref = 10;
public final static byte CONSTANT_InterfaceMethodref = 11; public static final byte CONSTANT_InterfaceMethodref = 11;
public final static byte CONSTANT_NameandType = 12; public static final byte CONSTANT_NameandType = 12;
public final static byte CONSTANT_unused13 = 13; public static final byte CONSTANT_unused13 = 13;
public final static byte CONSTANT_unused14 = 14; public static final byte CONSTANT_unused14 = 14;
public final static byte CONSTANT_MethodHandle = 15; public static final byte CONSTANT_MethodHandle = 15;
public final static byte CONSTANT_MethodType = 16; public static final byte CONSTANT_MethodType = 16;
public final static byte CONSTANT_unused17 = 17; // unused public static final byte CONSTANT_unused17 = 17; // unused
public final static byte CONSTANT_InvokeDynamic = 18; public static final byte CONSTANT_InvokeDynamic = 18;
// pseudo-constants: // pseudo-constants:
public final static byte CONSTANT_None = 0; public static final byte CONSTANT_None = 0;
public final static byte CONSTANT_Signature = CONSTANT_unused13; public static final byte CONSTANT_Signature = CONSTANT_unused13;
public final static byte CONSTANT_BootstrapMethod = CONSTANT_unused17; // used only in InvokeDynamic constants public static final byte CONSTANT_BootstrapMethod = CONSTANT_unused17; // used only in InvokeDynamic constants
public final static byte CONSTANT_Limit = 19; public static final byte CONSTANT_Limit = 19;
public final static byte CONSTANT_All = 50; // combined global map public static final byte CONSTANT_All = 50; // combined global map
public final static byte CONSTANT_LoadableValue = 51; // used for 'KL' and qldc operands public static final 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 static final 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 static final byte CONSTANT_FieldSpecific = 53; // used only for 'KQ' ConstantValue attrs
public final static byte CONSTANT_GroupFirst = CONSTANT_All; public static final byte CONSTANT_GroupFirst = CONSTANT_All;
public final static byte CONSTANT_GroupLimit = CONSTANT_FieldSpecific+1; public static final byte CONSTANT_GroupLimit = CONSTANT_FieldSpecific+1;
// CONSTANT_MethodHandle reference kinds // CONSTANT_MethodHandle reference kinds
public final static byte REF_getField = 1; public static final byte REF_getField = 1;
public final static byte REF_getStatic = 2; public static final byte REF_getStatic = 2;
public final static byte REF_putField = 3; public static final byte REF_putField = 3;
public final static byte REF_putStatic = 4; public static final byte REF_putStatic = 4;
public final static byte REF_invokeVirtual = 5; public static final byte REF_invokeVirtual = 5;
public final static byte REF_invokeStatic = 6; public static final byte REF_invokeStatic = 6;
public final static byte REF_invokeSpecial = 7; public static final byte REF_invokeSpecial = 7;
public final static byte REF_newInvokeSpecial = 8; public static final byte REF_newInvokeSpecial = 8;
public final static byte REF_invokeInterface = 9; public static final byte REF_invokeInterface = 9;
// pseudo-access bits // 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" // attribute "context types"
public static final int ATTR_CONTEXT_CLASS = 0; public static final int ATTR_CONTEXT_CLASS = 0;
@ -199,14 +199,14 @@ class Constants {
public static final int NO_MODTIME = 0; // null modtime value public static final int NO_MODTIME = 0; // null modtime value
// some comstantly empty containers // some comstantly empty containers
public final static int[] noInts = {}; public static final int[] noInts = {};
public final static byte[] noBytes = {}; public static final byte[] noBytes = {};
public final static Object[] noValues = {}; public static final Object[] noValues = {};
public final static String[] noStrings = {}; public static final String[] noStrings = {};
public final static List<Object> emptyList = Arrays.asList(noValues); public static final List<Object> emptyList = Arrays.asList(noValues);
// meta-coding // meta-coding
public final static int public static final int
_meta_default = 0, _meta_default = 0,
_meta_canon_min = 1, _meta_canon_min = 1,
_meta_canon_max = 115, _meta_canon_max = 115,
@ -216,7 +216,7 @@ class Constants {
_meta_limit = 189; _meta_limit = 189;
// bytecodes // bytecodes
public final static int public static final int
_nop = 0, // 0x00 _nop = 0, // 0x00
_aconst_null = 1, // 0x01 _aconst_null = 1, // 0x01
_iconst_m1 = 2, // 0x02 _iconst_m1 = 2, // 0x02
@ -422,10 +422,10 @@ class Constants {
_bytecode_limit = 202; // 0xca _bytecode_limit = 202; // 0xca
// End marker, used to terminate bytecode sequences: // End marker, used to terminate bytecode sequences:
public final static int _end_marker = 255; public static final int _end_marker = 255;
// Escapes: // Escapes:
public final static int _byte_escape = 254; public static final int _byte_escape = 254;
public final static int _ref_escape = 253; public static final int _ref_escape = 253;
// Self-relative pseudo-opcodes for better compression. // Self-relative pseudo-opcodes for better compression.
// A "linker op" is a bytecode which links to a class member. // A "linker op" is a bytecode which links to a class member.
@ -440,26 +440,26 @@ class Constants {
// For simplicity, we define the full symmetric set of variants. // For simplicity, we define the full symmetric set of variants.
// However, some of them are relatively useless. // However, some of them are relatively useless.
// Self linker ops are enabled by Pack.selfCallVariants (true). // Self linker ops are enabled by Pack.selfCallVariants (true).
public final static int _first_linker_op = _getstatic; public static final int _first_linker_op = _getstatic;
public final static int _last_linker_op = _invokestatic; public static final int _last_linker_op = _invokestatic;
public final static int _num_linker_ops = (_last_linker_op - _first_linker_op) + 1; public static final int _num_linker_ops = (_last_linker_op - _first_linker_op) + 1;
public final static int _self_linker_op = _bytecode_limit; public static final int _self_linker_op = _bytecode_limit;
public final static int _self_linker_aload_flag = 1*_num_linker_ops; public static final int _self_linker_aload_flag = 1*_num_linker_ops;
public final static int _self_linker_super_flag = 2*_num_linker_ops; public static final 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 _self_linker_limit = _self_linker_op + 4*_num_linker_ops;
// An "invoke init" op is a variant of invokespecial which works // An "invoke init" op is a variant of invokespecial which works
// only with the method name "<init>". There are variants which // only with the method name "<init>". There are variants which
// link to the current class, the super class, or the class of the // link to the current class, the super class, or the class of the
// immediately previous "newinstance" op. There are 3 of these ops. // immediately previous "newinstance" op. There are 3 of these ops.
// They all take method signature references as operands. // They all take method signature references as operands.
// Invoke init ops are enabled by Pack.initCallVariants (true). // Invoke init ops are enabled by Pack.initCallVariants (true).
public final static int _invokeinit_op = _self_linker_limit; public static final int _invokeinit_op = _self_linker_limit;
public final static int _invokeinit_self_option = 0; public static final int _invokeinit_self_option = 0;
public final static int _invokeinit_super_option = 1; public static final int _invokeinit_super_option = 1;
public final static int _invokeinit_new_option = 2; public static final int _invokeinit_new_option = 2;
public final static int _invokeinit_limit = _invokeinit_op+3; 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 // linker variant limit == 202+(7*4)+3 == 233
// Ldc variants support strongly typed references to constants. // Ldc variants support strongly typed references to constants.
@ -467,25 +467,25 @@ class Constants {
// which is a great simplification. // which is a great simplification.
// Ldc variants gain us only 0.007% improvement in compression ratio, // Ldc variants gain us only 0.007% improvement in compression ratio,
// but they simplify the file format greatly. // but they simplify the file format greatly.
public final static int _xldc_op = _invokeinit_limit; public static final int _xldc_op = _invokeinit_limit;
public final static int _sldc = _ldc; // previously named _aldc public static final int _sldc = _ldc; // previously named _aldc
public final static int _cldc = _xldc_op+0; public static final int _cldc = _xldc_op+0;
public final static int _ildc = _xldc_op+1; public static final int _ildc = _xldc_op+1;
public final static int _fldc = _xldc_op+2; public static final int _fldc = _xldc_op+2;
public final static int _sldc_w = _ldc_w; // previously named _aldc_w public static final int _sldc_w = _ldc_w; // previously named _aldc_w
public final static int _cldc_w = _xldc_op+3; public static final int _cldc_w = _xldc_op+3;
public final static int _ildc_w = _xldc_op+4; public static final int _ildc_w = _xldc_op+4;
public final static int _fldc_w = _xldc_op+5; public static final int _fldc_w = _xldc_op+5;
public final static int _lldc2_w = _ldc2_w; public static final int _lldc2_w = _ldc2_w;
public final static int _dldc2_w = _xldc_op+6; public static final int _dldc2_w = _xldc_op+6;
// anything other than primitive, string, or class must be handled with qldc: // anything other than primitive, string, or class must be handled with qldc:
public final static int _qldc = _xldc_op+7; public static final int _qldc = _xldc_op+7;
public final static int _qldc_w = _xldc_op+8; public static final int _qldc_w = _xldc_op+8;
public final static int _xldc_limit = _xldc_op+9; public static final int _xldc_limit = _xldc_op+9;
// handling of InterfaceMethodRef // handling of InterfaceMethodRef
public final static int _invoke_int_op = _xldc_limit; public static final int _invoke_int_op = _xldc_limit;
public final static int _invokespecial_int = _invoke_int_op+0; public static final int _invokespecial_int = _invoke_int_op+0;
public final static int _invokestatic_int = _invoke_int_op+1; public static final int _invokestatic_int = _invoke_int_op+1;
public final static int _invoke_int_limit = _invoke_int_op+2; public static final int _invoke_int_limit = _invoke_int_op+2;
} }

6
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java
View file

@ -376,7 +376,7 @@ class Driver {
} }
} }
static private private static
File createTempFile(String basefile, String suffix) throws IOException { File createTempFile(String basefile, String suffix) throws IOException {
File base = new File(basefile); File base = new File(basefile);
String prefix = base.getName(); String prefix = base.getName();
@ -393,7 +393,7 @@ class Driver {
return tmpfile.toFile(); return tmpfile.toFile();
} }
static private private static
void printUsage(boolean doPack, boolean full, PrintStream out) { void printUsage(boolean doPack, boolean full, PrintStream out) {
String prog = doPack ? "pack200" : "unpack200"; String prog = doPack ? "pack200" : "unpack200";
String[] packUsage = (String[])RESOURCE.getObject(DriverResource.PACK_HELP); String[] packUsage = (String[])RESOURCE.getObject(DriverResource.PACK_HELP);
@ -408,7 +408,7 @@ class Driver {
} }
} }
static private private static
String getZipComment(String jarfile) throws IOException { String getZipComment(String jarfile) throws IOException {
byte[] tail = new byte[1000]; byte[] tail = new byte[1000];
long filelen = new File(jarfile).length(); long filelen = new File(jarfile).length();

2
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java
View file

@ -218,7 +218,7 @@ final class Histogram {
return sum; return sum;
} }
static private private static
double round(double x, double scale) { double round(double x, double scale) {
return Math.round(x * scale) / scale; return Math.round(x * scale) / scale;
} }

16
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java
View file

@ -471,14 +471,14 @@ class Instruction {
/// Format definitions. /// Format definitions.
static private final byte[][] BC_LENGTH = new byte[2][0x100]; private static final byte[][] BC_LENGTH = new byte[2][0x100];
static private final byte[][] BC_INDEX = new byte[2][0x100]; private static final byte[][] BC_INDEX = new byte[2][0x100];
static private final byte[][] BC_TAG = new byte[2][0x100]; private static final byte[][] BC_TAG = new byte[2][0x100];
static private final byte[][] BC_BRANCH = new byte[2][0x100]; private static final byte[][] BC_BRANCH = new byte[2][0x100];
static private final byte[][] BC_SLOT = new byte[2][0x100]; private static final byte[][] BC_SLOT = new byte[2][0x100];
static private final byte[][] BC_CON = new byte[2][0x100]; private static final byte[][] BC_CON = new byte[2][0x100];
static private final String[] BC_NAME = new String[0x100]; // debug only private static 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 String[][] BC_FORMAT = new String[2][_bytecode_limit]; // debug only
static { static {
for (int i = 0; i < _bytecode_limit; i++) { for (int i = 0; i < _bytecode_limit; i++) {
BC_LENGTH[0][i] = -1; BC_LENGTH[0][i] = -1;

2
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java
View file

@ -104,7 +104,7 @@ class NativeUnpack {
} }
// for JNI callbacks // for JNI callbacks
static private Object currentInstance() { private static Object currentInstance() {
UnpackerImpl p200 = (UnpackerImpl) Utils.getTLGlobals(); UnpackerImpl p200 = (UnpackerImpl) Utils.getTLGlobals();
return (p200 == null)? null: p200._nunp; return (p200 == null)? null: p200._nunp;
} }

2
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java
View file

@ -990,7 +990,7 @@ class Package {
} }
// Helper for building InnerClasses attributes. // Helper for building InnerClasses attributes.
static private private static
void visitInnerClassRefs(Collection<InnerClass> innerClasses, int mode, Collection<Entry> refs) { void visitInnerClassRefs(Collection<InnerClass> innerClasses, int mode, Collection<Entry> refs) {
if (innerClasses == null) { if (innerClasses == null) {
return; // no attribute; nothing to do return; // no attribute; nothing to do

2
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java
View file

@ -218,7 +218,7 @@ class PackageReader extends BandStructure {
return res; return res;
} }
final static int MAGIC_BYTES = 4; static final int MAGIC_BYTES = 4;
void readArchiveMagic() throws IOException { void readArchiveMagic() throws IOException {
// Read a minimum of bytes in the first gulp. // Read a minimum of bytes in the first gulp.

2
jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java
View file

@ -265,7 +265,7 @@ class Utils {
} }
} }
// Wrapper to prevent closing of client-supplied stream. // Wrapper to prevent closing of client-supplied stream.
static private private static
class NonCloser extends FilterOutputStream { class NonCloser extends FilterOutputStream {
NonCloser(OutputStream out) { super(out); } NonCloser(OutputStream out) { super(out); }
public void close() throws IOException { flush(); } public void close() throws IOException { flush(); }

2
jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java
View file

@ -46,7 +46,7 @@ import javax.net.ssl.SSLPeerUnverifiedException;
* replaced by {@link javax.net.ssl.HttpsURLConnection}. * replaced by {@link javax.net.ssl.HttpsURLConnection}.
*/ */
@Deprecated @Deprecated
abstract public public abstract
class HttpsURLConnection extends HttpURLConnection class HttpsURLConnection extends HttpURLConnection
{ {
/* /*

2
jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java
View file

@ -61,7 +61,7 @@ public class KeyManagerFactory {
* *
* @see java.security.Security security properties * @see java.security.Security security properties
*/ */
public final static String getDefaultAlgorithm() { public static final String getDefaultAlgorithm() {
String type; String type;
type = AccessController.doPrivileged(new PrivilegedAction<>() { type = AccessController.doPrivileged(new PrivilegedAction<>() {
public String run() { public String run() {

2
jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java
View file

@ -61,7 +61,7 @@ public class TrustManagerFactory {
* *
* @see java.security.Security security properties * @see java.security.Security security properties
*/ */
public final static String getDefaultAlgorithm() { public static final String getDefaultAlgorithm() {
String type; String type;
type = AccessController.doPrivileged(new PrivilegedAction<>() { type = AccessController.doPrivileged(new PrivilegedAction<>() {
public String run() { public String run() {

2
jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java
View file

@ -56,7 +56,7 @@ public class X509V1CertImpl extends X509Certificate implements Serializable {
static final long serialVersionUID = -2048442350420423405L; static final long serialVersionUID = -2048442350420423405L;
private java.security.cert.X509Certificate wrappedCert; private java.security.cert.X509Certificate wrappedCert;
synchronized private static java.security.cert.CertificateFactory private static synchronized java.security.cert.CertificateFactory
getFactory() getFactory()
throws java.security.cert.CertificateException throws java.security.cert.CertificateException
{ {

4
jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java
View file

@ -43,8 +43,8 @@ import java.util.Locale;
* </pre> * </pre>
*/ */
public final class Client extends NTLM { public final class Client extends NTLM {
final private String hostname; private final String hostname;
final private String username; private final String username;
private String domain; private String domain;
private byte[] pw1, pw2; private byte[] pw1, pw2;

12
jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java
View file

@ -36,13 +36,13 @@ public final class NTLMException extends GeneralSecurityException {
/** /**
* If the incoming packet is invalid. * 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 * If the client cannot get a domain value from the server and the
* caller has not provided one. * 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 * If the domain provided by the client does not match the one received
@ -53,22 +53,22 @@ public final class NTLMException extends GeneralSecurityException {
/** /**
* If the client name is not found on server's user database. * 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. * If authentication fails.
*/ */
public final static int AUTH_FAILED = 4; public static final int AUTH_FAILED = 4;
/** /**
* If an illegal version string is provided. * If an illegal version string is provided.
*/ */
public final static int BAD_VERSION = 5; public static final int BAD_VERSION = 5;
/** /**
* Protocol errors. * Protocol errors.
*/ */
public final static int PROTOCOL = 6; public static final int PROTOCOL = 6;
private int errorCode; private int errorCode;

4
jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java
View file

@ -49,8 +49,8 @@ import java.util.Locale;
* </pre> * </pre>
*/ */
public abstract class Server extends NTLM { public abstract class Server extends NTLM {
final private String domain; private final String domain;
final private boolean allVersion; private final boolean allVersion;
/** /**
* Creates a Server instance. * Creates a Server instance.
* @param version the NTLM version to use, which can be: * @param version the NTLM version to use, which can be:

2
jdk/src/java.base/share/classes/java/io/Console.java
View file

@ -554,7 +554,7 @@ public final class Console implements Flushable
}); });
} }
private static Console cons; private static Console cons;
private native static boolean istty(); private static native boolean istty();
private Console() { private Console() {
readLock = new Object(); readLock = new Object();
writeLock = new Object(); writeLock = new Object();

2
jdk/src/java.base/share/classes/java/io/DataInputStream.java
View file

@ -585,7 +585,7 @@ loop: while (true) {
* valid modified UTF-8 encoding of a Unicode string. * valid modified UTF-8 encoding of a Unicode string.
* @see java.io.DataInputStream#readUnsignedShort() * @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(); int utflen = in.readUnsignedShort();
byte[] bytearr = null; byte[] bytearr = null;
char[] chararr = null; char[] chararr = null;

2
jdk/src/java.base/share/classes/java/io/File.java
View file

@ -2204,7 +2204,7 @@ public class File
// -- Integration with java.nio.file -- // -- 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 * Returns a {@link Path java.nio.file.Path} object constructed from the

14
jdk/src/java.base/share/classes/java/io/FilePermission.java
View file

@ -101,32 +101,32 @@ public final class FilePermission extends Permission implements Serializable {
/** /**
* Execute action. * Execute action.
*/ */
private final static int EXECUTE = 0x1; private static final int EXECUTE = 0x1;
/** /**
* Write action. * Write action.
*/ */
private final static int WRITE = 0x2; private static final int WRITE = 0x2;
/** /**
* Read action. * Read action.
*/ */
private final static int READ = 0x4; private static final int READ = 0x4;
/** /**
* Delete action. * Delete action.
*/ */
private final static int DELETE = 0x8; private static final int DELETE = 0x8;
/** /**
* Read link action. * Read link action.
*/ */
private final static int READLINK = 0x10; private static final int READLINK = 0x10;
/** /**
* All actions (read,write,execute,delete,readlink) * 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. * No actions.
*/ */
private final static int NONE = 0x0; private static final int NONE = 0x0;
// the actions mask // the actions mask
private transient int mask; private transient int mask;

2
jdk/src/java.base/share/classes/java/io/ObjectInputStream.java
View file

@ -1079,7 +1079,7 @@ public class ObjectInputStream
/** /**
* Provide access to the persistent fields read from the input stream. * 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. * Get the ObjectStreamClass that describes the fields in the stream.

2
jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java
View file

@ -875,7 +875,7 @@ public class ObjectOutputStream
* *
* @since 1.2 * @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. * Put the value of the named boolean field into the persistent field.

2
jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java
View file

@ -1839,7 +1839,7 @@ public class ObjectStreamClass implements Serializable {
* Returns true if the given class defines a static initializer method, * Returns true if the given class defines a static initializer method,
* false otherwise. * 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 * Class for computing and caching field/constructor/method signatures

58
jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java
View file

@ -36,12 +36,12 @@ public interface ObjectStreamConstants {
/** /**
* Magic number that is written to the stream header. * 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. * 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 /* Each item in the stream is preceded by a tag
*/ */
@ -49,95 +49,95 @@ public interface ObjectStreamConstants {
/** /**
* First tag value. * First tag value.
*/ */
final static byte TC_BASE = 0x70; static final byte TC_BASE = 0x70;
/** /**
* Null object reference. * 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. * 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. * new Class Descriptor.
*/ */
final static byte TC_CLASSDESC = (byte)0x72; static final byte TC_CLASSDESC = (byte)0x72;
/** /**
* new Object. * new Object.
*/ */
final static byte TC_OBJECT = (byte)0x73; static final byte TC_OBJECT = (byte)0x73;
/** /**
* new String. * new String.
*/ */
final static byte TC_STRING = (byte)0x74; static final byte TC_STRING = (byte)0x74;
/** /**
* new Array. * new Array.
*/ */
final static byte TC_ARRAY = (byte)0x75; static final byte TC_ARRAY = (byte)0x75;
/** /**
* Reference to Class. * 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 * Block of optional data. Byte following tag indicates number
* of bytes in this block data. * 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. * 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. * 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 * long Block data. The long following the tag indicates the
* number of bytes in this block data. * number of bytes in this block data.
*/ */
final static byte TC_BLOCKDATALONG= (byte)0x7A; static final byte TC_BLOCKDATALONG= (byte)0x7A;
/** /**
* Exception during write. * Exception during write.
*/ */
final static byte TC_EXCEPTION = (byte)0x7B; static final byte TC_EXCEPTION = (byte)0x7B;
/** /**
* Long string. * Long string.
*/ */
final static byte TC_LONGSTRING = (byte)0x7C; static final byte TC_LONGSTRING = (byte)0x7C;
/** /**
* new Proxy Class Descriptor. * new Proxy Class Descriptor.
*/ */
final static byte TC_PROXYCLASSDESC = (byte)0x7D; static final byte TC_PROXYCLASSDESC = (byte)0x7D;
/** /**
* new Enum constant. * new Enum constant.
* @since 1.5 * @since 1.5
*/ */
final static byte TC_ENUM = (byte)0x7E; static final byte TC_ENUM = (byte)0x7E;
/** /**
* Last tag value. * Last tag value.
*/ */
final static byte TC_MAX = (byte)0x7E; static final byte TC_MAX = (byte)0x7E;
/** /**
* First wire handle to be assigned. * First wire handle to be assigned.
*/ */
final static int baseWireHandle = 0x7e0000; static final int baseWireHandle = 0x7e0000;
/******************************************************/ /******************************************************/
@ -147,7 +147,7 @@ public interface ObjectStreamConstants {
* Bit mask for ObjectStreamClass flag. Indicates a Serializable class * Bit mask for ObjectStreamClass flag. Indicates a Serializable class
* defines its own writeObject method. * 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 * Bit mask for ObjectStreamClass flag. Indicates Externalizable data
@ -157,23 +157,23 @@ public interface ObjectStreamConstants {
* @see #PROTOCOL_VERSION_2 * @see #PROTOCOL_VERSION_2
* @since 1.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. * 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. * 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. * Bit mask for ObjectStreamClass flag. Indicates class is an enum type.
* @since 1.5 * @since 1.5
*/ */
final static byte SC_ENUM = 0x10; static final byte SC_ENUM = 0x10;
/* *******************************************************************/ /* *******************************************************************/
@ -187,7 +187,7 @@ public interface ObjectStreamConstants {
* @see java.io.ObjectInputStream#enableResolveObject(boolean) * @see java.io.ObjectInputStream#enableResolveObject(boolean)
* @since 1.2 * @since 1.2
*/ */
final static SerializablePermission SUBSTITUTION_PERMISSION = static final SerializablePermission SUBSTITUTION_PERMISSION =
new SerializablePermission("enableSubstitution"); new SerializablePermission("enableSubstitution");
/** /**
@ -197,7 +197,7 @@ public interface ObjectStreamConstants {
* @see java.io.ObjectInputStream#readObjectOverride() * @see java.io.ObjectInputStream#readObjectOverride()
* @since 1.2 * @since 1.2
*/ */
final static SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION = static final SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION =
new SerializablePermission("enableSubclassImplementation"); new SerializablePermission("enableSubclassImplementation");
/** /**
* A Stream Protocol Version. <p> * A Stream Protocol Version. <p>
@ -210,7 +210,7 @@ public interface ObjectStreamConstants {
* @see java.io.ObjectOutputStream#useProtocolVersion(int) * @see java.io.ObjectOutputStream#useProtocolVersion(int)
* @since 1.2 * @since 1.2
*/ */
public final static int PROTOCOL_VERSION_1 = 1; public static final int PROTOCOL_VERSION_1 = 1;
/** /**
@ -231,5 +231,5 @@ public interface ObjectStreamConstants {
* @see #SC_BLOCK_DATA * @see #SC_BLOCK_DATA
* @since 1.2 * @since 1.2
*/ */
public final static int PROTOCOL_VERSION_2 = 2; public static final int PROTOCOL_VERSION_2 = 2;
} }

4
jdk/src/java.base/share/classes/java/io/Reader.java
View file

@ -157,7 +157,7 @@ public abstract class Reader implements Readable, Closeable {
* If {@code off} is negative, or {@code len} is negative, * If {@code off} is negative, or {@code len} is negative,
* or {@code len} is greater than {@code cbuf.length - off} * 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 */ /** Maximum skip-buffer size */
private static final int maxSkipBufferSize = 8192; private static final int maxSkipBufferSize = 8192;
@ -260,6 +260,6 @@ public abstract class Reader implements Readable, Closeable {
* *
* @exception IOException If an I/O error occurs * @exception IOException If an I/O error occurs
*/ */
abstract public void close() throws IOException; public abstract void close() throws IOException;
} }

6
jdk/src/java.base/share/classes/java/io/Writer.java
View file

@ -142,7 +142,7 @@ public abstract class Writer implements Appendable, Closeable, Flushable {
* @throws IOException * @throws IOException
* If an I/O error occurs * 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. * Writes a string.
@ -312,7 +312,7 @@ public abstract class Writer implements Appendable, Closeable, Flushable {
* @throws IOException * @throws IOException
* If an I/O error occurs * 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, * Closes the stream, flushing it first. Once the stream has been closed,
@ -322,6 +322,6 @@ public abstract class Writer implements Appendable, Closeable, Flushable {
* @throws IOException * @throws IOException
* If an I/O error occurs * If an I/O error occurs
*/ */
abstract public void close() throws IOException; public abstract void close() throws IOException;
} }

20
jdk/src/java.base/share/classes/java/lang/Class.java
View file

@ -469,8 +469,8 @@ public final class Class<T> implements java.io.Serializable,
return null; return null;
} }
} }
private volatile transient Constructor<T> cachedConstructor; private transient volatile Constructor<T> cachedConstructor;
private volatile transient Class<?> newInstanceCallerCache; private transient volatile Class<?> newInstanceCallerCache;
/** /**
@ -1123,7 +1123,7 @@ public final class Class<T> implements java.io.Serializable,
} }
} }
private final static class EnclosingMethodInfo { private static final class EnclosingMethodInfo {
private Class<?> enclosingClass; private Class<?> enclosingClass;
private String name; private String name;
private String descriptor; private String descriptor;
@ -2514,11 +2514,11 @@ public final class Class<T> implements java.io.Serializable,
} }
} }
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() // Incremented by the VM on each call to JVM TI RedefineClasses()
// that redefines this class or a superclass. // that redefines this class or a superclass.
private volatile transient int classRedefinedCount = 0; private transient volatile int classRedefinedCount = 0;
// Lazily create and cache ReflectionData // Lazily create and cache ReflectionData
private ReflectionData<T> reflectionData() { private ReflectionData<T> reflectionData() {
@ -2561,7 +2561,7 @@ public final class Class<T> implements java.io.Serializable,
private native String getGenericSignature0(); private native String getGenericSignature0();
// Generic info repository; lazily initialized // Generic info repository; lazily initialized
private volatile transient ClassRepository genericInfo; private transient volatile ClassRepository genericInfo;
// accessor for factory // accessor for factory
private GenericsFactory getFactory() { private GenericsFactory getFactory() {
@ -3353,7 +3353,7 @@ public final class Class<T> implements java.io.Serializable,
} }
return enumConstants; 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 * Returns a map from simple name to enum constant. This package-private
@ -3375,7 +3375,7 @@ public final class Class<T> implements java.io.Serializable,
} }
return enumConstantDirectory; 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 * Casts an object to the class or interface represented
@ -3523,7 +3523,7 @@ public final class Class<T> implements java.io.Serializable,
// Annotations cache // Annotations cache
@SuppressWarnings("UnusedDeclaration") @SuppressWarnings("UnusedDeclaration")
private volatile transient AnnotationData annotationData; private transient volatile AnnotationData annotationData;
private AnnotationData annotationData() { private AnnotationData annotationData() {
while (true) { // retry loop while (true) { // retry loop
@ -3578,7 +3578,7 @@ public final class Class<T> implements java.io.Serializable,
// Annotation types cache their internal (AnnotationType) form // Annotation types cache their internal (AnnotationType) form
@SuppressWarnings("UnusedDeclaration") @SuppressWarnings("UnusedDeclaration")
private volatile transient AnnotationType annotationType; private transient volatile AnnotationType annotationType;
boolean casAnnotationType(AnnotationType oldType, AnnotationType newType) { boolean casAnnotationType(AnnotationType oldType, AnnotationType newType) {
return Atomic.casAnnotationType(this, oldType, newType); return Atomic.casAnnotationType(this, oldType, newType);

2
jdk/src/java.base/share/classes/java/lang/ClassLoader.java
View file

@ -1030,7 +1030,7 @@ public abstract class ClassLoader {
return findLoadedClass0(name); 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 * Sets the signers of a class. This should be invoked after defining a

12
jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java
View file

@ -47,14 +47,14 @@ import sun.text.Normalizer;
final class ConditionalSpecialCasing { final class ConditionalSpecialCasing {
// context conditions. // context conditions.
final static int FINAL_CASED = 1; static final int FINAL_CASED = 1;
final static int AFTER_SOFT_DOTTED = 2; static final int AFTER_SOFT_DOTTED = 2;
final static int MORE_ABOVE = 3; static final int MORE_ABOVE = 3;
final static int AFTER_I = 4; static final int AFTER_I = 4;
final static int NOT_BEFORE_DOT = 5; static final int NOT_BEFORE_DOT = 5;
// combining class definitions // combining class definitions
final static int COMBINING_CLASS_ABOVE = 230; static final int COMBINING_CLASS_ABOVE = 230;
// Special case mapping entries // Special case mapping entries
static Entry[] entry = { static Entry[] entry = {

8
jdk/src/java.base/share/classes/java/lang/Integer.java
View file

@ -76,7 +76,7 @@ public final class Integer extends Number implements Comparable<Integer> {
/** /**
* All possible chars for representing a number as a String * All possible chars for representing a number as a String
*/ */
final static char[] digits = { static final char[] digits = {
'0' , '1' , '2' , '3' , '4' , '5' , '0' , '1' , '2' , '3' , '4' , '5' ,
'6' , '7' , '8' , '9' , 'a' , 'b' , '6' , '7' , '8' , '9' , 'a' , 'b' ,
'c' , 'd' , 'e' , 'f' , 'g' , 'h' , 'c' , 'd' , 'e' , 'f' , 'g' , 'h' ,
@ -344,7 +344,7 @@ public final class Integer extends Number implements Comparable<Integer> {
} while (charPos > offset); } while (charPos > offset);
} }
final static char [] DigitTens = { static final char [] DigitTens = {
'0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0',
'1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1',
'2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2',
@ -357,7 +357,7 @@ public final class Integer extends Number implements Comparable<Integer> {
'9', '9', '9', '9', '9', '9', '9', '9', '9', '9', '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', '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 @@ public final class Integer extends Number implements Comparable<Integer> {
} }
} }
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 }; 99999999, 999999999, Integer.MAX_VALUE };
// Requires positive x // Requires positive x

2
jdk/src/java.base/share/classes/java/lang/Package.java
View file

@ -656,6 +656,6 @@ public class Package implements java.lang.reflect.AnnotatedElement {
private final String implVersion; private final String implVersion;
private final String implVendor; private final String implVendor;
private final URL sealBase; private final URL sealBase;
private transient final ClassLoader loader; private final transient ClassLoader loader;
private transient Class<?> packageInfo; private transient Class<?> packageInfo;
} }

2
jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java
View file

@ -458,7 +458,7 @@ public final class ProcessBuilder
* *
* @since 1.7 * @since 1.7
*/ */
public static abstract class Redirect { public abstract static class Redirect {
/** /**
* The type of a {@link Redirect}. * The type of a {@link Redirect}.
*/ */

4
jdk/src/java.base/share/classes/java/lang/StringCoding.java
View file

@ -52,9 +52,9 @@ class StringCoding {
private StringCoding() { } private StringCoding() { }
/** The cached coders for each thread */ /** The cached coders for each thread */
private final static ThreadLocal<SoftReference<StringDecoder>> decoder = private static final ThreadLocal<SoftReference<StringDecoder>> decoder =
new ThreadLocal<>(); new ThreadLocal<>();
private final static ThreadLocal<SoftReference<StringEncoder>> encoder = private static final ThreadLocal<SoftReference<StringEncoder>> encoder =
new ThreadLocal<>(); new ThreadLocal<>();
private static boolean warnUnsupportedCharset = true; private static boolean warnUnsupportedCharset = true;

6
jdk/src/java.base/share/classes/java/lang/System.java
View file

@ -81,7 +81,7 @@ public final class System {
* corresponds to keyboard input or another input source specified by * corresponds to keyboard input or another input source specified by
* the host environment or user. * 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 * The "standard" output stream. This stream is already
@ -108,7 +108,7 @@ public final class System {
* @see java.io.PrintStream#println(java.lang.Object) * @see java.io.PrintStream#println(java.lang.Object)
* @see java.io.PrintStream#println(java.lang.String) * @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 * The "standard" error output stream. This stream is already
@ -122,7 +122,7 @@ public final class System {
* variable <code>out</code>, has been redirected to a file or other * variable <code>out</code>, has been redirected to a file or other
* destination that is typically not continuously monitored. * 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. /* The security manager for the system.
*/ */

10
jdk/src/java.base/share/classes/java/lang/Thread.java
View file

@ -244,17 +244,17 @@ class Thread implements Runnable {
/** /**
* The minimum priority that a thread can have. * 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. * 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. * 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. * Returns a reference to the currently executing thread object.
@ -1688,8 +1688,8 @@ class Thread implements Runnable {
return result.booleanValue(); return result.booleanValue();
} }
private native static StackTraceElement[][] dumpThreads(Thread[] threads); private static native StackTraceElement[][] dumpThreads(Thread[] threads);
private native static Thread[] getThreads(); private static native Thread[] getThreads();
/** /**
* Returns the identifier of this Thread. The thread ID is a positive * Returns the identifier of this Thread. The thread ID is a positive

2
jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java
View file

@ -33,7 +33,7 @@ package java.lang;
* @author Frank Yellin * @author Frank Yellin
* @since 1.0 * @since 1.0
*/ */
abstract public class VirtualMachineError extends Error { public abstract class VirtualMachineError extends Error {
private static final long serialVersionUID = 4161983926571568670L; private static final long serialVersionUID = 4161983926571568670L;
/** /**

2
jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java
View file

@ -49,7 +49,7 @@ abstract class DelegatingMethodHandle extends MethodHandle {
} }
/** Define this to extract the delegated target which supplies the invocation behavior. */ /** Define this to extract the delegated target which supplies the invocation behavior. */
abstract protected MethodHandle getTarget(); protected abstract MethodHandle getTarget();
@Override @Override
abstract MethodHandle asTypeUncached(MethodType newType); abstract MethodHandle asTypeUncached(MethodType newType);

6
jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
View file

@ -445,9 +445,9 @@ class DirectMethodHandle extends MethodHandle {
/** This subclass handles static field references. */ /** This subclass handles static field references. */
static class StaticAccessor extends DirectMethodHandle { static class StaticAccessor extends DirectMethodHandle {
final private Class<?> fieldType; private final Class<?> fieldType;
final private Object staticBase; private final Object staticBase;
final private long staticOffset; private final long staticOffset;
private StaticAccessor(MethodType mtype, LambdaForm form, MemberName member, private StaticAccessor(MethodType mtype, LambdaForm form, MemberName member,
Object staticBase, long staticOffset) { Object staticBase, long staticOffset) {

6
jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
View file

@ -140,9 +140,9 @@ class InvokerBytecodeGenerator {
/** instance counters for dumped classes */ /** 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 */ /** debugging flag for saving generated class files */
private final static File DUMP_CLASS_FILES_DIR; private static final File DUMP_CLASS_FILES_DIR;
static { static {
if (DUMP_CLASS_FILES) { if (DUMP_CLASS_FILES) {
@ -771,7 +771,7 @@ class InvokerBytecodeGenerator {
mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, MH, "invokeBasic", type.basicType().toMethodDescriptorString(), false); 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: // Sample classes from each package we are willing to bind to statically:
java.lang.Object.class, java.lang.Object.class,
java.util.Arrays.class, java.util.Arrays.class,

2
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
View file

@ -440,7 +440,7 @@ class MethodHandleNatives {
* Use best possible cause for err.initCause(), substituting the * Use best possible cause for err.initCause(), substituting the
* cause for err itself if the cause has the same (or better) type. * 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(); Throwable th = ex.getCause();
if (err.getClass().isInstance(th)) if (err.getClass().isInstance(th))
return (Error) th; return (Error) th;

10
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
View file

@ -147,7 +147,7 @@ public class MethodHandles {
return lookup.revealDirect(target).reflectAs(expected, lookup); return lookup.revealDirect(target).reflectAs(expected, lookup);
} }
// Copied from AccessibleObject, as used by Method.setAccessible, etc.: // 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"); new ReflectPermission("suppressAccessChecks");
/** /**
@ -1884,7 +1884,7 @@ return invoker;
* or if the resulting method handle's type would have * or if the resulting method handle's type would have
* <a href="MethodHandle.html#maxarity">too many parameters</a> * <a href="MethodHandle.html#maxarity">too many parameters</a>
*/ */
static public public static
MethodHandle spreadInvoker(MethodType type, int leadingArgCount) { MethodHandle spreadInvoker(MethodType type, int leadingArgCount) {
if (leadingArgCount < 0 || leadingArgCount > type.parameterCount()) if (leadingArgCount < 0 || leadingArgCount > type.parameterCount())
throw newIllegalArgumentException("bad argument count", leadingArgCount); throw newIllegalArgumentException("bad argument count", leadingArgCount);
@ -1927,7 +1927,7 @@ return invoker;
* @throws IllegalArgumentException if the resulting method handle's type would have * @throws IllegalArgumentException if the resulting method handle's type would have
* <a href="MethodHandle.html#maxarity">too many parameters</a> * <a href="MethodHandle.html#maxarity">too many parameters</a>
*/ */
static public public static
MethodHandle exactInvoker(MethodType type) { MethodHandle exactInvoker(MethodType type) {
return type.invokers().exactInvoker(); return type.invokers().exactInvoker();
} }
@ -1966,7 +1966,7 @@ return invoker;
* @throws IllegalArgumentException if the resulting method handle's type would have * @throws IllegalArgumentException if the resulting method handle's type would have
* <a href="MethodHandle.html#maxarity">too many parameters</a> * <a href="MethodHandle.html#maxarity">too many parameters</a>
*/ */
static public public static
MethodHandle invoker(MethodType type) { MethodHandle invoker(MethodType type) {
return type.invokers().genericInvoker(); return type.invokers().genericInvoker();
} }
@ -2322,7 +2322,7 @@ assert((int)twice.invokeExact(21) == 42);
return MethodHandleImpl.makeIntrinsic(mtype, lform, Intrinsic.ZERO); 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. // Simulate a CAS, to avoid racy duplication of results.
MethodHandle prev = cache[pos]; MethodHandle prev = cache[pos];
if (prev != null) return prev; if (prev != null) return prev;

4
jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
View file

@ -111,7 +111,7 @@ final class MethodTypeForm {
return (entry != null) ? entry.get() : null; 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. // Simulate a CAS, to avoid racy duplication of results.
SoftReference<MethodHandle> entry = methodHandles[which]; SoftReference<MethodHandle> entry = methodHandles[which];
if (entry != null) { if (entry != null) {
@ -130,7 +130,7 @@ final class MethodTypeForm {
return (entry != null) ? entry.get() : null; 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. // Simulate a CAS, to avoid racy duplication of results.
SoftReference<LambdaForm> entry = lambdaForms[which]; SoftReference<LambdaForm> entry = lambdaForms[which];
if (entry != null) { if (entry != null) {

4
jdk/src/java.base/share/classes/java/lang/ref/Reference.java
View file

@ -107,7 +107,7 @@ public abstract class Reference<T> {
* pending: next element in the pending list (or null if last) * pending: next element in the pending list (or null if last)
* otherwise: NULL * 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 /* Object used to synchronize with the garbage collector. The collector
@ -115,7 +115,7 @@ public abstract class Reference<T> {
* therefore critical that any code holding this lock complete as quickly * therefore critical that any code holding this lock complete as quickly
* as possible, allocate no new objects, and avoid calling user code. * 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(); private static Lock lock = new Lock();

2
jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
View file

@ -51,7 +51,7 @@ public class ReferenceQueue<T> {
static ReferenceQueue<Object> NULL = new Null<>(); static ReferenceQueue<Object> NULL = new Null<>();
static ReferenceQueue<Object> ENQUEUED = new Null<>(); static ReferenceQueue<Object> ENQUEUED = new Null<>();
static private class Lock { }; private static class Lock { };
private Lock lock = new Lock(); private Lock lock = new Lock();
private volatile Reference<? extends T> head = null; private volatile Reference<? extends T> head = null;
private long queueLength = 0; private long queueLength = 0;

2
jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java
View file

@ -66,7 +66,7 @@ public class SoftReference<T> extends Reference<T> {
/** /**
* Timestamp clock, updated by the garbage collector * 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 * Timestamp updated by each invocation of the get method. The VM may use

2
jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
View file

@ -61,7 +61,7 @@ public class AccessibleObject implements AnnotatedElement {
* has sufficient privilege to defeat Java language access * has sufficient privilege to defeat Java language access
* control checks. * control checks.
*/ */
static final private java.security.Permission ACCESS_PERMISSION = private static final java.security.Permission ACCESS_PERMISSION =
new ReflectPermission("suppressAccessChecks"); new ReflectPermission("suppressAccessChecks");
/** /**

20
jdk/src/java.base/share/classes/java/math/BigDecimal.java
View file

@ -2268,14 +2268,14 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
* digit prior to a nonzero discarded fraction. Note that this rounding * digit prior to a nonzero discarded fraction. Note that this rounding
* mode never decreases the magnitude of the calculated value. * 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 * Rounding mode to round towards zero. Never increments the digit
* prior to a discarded fraction (i.e., truncates). Note that this * prior to a discarded fraction (i.e., truncates). Note that this
* rounding mode never increases the magnitude of the calculated value. * 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 * Rounding mode to round towards positive infinity. If the
@ -2284,7 +2284,7 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
* {@code ROUND_DOWN}. Note that this rounding mode never * {@code ROUND_DOWN}. Note that this rounding mode never
* decreases the calculated value. * 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 * Rounding mode to round towards negative infinity. If the
@ -2293,7 +2293,7 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
* {@code ROUND_UP}. Note that this rounding mode never * {@code ROUND_UP}. Note that this rounding mode never
* increases the calculated value. * 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"} * Rounding mode to round towards {@literal "nearest neighbor"}
@ -2303,7 +2303,7 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
* that this is the rounding mode that most of us were taught in * that this is the rounding mode that most of us were taught in
* grade school. * 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"} * Rounding mode to round towards {@literal "nearest neighbor"}
@ -2312,7 +2312,7 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
* fraction is {@literal >} 0.5; otherwise, behaves as for * fraction is {@literal >} 0.5; otherwise, behaves as for
* {@code ROUND_DOWN}. * {@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"} * Rounding mode to round towards the {@literal "nearest neighbor"}
@ -2324,7 +2324,7 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
* rounding mode that minimizes cumulative error when applied * rounding mode that minimizes cumulative error when applied
* repeatedly over a sequence of calculations. * 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 * Rounding mode to assert that the requested operation has an exact
@ -2332,7 +2332,7 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
* specified on an operation that yields an inexact result, an * specified on an operation that yields an inexact result, an
* {@code ArithmeticException} is thrown. * {@code ArithmeticException} is thrown.
*/ */
public final static int ROUND_UNNECESSARY = 7; public static final int ROUND_UNNECESSARY = 7;
// Scaling/Rounding Operations // Scaling/Rounding Operations
@ -3398,7 +3398,7 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
return charPos; return charPos;
} }
final static char[] DIGIT_TENS = { static final char[] DIGIT_TENS = {
'0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0',
'1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1',
'2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2',
@ -3411,7 +3411,7 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
'9', '9', '9', '9', '9', '9', '9', '9', '9', '9', '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', '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',

4
jdk/src/java.base/share/classes/java/math/BigInteger.java
View file

@ -184,7 +184,7 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
/** /**
* This mask is used to obtain the value of an int as if it were unsigned. * 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 * This constant limits {@code mag.length} of BigIntegers to the supported
@ -1212,7 +1212,7 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
/** /**
* Initialize static constant array when class is loaded. * 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 posConst[] = new BigInteger[MAX_CONSTANT+1];
private static BigInteger negConst[] = new BigInteger[MAX_CONSTANT+1]; private static BigInteger negConst[] = new BigInteger[MAX_CONSTANT+1];

2
jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
View file

@ -55,7 +55,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
/** /**
* flag set if the native connect() call not to be used * 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. * Load net library into runtime.

4
jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java
View file

@ -721,6 +721,6 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
abstract void socketSendUrgentData(int data) abstract void socketSendUrgentData(int data)
throws IOException; throws IOException;
public final static int SHUT_RD = 0; public static final int SHUT_RD = 0;
public final static int SHUT_WR = 1; public static final int SHUT_WR = 1;
} }

2
jdk/src/java.base/share/classes/java/net/Authenticator.java
View file

@ -119,7 +119,7 @@ class Authenticator {
* @see SecurityManager#checkPermission * @see SecurityManager#checkPermission
* @see java.net.NetPermission * @see java.net.NetPermission
*/ */
public synchronized static void setDefault(Authenticator a) { public static synchronized void setDefault(Authenticator a) {
SecurityManager sm = System.getSecurityManager(); SecurityManager sm = System.getSecurityManager();
if (sm != null) { if (sm != null) {
NetPermission setDefaultPermission NetPermission setDefaultPermission

4
jdk/src/java.base/share/classes/java/net/ContentHandler.java
View file

@ -81,7 +81,7 @@ import java.io.IOException;
* @see java.net.URLConnection#setContentHandlerFactory(java.net.ContentHandlerFactory) * @see java.net.URLConnection#setContentHandlerFactory(java.net.ContentHandlerFactory)
* @since 1.0 * @since 1.0
*/ */
abstract public class ContentHandler { public abstract class ContentHandler {
/** /**
* Given a URL connect stream positioned at the beginning of the * Given a URL connect stream positioned at the beginning of the
@ -92,7 +92,7 @@ abstract public class ContentHandler {
* @return the object read by the {@code ContentHandler}. * @return the object read by the {@code ContentHandler}.
* @exception IOException if an I/O error occurs while reading the object. * @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 * Given a URL connect stream positioned at the beginning of the

4
jdk/src/java.base/share/classes/java/net/CookieHandler.java
View file

@ -69,7 +69,7 @@ public abstract class CookieHandler {
* {@link NetPermission}{@code ("getCookieHandler")} * {@link NetPermission}{@code ("getCookieHandler")}
* @see #setDefault(CookieHandler) * @see #setDefault(CookieHandler)
*/ */
public synchronized static CookieHandler getDefault() { public static synchronized CookieHandler getDefault() {
SecurityManager sm = System.getSecurityManager(); SecurityManager sm = System.getSecurityManager();
if (sm != null) { if (sm != null) {
sm.checkPermission(SecurityConstants.GET_COOKIEHANDLER_PERMISSION); sm.checkPermission(SecurityConstants.GET_COOKIEHANDLER_PERMISSION);
@ -89,7 +89,7 @@ public abstract class CookieHandler {
* {@link NetPermission}{@code ("setCookieHandler")} * {@link NetPermission}{@code ("setCookieHandler")}
* @see #getDefault() * @see #getDefault()
*/ */
public synchronized static void setDefault(CookieHandler cHandler) { public static synchronized void setDefault(CookieHandler cHandler) {
SecurityManager sm = System.getSecurityManager(); SecurityManager sm = System.getSecurityManager();
if (sm != null) { if (sm != null) {
sm.checkPermission(SecurityConstants.SET_COOKIEHANDLER_PERMISSION); sm.checkPermission(SecurityConstants.SET_COOKIEHANDLER_PERMISSION);

2
jdk/src/java.base/share/classes/java/net/CookieManager.java
View file

@ -362,7 +362,7 @@ public class CookieManager extends CookieHandler
} }
static private boolean isInPortList(String lst, int port) { private static boolean isInPortList(String lst, int port) {
int i = lst.indexOf(','); int i = lst.indexOf(',');
int val = -1; int val = -1;
while (i > 0) { while (i > 0) {

2
jdk/src/java.base/share/classes/java/net/DatagramPacket.java
View file

@ -384,5 +384,5 @@ class DatagramPacket {
/** /**
* Perform class load-time initializations. * Perform class load-time initializations.
*/ */
private native static void init(); private static native void init();
} }

6
jdk/src/java.base/share/classes/java/net/HostPortrange.java
View file

@ -225,9 +225,9 @@ class HostPortrange {
} }
// these shouldn't leak outside the implementation // these shouldn't leak outside the implementation
final static int[] HTTP_PORT = {80, 80}; static final int[] HTTP_PORT = {80, 80};
final static int[] HTTPS_PORT = {443, 443}; static final int[] HTTPS_PORT = {443, 443};
final static int[] NO_PORT = {-1, -1}; static final int[] NO_PORT = {-1, -1};
int[] defaultPort() { int[] defaultPort() {
if (scheme.equals("http")) { if (scheme.equals("http")) {

8
jdk/src/java.base/share/classes/java/net/HttpCookie.java
View file

@ -84,11 +84,11 @@ public final class HttpCookie implements Cloneable {
// Since the positive and zero max-age have their meanings, // Since the positive and zero max-age have their meanings,
// this value serves as a hint as 'not specify max-age' // 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 // date formats used by Netscape's cookie draft
// as well as formats seen on various sites // 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',' dd MMM yyyy HH:mm:ss 'GMT'", "EEE',' dd MMM yyyy HH:mm:ss 'GMT'",
"EEE MMM dd yyyy HH:mm:ss 'GMT'Z", "EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
@ -98,8 +98,8 @@ public final class HttpCookie implements Cloneable {
}; };
// constant strings represent set-cookie header token // constant strings represent set-cookie header token
private final static String SET_COOKIE = "set-cookie:"; private static final String SET_COOKIE = "set-cookie:";
private final static String SET_COOKIE2 = "set-cookie2:"; private static final String SET_COOKIE2 = "set-cookie2:";
// ---------------- Ctors -------------- // ---------------- Ctors --------------

2
jdk/src/java.base/share/classes/java/net/HttpURLConnection.java
View file

@ -66,7 +66,7 @@ import java.util.Date;
* @see java.net.HttpURLConnection#disconnect() * @see java.net.HttpURLConnection#disconnect()
* @since 1.1 * @since 1.1
*/ */
abstract public class HttpURLConnection extends URLConnection { public abstract class HttpURLConnection extends URLConnection {
/* instance variables */ /* instance variables */
/** /**

2
jdk/src/java.base/share/classes/java/net/Inet4Address.java
View file

@ -84,7 +84,7 @@ import java.io.ObjectStreamException;
public final public final
class Inet4Address extends InetAddress { class Inet4Address extends InetAddress {
final static int INADDRSZ = 4; static final int INADDRSZ = 4;
/** use serialVersionUID from InetAddress, but Inet4Address instance /** use serialVersionUID from InetAddress, but Inet4Address instance
* is always replaced by an InetAddress instance before being * is always replaced by an InetAddress instance before being

4
jdk/src/java.base/share/classes/java/net/Inet6Address.java
View file

@ -173,7 +173,7 @@ import java.util.Arrays;
public final public final
class Inet6Address extends InetAddress { class Inet6Address extends InetAddress {
final static int INADDRSZ = 16; static final int INADDRSZ = 16;
/* /*
* cached scope_id - for link-local address use only. * cached scope_id - for link-local address use only.
@ -922,7 +922,7 @@ class Inet6Address extends InetAddress {
} }
// Utilities // Utilities
private final static int INT16SZ = 2; private static final int INT16SZ = 2;
/* /*
* Convert IPv6 binary address into presentation (printable) format. * Convert IPv6 binary address into presentation (printable) format.

20
jdk/src/java.base/share/classes/java/net/NetworkInterface.java
View file

@ -400,16 +400,16 @@ public final class NetworkInterface {
false); false);
} }
private native static NetworkInterface[] getAll() private static native NetworkInterface[] getAll()
throws SocketException; throws SocketException;
private native static NetworkInterface getByName0(String name) private static native NetworkInterface getByName0(String name)
throws SocketException; throws SocketException;
private native static NetworkInterface getByIndex0(int index) private static native NetworkInterface getByIndex0(int index)
throws SocketException; throws SocketException;
private native static NetworkInterface getByInetAddress0(InetAddress addr) private static native NetworkInterface getByInetAddress0(InetAddress addr)
throws SocketException; throws SocketException;
/** /**
@ -525,12 +525,12 @@ public final class NetworkInterface {
return virtual; return virtual;
} }
private native static boolean isUp0(String name, int ind) throws SocketException; private static native boolean isUp0(String name, int ind) throws SocketException;
private native static boolean isLoopback0(String name, int ind) throws SocketException; private static native boolean isLoopback0(String name, int ind) throws SocketException;
private native static boolean supportsMulticast0(String name, int ind) throws SocketException; private static native boolean supportsMulticast0(String name, int ind) throws SocketException;
private native static boolean isP2P0(String name, int ind) throws SocketException; private static native boolean isP2P0(String name, int ind) throws SocketException;
private native static byte[] getMacAddr0(byte[] inAddr, String name, int ind) throws SocketException; private static native byte[] getMacAddr0(byte[] inAddr, String name, int ind) throws SocketException;
private native static int getMTU0(String name, int ind) throws SocketException; private static native int getMTU0(String name, int ind) throws SocketException;
/** /**
* Compares this object against the specified object. * Compares this object against the specified object.

2
jdk/src/java.base/share/classes/java/net/Proxy.java
View file

@ -69,7 +69,7 @@ public class Proxy {
* {@code Socket s = new Socket(Proxy.NO_PROXY);} * {@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. // Creates the proxy that represents a {@code DIRECT} connection.
private Proxy() { private Proxy() {

4
jdk/src/java.base/share/classes/java/net/ResponseCache.java
View file

@ -80,7 +80,7 @@ public abstract class ResponseCache {
* @return the system-wide {@code ResponseCache} * @return the system-wide {@code ResponseCache}
* @since 1.5 * @since 1.5
*/ */
public synchronized static ResponseCache getDefault() { public static synchronized ResponseCache getDefault() {
SecurityManager sm = System.getSecurityManager(); SecurityManager sm = System.getSecurityManager();
if (sm != null) { if (sm != null) {
sm.checkPermission(SecurityConstants.GET_RESPONSECACHE_PERMISSION); sm.checkPermission(SecurityConstants.GET_RESPONSECACHE_PERMISSION);
@ -103,7 +103,7 @@ public abstract class ResponseCache {
* @see #getDefault() * @see #getDefault()
* @since 1.5 * @since 1.5
*/ */
public synchronized static void setDefault(ResponseCache responseCache) { public static synchronized void setDefault(ResponseCache responseCache) {
SecurityManager sm = System.getSecurityManager(); SecurityManager sm = System.getSecurityManager();
if (sm != null) { if (sm != null) {
sm.checkPermission(SecurityConstants.SET_RESPONSECACHE_PERMISSION); sm.checkPermission(SecurityConstants.SET_RESPONSECACHE_PERMISSION);

2
jdk/src/java.base/share/classes/java/net/SocketInputStream.java
View file

@ -287,5 +287,5 @@ class SocketInputStream extends FileInputStream
/** /**
* Perform class load-time initializations. * Perform class load-time initializations.
*/ */
private native static void init(); private static native void init();
} }

28
jdk/src/java.base/share/classes/java/net/SocketOptions.java
View file

@ -139,7 +139,7 @@ public interface SocketOptions {
* @see Socket#getTcpNoDelay * @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 * Fetch the local address binding of a socket (this option cannot
@ -160,7 +160,7 @@ public interface SocketOptions {
* @see DatagramSocket#getLocalAddress * @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 /** Sets SO_REUSEADDR for a socket. This is used only for MulticastSockets
* in java, and it is set by default for MulticastSockets. * in java, and it is set by default for MulticastSockets.
@ -168,7 +168,7 @@ public interface SocketOptions {
* Valid for: DatagramSocketImpl * 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 * Sets SO_BROADCAST for a socket. This option enables and disables
@ -179,7 +179,7 @@ public interface SocketOptions {
* @since 1.4 * @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. /** Set which outgoing interface on which to send multicast packets.
* Useful on hosts with multiple network interfaces, where applications * Useful on hosts with multiple network interfaces, where applications
@ -191,7 +191,7 @@ public interface SocketOptions {
* @see MulticastSocket#getInterface() * @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 /** Same as above. This option is introduced so that the behaviour
* with IP_MULTICAST_IF will be kept the same as before, while * with IP_MULTICAST_IF will be kept the same as before, while
@ -203,7 +203,7 @@ public interface SocketOptions {
* @see MulticastSocket#getNetworkInterface() * @see MulticastSocket#getNetworkInterface()
* @since 1.4 * @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. * This option enables or disables local loopback of multicast datagrams.
@ -211,7 +211,7 @@ public interface SocketOptions {
* @since 1.4 * @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 * This option sets the type-of-service or traffic class field
@ -219,7 +219,7 @@ public interface SocketOptions {
* @since 1.4 * @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 * Specify a linger-on-close timeout. This option disables/enables
@ -237,7 +237,7 @@ public interface SocketOptions {
* @see Socket#setSoLinger * @see Socket#setSoLinger
* @see Socket#getSoLinger * @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: /** Set a timeout on blocking Socket operations:
* <PRE> * <PRE>
@ -258,7 +258,7 @@ public interface SocketOptions {
* @see ServerSocket#setSoTimeout * @see ServerSocket#setSoTimeout
* @see DatagramSocket#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 * Set a hint the size of the underlying buffers used by the
@ -275,7 +275,7 @@ public interface SocketOptions {
* @see DatagramSocket#setSendBufferSize * @see DatagramSocket#setSendBufferSize
* @see DatagramSocket#getSendBufferSize * @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 * Set a hint the size of the underlying buffers used by the
@ -293,7 +293,7 @@ public interface SocketOptions {
* @see DatagramSocket#setReceiveBufferSize * @see DatagramSocket#setReceiveBufferSize
* @see DatagramSocket#getReceiveBufferSize * @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 * When the keepalive option is set for a TCP socket and no data
@ -316,7 +316,7 @@ public interface SocketOptions {
* @see Socket#setKeepAlive * @see Socket#setKeepAlive
* @see Socket#getKeepAlive * @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 * When the OOBINLINE option is set, any TCP urgent data received on
@ -327,5 +327,5 @@ public interface SocketOptions {
* @see Socket#setOOBInline * @see Socket#setOOBInline
* @see Socket#getOOBInline * @see Socket#getOOBInline
*/ */
@Native public final static int SO_OOBINLINE = 0x1003; @Native public static final int SO_OOBINLINE = 0x1003;
} }

2
jdk/src/java.base/share/classes/java/net/SocketOutputStream.java
View file

@ -178,6 +178,6 @@ class SocketOutputStream extends FileOutputStream
/** /**
* Perform class load-time initializations. * Perform class load-time initializations.
*/ */
private native static void init(); private static native void init();
} }

12
jdk/src/java.base/share/classes/java/net/SocketPermission.java
View file

@ -154,32 +154,32 @@ public final class SocketPermission extends Permission
/** /**
* Connect to host:port * Connect to host:port
*/ */
private final static int CONNECT = 0x1; private static final int CONNECT = 0x1;
/** /**
* Listen on host:port * Listen on host:port
*/ */
private final static int LISTEN = 0x2; private static final int LISTEN = 0x2;
/** /**
* Accept a connection from host:port * Accept a connection from host:port
*/ */
private final static int ACCEPT = 0x4; private static final int ACCEPT = 0x4;
/** /**
* Resolve DNS queries * Resolve DNS queries
*/ */
private final static int RESOLVE = 0x8; private static final int RESOLVE = 0x8;
/** /**
* No actions * No actions
*/ */
private final static int NONE = 0x0; private static final int NONE = 0x0;
/** /**
* All actions * All actions
*/ */
private final static int ALL = CONNECT|LISTEN|ACCEPT|RESOLVE; private static final int ALL = CONNECT|LISTEN|ACCEPT|RESOLVE;
// various port constants // various port constants
private static final int PORT_MIN = 0; private static final int PORT_MIN = 0;

24
jdk/src/java.base/share/classes/java/net/URI.java
View file

@ -492,15 +492,15 @@ public final class URI
// The remaining fields may be computed on demand // The remaining fields may be computed on demand
private volatile transient String schemeSpecificPart; private transient volatile String schemeSpecificPart;
private volatile transient int hash; // Zero ==> undefined private transient volatile int hash; // Zero ==> undefined
private volatile transient String decodedUserInfo = null; private transient volatile String decodedUserInfo = null;
private volatile transient String decodedAuthority = null; private transient volatile String decodedAuthority = null;
private volatile transient String decodedPath = null; private transient volatile String decodedPath = null;
private volatile transient String decodedQuery = null; private transient volatile String decodedQuery = null;
private volatile transient String decodedFragment = null; private transient volatile String decodedFragment = null;
private volatile transient String decodedSchemeSpecificPart = null; private transient volatile String decodedSchemeSpecificPart = null;
/** /**
* The string form of this URI. * The string form of this URI.
@ -2175,7 +2175,7 @@ public final class URI
// This method takes a string argument rather than a char array so that // This method takes a string argument rather than a char array so that
// this test can be performed without invoking path.toCharArray(). // this test can be performed without invoking path.toCharArray().
// //
static private int needsNormalization(String path) { private static int needsNormalization(String path) {
boolean normal = true; boolean normal = true;
int ns = 0; // Number of segments int ns = 0; // Number of segments
int end = path.length() - 1; // Index of last char in path int end = path.length() - 1; // Index of last char in path
@ -2232,7 +2232,7 @@ public final class URI
// All slashes in path replaced by '\0' // All slashes in path replaced by '\0'
// segs[i] == Index of first char in segment i (0 <= i < segs.length) // 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 end = path.length - 1; // Index of last char in path
int p = 0; // Index of next char in path int p = 0; // Index of next char in path
int i = 0; // Index of current segment int i = 0; // Index of current segment
@ -2281,7 +2281,7 @@ public final class URI
// Postconditions: // Postconditions:
// path[0] .. path[return value] == Resulting path // 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 ns = segs.length; // Number of segments
int end = path.length - 1; // Index of last char in path int end = path.length - 1; // Index of last char in path
int p = 0; // Index of next path char to write int p = 0; // Index of next path char to write
@ -2645,7 +2645,7 @@ public final class URI
// -- Escaping and encoding -- // -- Escaping and encoding --
private final static char[] hexDigits = { private static final char[] hexDigits = {
'0', '1', '2', '3', '4', '5', '6', '7', '0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F' '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
}; };

10
jdk/src/java.base/share/classes/java/net/URLConnection.java
View file

@ -365,7 +365,7 @@ public abstract class URLConnection {
* @see #getConnectTimeout() * @see #getConnectTimeout()
* @see #setConnectTimeout(int) * @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 * Sets a specified timeout value, in milliseconds, to be used
@ -1440,7 +1440,7 @@ public abstract class URLConnection {
* @see java.io.InputStream#markSupported() * @see java.io.InputStream#markSupported()
* @see java.net.URLConnection#getContentType() * @see java.net.URLConnection#getContentType()
*/ */
static public String guessContentTypeFromStream(InputStream is) public static String guessContentTypeFromStream(InputStream is)
throws IOException { throws IOException {
// If we can't read ahead safely, just give up on guessing // If we can't read ahead safely, just give up on guessing
if (!is.markSupported()) if (!is.markSupported())
@ -1605,7 +1605,7 @@ public abstract class URLConnection {
* method, the stream should have already been checked to be sure it * method, the stream should have already been checked to be sure it
* contains Microsoft Structured Storage data. * 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. /* Test for FlashPix image data in Microsoft Structured Storage format.
* In general, should do this with calls to an SS implementation. * In general, should do this with calls to an SS implementation.
@ -1766,7 +1766,7 @@ public abstract class URLConnection {
* Returns -1, If EOF is reached before len bytes are read, returns 0 * Returns -1, If EOF is reached before len bytes are read, returns 0
* otherwise * otherwise
*/ */
static private int readBytes(int c[], int len, InputStream is) private static int readBytes(int c[], int len, InputStream is)
throws IOException { throws IOException {
byte buf[] = new byte[len]; byte buf[] = new byte[len];
@ -1787,7 +1787,7 @@ public abstract class URLConnection {
* until either EOF is reached, or the specified * until either EOF is reached, or the specified
* number of bytes have been skipped * number of bytes have been skipped
*/ */
static private long skipForward(InputStream is, long toSkip) private static long skipForward(InputStream is, long toSkip)
throws IOException { throws IOException {
long eachSkip = 0; long eachSkip = 0;

2
jdk/src/java.base/share/classes/java/net/URLStreamHandler.java
View file

@ -68,7 +68,7 @@ public abstract class URLStreamHandler {
* @exception IOException if an I/O error occurs while opening the * @exception IOException if an I/O error occurs while opening the
* connection. * 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 * Same as openConnection(URL), except that the connection will be

8
jdk/src/java.base/share/classes/java/nio/Bits.java
View file

@ -64,7 +64,7 @@ class Bits { // package-private
// -- get/put char -- // -- 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)); return (char)((b1 << 8) | (b0 & 0xff));
} }
@ -136,7 +136,7 @@ class Bits { // package-private
// -- get/put short -- // -- 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)); return (short)((b1 << 8) | (b0 & 0xff));
} }
@ -208,7 +208,7 @@ class Bits { // package-private
// -- get/put int -- // -- 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) | return (((b3 ) << 24) |
((b2 & 0xff) << 16) | ((b2 & 0xff) << 16) |
((b1 & 0xff) << 8) | ((b1 & 0xff) << 8) |
@ -301,7 +301,7 @@ class Bits { // package-private
// -- get/put long -- // -- 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) byte b3, byte b2, byte b1, byte b0)
{ {
return ((((long)b7 ) << 56) | return ((((long)b7 ) << 56) |

4
jdk/src/java.base/share/classes/java/nio/channels/Pipe.java
View file

@ -56,7 +56,7 @@ public abstract class Pipe {
* *
* @since 1.4 * @since 1.4
*/ */
public static abstract class SourceChannel public abstract static class SourceChannel
extends AbstractSelectableChannel extends AbstractSelectableChannel
implements ReadableByteChannel, ScatteringByteChannel implements ReadableByteChannel, ScatteringByteChannel
{ {
@ -90,7 +90,7 @@ public abstract class Pipe {
* *
* @since 1.4 * @since 1.4
*/ */
public static abstract class SinkChannel public abstract static class SinkChannel
extends AbstractSelectableChannel extends AbstractSelectableChannel
implements WritableByteChannel, GatheringByteChannel implements WritableByteChannel, GatheringByteChannel
{ {

2
jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java
View file

@ -191,7 +191,7 @@ public class CoderResult {
public static final CoderResult OVERFLOW public static final CoderResult OVERFLOW
= new CoderResult(CR_OVERFLOW, 0); = new CoderResult(CR_OVERFLOW, 0);
private static abstract class Cache { private abstract static class Cache {
private Map<Integer,WeakReference<CoderResult>> cache = null; private Map<Integer,WeakReference<CoderResult>> cache = null;

6
jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java
View file

@ -547,9 +547,9 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi {
private Iterator<Service> serviceIterator; private Iterator<Service> serviceIterator;
private final static int I_NONE = 1; private static final int I_NONE = 1;
private final static int I_SIZE = 2; private static final int I_SIZE = 2;
private final static int I_PARAMS = 3; private static final int I_PARAMS = 3;
private int initType; private int initType;
private int initKeySize; private int initKeySize;

4
jdk/src/java.base/share/classes/java/security/KeyStore.java
View file

@ -974,7 +974,7 @@ public class KeyStore {
* if no such property exists. * if no such property exists.
* @see java.security.Security security properties * @see java.security.Security security properties
*/ */
public final static String getDefaultType() { public static final String getDefaultType() {
String kstype; String kstype;
kstype = AccessController.doPrivileged(new PrivilegedAction<>() { kstype = AccessController.doPrivileged(new PrivilegedAction<>() {
public String run() { public String run() {
@ -1811,7 +1811,7 @@ public class KeyStore {
* @see javax.net.ssl.KeyStoreBuilderParameters * @see javax.net.ssl.KeyStoreBuilderParameters
* @since 1.5 * @since 1.5
*/ */
public static abstract class Builder { public abstract static class Builder {
// maximum times to try the callbackhandler if the password is wrong // maximum times to try the callbackhandler if the password is wrong
static final int MAX_CALLBACK_TRIES = 3; static final int MAX_CALLBACK_TRIES = 3;

6
jdk/src/java.base/share/classes/java/security/Provider.java
View file

@ -998,9 +998,9 @@ public abstract class Provider extends Properties {
return new String[] {type, alg}; return new String[] {type, alg};
} }
private final static String ALIAS_PREFIX = "Alg.Alias."; private static final String ALIAS_PREFIX = "Alg.Alias.";
private final static String ALIAS_PREFIX_LOWER = "alg.alias."; private static final String ALIAS_PREFIX_LOWER = "alg.alias.";
private final static int ALIAS_LENGTH = ALIAS_PREFIX.length(); private static final int ALIAS_LENGTH = ALIAS_PREFIX.length();
private void parseLegacyPut(String name, String value) { private void parseLegacyPut(String name, String value) {
if (name.toLowerCase(ENGLISH).startsWith(ALIAS_PREFIX_LOWER)) { if (name.toLowerCase(ENGLISH).startsWith(ALIAS_PREFIX_LOWER)) {

6
jdk/src/java.base/share/classes/java/security/SecureRandom.java
View file

@ -424,7 +424,7 @@ public class SecureRandom extends java.util.Random {
* *
* @see #getSeed * @see #getSeed
*/ */
synchronized public void setSeed(byte[] seed) { public synchronized void setSeed(byte[] seed) {
secureRandomSpi.engineSetSeed(seed); secureRandomSpi.engineSetSeed(seed);
} }
@ -465,7 +465,7 @@ public class SecureRandom extends java.util.Random {
* @param bytes the array to be filled in with random bytes. * @param bytes the array to be filled in with random bytes.
*/ */
@Override @Override
synchronized public void nextBytes(byte[] bytes) { public synchronized void nextBytes(byte[] bytes) {
secureRandomSpi.engineNextBytes(bytes); secureRandomSpi.engineNextBytes(bytes);
} }
@ -484,7 +484,7 @@ public class SecureRandom extends java.util.Random {
* of pseudo-random bits (right justified, with leading zeros). * of pseudo-random bits (right justified, with leading zeros).
*/ */
@Override @Override
final protected int next(int numBits) { protected final int next(int numBits) {
int numBytes = (numBits+7)/8; int numBytes = (numBits+7)/8;
byte[] b = new byte[numBytes]; byte[] b = new byte[numBytes];
int next = 0; int next = 0;

20
jdk/src/java.base/share/classes/java/security/Signature.java
View file

@ -141,19 +141,19 @@ public abstract class Signature extends SignatureSpi {
* Possible {@link #state} value, signifying that * Possible {@link #state} value, signifying that
* this signature object has not yet been initialized. * 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 * Possible {@link #state} value, signifying that
* this signature object has been initialized for signing. * 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 * Possible {@link #state} value, signifying that
* this signature object has been initialized for verification. * 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. * Current state of this signature object.
@ -174,13 +174,13 @@ public abstract class Signature extends SignatureSpi {
} }
// name of the special signature alg // 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 // 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 // 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[] {
new ServiceId("Signature", "NONEwithRSA"), new ServiceId("Signature", "NONEwithRSA"),
new ServiceId("Cipher", "RSA/ECB/PKCS1Padding"), new ServiceId("Cipher", "RSA/ECB/PKCS1Padding"),
@ -263,7 +263,7 @@ public abstract class Signature extends SignatureSpi {
return sig; return sig;
} }
private final static Map<String,Boolean> signatureInfo; private static final Map<String,Boolean> signatureInfo;
static { static {
signatureInfo = new ConcurrentHashMap<>(); signatureInfo = new ConcurrentHashMap<>();
@ -1147,9 +1147,9 @@ public abstract class Signature extends SignatureSpi {
} }
} }
private final static int I_PUB = 1; private static final int I_PUB = 1;
private final static int I_PRIV = 2; private static final int I_PRIV = 2;
private final static int I_PRIV_SR = 3; private static final int I_PRIV_SR = 3;
private void init(SignatureSpi spi, int type, Key key, private void init(SignatureSpi spi, int type, Key key,
SecureRandom random) throws InvalidKeyException { SecureRandom random) throws InvalidKeyException {

2
jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java
View file

@ -299,7 +299,7 @@ public class CertPathBuilder {
* by the {@code certpathbuilder.type} security property, or the string * by the {@code certpathbuilder.type} security property, or the string
* {@literal "PKIX"} if no such property exists. * {@literal "PKIX"} if no such property exists.
*/ */
public final static String getDefaultType() { public static final String getDefaultType() {
String cpbtype = String cpbtype =
AccessController.doPrivileged(new PrivilegedAction<>() { AccessController.doPrivileged(new PrivilegedAction<>() {
public String run() { public String run() {

2
jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java
View file

@ -49,7 +49,7 @@ class CertPathHelperImpl extends CertPathHelper {
* the methods in this class. This ensures that the helper is initialized * the methods in this class. This ensures that the helper is initialized
* prior to a tunneled call from the Sun provider. * prior to a tunneled call from the Sun provider.
*/ */
synchronized static void initialize() { static synchronized void initialize() {
if (CertPathHelper.instance == null) { if (CertPathHelper.instance == null) {
CertPathHelper.instance = new CertPathHelperImpl(); CertPathHelper.instance = new CertPathHelperImpl();
} }

2
jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java
View file

@ -311,7 +311,7 @@ public class CertPathValidator {
* by the {@code certpathvalidator.type} security property, or the string * by the {@code certpathvalidator.type} security property, or the string
* {@literal "PKIX"} if no such property exists. * {@literal "PKIX"} if no such property exists.
*/ */
public final static String getDefaultType() { public static final String getDefaultType() {
String cpvtype = String cpvtype =
AccessController.doPrivileged(new PrivilegedAction<>() { AccessController.doPrivileged(new PrivilegedAction<>() {
public String run() { public String run() {

2
jdk/src/java.base/share/classes/java/security/cert/CertStore.java
View file

@ -407,7 +407,7 @@ public class CertStore {
* {@code certstore.type} security property, or the string * {@code certstore.type} security property, or the string
* {@literal "LDAP"} if no such property exists. * {@literal "LDAP"} if no such property exists.
*/ */
public final static String getDefaultType() { public static final String getDefaultType() {
String cstype; String cstype;
cstype = AccessController.doPrivileged(new PrivilegedAction<>() { cstype = AccessController.doPrivileged(new PrivilegedAction<>() {
public String run() { public String run() {

2
jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java
View file

@ -87,7 +87,7 @@ public class X509CertSelector implements CertSelector {
private static final Debug debug = Debug.getInstance("certpath"); 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}); ObjectIdentifier.newInternal(new int[] {2, 5, 29, 37, 0});
static { static {

6
jdk/src/java.base/share/classes/java/text/AttributedString.java
View file

@ -667,7 +667,7 @@ public class AttributedString {
} }
// returns whether the two objects are either both null or equal // 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) { if (value1 == null) {
return value2 == null; return value2 == null;
} else { } else {
@ -732,7 +732,7 @@ public class AttributedString {
// the iterator class associated with this string class // the iterator class associated with this string class
final private class AttributedStringIterator implements AttributedCharacterIterator { private final class AttributedStringIterator implements AttributedCharacterIterator {
// note on synchronization: // note on synchronization:
// we don't synchronize on the iterator, assuming that an iterator is only used in one thread. // we don't synchronize on the iterator, assuming that an iterator is only used in one thread.
@ -1045,7 +1045,7 @@ public class AttributedString {
// the map class associated with this string class, giving access to the attributes of one run // 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 runIndex;
int beginIndex; int beginIndex;

20
jdk/src/java.base/share/classes/java/text/CollationElementIterator.java
View file

@ -111,7 +111,7 @@ public final class CollationElementIterator
* Null order which indicates the end of string is reached by the * Null order which indicates the end of string is reached by the
* cursor. * cursor.
*/ */
public final static int NULLORDER = 0xffffffff; public static final int NULLORDER = 0xffffffff;
/** /**
* CollationElementIterator constructor. This takes the source string and * CollationElementIterator constructor. This takes the source string and
@ -358,7 +358,7 @@ public final class CollationElementIterator
* @param order the collation element * @param order the collation element
* @return the element's primary component * @return the element's primary component
*/ */
public final static int primaryOrder(int order) public static final int primaryOrder(int order)
{ {
order &= RBCollationTables.PRIMARYORDERMASK; order &= RBCollationTables.PRIMARYORDERMASK;
return (order >>> RBCollationTables.PRIMARYORDERSHIFT); return (order >>> RBCollationTables.PRIMARYORDERSHIFT);
@ -368,7 +368,7 @@ public final class CollationElementIterator
* @param order the collation element * @param order the collation element
* @return the element's secondary component * @return the element's secondary component
*/ */
public final static short secondaryOrder(int order) public static final short secondaryOrder(int order)
{ {
order = order & RBCollationTables.SECONDARYORDERMASK; order = order & RBCollationTables.SECONDARYORDERMASK;
return ((short)(order >> RBCollationTables.SECONDARYORDERSHIFT)); return ((short)(order >> RBCollationTables.SECONDARYORDERSHIFT));
@ -378,7 +378,7 @@ public final class CollationElementIterator
* @param order the collation element * @param order the collation element
* @return the element's tertiary component * @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)); return ((short)(order &= RBCollationTables.TERTIARYORDERMASK));
} }
@ -540,14 +540,14 @@ public final class CollationElementIterator
* Determine if a character is a Thai vowel (which sorts after * Determine if a character is a Thai vowel (which sorts after
* its base consonant). * its base consonant).
*/ */
private final static boolean isThaiPreVowel(int ch) { private static final boolean isThaiPreVowel(int ch) {
return (ch >= 0x0e40) && (ch <= 0x0e44); return (ch >= 0x0e40) && (ch <= 0x0e44);
} }
/** /**
* Determine if a character is a Thai base consonant * 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); return (ch >= 0x0e01) && (ch <= 0x0e2e);
} }
@ -555,14 +555,14 @@ public final class CollationElementIterator
* Determine if a character is a Lao vowel (which sorts after * Determine if a character is a Lao vowel (which sorts after
* its base consonant). * its base consonant).
*/ */
private final static boolean isLaoPreVowel(int ch) { private static final boolean isLaoPreVowel(int ch) {
return (ch >= 0x0ec0) && (ch <= 0x0ec4); return (ch >= 0x0ec0) && (ch <= 0x0ec4);
} }
/** /**
* Determine if a character is a Lao base consonant * 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); return (ch >= 0x0e81) && (ch <= 0x0eae);
} }
@ -634,7 +634,7 @@ public final class CollationElementIterator
* Check if a comparison order is ignorable. * Check if a comparison order is ignorable.
* @return true if a character is ignorable, false otherwise. * @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); return ((primaryOrder(order) == 0) ? true : false);
} }
@ -770,7 +770,7 @@ public final class CollationElementIterator
return order; return order;
} }
final static int UNMAPPEDCHARVALUE = 0x7FFF0000; static final int UNMAPPEDCHARVALUE = 0x7FFF0000;
private NormalizerBase text = null; private NormalizerBase text = null;
private int[] buffer = null; private int[] buffer = null;

6
jdk/src/java.base/share/classes/java/text/CollationKey.java
View file

@ -108,7 +108,7 @@ public abstract class CollationKey implements Comparable<CollationKey> {
* zero if this is greater than target. * zero if this is greater than target.
* @see java.text.Collator#compare * @see java.text.Collator#compare
*/ */
abstract public int compareTo(CollationKey target); public abstract int compareTo(CollationKey target);
/** /**
* Returns the String that this CollationKey represents. * Returns the String that this CollationKey represents.
@ -128,7 +128,7 @@ public abstract class CollationKey implements Comparable<CollationKey> {
* *
* @return a byte array representation of the CollationKey * @return a byte array representation of the CollationKey
*/ */
abstract public byte[] toByteArray(); public abstract byte[] toByteArray();
/** /**
@ -145,5 +145,5 @@ public abstract class CollationKey implements Comparable<CollationKey> {
this.source = source; this.source = source;
} }
final private String source; private final String source;
} }

Some files were not shown because too many files have changed in this diff Show more