diff options
Diffstat (limited to 'src/share/classes/sun')
33 files changed, 135 insertions, 78 deletions
diff --git a/src/share/classes/sun/awt/datatransfer/DataTransferer.java b/src/share/classes/sun/awt/datatransfer/DataTransferer.java index b21dab69a..e1677b9c8 100644 --- a/src/share/classes/sun/awt/datatransfer/DataTransferer.java +++ b/src/share/classes/sun/awt/datatransfer/DataTransferer.java @@ -77,6 +77,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.SortedMap; @@ -273,7 +274,7 @@ public abstract class DataTransferer { * instead, null will be returned. */ public static synchronized DataTransferer getInstance() { - return ((ComponentFactory) Toolkit.getDefaultToolkit()).getDataTransferer(); + return ((SunToolkit) Toolkit.getDefaultToolkit()).getDataTransferer(); } /** @@ -1294,6 +1295,15 @@ search: // bytes and dump them into a byte array. For text flavors, decode back // to a String and recur to reencode according to the requested format. } else if (flavor.isRepresentationClassInputStream()) { + + // Workaround to JDK-8024061: Exception thrown when drag and drop + // between two components is executed quickly. + // and JDK-8065098: JColorChooser no longer supports drag and drop + // between two JVM instances + if (!(obj instanceof InputStream)) { + return new byte[0]; + } + try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) { try (InputStream is = (InputStream)obj) { boolean eof = false; @@ -2424,8 +2434,8 @@ search: * If there are no platform-specific mappings for this native, the method * returns an empty <code>List</code>. */ - public List getPlatformMappingsForNative(String nat) { - return new ArrayList(); + public LinkedHashSet<DataFlavor> getPlatformMappingsForNative(String nat) { + return new LinkedHashSet<>(); } /** @@ -2433,8 +2443,8 @@ search: * If there are no platform-specific mappings for this flavor, the method * returns an empty <code>List</code>. */ - public List getPlatformMappingsForFlavor(DataFlavor df) { - return new ArrayList(); + public LinkedHashSet<String> getPlatformMappingsForFlavor(DataFlavor df) { + return new LinkedHashSet<>(); } /** diff --git a/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java b/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java index b1c89e70b..c81ce90f5 100644 --- a/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java +++ b/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java @@ -239,13 +239,6 @@ public abstract class SunDropTargetContextPeer implements DropTargetContextPeer, if (localTransferable != null) { return localTransferable.getTransferData(df); - } else if (df.isMimeTypeEqual(DataFlavor.javaJVMLocalObjectMimeType)) { - // Workaround to JDK-8024061: Exception thrown when drag and drop - // between two components is executed quickly. - // It is expected localTransferable is not null if javaJVMLocalObjectMimeType - // is used. Executing further results in ClassCastException, so null is - // returned here as no transfer data is available in this case. - return null; } if (dropStatus != STATUS_ACCEPT || dropComplete) { diff --git a/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java b/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java index abc78f210..e40ee731a 100644 --- a/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java +++ b/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java @@ -47,7 +47,7 @@ import sun.java2d.pipe.RenderQueue; import static sun.java2d.pipe.BufferedOpCodes.*; import java.lang.annotation.Native; -class OGLBlitLoops { +final class OGLBlitLoops { static void register() { Blit blitIntArgbPreToSurface = @@ -56,7 +56,9 @@ class OGLBlitLoops { Blit blitIntArgbPreToTexture = new OGLSwToTextureBlit(SurfaceType.IntArgbPre, OGLSurfaceData.PF_INT_ARGB_PRE); - + TransformBlit transformBlitIntArgbPreToSurface = + new OGLSwToSurfaceTransform(SurfaceType.IntArgbPre, + OGLSurfaceData.PF_INT_ARGB_PRE); GraphicsPrimitive[] primitives = { // surface->surface ops new OGLSurfaceToSurfaceBlit(), @@ -100,7 +102,7 @@ class OGLBlitLoops { CompositeType.AnyAlpha, blitIntArgbPreToSurface), - new OGLAnyCompositeBlit(OGLSurfaceData.OpenGLSurface), + new OGLAnyCompositeBlit(), new OGLSwToSurfaceScale(SurfaceType.IntRgb, OGLSurfaceData.PF_INT_RGB), @@ -145,8 +147,9 @@ class OGLBlitLoops { OGLSurfaceData.PF_BYTE_GRAY), new OGLSwToSurfaceTransform(SurfaceType.UshortGray, OGLSurfaceData.PF_USHORT_GRAY), - new OGLSwToSurfaceTransform(SurfaceType.IntArgbPre, - OGLSurfaceData.PF_INT_ARGB_PRE), + transformBlitIntArgbPreToSurface, + + new OGLGeneralTransformedBlit(transformBlitIntArgbPreToSurface), // texture->surface ops new OGLTextureToSurfaceBlit(), @@ -178,9 +181,6 @@ class OGLBlitLoops { new OGLGeneralBlit(OGLSurfaceData.OpenGLTexture, CompositeType.SrcNoEa, blitIntArgbPreToTexture), - - new OGLAnyCompositeBlit(OGLSurfaceData.OpenGLTexture), - }; GraphicsPrimitiveMgr.register(primitives); } @@ -781,11 +781,11 @@ class OGLTextureToSurfaceTransform extends TransformBlit { * This general Blit implementation converts any source surface to an * intermediate IntArgbPre surface, and then uses the more specific * IntArgbPre->OpenGLSurface/Texture loop to get the intermediate - * (premultiplied) surface down to OpenGL. + * (premultiplied) surface down to OpenGL using simple blit. */ class OGLGeneralBlit extends Blit { - private Blit performop; + private final Blit performop; private WeakReference srcTmp; OGLGeneralBlit(SurfaceType dstType, @@ -826,12 +826,56 @@ class OGLGeneralBlit extends Blit { } } -class OGLAnyCompositeBlit extends Blit { +/** + * This general TransformedBlit implementation converts any source surface to an + * intermediate IntArgbPre surface, and then uses the more specific + * IntArgbPre->OpenGLSurface/Texture loop to get the intermediate + * (premultiplied) surface down to OpenGL using simple transformBlit. + */ +final class OGLGeneralTransformedBlit extends TransformBlit { + + private final TransformBlit performop; + private WeakReference<SurfaceData> srcTmp; + + OGLGeneralTransformedBlit(final TransformBlit performop) { + super(SurfaceType.Any, CompositeType.AnyAlpha, + OGLSurfaceData.OpenGLSurface); + this.performop = performop; + } + + @Override + public synchronized void Transform(SurfaceData src, SurfaceData dst, + Composite comp, Region clip, + AffineTransform at, int hint, int srcx, + int srcy, int dstx, int dsty, int width, + int height){ + Blit convertsrc = Blit.getFromCache(src.getSurfaceType(), + CompositeType.SrcNoEa, + SurfaceType.IntArgbPre); + // use cached intermediate surface, if available + final SurfaceData cachedSrc = srcTmp != null ? srcTmp.get() : null; + // convert source to IntArgbPre + src = convertFrom(convertsrc, src, srcx, srcy, width, height, cachedSrc, + BufferedImage.TYPE_INT_ARGB_PRE); + + // transform IntArgbPre intermediate surface to OpenGL surface + performop.Transform(src, dst, comp, clip, at, hint, 0, 0, dstx, dsty, + width, height); + + if (src != cachedSrc) { + // cache the intermediate surface + srcTmp = new WeakReference<>(src); + } + } +} + +final class OGLAnyCompositeBlit extends Blit { private WeakReference<SurfaceData> dstTmp; - public OGLAnyCompositeBlit(SurfaceType dstType) { - super(SurfaceType.Any, CompositeType.Any, dstType); + OGLAnyCompositeBlit() { + super(SurfaceType.Any, CompositeType.Any, OGLSurfaceData.OpenGLSurface); } + public synchronized void Blit(SurfaceData src, SurfaceData dst, Composite comp, Region clip, int sx, int sy, int dx, int dy, @@ -848,15 +892,15 @@ class OGLAnyCompositeBlit extends Blit { cachedDst = dstTmp.get(); } - // convert source to IntArgbPre + // convert destination to IntArgbPre SurfaceData dstBuffer = convertFrom(convertdst, dst, dx, dy, w, h, cachedDst, BufferedImage.TYPE_INT_ARGB_PRE); + Region bufferClip = + clip == null ? null : clip.getTranslatedRegion(-dx, -dy); Blit performop = Blit.getFromCache(src.getSurfaceType(), CompositeType.Any, dstBuffer.getSurfaceType()); - - performop.Blit(src, dstBuffer, comp, clip, - sx, sy, 0, 0, w, h); + performop.Blit(src, dstBuffer, comp, bufferClip, sx, sy, 0, 0, w, h); if (dstBuffer != cachedDst) { // cache the intermediate surface diff --git a/src/share/classes/sun/java2d/pipe/DrawImage.java b/src/share/classes/sun/java2d/pipe/DrawImage.java index d27ee470f..6b10d247e 100644 --- a/src/share/classes/sun/java2d/pipe/DrawImage.java +++ b/src/share/classes/sun/java2d/pipe/DrawImage.java @@ -510,7 +510,7 @@ public class DrawImage implements DrawImagePipe // We need to transform to a temp image and then copy // just the pieces that are valid data to the dest. BufferedImage tmpimg = new BufferedImage(dx2-dx1, dy2-dy1, - BufferedImage.TYPE_INT_ARGB); + BufferedImage.TYPE_INT_ARGB_PRE); SurfaceData tmpData = SurfaceData.getPrimarySurfaceData(tmpimg); SurfaceType tmpType = tmpData.getSurfaceType(); MaskBlit tmpmaskblit = diff --git a/src/share/classes/sun/management/Flag.java b/src/share/classes/sun/management/Flag.java index 6bb1bf664..6c040ad9e 100644 --- a/src/share/classes/sun/management/Flag.java +++ b/src/share/classes/sun/management/Flag.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ package sun.management; import java.util.*; import com.sun.management.VMOption; import com.sun.management.VMOption.Origin; +import java.security.AccessController; /** * Flag class is a helper class for constructing a VMOption. @@ -114,6 +115,13 @@ class Flag { static synchronized native void setStringValue(String name, String value); static { + AccessController.doPrivileged( + new java.security.PrivilegedAction<Void>() { + public Void run() { + System.loadLibrary("management"); + return null; + } + }); initialize(); } private static native void initialize(); diff --git a/src/share/classes/sun/net/www/http/HttpClient.java b/src/share/classes/sun/net/www/http/HttpClient.java index 3013da01d..723a56bad 100644 --- a/src/share/classes/sun/net/www/http/HttpClient.java +++ b/src/share/classes/sun/net/www/http/HttpClient.java @@ -657,9 +657,10 @@ public class HttpClient extends NetworkClient { cachedHttpClient = false; if (!failedOnce && requests != null) { failedOnce = true; - if (getRequestMethod().equals("CONNECT") || - (httpuc.getRequestMethod().equals("POST") && - (!retryPostProp || streaming))) { + if (getRequestMethod().equals("CONNECT") + || streaming + || (httpuc.getRequestMethod().equals("POST") + && !retryPostProp)) { // do not retry the request } else { // try once more @@ -769,9 +770,10 @@ public class HttpClient extends NetworkClient { } else if (nread != 8) { if (!failedOnce && requests != null) { failedOnce = true; - if (getRequestMethod().equals("CONNECT") || - (httpuc.getRequestMethod().equals("POST") && - (!retryPostProp || streaming))) { + if (getRequestMethod().equals("CONNECT") + || streaming + || (httpuc.getRequestMethod().equals("POST") + && !retryPostProp)) { // do not retry the request } else { closeServer(); diff --git a/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java b/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java index 9c8e83359..d44fc8904 100644 --- a/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java +++ b/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java @@ -32,7 +32,7 @@ import java.lang.reflect.Constructor; bootstrapping. */ class BootstrapConstructorAccessorImpl extends ConstructorAccessorImpl { - private Constructor<?> constructor; + private final Constructor<?> constructor; BootstrapConstructorAccessorImpl(Constructor<?> c) { this.constructor = c; diff --git a/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java b/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java index 08f921f82..854febe7b 100644 --- a/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java +++ b/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java @@ -33,7 +33,7 @@ import java.lang.reflect.InvocationTargetException; class InstantiationExceptionConstructorAccessorImpl extends ConstructorAccessorImpl { - private String message; + private final String message; InstantiationExceptionConstructorAccessorImpl(String message) { this.message = message; diff --git a/src/share/classes/sun/reflect/Label.java b/src/share/classes/sun/reflect/Label.java index 53c912d18..4caa3b40a 100644 --- a/src/share/classes/sun/reflect/Label.java +++ b/src/share/classes/sun/reflect/Label.java @@ -47,10 +47,10 @@ class Label { } // This won't work for more than one assembler anyway, so this is // unnecessary - ClassFileAssembler asm; - short instrBCI; - short patchBCI; - int stackDepth; + final ClassFileAssembler asm; + final short instrBCI; + final short patchBCI; + final int stackDepth; } private List<PatchInfo> patches = new ArrayList<>(); diff --git a/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java b/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java index d56c3caab..171521dd2 100644 --- a/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java +++ b/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java @@ -32,7 +32,7 @@ import sun.reflect.misc.ReflectUtil; afterward, switches to bytecode-based implementation */ class NativeConstructorAccessorImpl extends ConstructorAccessorImpl { - private Constructor<?> c; + private final Constructor<?> c; private DelegatingConstructorAccessorImpl parent; private int numInvocations; diff --git a/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java b/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java index b1d39e7c9..a33670fe8 100644 --- a/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java +++ b/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java @@ -32,7 +32,7 @@ import sun.reflect.misc.ReflectUtil; switches to bytecode-based implementation */ class NativeMethodAccessorImpl extends MethodAccessorImpl { - private Method method; + private final Method method; private DelegatingMethodAccessorImpl parent; private int numInvocations; diff --git a/src/share/classes/sun/reflect/ReflectionFactory.java b/src/share/classes/sun/reflect/ReflectionFactory.java index 0dbada7d5..dc26fab81 100644 --- a/src/share/classes/sun/reflect/ReflectionFactory.java +++ b/src/share/classes/sun/reflect/ReflectionFactory.java @@ -50,9 +50,9 @@ import sun.reflect.misc.ReflectUtil; public class ReflectionFactory { private static boolean initted = false; - private static Permission reflectionFactoryAccessPerm + private static final Permission reflectionFactoryAccessPerm = new RuntimePermission("reflectionFactoryAccess"); - private static ReflectionFactory soleInstance = new ReflectionFactory(); + private static final ReflectionFactory soleInstance = new ReflectionFactory(); // Provides access to package-private mechanisms in java.lang.reflect private static volatile LangReflectAccess langReflectAccess; diff --git a/src/share/classes/sun/reflect/SignatureIterator.java b/src/share/classes/sun/reflect/SignatureIterator.java index 7b4ac45cb..ea7fd3c80 100644 --- a/src/share/classes/sun/reflect/SignatureIterator.java +++ b/src/share/classes/sun/reflect/SignatureIterator.java @@ -28,7 +28,7 @@ package sun.reflect; /** Assists in iterating down a method's signature */ public class SignatureIterator { - private String sig; + private final String sig; private int idx; public SignatureIterator(String sig) { diff --git a/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java b/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java index 423a0ebf3..7520403ff 100644 --- a/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java +++ b/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java @@ -34,7 +34,7 @@ import java.util.Objects; */ public class GenericArrayTypeImpl implements GenericArrayType { - private Type genericComponentType; + private final Type genericComponentType; // private constructor enforces use of static factory private GenericArrayTypeImpl(Type ct) { diff --git a/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java b/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java index 7e80afb72..1addbcc9c 100644 --- a/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java +++ b/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java @@ -38,9 +38,9 @@ import java.util.Objects; /** Implementing class for ParameterizedType interface. */ public class ParameterizedTypeImpl implements ParameterizedType { - private Type[] actualTypeArguments; - private Class<?> rawType; - private Type ownerType; + private final Type[] actualTypeArguments; + private final Class<?> rawType; + private final Type ownerType; private ParameterizedTypeImpl(Class<?> rawType, Type[] actualTypeArguments, diff --git a/src/share/classes/sun/reflect/generics/scope/DummyScope.java b/src/share/classes/sun/reflect/generics/scope/DummyScope.java index 3370c9f3b..8a012dc33 100644 --- a/src/share/classes/sun/reflect/generics/scope/DummyScope.java +++ b/src/share/classes/sun/reflect/generics/scope/DummyScope.java @@ -38,7 +38,7 @@ import java.lang.reflect.TypeVariable; public class DummyScope implements Scope { // Caches the unique instance of this class; instances contain no data // so we can use the singleton pattern - private static DummyScope singleton = new DummyScope(); + private static final DummyScope singleton = new DummyScope(); // constructor is private to enforce use of factory method private DummyScope(){} diff --git a/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java b/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java index b6606d2fb..ba0a0d416 100644 --- a/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java @@ -28,7 +28,7 @@ package sun.reflect.generics.tree; import sun.reflect.generics.visitor.TypeTreeVisitor; public class ArrayTypeSignature implements FieldTypeSignature { - private TypeSignature componentType; + private final TypeSignature componentType; private ArrayTypeSignature(TypeSignature ct) {componentType = ct;} diff --git a/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java b/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java index 5e3b8a3e4..133c7e191 100644 --- a/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java @@ -29,7 +29,7 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; /** AST that represents the type boolean. */ public class BooleanSignature implements BaseType { - private static BooleanSignature singleton = new BooleanSignature(); + private static final BooleanSignature singleton = new BooleanSignature(); private BooleanSignature(){} diff --git a/src/share/classes/sun/reflect/generics/tree/BottomSignature.java b/src/share/classes/sun/reflect/generics/tree/BottomSignature.java index b0aaedb2f..0fbbe2ea5 100644 --- a/src/share/classes/sun/reflect/generics/tree/BottomSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/BottomSignature.java @@ -28,7 +28,7 @@ package sun.reflect.generics.tree; import sun.reflect.generics.visitor.TypeTreeVisitor; public class BottomSignature implements FieldTypeSignature { - private static BottomSignature singleton = new BottomSignature(); + private static final BottomSignature singleton = new BottomSignature(); private BottomSignature(){} diff --git a/src/share/classes/sun/reflect/generics/tree/ByteSignature.java b/src/share/classes/sun/reflect/generics/tree/ByteSignature.java index 47b64f903..5335782fc 100644 --- a/src/share/classes/sun/reflect/generics/tree/ByteSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/ByteSignature.java @@ -29,7 +29,7 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; /** AST that represents the type byte. */ public class ByteSignature implements BaseType { - private static ByteSignature singleton = new ByteSignature(); + private static final ByteSignature singleton = new ByteSignature(); private ByteSignature(){} diff --git a/src/share/classes/sun/reflect/generics/tree/CharSignature.java b/src/share/classes/sun/reflect/generics/tree/CharSignature.java index 365c36108..44766a577 100644 --- a/src/share/classes/sun/reflect/generics/tree/CharSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/CharSignature.java @@ -29,7 +29,7 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; /** AST that represents the type char. */ public class CharSignature implements BaseType { - private static CharSignature singleton = new CharSignature(); + private static final CharSignature singleton = new CharSignature(); private CharSignature(){} diff --git a/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java b/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java index f16622bf6..320764a4f 100644 --- a/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java @@ -33,7 +33,7 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; * AST representing class types. */ public class ClassTypeSignature implements FieldTypeSignature { - private List<SimpleClassTypeSignature> path; + private final List<SimpleClassTypeSignature> path; private ClassTypeSignature(List<SimpleClassTypeSignature> p) { diff --git a/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java b/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java index 533d43e54..a394228eb 100644 --- a/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java @@ -29,7 +29,7 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; /** AST that represents the type double. */ public class DoubleSignature implements BaseType { - private static DoubleSignature singleton = new DoubleSignature(); + private static final DoubleSignature singleton = new DoubleSignature(); private DoubleSignature(){} diff --git a/src/share/classes/sun/reflect/generics/tree/FloatSignature.java b/src/share/classes/sun/reflect/generics/tree/FloatSignature.java index 61f8f45cc..70bf8c5c3 100644 --- a/src/share/classes/sun/reflect/generics/tree/FloatSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/FloatSignature.java @@ -29,7 +29,7 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; /** AST that represents the type float. */ public class FloatSignature implements BaseType { - private static FloatSignature singleton = new FloatSignature(); + private static final FloatSignature singleton = new FloatSignature(); private FloatSignature(){} diff --git a/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java b/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java index 262cdb3d5..c25c41797 100644 --- a/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java +++ b/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java @@ -29,8 +29,8 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; /** AST that represents a formal type parameter. */ public class FormalTypeParameter implements TypeTree { - private String name; - private FieldTypeSignature[] bounds; + private final String name; + private final FieldTypeSignature[] bounds; private FormalTypeParameter(String n, FieldTypeSignature[] bs) { name = n; diff --git a/src/share/classes/sun/reflect/generics/tree/IntSignature.java b/src/share/classes/sun/reflect/generics/tree/IntSignature.java index e622b2350..e1d3a4439 100644 --- a/src/share/classes/sun/reflect/generics/tree/IntSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/IntSignature.java @@ -29,7 +29,7 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; /** AST that represents the type int. */ public class IntSignature implements BaseType { - private static IntSignature singleton = new IntSignature(); + private static final IntSignature singleton = new IntSignature(); private IntSignature(){} diff --git a/src/share/classes/sun/reflect/generics/tree/LongSignature.java b/src/share/classes/sun/reflect/generics/tree/LongSignature.java index a730a983c..13eef0596 100644 --- a/src/share/classes/sun/reflect/generics/tree/LongSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/LongSignature.java @@ -29,7 +29,7 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; /** AST that represents the type long. */ public class LongSignature implements BaseType { - private static LongSignature singleton = new LongSignature(); + private static final LongSignature singleton = new LongSignature(); private LongSignature(){} diff --git a/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java b/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java index 2d4bc1947..efbda03bf 100644 --- a/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java @@ -28,10 +28,10 @@ package sun.reflect.generics.tree; import sun.reflect.generics.visitor.Visitor; public class MethodTypeSignature implements Signature { - private FormalTypeParameter[] formalTypeParams; - private TypeSignature[] parameterTypes; - private ReturnType returnType; - private FieldTypeSignature[] exceptionTypes; + private final FormalTypeParameter[] formalTypeParams; + private final TypeSignature[] parameterTypes; + private final ReturnType returnType; + private final FieldTypeSignature[] exceptionTypes; private MethodTypeSignature(FormalTypeParameter[] ftps, TypeSignature[] pts, diff --git a/src/share/classes/sun/reflect/generics/tree/ShortSignature.java b/src/share/classes/sun/reflect/generics/tree/ShortSignature.java index ccdadcf0a..374f6fba8 100644 --- a/src/share/classes/sun/reflect/generics/tree/ShortSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/ShortSignature.java @@ -29,7 +29,7 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; /** AST that represents the type short. */ public class ShortSignature implements BaseType { - private static ShortSignature singleton = new ShortSignature(); + private static final ShortSignature singleton = new ShortSignature(); private ShortSignature(){} diff --git a/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java b/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java index 45ba803cf..8c287018f 100644 --- a/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java @@ -28,9 +28,9 @@ package sun.reflect.generics.tree; import sun.reflect.generics.visitor.TypeTreeVisitor; public class SimpleClassTypeSignature implements FieldTypeSignature { - private boolean dollar; - private String name; - private TypeArgument[] typeArgs; + private final boolean dollar; + private final String name; + private final TypeArgument[] typeArgs; private SimpleClassTypeSignature(String n, boolean dollar, TypeArgument[] tas) { name = n; diff --git a/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java b/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java index 68e46e546..9f1196586 100644 --- a/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java +++ b/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java @@ -28,7 +28,7 @@ package sun.reflect.generics.tree; import sun.reflect.generics.visitor.TypeTreeVisitor; public class TypeVariableSignature implements FieldTypeSignature { - private String identifier; + private final String identifier; private TypeVariableSignature(String id) {identifier = id;} diff --git a/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java b/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java index d685c60c6..5544ebc6b 100644 --- a/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java +++ b/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java @@ -30,7 +30,7 @@ import sun.reflect.generics.visitor.TypeTreeVisitor; /** AST that represents the pseudo-type void. */ public class VoidDescriptor implements ReturnType { - private static VoidDescriptor singleton = new VoidDescriptor(); + private static final VoidDescriptor singleton = new VoidDescriptor(); private VoidDescriptor(){} diff --git a/src/share/classes/sun/reflect/misc/MethodUtil.java b/src/share/classes/sun/reflect/misc/MethodUtil.java index b49ed0a65..ebe802b60 100644 --- a/src/share/classes/sun/reflect/misc/MethodUtil.java +++ b/src/share/classes/sun/reflect/misc/MethodUtil.java @@ -76,9 +76,9 @@ class Trampoline { * Create a trampoline class. */ public final class MethodUtil extends SecureClassLoader { - private static String MISC_PKG = "sun.reflect.misc."; - private static String TRAMPOLINE = MISC_PKG + "Trampoline"; - private static Method bounce = getTrampoline(); + private static final String MISC_PKG = "sun.reflect.misc."; + private static final String TRAMPOLINE = MISC_PKG + "Trampoline"; + private static final Method bounce = getTrampoline(); private MethodUtil() { super(); |