--- old/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java	2017-11-07 08:17:50.636052230 -0800
+++ new/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java	2017-11-07 08:17:50.476052225 -0800
@@ -329,7 +329,7 @@
             }
         }
 
-        private final void swap(final Vector<Object> a, final int i, final int j) {
+        private void swap(final Vector<Object> a, final int i, final int j) {
             final Object T = a.elementAt(i);
             a.setElementAt(a.elementAt(j), i);
             a.setElementAt(T, j);
--- old/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java	2017-11-07 08:17:51.032052241 -0800
+++ new/src/java.desktop/macosx/classes/sun/lwawt/LWComponentPeer.java	2017-11-07 08:17:50.876052237 -0800
@@ -1448,7 +1448,7 @@
      *
      * @return true during layout, false otherwise.
      */
-    private final boolean isLayouting() {
+    private boolean isLayouting() {
         return isLayouting;
     }
 }
--- old/src/java.desktop/share/classes/java/awt/Component.java	2017-11-07 08:17:51.440052254 -0800
+++ new/src/java.desktop/share/classes/java/awt/Component.java	2017-11-07 08:17:51.280052249 -0800
@@ -10218,7 +10218,7 @@
         applyCompoundShape(getAppliedShape().getDifference(s));
     }
 
-    private final void applyCurrentShapeBelowMe() {
+    private void applyCurrentShapeBelowMe() {
         checkTreeLock();
         Container parent = getContainer();
         if (parent != null && parent.isShowing()) {
--- old/src/java.desktop/share/classes/java/awt/EventQueue.java	2017-11-07 08:17:51.912052268 -0800
+++ new/src/java.desktop/share/classes/java/awt/EventQueue.java	2017-11-07 08:17:51.752052263 -0800
@@ -283,7 +283,7 @@
      * @param theEvent an instance of {@code java.awt.AWTEvent},
      *          or a subclass of it
      */
-    private final void postEventPrivate(AWTEvent theEvent) {
+    private void postEventPrivate(AWTEvent theEvent) {
         theEvent.isPosted = true;
         pushPopLock.lock();
         try {
--- old/src/java.desktop/share/classes/java/awt/MenuItem.java	2017-11-07 08:17:52.320052280 -0800
+++ new/src/java.desktop/share/classes/java/awt/MenuItem.java	2017-11-07 08:17:52.164052275 -0800
@@ -410,7 +410,7 @@
      * Returns true if the item and all its ancestors are
      * enabled, false otherwise
      */
-    private final boolean isItemEnabled() {
+    private boolean isItemEnabled() {
         // Fix For 6185151: Menu shortcuts of all menuitems within a menu
         // should be disabled when the menu itself is disabled
         if (!isEnabled()) {
--- old/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java	2017-11-07 08:17:52.720052292 -0800
+++ new/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java	2017-11-07 08:17:52.564052287 -0800
@@ -1354,7 +1354,7 @@
         /* SH | SC => */         APPLY_SHEAR | APPLY_SCALE,
         /* SH | SC | TR => */    APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE,
     };
-    private final void rotate90() {
+    private void rotate90() {
         double M0 = m00;
         m00 = m01;
         m01 = -M0;
@@ -1370,7 +1370,7 @@
         this.state = state;
         type = TYPE_UNKNOWN;
     }
-    private final void rotate180() {
+    private void rotate180() {
         m00 = -m00;
         m11 = -m11;
         int state = this.state;
@@ -1390,7 +1390,7 @@
         }
         type = TYPE_UNKNOWN;
     }
-    private final void rotate270() {
+    private void rotate270() {
         double M0 = m00;
         m00 = -m01;
         m01 = M0;
--- old/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java	2017-11-07 08:17:53.148052304 -0800
+++ new/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java	2017-11-07 08:17:52.988052299 -0800
@@ -397,7 +397,7 @@
         consumer.imageComplete(status);
     }
 
-    private final WritableRaster createDCMraster() {
+    private WritableRaster createDCMraster() {
         WritableRaster wr;
         DirectColorModel dcm = (DirectColorModel) model;
         boolean hasAlpha = model.hasAlpha();
--- old/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java	2017-11-07 08:17:53.548052316 -0800
+++ new/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java	2017-11-07 08:17:53.388052311 -0800
@@ -295,7 +295,7 @@
         }
     }
 
-    private final BufferedImage ICCBIFilter(BufferedImage src,
+    private BufferedImage ICCBIFilter(BufferedImage src,
                                             ColorSpace srcColorSpace,
                                             BufferedImage dest,
                                             ColorSpace destColorSpace) {
@@ -753,7 +753,7 @@
         return hints;
     }
 
-    private final BufferedImage nonICCBIFilter(BufferedImage src,
+    private BufferedImage nonICCBIFilter(BufferedImage src,
                                                ColorSpace srcColorSpace,
                                                BufferedImage dst,
                                                ColorSpace dstColorSpace) {
@@ -947,7 +947,7 @@
 
     /* color convert a Raster - handles byte, ushort, int, short, float,
        or double transferTypes */
-    private final WritableRaster nonICCRasterFilter(Raster src,
+    private WritableRaster nonICCRasterFilter(Raster src,
                                                     WritableRaster dst)  {
 
         if (CSList.length != 2) {
--- old/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java	2017-11-07 08:17:53.952052328 -0800
+++ new/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java	2017-11-07 08:17:53.796052323 -0800
@@ -755,7 +755,7 @@
      * value is used to mask off the pixel parameters for methods such
      * as getRed(), getGreen(), getBlue(), getAlpha(), and getRGB().
      */
-    private final void calculatePixelMask() {
+    private void calculatePixelMask() {
         // Note that we adjust the mask so that our masking behavior here
         // is consistent with that of our native rendering loops.
         int maskbits = pixel_bits;
--- old/src/java.desktop/share/classes/java/awt/image/LookupOp.java	2017-11-07 08:17:54.368052340 -0800
+++ new/src/java.desktop/share/classes/java/awt/image/LookupOp.java	2017-11-07 08:17:54.212052336 -0800
@@ -472,7 +472,7 @@
         return hints;
     }
 
-    private final void byteFilter(ByteLookupTable lookup, Raster src,
+    private void byteFilter(ByteLookupTable lookup, Raster src,
                                   WritableRaster dst,
                                   int width, int height, int numBands) {
         int[] srcPix = null;
@@ -519,7 +519,7 @@
         }
     }
 
-    private final void shortFilter(ShortLookupTable lookup, Raster src,
+    private void shortFilter(ShortLookupTable lookup, Raster src,
                                    WritableRaster dst,
                                    int width, int height, int numBands) {
         int band;
--- old/src/java.desktop/share/classes/java/awt/image/LookupTable.java	2017-11-07 08:17:54.772052352 -0800
+++ new/src/java.desktop/share/classes/java/awt/image/LookupTable.java	2017-11-07 08:17:54.612052348 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -43,7 +43,7 @@
  * @see ShortLookupTable
  * @see LookupOp
  */
-public abstract class LookupTable extends Object{
+public abstract class LookupTable {
 
     /**
      * Constants
--- old/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	2017-11-07 08:17:55.176052364 -0800
+++ new/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTreeUI.java	2017-11-07 08:17:55.012052360 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -3490,7 +3490,7 @@
       * the destination it is constructed with. It is assumed all the
       * events are currently target at source.
       */
-    public class MouseInputHandler extends Object implements
+    public class MouseInputHandler implements
                      MouseInputListener
     {
         /** Source that events are coming from. */
--- old/src/java.desktop/share/classes/javax/swing/table/TableColumn.java	2017-11-07 08:17:55.616052377 -0800
+++ new/src/java.desktop/share/classes/javax/swing/table/TableColumn.java	2017-11-07 08:17:55.456052373 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -83,7 +83,7 @@
  * @see JTable#getCellEditor(int, int)
  */
 @SuppressWarnings("serial") // Same-version serialization only
-public class TableColumn extends Object implements Serializable {
+public class TableColumn implements Serializable {
 
     /**
      * Obsolete as of Java 2 platform v1.3.  Please use string literals to identify
--- old/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java	2017-11-07 08:17:56.024052390 -0800
+++ new/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java	2017-11-07 08:17:55.864052385 -0800
@@ -1797,7 +1797,7 @@
             }
         }
 
-        private final void indent(PrintWriter out, int n) {
+        private void indent(PrintWriter out, int n) {
             for (int i = 0; i < n; i++) {
                 out.print("  ");
             }
@@ -2063,7 +2063,7 @@
             }
         }
 
-        private final void checkForIllegalCast() {
+        private void checkForIllegalCast() {
             Thread t = getCurrentWriter();
             if ((t == null) || (t != Thread.currentThread())) {
                 throw new StateInvariantError("Illegal cast to MutableAttributeSet");
--- old/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java	2017-11-07 08:17:56.448052402 -0800
+++ new/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java	2017-11-07 08:17:56.288052397 -0800
@@ -2422,7 +2422,7 @@
     private int currentPosition;
 
 
-    private final int readCh() throws IOException {
+    private int readCh() throws IOException {
 
         if (pos >= len) {
 
--- old/src/java.desktop/share/classes/javax/swing/tree/TreePath.java	2017-11-07 08:17:56.864052414 -0800
+++ new/src/java.desktop/share/classes/javax/swing/tree/TreePath.java	2017-11-07 08:17:56.704052410 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -82,7 +82,7 @@
  * @author Philip Milne
  */
 @SuppressWarnings("serial") // Same-version serialization only
-public class TreePath extends Object implements Serializable {
+public class TreePath implements Serializable {
     /** Path representing the parent, null if lastPathComponent represents
      * the root. */
     private TreePath           parentPath;
--- old/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java	2017-11-07 08:17:57.268052426 -0800
+++ new/src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java	2017-11-07 08:17:57.108052422 -0800
@@ -89,7 +89,7 @@
     private void property(String key,float value) {
         property(key, Float.valueOf(value));
     }
-    private final void pngassert(boolean b) throws IOException {
+    private void pngassert(boolean b) throws IOException {
         if(!b) {
             PNGException e = new PNGException("Broken file");
             e.printStackTrace();
@@ -692,20 +692,20 @@
         fill();
         return limit-pos>=n;
     }
-    private final int getInt(int pos) {
+    private int getInt(int pos) {
         return ((inbuf[pos  ]&0xFF)<<24)
              | ((inbuf[pos+1]&0xFF)<<16)
              | ((inbuf[pos+2]&0xFF)<< 8)
              | ((inbuf[pos+3]&0xFF)    );
     }
-    private final int getShort(int pos) {
+    private int getShort(int pos) {
         return (short)(((inbuf[pos  ]&0xFF)<<8)
                      | ((inbuf[pos+1]&0xFF)   ));
     }
-    private final int getByte(int pos) {
+    private int getByte(int pos) {
         return inbuf[pos]&0xFF;
     }
-    private final boolean getChunk() throws IOException {
+    private boolean getChunk() throws IOException {
         chunkLength = 0;
         if (!need(8)) return false;
         chunkLength = getInt(pos);
--- old/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java	2017-11-07 08:17:57.672052438 -0800
+++ new/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java	2017-11-07 08:17:57.516052434 -0800
@@ -310,7 +310,7 @@
     return new Rectangle2D.Float(l, t, r - l, b - t);
   }
 
-  private final StandardGlyphVector getGV() {
+  private StandardGlyphVector getGV() {
     if (gv == null) {
       gv = createGV();
     }
@@ -543,7 +543,7 @@
       }
   }
 
-  private final float[] getCharinfo() {
+  private float[] getCharinfo() {
     if (charinfo == null) {
       charinfo = createCharinfo();
     }
--- old/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java	2017-11-07 08:17:58.084052451 -0800
+++ new/src/java.desktop/share/classes/sun/font/StandardGlyphVector.java	2017-11-07 08:17:57.920052446 -0800
@@ -998,14 +998,14 @@
     }
 
     // called by getGlyphsPixelBounds
-    private final void setDTX(AffineTransform tx) {
+    private void setDTX(AffineTransform tx) {
         if (!equalNonTranslateTX(dtx, tx)) {
             resetDTX(getNonTranslateTX(tx));
         }
     }
 
     // called by most functions
-    private final void setFRCTX() {
+    private void setFRCTX() {
         if (!equalNonTranslateTX(frctx, dtx)) {
             resetDTX(getNonTranslateTX(frctx));
         }
@@ -1016,7 +1016,7 @@
      * must not contain translation.
      * Called by setRenderTransform, setDTX, initFontData.
      */
-    private final void resetDTX(AffineTransform at) {
+    private void resetDTX(AffineTransform at) {
         fsref = null;
         dtx = at;
         invdtx = null;
--- old/src/java.desktop/share/classes/sun/font/TextSourceLabel.java	2017-11-07 08:17:58.496052463 -0800
+++ new/src/java.desktop/share/classes/sun/font/TextSourceLabel.java	2017-11-07 08:17:58.336052458 -0800
@@ -147,7 +147,7 @@
     return createLogicalBounds();
   }
 
-  private final GlyphVector getGV() {
+  private GlyphVector getGV() {
     if (gv == null) {
       gv = createGV();
     }
--- old/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java	2017-11-07 08:17:58.900052475 -0800
+++ new/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java	2017-11-07 08:17:58.736052470 -0800
@@ -106,11 +106,11 @@
         cmap = CMap.theNullCmap;
     }
 
-    private final char remapJAChar(char unicode) {
+    private char remapJAChar(char unicode) {
         return (unicode == REVERSE_SOLIDUS) ? JA_YEN : unicode;
     }
 
-    private final int remapJAIntChar(int unicode) {
+    private int remapJAIntChar(int unicode) {
         return (unicode == REVERSE_SOLIDUS) ? JA_YEN : unicode;
     }
 
--- old/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java	2017-11-07 08:17:59.312052487 -0800
+++ new/src/java.desktop/share/classes/sun/java2d/marlin/DMarlinRenderingEngine.java	2017-11-07 08:17:59.152052482 -0800
@@ -227,7 +227,7 @@
                  pc2d);
     }
 
-    private final double userSpaceLineWidth(AffineTransform at, double lw) {
+    private double userSpaceLineWidth(AffineTransform at, double lw) {
 
         double widthScale;
 
--- old/src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderingEngine.java	2017-11-07 08:17:59.720052499 -0800
+++ new/src/java.desktop/share/classes/sun/java2d/marlin/MarlinRenderingEngine.java	2017-11-07 08:17:59.564052495 -0800
@@ -227,7 +227,7 @@
                  pc2d);
     }
 
-    private final float userSpaceLineWidth(AffineTransform at, float lw) {
+    private float userSpaceLineWidth(AffineTransform at, float lw) {
 
         float widthScale;
 
--- old/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java	2017-11-07 08:18:00.124052511 -0800
+++ new/src/java.desktop/share/classes/sun/swing/AccumulativeRunnable.java	2017-11-07 08:17:59.964052506 -0800
@@ -152,7 +152,7 @@
      *
      * @return accumulated arguments
      */
-    private final synchronized List<T> flush() {
+    private synchronized List<T> flush() {
         List<T> list = arguments;
         arguments = null;
         return list;
--- old/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java	2017-11-07 08:18:00.520052523 -0800
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java	2017-11-07 08:18:00.360052518 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -113,7 +113,7 @@
 
     // internal lock for synchronizing state changes and paint calls, initialized in preInit.
     // the order with other locks: AWTLock -> stateLock
-    static class StateLock extends Object { }
+    static class StateLock { }
     protected StateLock state_lock;
 
     /**
@@ -315,7 +315,7 @@
      * Creates window with parameters specified by {@code params}
      * @see #init
      */
-    private final void create(XCreateWindowParams params) {
+    private void create(XCreateWindowParams params) {
         XToolkit.awtLock();
         try {
             XSetWindowAttributes xattr = new XSetWindowAttributes();
--- old/src/java.desktop/unix/classes/sun/java2d/jules/JulesShapePipe.java	2017-11-07 08:18:00.924052535 -0800
+++ new/src/java.desktop/unix/classes/sun/java2d/jules/JulesShapePipe.java	2017-11-07 08:18:00.768052530 -0800
@@ -44,7 +44,7 @@
      * Common validate method, used by all XRRender functions to validate the
      * destination context.
      */
-    private final void validateSurface(SunGraphics2D sg2d) {
+    private void validateSurface(SunGraphics2D sg2d) {
         XRSurfaceData xrsd = (XRSurfaceData) sg2d.surfaceData;
         xrsd.validateAsDestination(sg2d, sg2d.getCompClip());
         xrsd.maskBuffer.validateCompositeState(sg2d.composite, sg2d.transform,
--- old/src/java.desktop/unix/classes/sun/java2d/jules/TrapezoidList.java	2017-11-07 08:18:01.320052547 -0800
+++ new/src/java.desktop/unix/classes/sun/java2d/jules/TrapezoidList.java	2017-11-07 08:18:01.160052542 -0800
@@ -64,7 +64,7 @@
     }
 
 
-    private final int getTrapStartAddresse(int pos) {
+    private int getTrapStartAddresse(int pos) {
         return TRAP_START_INDEX + TRAP_SIZE * pos;
     }
 
--- old/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java	2017-11-07 08:18:01.720052559 -0800
+++ new/src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java	2017-11-07 08:18:01.560052554 -0800
@@ -54,7 +54,7 @@
                 : new X11Renderer());
     }
 
-    private final long validate(SunGraphics2D sg2d) {
+    private long validate(SunGraphics2D sg2d) {
         // NOTE: getCompClip() will revalidateAll() if the
         // surfaceData is invalid.  This should ensure that
         // the clip and pixel that we are validating against
--- old/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java	2017-11-07 08:18:02.116052570 -0800
+++ new/src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java	2017-11-07 08:18:01.956052566 -0800
@@ -69,7 +69,7 @@
      * Common validate method, used by all XRRender functions to validate the
      * destination context.
      */
-    private final void validateSurface(SunGraphics2D sg2d) {
+    private void validateSurface(SunGraphics2D sg2d) {
         XRSurfaceData xrsd;
         try {
             xrsd = (XRSurfaceData) sg2d.surfaceData;
--- old/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java	2017-11-07 08:18:02.508052582 -0800
+++ new/src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java	2017-11-07 08:18:02.352052577 -0800
@@ -630,7 +630,7 @@
      private native void nativeGrab();
      private native void nativeUngrab();
 
-     private final boolean hasWarningWindow() {
+     private boolean hasWarningWindow() {
          return ((Window)target).getWarningString() != null;
      }
 
@@ -674,7 +674,7 @@
          super.setBounds(x, y, width, height, op);
      }
 
-    private final void initScales() {
+    private void initScales() {
 
         if (scaleX >= 1 && scaleY >= 1) {
             return;