6521783: Unnecessary final modifier for a method in a final class
Reviewed-by: pchelko, prr
--- a/jdk/src/macosx/classes/apple/laf/JRSUIControl.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/macosx/classes/apple/laf/JRSUIControl.java Thu Jul 24 17:36:56 2014 +0400
@@ -114,7 +114,7 @@
changes.putAll(other.changes);
}
- protected synchronized final void finalize() throws Throwable {
+ protected synchronized void finalize() throws Throwable {
if (cfDictionaryPtr == 0) return;
disposeCFDictionary(cfDictionaryPtr);
cfDictionaryPtr = 0;
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java Thu Jul 24 17:36:56 2014 +0400
@@ -54,11 +54,11 @@
return "" + fNSPrintInfo;
}
- public final Class<? extends Attribute> getCategory() {
+ public Class<? extends Attribute> getCategory() {
return NSPrintInfo.class;
}
- public final String getName() {
+ public String getName() {
return "nsPrintInfo";
}
}
--- a/jdk/src/share/classes/com/sun/media/sound/FFT.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/com/sun/media/sound/FFT.java Thu Jul 24 17:36:56 2014 +0400
@@ -68,7 +68,7 @@
calc(fftFrameSize, data, sign, w);
}
- private final static double[] computeTwiddleFactors(int fftFrameSize,
+ private static double[] computeTwiddleFactors(int fftFrameSize,
int sign) {
int imax = (int) (Math.log(fftFrameSize) / Math.log(2.));
@@ -122,7 +122,7 @@
return warray;
}
- private final static void calc(int fftFrameSize, double[] data, int sign,
+ private static void calc(int fftFrameSize, double[] data, int sign,
double[] w) {
final int fftFrameSize2 = fftFrameSize << 1;
@@ -139,7 +139,7 @@
}
- private final static void calcF2E(int fftFrameSize, double[] data, int i,
+ private static void calcF2E(int fftFrameSize, double[] data, int i,
int nstep, double[] w) {
int jmax = nstep;
for (int n = 0; n < jmax; n += 2) {
@@ -163,7 +163,7 @@
// Perform Factor-4 Decomposition with 3 * complex operators and 8 +/-
// complex operators
- private final static void calcF4F(int fftFrameSize, double[] data, int i,
+ private static void calcF4F(int fftFrameSize, double[] data, int i,
int nstep, double[] w) {
final int fftFrameSize2 = fftFrameSize << 1; // 2*fftFrameSize;
// Factor-4 Decomposition
@@ -331,7 +331,7 @@
// Perform Factor-4 Decomposition with 3 * complex operators and 8 +/-
// complex operators
- private final static void calcF4I(int fftFrameSize, double[] data, int i,
+ private static void calcF4I(int fftFrameSize, double[] data, int i,
int nstep, double[] w) {
final int fftFrameSize2 = fftFrameSize << 1; // 2*fftFrameSize;
// Factor-4 Decomposition
@@ -499,7 +499,7 @@
// Perform Factor-4 Decomposition with 3 * complex operators and 8 +/-
// complex operators
- private final static void calcF4FE(int fftFrameSize, double[] data, int i,
+ private static void calcF4FE(int fftFrameSize, double[] data, int i,
int nstep, double[] w) {
final int fftFrameSize2 = fftFrameSize << 1; // 2*fftFrameSize;
// Factor-4 Decomposition
@@ -593,7 +593,7 @@
// Perform Factor-4 Decomposition with 3 * complex operators and 8 +/-
// complex operators
- private final static void calcF4IE(int fftFrameSize, double[] data, int i,
+ private static void calcF4IE(int fftFrameSize, double[] data, int i,
int nstep, double[] w) {
final int fftFrameSize2 = fftFrameSize << 1; // 2*fftFrameSize;
// Factor-4 Decomposition
@@ -685,7 +685,7 @@
}
- private final void bitreversal(double[] data) {
+ private void bitreversal(double[] data) {
if (fftFrameSize < 4)
return;
--- a/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java Thu Jul 24 17:36:56 2014 +0400
@@ -147,11 +147,11 @@
}
}
- public final void readFully(byte b[]) throws IOException {
+ public void readFully(byte b[]) throws IOException {
readFully(b, 0, b.length);
}
- public final void readFully(byte b[], int off, int len) throws IOException {
+ public void readFully(byte b[], int off, int len) throws IOException {
if (len < 0)
throw new IndexOutOfBoundsException();
while (len > 0) {
@@ -165,7 +165,7 @@
}
}
- public final long skipBytes(long n) throws IOException {
+ public long skipBytes(long n) throws IOException {
if (n < 0)
return 0;
long skipped = 0;
--- a/jdk/src/share/classes/java/awt/font/TextLayout.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/java/awt/font/TextLayout.java Thu Jul 24 17:36:56 2014 +0400
@@ -1811,7 +1811,7 @@
* should be logical or visual counterparts. They are not
* checked for validity.
*/
- private final TextHitInfo getStrongHit(TextHitInfo hit1, TextHitInfo hit2) {
+ private TextHitInfo getStrongHit(TextHitInfo hit1, TextHitInfo hit2) {
// right now we're using the following rule for strong hits:
// A hit on a character with a lower level
--- a/jdk/src/share/classes/java/beans/PropertyChangeSupport.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/java/beans/PropertyChangeSupport.java Thu Jul 24 17:36:56 2014 +0400
@@ -544,7 +544,7 @@
/**
* {@inheritDoc}
*/
- public final PropertyChangeListener extract(PropertyChangeListener listener) {
+ public PropertyChangeListener extract(PropertyChangeListener listener) {
while (listener instanceof PropertyChangeListenerProxy) {
listener = ((PropertyChangeListenerProxy) listener).getListener();
}
--- a/jdk/src/share/classes/java/beans/VetoableChangeSupport.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/java/beans/VetoableChangeSupport.java Thu Jul 24 17:36:56 2014 +0400
@@ -533,7 +533,7 @@
/**
* {@inheritDoc}
*/
- public final VetoableChangeListener extract(VetoableChangeListener listener) {
+ public VetoableChangeListener extract(VetoableChangeListener listener) {
while (listener instanceof VetoableChangeListenerProxy) {
listener = ((VetoableChangeListenerProxy) listener).getListener();
}
--- a/jdk/src/share/classes/javax/swing/event/SwingPropertyChangeSupport.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/javax/swing/event/SwingPropertyChangeSupport.java Thu Jul 24 17:36:56 2014 +0400
@@ -107,7 +107,7 @@
* @see #SwingPropertyChangeSupport(Object sourceBean, boolean notifyOnEDT)
* @since 1.6
*/
- public final boolean isNotifyOnEDT() {
+ public boolean isNotifyOnEDT() {
return notifyOnEDT;
}
--- a/jdk/src/share/classes/javax/swing/text/GapContent.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/javax/swing/text/GapContent.java Thu Jul 24 17:36:56 2014 +0400
@@ -280,7 +280,7 @@
* is held by the mark, so it is adjusted according
* to it's relationship to the gap.
*/
- public final int getOffset() {
+ public int getOffset() {
int g0 = getGapStart();
int g1 = getGapEnd();
int offs = (index < g0) ? index : index - (g1 - g0);
@@ -302,7 +302,7 @@
this.mark = mark;
}
- public final int getOffset() {
+ public int getOffset() {
return mark.getOffset();
}
--- a/jdk/src/share/classes/sun/awt/AWTAutoShutdown.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/awt/AWTAutoShutdown.java Thu Jul 24 17:36:56 2014 +0400
@@ -354,7 +354,7 @@
}
}
- final void registerPeer(final Object target, final Object peer) {
+ void registerPeer(final Object target, final Object peer) {
synchronized (activationLock) {
synchronized (mainLock) {
peerMap.put(target, peer);
@@ -363,7 +363,7 @@
}
}
- final void unregisterPeer(final Object target, final Object peer) {
+ void unregisterPeer(final Object target, final Object peer) {
synchronized (activationLock) {
synchronized (mainLock) {
if (peerMap.get(target) == peer) {
@@ -374,7 +374,7 @@
}
}
- final Object getPeer(final Object target) {
+ Object getPeer(final Object target) {
synchronized (activationLock) {
synchronized (mainLock) {
return peerMap.get(target);
@@ -382,7 +382,7 @@
}
}
- final void dumpPeers(final PlatformLogger aLog) {
+ void dumpPeers(final PlatformLogger aLog) {
if (aLog.isLoggable(PlatformLogger.Level.FINE)) {
synchronized (activationLock) {
synchronized (mainLock) {
--- a/jdk/src/share/classes/sun/awt/AppContext.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/awt/AppContext.java Thu Jul 24 17:36:56 2014 +0400
@@ -259,7 +259,7 @@
private static final ThreadLocal<AppContext> threadAppContext =
new ThreadLocal<AppContext>();
- private final static void initMainAppContext() {
+ private static void initMainAppContext() {
// On the main Thread, we get the ThreadGroup, make a corresponding
// AppContext, and instantiate the Java EventQueue. This way, legacy
// code is unaffected by the move to multiple AppContext ability.
@@ -291,7 +291,7 @@
* @see java.lang.ThreadGroup
* @since 1.2
*/
- public final static AppContext getAppContext() {
+ public static AppContext getAppContext() {
// we are standalone app, return the main app context
if (numAppContexts.get() == 1 && mainAppContext != null) {
return mainAppContext;
@@ -375,11 +375,11 @@
* @return true if the specified AppContext is the main AppContext.
* @since 1.8
*/
- public final static boolean isMainContext(AppContext ctx) {
+ public static boolean isMainContext(AppContext ctx) {
return (ctx != null && ctx == mainAppContext);
}
- private final static AppContext getExecutionAppContext() {
+ private static AppContext getExecutionAppContext() {
SecurityManager securityManager = System.getSecurityManager();
if ((securityManager != null) &&
(securityManager instanceof AWTSecurityManager))
--- a/jdk/src/share/classes/sun/awt/geom/Crossings.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/awt/geom/Crossings.java Thu Jul 24 17:36:56 2014 +0400
@@ -312,7 +312,7 @@
super(xlo, ylo, xhi, yhi);
}
- public final boolean covers(double ystart, double yend) {
+ public boolean covers(double ystart, double yend) {
return (limit == 2 && yranges[0] <= ystart && yranges[1] >= yend);
}
@@ -398,7 +398,7 @@
crosscounts = new int[yranges.length / 2];
}
- public final boolean covers(double ystart, double yend) {
+ public boolean covers(double ystart, double yend) {
int i = 0;
while (i < limit) {
double ylo = yranges[i++];
--- a/jdk/src/share/classes/sun/font/CompositeGlyphMapper.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/font/CompositeGlyphMapper.java Thu Jul 24 17:36:56 2014 +0400
@@ -67,11 +67,11 @@
compFont.maxIndices != null;
}
- public final int compositeGlyphCode(int slot, int glyphCode) {
+ public int compositeGlyphCode(int slot, int glyphCode) {
return (slot << 24 | (glyphCode & GLYPHMASK));
}
- private final void initMapper() {
+ private void initMapper() {
if (missingGlyph == CharToGlyphMapper.UNINITIALIZED_GLYPH) {
if (glyphMaps == null) {
glyphMaps = new int[NBLOCKS][];
@@ -108,7 +108,7 @@
glyphMaps[index0][unicode & 0xff] = glyphCode;
}
- private final CharToGlyphMapper getSlotMapper(int slot) {
+ private CharToGlyphMapper getSlotMapper(int slot) {
CharToGlyphMapper mapper = slotMappers[slot];
if (mapper == null) {
mapper = font.getSlotFont(slot).getMapper();
@@ -117,7 +117,7 @@
return mapper;
}
- private final int convertToGlyph(int unicode) {
+ private int convertToGlyph(int unicode) {
for (int slot = 0; slot < font.numSlots; slot++) {
if (!hasExcludes || !font.isExcludedChar(slot, unicode)) {
--- a/jdk/src/share/classes/sun/font/CoreMetrics.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/font/CoreMetrics.java Thu Jul 24 17:36:56 2014 +0400
@@ -66,11 +66,11 @@
return ((FontLineMetrics)lm).cm;
}
- public final int hashCode() {
+ public int hashCode() {
return Float.floatToIntBits(ascent + ssOffset);
}
- public final boolean equals(Object rhs) {
+ public boolean equals(Object rhs) {
try {
return equals((CoreMetrics)rhs);
}
@@ -79,7 +79,7 @@
}
}
- public final boolean equals(CoreMetrics rhs) {
+ public boolean equals(CoreMetrics rhs) {
if (rhs != null) {
if (this == rhs) {
return true;
@@ -105,7 +105,7 @@
// fullOffsets is an array of 5 baseline offsets,
// roman, center, hanging, bottom, and top in that order
// this does NOT add the ssOffset
- public final float effectiveBaselineOffset(float[] fullOffsets) {
+ public float effectiveBaselineOffset(float[] fullOffsets) {
switch (baselineIndex) {
case GraphicAttribute.TOP_ALIGNMENT:
return fullOffsets[4] + ascent;
--- a/jdk/src/share/classes/sun/font/FontLineMetrics.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/font/FontLineMetrics.java Thu Jul 24 17:36:56 2014 +0400
@@ -50,55 +50,55 @@
this.frc = frc;
}
- public final int getNumChars() {
+ public int getNumChars() {
return numchars;
}
- public final float getAscent() {
+ public float getAscent() {
return cm.ascent;
}
- public final float getDescent() {
+ public float getDescent() {
return cm.descent;
}
- public final float getLeading() {
+ public float getLeading() {
return cm.leading;
}
- public final float getHeight() {
+ public float getHeight() {
return cm.height;
}
- public final int getBaselineIndex() {
+ public int getBaselineIndex() {
return cm.baselineIndex;
}
- public final float[] getBaselineOffsets() {
+ public float[] getBaselineOffsets() {
return cm.baselineOffsets.clone();
}
- public final float getStrikethroughOffset() {
+ public float getStrikethroughOffset() {
return cm.strikethroughOffset;
}
- public final float getStrikethroughThickness() {
+ public float getStrikethroughThickness() {
return cm.strikethroughThickness;
}
- public final float getUnderlineOffset() {
+ public float getUnderlineOffset() {
return cm.underlineOffset;
}
- public final float getUnderlineThickness() {
+ public float getUnderlineThickness() {
return cm.underlineThickness;
}
- public final int hashCode() {
+ public int hashCode() {
return cm.hashCode();
}
- public final boolean equals(Object rhs) {
+ public boolean equals(Object rhs) {
try {
return cm.equals(((FontLineMetrics)rhs).cm);
}
@@ -107,7 +107,7 @@
}
}
- public final Object clone() {
+ public Object clone() {
// frc, cm do not need deep clone
try {
return super.clone();
--- a/jdk/src/share/classes/sun/font/FontRunIterator.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/font/FontRunIterator.java Thu Jul 24 17:36:56 2014 +0400
@@ -140,11 +140,11 @@
static final int DONE = -1;
- final int nextCodePoint() {
+ int nextCodePoint() {
return nextCodePoint(limit);
}
- final int nextCodePoint(int lim) {
+ int nextCodePoint(int lim) {
if (pos >= lim) {
return DONE;
}
@@ -159,7 +159,7 @@
return ch;
}
- final void pushback(int ch) {
+ void pushback(int ch) {
if (ch >= 0) {
if (ch >= 0x10000) {
pos -= 2;
--- a/jdk/src/share/classes/sun/font/GlyphList.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/font/GlyphList.java Thu Jul 24 17:36:56 2014 +0400
@@ -262,7 +262,7 @@
return mapChars(info, len);
}
- private final boolean mapChars(FontInfo info, int len) {
+ private boolean mapChars(FontInfo info, int len) {
/* REMIND.Is it worthwhile for the iteration to convert
* chars to glyph ids to directly map to images?
*/
--- a/jdk/src/share/classes/sun/font/ScriptRun.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/font/ScriptRun.java Thu Jul 24 17:36:56 2014 +0400
@@ -121,7 +121,7 @@
*
* @return the index of the first character in the current script run.
*/
- public final int getScriptStart() {
+ public int getScriptStart() {
return scriptStart;
}
@@ -130,7 +130,7 @@
*
* @return the index of the first character after the current script run.
*/
- public final int getScriptLimit() {
+ public int getScriptLimit() {
return scriptLimit;
}
@@ -140,7 +140,7 @@
* @return the script code for the script of the current script run.
* @see #Script
*/
- public final int getScriptCode() {
+ public int getScriptCode() {
return scriptCode;
}
@@ -150,7 +150,7 @@
*
* @return <code>false</code> if there isn't another run, <code>true</code> if there is.
*/
- public final boolean next() {
+ public boolean next() {
int startSP = parenSP; // used to find the first new open character
// if we've fallen off the end of the text, we're done
@@ -242,7 +242,7 @@
static final int DONE = -1;
- private final int nextCodePoint() {
+ private int nextCodePoint() {
if (scriptLimit >= textLimit) {
return DONE;
}
@@ -257,7 +257,7 @@
return ch;
}
- private final void pushback(int ch) {
+ private void pushback(int ch) {
if (ch >= 0) {
if (ch >= 0x10000) {
scriptLimit -= 2;
@@ -287,7 +287,7 @@
* @param n the word in which to find the highest bit that's set.
* @return the bit number (counting from the low order bit) of the highest bit.
*/
- private static final byte highBit(int n)
+ private static byte highBit(int n)
{
if (n <= 0) {
return -32;
--- a/jdk/src/share/classes/sun/font/ScriptRunData.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/font/ScriptRunData.java Thu Jul 24 17:36:56 2014 +0400
@@ -39,7 +39,7 @@
private static final int CHAR_LIMIT = 0x110000;
private static int cache = 0;
- public static final int getScript(int cp) {
+ public static int getScript(int cp) {
// optimize for runs of characters in the same script
if (cp >= data[cache] && cp < data[cache+2]) {
return data[cache+1];
--- a/jdk/src/share/classes/sun/font/StrikeCache.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/font/StrikeCache.java Thu Jul 24 17:36:56 2014 +0400
@@ -202,7 +202,7 @@
recentStrikeIndex = index;
}
- private static final void doDispose(FontStrikeDisposer disposer) {
+ private static void doDispose(FontStrikeDisposer disposer) {
if (disposer.intGlyphImages != null) {
freeCachedIntMemory(disposer.intGlyphImages,
disposer.pScalerContext);
--- a/jdk/src/share/classes/sun/java2d/StateTrackableDelegate.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/java2d/StateTrackableDelegate.java Thu Jul 24 17:36:56 2014 +0400
@@ -250,7 +250,7 @@
* {@code IMMUTABLE} delegate is never modified.
* @since 1.7
*/
- public final void markDirty() {
+ public void markDirty() {
theTracker = null;
}
}
--- a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Thu Jul 24 17:36:56 2014 +0400
@@ -917,7 +917,7 @@
* Return the SurfaceData object assigned to manage the destination
* drawable surface of this Graphics2D.
*/
- public final SurfaceData getSurfaceData() {
+ public SurfaceData getSurfaceData() {
return surfaceData;
}
@@ -1734,7 +1734,7 @@
* compositeState <= COMP_CUSTOM)
* though nothing bad will happen if it is run in other states.
*/
- final void validateColor() {
+ void validateColor() {
int eargb;
if (imageComp == CompositeType.Clear) {
eargb = 0;
--- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSProfile.java Thu Jul 24 17:36:56 2014 +0400
@@ -43,7 +43,7 @@
tagCache = new TagCache(this);
}
- final long getLcmsPtr() {
+ long getLcmsPtr() {
return this.getNativePtr();
}
--- a/jdk/src/share/classes/sun/java2d/loops/CompositeType.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/java2d/loops/CompositeType.java Thu Jul 24 17:36:56 2014 +0400
@@ -242,7 +242,7 @@
this.uniqueID = makeUniqueID(desc);
}
- public synchronized static final int makeUniqueID(String desc) {
+ public synchronized static int makeUniqueID(String desc) {
Integer i = compositeUIDMap.get(desc);
if (i == null) {
--- a/jdk/src/share/classes/sun/java2d/loops/SurfaceType.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/java2d/loops/SurfaceType.java Thu Jul 24 17:36:56 2014 +0400
@@ -401,7 +401,7 @@
this.pixelConverter = parent.pixelConverter;
}
- public synchronized static final int makeUniqueID(String desc) {
+ public static synchronized int makeUniqueID(String desc) {
Integer i = surfaceUIDMap.get(desc);
if (i == null) {
--- a/jdk/src/share/classes/sun/print/DialogOwner.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/print/DialogOwner.java Thu Jul 24 17:36:56 2014 +0400
@@ -73,7 +73,7 @@
* @return Printing attribute class (category), an instance of class
* {@link java.lang.Class java.lang.Class}.
*/
- public final Class<? extends Attribute> getCategory() {
+ public Class<? extends Attribute> getCategory() {
return DialogOwner.class;
}
@@ -87,7 +87,7 @@
*
* @return Attribute category name.
*/
- public final String getName() {
+ public String getName() {
return "dialog-owner";
}
--- a/jdk/src/share/classes/sun/print/SunMinMaxPage.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/print/SunMinMaxPage.java Thu Jul 24 17:36:56 2014 +0400
@@ -40,23 +40,19 @@
page_max = max;
}
-
- public final Class<? extends PrintRequestAttribute> getCategory() {
+ public Class<? extends PrintRequestAttribute> getCategory() {
return SunMinMaxPage.class;
}
-
- public final int getMin() {
+ public int getMin() {
return page_min;
}
- public final int getMax() {
+ public int getMax() {
return page_max;
}
-
- public final String getName() {
+ public String getName() {
return "sun-page-minmax";
}
-
}
--- a/jdk/src/share/classes/sun/print/SunPageSelection.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/share/classes/sun/print/SunPageSelection.java Thu Jul 24 17:36:56 2014 +0400
@@ -44,11 +44,11 @@
pages = value;
}
- public final Class<? extends Attribute> getCategory() {
+ public Class<? extends Attribute> getCategory() {
return SunPageSelection.class;
}
- public final String getName() {
+ public String getName() {
return "sun-page-selection";
}
--- a/jdk/src/solaris/classes/sun/awt/X11/XAtom.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XAtom.java Thu Jul 24 17:36:56 2014 +0400
@@ -179,7 +179,7 @@
}
return xatom;
}
- public final String getName() {
+ public String getName() {
if (name == null) {
XToolkit.awtLock();
try {
--- a/jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java Thu Jul 24 17:36:56 2014 +0400
@@ -86,7 +86,7 @@
return window;
}
- static final long getDnDProxyWindow() {
+ static long getDnDProxyWindow() {
return XWindow.getXAWTRootWindow().getWindow();
}
--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Thu Jul 24 17:36:56 2014 +0400
@@ -159,7 +159,7 @@
static native void awt_output_flush();
- static final void awtFUnlock() {
+ static void awtFUnlock() {
awtUnlock();
awt_output_flush();
}
@@ -876,7 +876,7 @@
*/
// Need this for XMenuItemPeer.
- protected static final Object targetToPeer(Object target) {
+ protected static Object targetToPeer(Object target) {
Object p=null;
if (target != null && !GraphicsEnvironment.isHeadless()) {
p = specialPeerMap.get(target);
@@ -887,7 +887,7 @@
}
// Need this for XMenuItemPeer.
- protected static final void targetDisposedPeer(Object target, Object peer) {
+ protected static void targetDisposedPeer(Object target, Object peer) {
SunToolkit.targetDisposedPeer(target, peer);
}
--- a/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/windows/classes/sun/awt/windows/WInputMethod.java Thu Jul 24 17:36:56 2014 +0400
@@ -145,7 +145,7 @@
}
@Override
- public final void dispose() {
+ public void dispose() {
// Due to a memory management problem in Windows 98, we should retain
// the native input context until this object is finalized. So do
// nothing here.
--- a/jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java Thu Jul 24 17:36:56 2014 +0400
@@ -1573,7 +1573,7 @@
//** BEGIN Functions called by native code for querying/updating attributes
- private final String getPrinterAttrib() {
+ private String getPrinterAttrib() {
// getPrintService will get current print service or default if none
PrintService service = this.getPrintService();
String name = (service != null) ? service.getName() : null;
@@ -1581,7 +1581,7 @@
}
/* SheetCollate */
- private final int getCollateAttrib() {
+ private int getCollateAttrib() {
// -1 means unset, 0 uncollated, 1 collated.
return mAttCollate;
}
@@ -1602,7 +1602,7 @@
/* Orientation */
- private final int getOrientAttrib() {
+ private int getOrientAttrib() {
int orient = PageFormat.PORTRAIT;
OrientationRequested orientReq = (attributes == null) ? null :
(OrientationRequested)attributes.get(OrientationRequested.class);
@@ -1629,7 +1629,7 @@
}
/* Copies and Page Range. */
- private final int getCopiesAttrib() {
+ private int getCopiesAttrib() {
if (defaultCopies) {
return 0;
} else {
@@ -1637,9 +1637,8 @@
}
}
- private final void setRangeCopiesAttribute(int from, int to,
- boolean isRangeSet,
- int copies) {
+ private void setRangeCopiesAttribute(int from, int to, boolean isRangeSet,
+ int copies) {
if (attributes != null) {
if (isRangeSet) {
attributes.add(new PageRanges(from, to));
@@ -1658,12 +1657,12 @@
- private final boolean getDestAttrib() {
+ private boolean getDestAttrib() {
return (mDestination != null);
}
/* Quality */
- private final int getQualityAttrib() {
+ private int getQualityAttrib() {
return mAttQuality;
}
@@ -1684,7 +1683,7 @@
}
/* Color/Chromaticity */
- private final int getColorAttrib() {
+ private int getColorAttrib() {
return mAttChromaticity;
}
@@ -1703,7 +1702,7 @@
}
/* Sides */
- private final int getSidesAttrib() {
+ private int getSidesAttrib() {
return mAttSides;
}
@@ -1724,7 +1723,7 @@
}
/** MediaSizeName / dmPaper */
- private final int[] getWin32MediaAttrib() {
+ private int[] getWin32MediaAttrib() {
int wid_ht[] = {0, 0};
if (attributes != null) {
Media media = (Media)attributes.get(Media.class);
@@ -1810,7 +1809,7 @@
- private final boolean getPrintToFileEnabled() {
+ private boolean getPrintToFileEnabled() {
SecurityManager security = System.getSecurityManager();
if (security != null) {
FilePermission printToFilePermission =
@@ -1824,7 +1823,7 @@
return true;
}
- private final void setNativeAttributes(int flags, int fields, int values) {
+ private void setNativeAttributes(int flags, int fields, int values) {
if (attributes == null) {
return;
}
@@ -2016,7 +2015,7 @@
* The attribute set here is a temporary one installed whilst this
* happens,
*/
- private final void setJobAttributes(PrintRequestAttributeSet attributes,
+ private void setJobAttributes(PrintRequestAttributeSet attributes,
int fields, int values,
short copies,
short dmPaperSize,
@@ -2152,7 +2151,7 @@
}
/* Printer Resolution. See also getXRes() and getYRes() */
- private final void setResolutionDPI(int xres, int yres) {
+ private void setResolutionDPI(int xres, int yres) {
if (attributes != null) {
PrinterResolution res =
new PrinterResolution(xres, yres, PrinterResolution.DPI);
--- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java Wed Jul 23 16:19:26 2014 +0400
+++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java Thu Jul 24 17:36:56 2014 +0400
@@ -276,7 +276,7 @@
setExtraMouseButtonsEnabledNative(areExtraMouseButtonsEnabled);
}
- private final void registerShutdownHook() {
+ private void registerShutdownHook() {
AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
Thread shutdown = new Thread(ThreadGroupUtils.getRootThreadGroup(), this::shutdown);
shutdown.setContextClassLoader(null);
@@ -746,11 +746,11 @@
@Override
protected native void loadSystemColors(int[] systemColors);
- public static final Object targetToPeer(Object target) {
+ public static Object targetToPeer(Object target) {
return SunToolkit.targetToPeer(target);
}
- public static final void targetDisposedPeer(Object target, Object peer) {
+ public static void targetDisposedPeer(Object target, Object peer) {
SunToolkit.targetDisposedPeer(target, peer);
}