8299430: Cleanup: delete unnecessary semicolons in java.desktop module

Reviewed-by: stsypanov, aghaisas, iris

src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java

@@ -126,7 +126,7 @@ public final class JRSUIControl {
         NO_CHANGE,
         ALL_CHANGES_IN_BUFFER,
         SOME_CHANGES_IN_BUFFER,
-        CHANGE_WONT_FIT_IN_BUFFER;
+        CHANGE_WONT_FIT_IN_BUFFER
     }
 
     private BufferState loadBufferWithChanges(final ThreadLocalByteBuffer localByteBuffer) {

src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java

@@ -1303,7 +1303,7 @@ public class AquaFileChooserUI extends FileChooserUI {
             while (f.getParent() != null) {
                 path.add(f);
                 f = getFileChooser().getFileSystemView().createFileObject(f.getParent());
-            };
+            }
 
             // Add root file (the desktop) to the model
             final File[] roots = getFileChooser().getFileSystemView().getRoots();

src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java

@@ -106,7 +106,7 @@ public class AquaTabbedPaneContrastUI extends AquaTabbedPaneUI {
     }
 
     protected State getState(final int index, final boolean frameActive, final boolean isSelected) {
-        isFrameActive = frameActive;;
+        isFrameActive = frameActive;
         if (!frameActive) return State.INACTIVE;
         if (!tabPane.isEnabled()) return State.DISABLED;
         if (pressedTab == index) return State.PRESSED;

src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java

@@ -1051,7 +1051,6 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing
             case TOP:
             default:
                 nudge = isSelected ? -1 : 1;
-                ;
         }
         return nudge;
     }

src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java

@@ -122,7 +122,7 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
     public synchronized void charsToGlyphs(int count, int[] unicodes, int[] glyphs) {
         for (int i = 0; i < count; i++) {
             glyphs[i] = charToGlyph(unicodes[i]);
-        };
+        }
     }
 
     // This mapper returns either the glyph code, or if the character can be

src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java

@@ -43,7 +43,7 @@ public class MacOSFlags {
     private static boolean metalEnabled;
     private static boolean metalVerbose;
 
-    private enum PropertyState {ENABLED, DISABLED, UNSPECIFIED};
+    private enum PropertyState {ENABLED, DISABLED, UNSPECIFIED}
 
     static {
         initJavaFlags();

src/java.desktop/macosx/classes/sun/java2d/metal/MTLLayer.java

@@ -91,7 +91,7 @@ public class MTLLayer extends CFLayer {
         // break the connection between the layer and the buffer
         validate(null);
         SurfaceData oldData = surfaceData;
-        surfaceData = NullSurfaceData.theInstance;;
+        surfaceData = NullSurfaceData.theInstance;
         if (oldData != null) {
             oldData.flush();
         }

src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java

@@ -83,7 +83,7 @@ public class CGLLayer extends CFLayer {
         // break the connection between the layer and the buffer
         validate(null);
         SurfaceData oldData = surfaceData;
-        surfaceData = NullSurfaceData.theInstance;;
+        surfaceData = NullSurfaceData.theInstance;
         if (oldData != null) {
             oldData.flush();
         }

src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m

@@ -432,7 +432,7 @@ NSValue *javaIntArrayToNSRangeValue(JNIEnv* env, jintArray array) {
         // Note: Java will not be on the stack here so a java exception can't happen and no need to call ExceptionCheck.
         NSLog(@"%s failed calling GetIntArrayElements", __FUNCTION__);
         return nil;
-    };
+    }
     NSValue *value = [NSValue valueWithRange:NSMakeRange(values[0], values[1] - values[0])];
     (*env)->ReleaseIntArrayElements(env, array, values, 0);
     return value;

src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m

@@ -359,7 +359,7 @@ static jmethodID sjm_getAccessibleEditableText = NULL;
         // Note: Java will not be on the stack here so a java exception can't happen and no need to call ExceptionCheck.
         NSLog(@"%s failed calling GetDoubleArrayElements", __FUNCTION__);
         return nil;
-    };
+    }
     NSRect bounds;
     bounds.origin.x = values[0];
     bounds.origin.y = [[[[self view] window] screen] frame].size.height - values[1] - values[3]; //values[1] is y-coord from top-left of screen. Flip. Account for the height (values[3]) when flipping

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CellAccessibility.m

@@ -34,7 +34,7 @@
 
 - (NSAccessibilityRole)accessibilityRole
 {
-    return NSAccessibilityCellRole;;
+    return NSAccessibilityCellRole;
 }
 
 - (NSInteger)accessibilityIndex

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m

@@ -634,7 +634,7 @@ static jobject sAccessibilityClass = NULL;
     }
     if ([[currentAction allKeys] containsObject:actionName]) {
         [(JavaAxAction *)[currentAction objectForKey:actionName] perform];
-        return YES;;
+        return YES;
     }
     return NO;
 }

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonTextAccessibility.m

@@ -58,7 +58,7 @@ static NSRange javaIntArrayToNSRange(JNIEnv* env, jintArray array) {
     if (values == NULL) {
         NSLog(@"%s failed calling GetIntArrayElements", __FUNCTION__);
         return DEFAULT_RANGE;
-    };
+    }
     return NSMakeRange(values[0], values[1] - values[0]);
 }
 

src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/OutlineRowAccessibility.m

@@ -90,12 +90,12 @@ static jclass sjc_CAccessible = NULL;
 
 - (NSAccessibilitySubrole)accessibilitySubrole
 {
-    return NSAccessibilityOutlineRowSubrole;;
+    return NSAccessibilityOutlineRowSubrole;
 }
 
 - (NSAccessibilityRole)accessibilityRole
 {
-    return NSAccessibilityRowRole;;
+    return NSAccessibilityRowRole;
 }
 
 - (BOOL)isAccessibilitySelected

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLClip.m

@@ -276,7 +276,7 @@ static void initTemplatePipelineDescriptors() {
 - (id<MTLTexture>) stencilTextureRef {
     if (_dstOps == NULL) return nil;
 
-    return _dstOps->pStencilTexture;;
+    return _dstOps->pStencilTexture;
 }
 
 - (NSUInteger)shapeX {

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLGlyphCache.h

@@ -93,7 +93,7 @@ void
 MTLGlyphCache_Free(MTLGlyphCacheInfo *cache);
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif /* MTLGlyphCache_h_Included */

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLPaints.m

@@ -369,8 +369,8 @@ jint _color;
 - (NSUInteger)hash {
     NSUInteger h = [super hash];
     h = h*31 + [@(_p0) hash];
-    h = h*31 + [@(_p1) hash];;
-    h = h*31 + [@(_p3) hash];;
+    h = h*31 + [@(_p1) hash];
+    h = h*31 + [@(_p3) hash];
     h = h*31 + _pixel1;
     h = h*31 + _pixel2;
     return h;

src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderer.m

@@ -561,7 +561,7 @@ MTLRenderer_FillParallelogram(MTLContext *mtlc, BMTLSDOps * dstOps,
         }};
 
     // Encode render command.
-    id<MTLRenderCommandEncoder> mtlEncoder = [mtlc.encoderManager getRenderEncoder:dstOps];;
+    id<MTLRenderCommandEncoder> mtlEncoder = [mtlc.encoderManager getRenderEncoder:dstOps];
 
     if (mtlEncoder == nil) {
         J2dRlsTraceLn(J2D_TRACE_ERROR, "MTLRenderer_FillParallelogram: error creating MTLRenderCommandEncoder.");

src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp

@@ -438,7 +438,7 @@ static void* CreatePortControl(PortMixer *mixer, PortControlCreator *creator, Po
     case PortControl::Balance:
         jControl = creator->newFloatControl(creator, control, CONTROL_TYPE_BALANCE, -1, 1, precision, "");
         break;
-    };
+    }
 
     if (jControl == NULL) {
         ERROR0("CreatePortControl: javaControl was not created\n");

src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java

@@ -763,7 +763,7 @@ public class PNGImageReader extends ImageReader {
                 // verify the chunk length
                 if (chunkLength < 0) {
                     throw new IIOException("Invalid chunk length " + chunkLength);
-                };
+                }
 
                 try {
                     /*

src/java.desktop/share/classes/com/sun/imageio/plugins/png/RowFilter.java

@@ -143,7 +143,7 @@ public class RowFilter {
                 int curr = currRow[i] & 0xff;
                 int left = currRow[i - bytesPerPixel] & 0xff;
                 int up = prevRow[i] & 0xff;
-                int difference = curr - (left + up)/2;;
+                int difference = curr - (left + up)/2;
                 averageFilteredRow[i] = (byte)difference;
 
                 badness += abs(difference);

src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java

@@ -148,5 +148,5 @@ public class TIFFImageWriteParam extends ImageWriteParam {
         this.canWriteCompressed = true;
         this.canWriteTiles = true;
         this.compressionTypes = TIFFImageWriter.TIFFCompressionTypes;
-    };
+    }
 }

src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java

@@ -408,7 +408,7 @@ public class TIFFOldJPEGDecompressor extends TIFFJPEGDecompressor {
 
                     baos.write((byte)i); // Quantization table ID
                 }
-            };
+            }
 
 
             // DRI (optional).
@@ -485,7 +485,7 @@ public class TIFFOldJPEGDecompressor extends TIFFJPEGDecompressor {
 
                     tables[tmpOffset++] = (byte)i; // Quantization table ID
                 }
-            };
+            }
         }
 
         //
@@ -527,7 +527,7 @@ public class TIFFOldJPEGDecompressor extends TIFFJPEGDecompressor {
                     SOSMarker[SOSMarkerIndex++] =
                         (byte)((i << 4) | i); // Huffman table IDs
                 }
-            };
+            }
             SOSMarker[SOSMarkerIndex++] = (byte)0;
             SOSMarker[SOSMarkerIndex++] = (byte)0x3f;
             SOSMarker[SOSMarkerIndex++] = (byte)0;

src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java

@@ -79,7 +79,7 @@ public class MotifDesktopPaneUI extends javax.swing.plaf.basic.BasicDesktopPaneU
             g.setColor(Color.darkGray);
             g.drawRect(0, 0, getWidth()-1, getHeight()-1);
         }
-    };
+    }
 
 ////////////////////////////////////////////////////////////////////////////////////
 ///  MotifDesktopManager class
@@ -266,5 +266,5 @@ public class MotifDesktopPaneUI extends javax.swing.plaf.basic.BasicDesktopPaneU
             }
             return null;
         }
-    }; /// END of MotifDesktopManager
+    } /// END of MotifDesktopManager
 }

src/java.desktop/share/classes/java/awt/Component.java

@@ -8086,7 +8086,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
         {
             return true;
         }
-    };
+    }
 
     static synchronized void setRequestFocusController(RequestFocusController requestController)
     {

src/java.desktop/share/classes/java/awt/Desktop.java

@@ -261,7 +261,7 @@ public class Desktop {
          * @since 9
          */
         MOVE_TO_TRASH
-    };
+    }
 
     private DesktopPeer peer;
 

src/java.desktop/share/classes/java/awt/Dialog.java

@@ -191,7 +191,7 @@ public class Dialog extends Window {
          * be left unchanged.
          */
         TOOLKIT_MODAL
-    };
+    }
 
     /**
      * Default modality type for modal dialogs. The default modality type is
@@ -272,7 +272,7 @@ public class Dialog extends Window {
          * property will be left unchanged.
          */
         TOOLKIT_EXCLUDE
-    };
+    }
 
     /* operations with this list should be synchronized on tree lock*/
     static transient IdentityArrayList<Dialog> modalDialogs = new IdentityArrayList<Dialog>();

src/java.desktop/share/classes/java/awt/EventFilter.java

@@ -55,7 +55,7 @@ interface EventFilter {
          * @see ModalEventFilter
          */
         ACCEPT_IMMEDIATELY
-    };
+    }
 
     FilterAction acceptEvent(AWTEvent ev);
 }

src/java.desktop/share/classes/java/awt/GraphicsDevice.java

@@ -136,7 +136,7 @@ public abstract class GraphicsDevice {
          * contain or might contain pixels with arbitrary alpha values
          * between and including 0.0 and 1.0.
          */
-        PERPIXEL_TRANSLUCENT;
+        PERPIXEL_TRANSLUCENT
     }
 
     /**

src/java.desktop/share/classes/java/awt/TrayIcon.java

@@ -637,7 +637,7 @@ public class TrayIcon {
         INFO,
         /** Simple message */
         NONE
-    };
+    }
 
     /**
      * Displays a popup message near the tray icon.  The message will

src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java

@@ -195,4 +195,4 @@ public class InputMethodHighlight {
     private int variation;
     private Map<TextAttribute, ?> style;
 
-};
+}

src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java

@@ -550,7 +550,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp {
      */
     public BufferedImage createCompatibleDestImage (BufferedImage src,
                                                     ColorModel destCM) {
-        ColorSpace cs = null;;
+        ColorSpace cs = null;
         if (destCM == null) {
             if (CSList == null) {
                 /* ICC case */

src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java

@@ -67,4 +67,4 @@ public class AccessibleAttributeSequence {
         endIndex = end;
         attributes = attr;
     }
-};
+}

src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java

@@ -64,4 +64,4 @@ public class AccessibleTextSequence {
         endIndex = end;
         text = txt;
     }
-};
+}

src/java.desktop/share/classes/javax/print/StreamPrintService.java

@@ -63,7 +63,7 @@ public abstract class StreamPrintService implements PrintService {
      * Constructs a {@code StreamPrintService} object.
      */
     private StreamPrintService() {
-    };
+    }
 
     /**
      * Constructs a {@code StreamPrintService} object.

src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java

@@ -385,7 +385,6 @@ public class DefaultDesktopManager implements DesktopManager, java.io.Serializab
               if (!sData.isSurfaceLost()) {
                   currentLoc = new Point (newX, newY);
               }
-;
               g.dispose();
             }
         } else if (dragMode == FASTER_DRAG_MODE) {
@@ -726,7 +725,7 @@ public class DefaultDesktopManager implements DesktopManager, java.io.Serializab
           } else {
               dirtyRects = new Rectangle[1];
               dirtyRects[0] = previousBounds;
-          };
+          }
 
           // Fix the damage
           for (int i = 0; i < dirtyRects.length; i++) {

src/java.desktop/share/classes/javax/swing/LayoutStyle.java

@@ -120,7 +120,7 @@ public abstract class LayoutStyle {
          * This value is typically only useful with a direction of
          * <code>EAST</code> or <code>WEST</code>.
          */
-        INDENT;
+        INDENT
     }
 
 

src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java

@@ -149,7 +149,7 @@ class MultiUIDefaults extends UIDefaults
 
     private static class MultiUIDefaultsEnumerator implements Enumeration<Object>
     {
-        public static enum Type { KEYS, ELEMENTS };
+        public static enum Type { KEYS, ELEMENTS }
         private Iterator<Entry<Object, Object>> iterator;
         private Type type;
 

src/java.desktop/share/classes/javax/swing/Spring.java

@@ -477,7 +477,7 @@ public abstract class Spring {
         /*pp*/ boolean isCyclic(SpringLayout l) {
             return l.isCyclic(s1) || l.isCyclic(s2);
         }
-    };
+    }
 
      private static class SumSpring extends CompoundSpring {
          public SumSpring(Spring s1, Spring s2) {

src/java.desktop/share/classes/javax/swing/TransferHandler.java

@@ -188,7 +188,7 @@ public class TransferHandler implements Serializable {
         public String toString() {
             return getClass().getName() + "[dropPoint=" + dropPoint + "]";
         }
-    };
+    }
 
     /**
      * This class encapsulates all relevant details of a clipboard

src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java

@@ -88,12 +88,12 @@ public class TableColumnModelEvent extends java.util.EventObject
      *
      * @return int value for index from which the column was moved or removed
      */
-    public int getFromIndex() { return fromIndex; };
+    public int getFromIndex() { return fromIndex; }
 
     /**
      * Returns the toIndex.  Valid for add and moved events
      *
      * @return int value of column's new index
      */
-    public int getToIndex() { return toIndex; };
+    public int getToIndex() { return toIndex; }
 }

src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java

@@ -198,14 +198,14 @@ public class TableModelEvent extends java.util.EventObject
      *
      * @return an integer signifying the first row changed
      */
-    public int getFirstRow() { return firstRow; };
+    public int getFirstRow() { return firstRow; }
 
     /**
      * Returns the last row that changed.
      *
      * @return an integer signifying the last row changed
      */
-    public int getLastRow() { return lastRow; };
+    public int getLastRow() { return lastRow; }
 
     /**
      *  Returns the column for the event.  If the return
@@ -214,7 +214,7 @@ public class TableModelEvent extends java.util.EventObject
      *
      * @return an integer signifying which column is affected by this event
      */
-    public int getColumn() { return column; };
+    public int getColumn() { return column; }
 
     /**
      *  Returns the type of event - one of: INSERT, UPDATE and DELETE.

src/java.desktop/share/classes/javax/swing/filechooser/FileView.java

@@ -80,7 +80,7 @@ public abstract class FileView {
      */
     public String getName(File f) {
         return null;
-    };
+    }
 
     /**
      * A human readable description of the file. For example,

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java

@@ -71,7 +71,7 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup {
         public Object getElementAt(int index) { return null; }
         public void addListDataListener(ListDataListener l) {}
         public void removeListDataListener(ListDataListener l) {}
-    };
+    }
 
     static final ListModel<Object> EmptyListModel = new EmptyListModelClass();
 

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java

@@ -351,6 +351,6 @@ public class BasicDesktopIconUI extends DesktopIconUI {
             SwingUtilities.computeUnion(newX, newY, newWidth, newHeight, r);
             f.getParent().repaint(r.x, r.y, r.width, r.height);
         }
-    }; /// End MotionListener
+    } /// End MotionListener
 
 }

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java

@@ -168,7 +168,7 @@ public class BasicIconFactory implements Serializable
         }
         public int getIconWidth() { return width; }
         public int getIconHeight() { return height; }
-    };
+    }
 
     private static class CheckBoxIcon implements Icon, Serializable
     {

src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java

@@ -687,7 +687,7 @@ public class BasicMenuUI extends BasicMenuItemUI
                     newList.add(sub);
                 }
                 MenuSelectionManager manager = e.getMenuSelectionManager();
-                MenuElement[] newPath = new MenuElement[0];;
+                MenuElement[] newPath = new MenuElement[0];
                 newPath = newList.toArray(newPath);
                 manager.setSelectedPath(newPath);
                 e.consume();

src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java

@@ -256,7 +256,7 @@ public class MetalInternalFrameUI extends BasicInternalFrameUI {
                 super.mouseClicked(e);
             }
         }
-    };    /// End BorderListener Class
+    }    /// End BorderListener Class
 
 
     /**

src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java

@@ -62,8 +62,6 @@ class ImageScalingHelper {
         PAINT9_TILE
     }
 
-    ;
-
     private static final Insets EMPTY_INSETS = new Insets(0, 0, 0, 0);
 
     static final int PAINT_TOP_LEFT = 1;

src/java.desktop/share/classes/javax/swing/text/Caret.java

@@ -201,4 +201,4 @@ public interface Caret {
      */
     public void moveDot(int dot);
 
-};
+}

src/java.desktop/share/classes/javax/swing/text/Highlighter.java

@@ -151,4 +151,4 @@ public interface Highlighter {
         public HighlightPainter getPainter();
 
     }
-};
+}

src/java.desktop/share/classes/javax/swing/text/View.java

@@ -1383,4 +1383,4 @@ public abstract class View implements SwingConstants {
      */
     int lastUpdateIndex;
 
-};
+}

src/java.desktop/share/classes/sun/awt/AppContext.java

@@ -163,7 +163,7 @@ public final class AppContext {
      */
     private static volatile AppContext mainAppContext;
 
-    private static class GetAppContextLock {};
+    private static class GetAppContextLock {}
     private static final Object getAppContextLock = new GetAppContextLock();
 
     /*
@@ -193,7 +193,7 @@ public final class AppContext {
         VALID,
         BEING_DISPOSED,
         DISPOSED
-    };
+    }
 
     private volatile State state = State.VALID;
 

src/java.desktop/share/classes/sun/awt/CausedFocusEvent.java

@@ -58,8 +58,8 @@ class CausedFocusEvent extends FocusEvent {
         NATIVE_SYSTEM,
         ACTIVATION,
         CLEAR_GLOBAL_FOCUS_OWNER,
-        RETARGETED;
-    };
+        RETARGETED
+    }
 
     @SuppressWarnings("serial")
     private static final Component dummy = new Component(){};

src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java

@@ -363,7 +363,7 @@ public abstract class EmbeddedFrame extends Frame
 
     protected void setPeer(final ComponentPeer p){
         AWTAccessor.getComponentAccessor().setPeer(EmbeddedFrame.this, p);
-    };
+    }
 
     /**
      * Synthesize native message to activate or deactivate EmbeddedFrame window

src/java.desktop/share/classes/sun/awt/SunToolkit.java

@@ -130,7 +130,7 @@ public abstract class SunToolkit extends Toolkit
         touchKeyboardAutoShowIsEnabled = Boolean.parseBoolean(
             GetPropertyAction.privilegedGetProperty(
                 "awt.touchKeyboardAutoShowIsEnabled", "true"));
-    };
+    }
 
     /**
      * Special mask for the UngrabEvent events, in addition to the
@@ -410,7 +410,7 @@ public abstract class SunToolkit extends Toolkit
 
     public static void setLWRequestStatus(Window changed,boolean status){
         AWTAccessor.getWindowAccessor().setLWRequestStatus(changed, status);
-    };
+    }
 
     public static void checkAndSetPolicy(Container cont) {
         FocusTraversalPolicy defaultPolicy = KeyboardFocusManager.

src/java.desktop/share/classes/sun/awt/image/ImageCache.java

@@ -109,7 +109,7 @@ public final class ImageCache {
                 // soft image has been removed
                 currentPixelCount -= key.getPixelCount();
                 map.remove(key);
-            };
+            }
 
 
             // add new image to pixel count

src/java.desktop/share/classes/sun/font/LayoutPathImpl.java

@@ -104,7 +104,7 @@ public abstract class LayoutPathImpl extends LayoutPath {
         public boolean isPinned() { return this == PINNED; }
         public boolean isExtended() { return this == EXTENDED; }
         public boolean isClosed() { return this == CLOSED; }
-    };
+    }
 
     //
     // Top level construction.

src/java.desktop/share/classes/sun/font/SunFontManager.java

@@ -1325,7 +1325,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
          */
         HashMap<String,String> fontToFileMap2 = null;
         HashMap<String,String> fontToFamilyNameMap2 = null;
-        HashMap<String,ArrayList<String>> familyToFontListMap2 = null;;
+        HashMap<String,ArrayList<String>> familyToFontListMap2 = null;
 
         for (String pathFile : getFontFilesFromPath(false)) {
             if (!registryFiles.contains(pathFile)) {

src/java.desktop/share/classes/sun/java2d/Disposer.java

@@ -162,7 +162,7 @@ public class Disposer implements Runnable {
      * which happens to be the Toolkit thread, is in use.
      */
     public static interface PollDisposable {
-    };
+    }
 
     private static ConcurrentLinkedDeque<DisposerRecord> deferredRecords = new ConcurrentLinkedDeque<>();
 

src/java.desktop/share/classes/sun/java2d/StateTrackable.java

@@ -196,7 +196,7 @@ public interface StateTrackable {
          * whether or not that cached information was out of date.
          */
         UNTRACKABLE,
-    };
+    }
 
     /**
      * Returns the general state of the complex data held by this

src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java

@@ -141,7 +141,7 @@ final class LCMS implements PCMM {
                                     Object srcData, Object dstData,
                                     int srcType, int dstType);
 
-    private LCMS() {};
+    private LCMS() {}
 
     private static LCMS theLcms = null;
 

src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java

@@ -309,13 +309,13 @@ public class ProcessPath {
             if (c[a1] < (LINE_MIN)) {
                 if (c[a2] < (LINE_MIN)) {
                     return CRES_INVISIBLE;
-                };
+                }
                 res = CRES_MIN_CLIPPED;
                 t = (LINE_MIN);
             } else {
                 if (c[a2] > (LINE_MAX)) {
                     return CRES_INVISIBLE;
-                };
+                }
                 res = CRES_MAX_CLIPPED;
                 t = (LINE_MAX);
             }
@@ -334,13 +334,13 @@ public class ProcessPath {
             if (c[a1] < (LINE_MIN)) {
                 if (c[a2] < (LINE_MIN)) {
                     return CRES_INVISIBLE;
-                };
+                }
                 res = CRES_MIN_CLIPPED;
                 t = (LINE_MIN);
             } else {
                 if (c[a2] > (LINE_MAX)) {
                     return CRES_INVISIBLE;
-                };
+                }
                 res = CRES_MAX_CLIPPED;
                 t = (LINE_MAX);
             }
@@ -1710,7 +1710,7 @@ public class ProcessPath {
             this.y = y;
             this.lastPoint = lastPoint;
         }
-    };
+    }
 
     private static class Edge {
         int x;
@@ -1726,7 +1726,7 @@ public class ProcessPath {
             this.dx = dx;
             this.dir = dir;
         }
-    };
+    }
 
     /* Size of the default buffer in the FillData structure. This buffer is
      * replaced with heap allocated in case of large paths.

src/java.desktop/share/classes/sun/swing/plaf/synth/Paint9Painter.java

@@ -62,7 +62,7 @@ public class Paint9Painter extends CachedPainter {
          * regions with the top, left, bottom and right areas tiled.
          */
         PAINT9_TILE
-    };
+    }
 
     private static final Insets EMPTY_INSETS = new Insets(0, 0, 0, 0);
 

src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java

@@ -245,7 +245,7 @@ public class TextComponentPrintable implements CountingPrintable {
                     //the values do not matter
                     //we only need to get frames created
                     rendererPane.setSize(WIDTH, HEIGHT);
-                };
+                }
             };
         if (SwingUtilities.isEventDispatchThread()) {
             doCreateFrames.run();

src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c

@@ -267,7 +267,7 @@ mlib_image* mlib_ImageCreate(mlib_type type,
 /* sanity check */
   if (width <= 0 || height <= 0 || channels < 1 || channels > 4) {
     return NULL;
-  };
+  }
 
   if (!SAFE_TO_MULT(width, channels)) {
     return NULL;
@@ -322,7 +322,7 @@ mlib_image* mlib_ImageCreate(mlib_type type,
   if (image == NULL) {
     mlib_free(data);
     return NULL;
-  };
+  }
 
   image -> type     = type;
   image -> channels = channels;

src/java.desktop/share/native/common/font/AccelGlyphCache.h

@@ -91,7 +91,7 @@ void
 AccelGlyphCache_Free(GlyphCacheInfo *cache);
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif /* AccelGlyphCache_h_Included */

src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.h

@@ -85,7 +85,7 @@ typedef struct {
  * Pointer to native-specific (GLX, WGL, etc.) SurfaceData info, such as the
  * native Drawable handle and GraphicsConfig data.
  *
- *     jobject graphicsConfig;;
+ *     jobject graphicsConfig;
  * Strong reference to the OGLGraphicsConfig used by this OGLSurfaceData.
  *
  *     jint drawableType;

src/java.desktop/share/native/libawt/java2d/Disposer.h

@@ -47,7 +47,7 @@ Disposer_AddRecord(JNIEnv *env, jobject obj,
                    GeneralDisposeFunc disposer, jlong pData);
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif /* _Included_Disposer */

src/java.desktop/share/native/libawt/java2d/SurfaceData.h

@@ -661,7 +661,7 @@ SurfaceData_InitOps(JNIEnv *env, jobject sData, int opsSize);
 void SurfaceData_DisposeOps(JNIEnv *env, jlong ops);
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif

src/java.desktop/share/native/libawt/java2d/Trace.h

@@ -176,7 +176,7 @@ J2dTraceInit();
         }
 
 #ifdef __cplusplus
-};
+}
 #endif /* __cplusplus */
 
 #endif /* _Included_Trace */

src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h

@@ -649,7 +649,7 @@ JNIEXPORT extern jint sunHints_INTVAL_STROKE_PURE;
     REGISTER_PRIMITIVE(DrawGlyphListLCD, SRC, COMP, DST, FUNC)
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif /* GraphicsPrimitiveMgr_h_Included */

src/java.desktop/share/native/libawt/java2d/loops/ImageData.h

@@ -372,7 +372,7 @@ JNIEXPORT void JNICALL unlockBitImageData(
     JNIEnv *env, ImageDataBitLockInfo *lockInfo);
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif

src/java.desktop/share/native/libawt/java2d/pipe/Region.h

@@ -212,7 +212,7 @@ RegionToYXBandedRectangles(JNIEnv *env,
 
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif

src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java

@@ -77,7 +77,7 @@ public abstract class UNIXToolkit extends SunToolkit
         public int getNumber() {
             return number;
         }
-    };
+    }
 
     private Boolean nativeGTKAvailable;
     private Boolean nativeGTKLoaded;

src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java

@@ -81,7 +81,7 @@ public class XBaseWindow {
         INITIALISING,
         INITIALISED,
         FAILED_INITIALISATION
-    };
+    }
 
     private InitialiseState initialising;
 

src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java

@@ -59,7 +59,7 @@ public class XKeysym {
             jkeycode = jk;
             keyLocation = loc;
         }
-    };
+    }
     private static Unsafe unsafe = XlibWrapper.unsafe;
     static Hashtable<Long, Keysym2JavaKeycode>  keysym2JavaKeycodeHash = new Hashtable<Long, Keysym2JavaKeycode>();
     static Hashtable<Long, Character> keysym2UCSHash = new Hashtable<Long, Character>();
@@ -1724,6 +1724,6 @@ public class XKeysym {
         javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_NUM_LOCK, XKeySymConstants.XK_Num_Lock);
         javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_SCROLL_LOCK, XKeySymConstants.XK_Scroll_Lock);
         javaKeycode2KeysymHash.put( java.awt.event.KeyEvent.VK_KANA_LOCK, XKeySymConstants.XK_Kana_Lock);
-    };
+    }
 
 }

src/java.desktop/unix/classes/sun/awt/X11/XSelection.java

@@ -767,7 +767,7 @@ final class XSelection {
             }
             }
         }
-    };
+    }
 
     private static class IncrementalDataProvider implements XEventDispatcher {
         private final long requestor;
@@ -876,5 +876,5 @@ final class XSelection {
                 break;
             }
         }
-    };
+    }
 }

src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java

@@ -539,7 +539,7 @@ public class XTrayIconPeer implements TrayIconPeer,
         public void realDispose(){
             super.dispose();
         }
-    };
+    }
 
     // ***************************************
     // Classes for painting an image on canvas

src/java.desktop/unix/classes/sun/font/NativeFont.java

@@ -211,7 +211,7 @@ public class NativeFont extends PhysicalFont {
         while (pos >=0) {
             sb.replace(pos+1, pos+2, "*");
             pos = sb.indexOf("-0-", pos);
-        };
+        }
         String xlfd = sb.toString();
         return haveBitmapFonts(xlfd.getBytes(UTF_8));
     }

src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java

@@ -328,7 +328,7 @@ public class WindowsIconFactory implements Serializable
             }
             public int getIconWidth() { return 13; }
             public int getIconHeight() { return 13; }
-        };
+        }
 
     @SuppressWarnings("serial") // Same-version serialization only
     private static class CheckBoxIcon implements Icon, Serializable

src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java

@@ -614,8 +614,8 @@ class HTMLCodec extends InputStream {
                 if (!stUpContext.contains("<BODY")) {
                     htmlPrefix = htmlPrefix +"<BODY>";
                     htmlSuffix = "</BODY>" + htmlSuffix;
-                };
-            };
+                }
+            }
         }
 
         String stBaseUrl = DEF_SOURCE_URL;
@@ -821,7 +821,7 @@ class HTMLCodec extends InputStream {
                             case 7:
                                 stBaseURL = stValue;
                                 break;
-                        };
+                        }
                     } catch ( NumberFormatException e ) {
                         throw new IOException(FAILURE_MSG + astEntries[iEntry]+ " value " + e + INVALID_MSG);
                     }

src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java

@@ -112,7 +112,7 @@ public final class D3DGraphicsDevice extends Win32GraphicsDevice {
             class Result {
                 int caps;
                 String id;
-            };
+            }
             final Result res = new Result();
             rq.flushAndInvokeNow(new Runnable() {
                 public void run() {
@@ -320,7 +320,7 @@ public final class D3DGraphicsDevice extends Win32GraphicsDevice {
         try {
             class Result {
                 DisplayMode dm = null;
-            };
+            }
             final Result res = new Result();
             rq.flushAndInvokeNow(new Runnable() {
                 public void run() {
@@ -412,7 +412,7 @@ public final class D3DGraphicsDevice extends Win32GraphicsDevice {
         try {
             class Result {
                 long mem = 0L;
-            };
+            }
             final Result res = new Result();
             rq.flushAndInvokeNow(new Runnable() {
                 public void run() {
@@ -466,7 +466,7 @@ public final class D3DGraphicsDevice extends Win32GraphicsDevice {
         try {
             class Result {
                 boolean avail = false;
-            };
+            }
             final Result res = new Result();
             rq.flushAndInvokeNow(new Runnable() {
                 public void run() {

src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java

@@ -419,7 +419,7 @@ public class D3DSurfaceData extends SurfaceData implements AccelSurface {
         // REMIND: somewhere a puppy died
         class Status {
             boolean success = false;
-        };
+        }
         final Status status = new Status();
         D3DRenderQueue rq = D3DRenderQueue.getInstance();
         rq.lock();

src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.h

@@ -79,7 +79,7 @@ jlong ShaderList_FindProgram(ShaderList *programList,
 void ShaderList_Dispose(ShaderList *programList);
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif /* ShaderList_h_Included */

src/java.desktop/windows/native/libawt/java2d/windows/GDIBlitLoops.cpp

@@ -101,7 +101,7 @@ static void retryingSetDIBitsToDevice(
     printf("with retry time: %zd\n", (ts2.QuadPart-ts1.QuadPart));
 #endif
 
-};
+}
 
 /*
  * Class:     sun_java2d_windows_GDIBlitLoops

src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp

@@ -78,7 +78,7 @@ DCHolder::~DCHolder(){
     if (m_hMemoryDC) {
         ::DeleteDC(m_hMemoryDC);
     }
-};
+}
 
 
 HBITMAP DCHolder::CreateJavaContextBitmap(

src/java.desktop/windows/native/libawt/windows/awt_Mlib.h

@@ -40,7 +40,7 @@ JNIEXPORT mlib_start_timer awt_setMlibStartTimer();
 JNIEXPORT mlib_stop_timer awt_setMlibStopTimer();
 
 #ifdef __cplusplus
-}; /* end of extern "C" */
+} /* end of extern "C" */
 #endif
 
 

src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp

@@ -841,9 +841,9 @@ Java_sun_awt_windows_WPrinterJob_getDefaultPage(JNIEnv *env, jobject self,
 
           // set margins to 1"
           margins.left = convertFromPoints(72, units);
-          margins.top = convertFromPoints(72, units);;
-          margins.right = convertFromPoints(72, units);;
-          margins.bottom = convertFromPoints(72, units);;
+          margins.top = convertFromPoints(72, units);
+          margins.right = convertFromPoints(72, units);
+          margins.bottom = convertFromPoints(72, units);
 
           jobject paper = getPaper(env, page);
           if (paper == NULL) {
@@ -4297,7 +4297,7 @@ Java_sun_awt_windows_WPrinterJob_setNativePrintService(JNIEnv *env,
       hDevMode = NULL;
     }
 
-    HANDLE hDevNames = AwtPrintControl::getPrintHDName(env, name);;
+    HANDLE hDevNames = AwtPrintControl::getPrintHDName(env, name);
     if (hDevNames != NULL) {
       ::GlobalFree(hDevNames);
       hDevNames = NULL;

src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp

@@ -209,8 +209,8 @@ void AwtScrollPane::RecalcSizes(int parentWidth, int parentHeight,
     }
 
     /* Determine border width without scrollbars. */
-    int horzBorder = ::GetSystemMetrics(SM_CXEDGE);;
-    int vertBorder = ::GetSystemMetrics(SM_CYEDGE);;
+    int horzBorder = ::GetSystemMetrics(SM_CXEDGE);
+    int vertBorder = ::GetSystemMetrics(SM_CYEDGE);
 
     parentWidth -= (horzBorder * 2);
     parentHeight -= (vertBorder * 2);

src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp

@@ -1946,7 +1946,7 @@ HICON AwtToolkit::GetSecurityWarningIcon(UINT index, UINT w, UINT h)
     //Note: should not exceed 10 because of the current implementation.
     static const int securityWarningIconCounter = 3;
 
-    static HICON securityWarningIcon[securityWarningIconCounter]      = {NULL, NULL, NULL};;
+    static HICON securityWarningIcon[securityWarningIconCounter]      = {NULL, NULL, NULL};
     static UINT securityWarningIconWidth[securityWarningIconCounter]  = {0, 0, 0};
     static UINT securityWarningIconHeight[securityWarningIconCounter] = {0, 0, 0};
 

src/java.desktop/windows/native/libawt/windows/img_util_md.h

@@ -111,5 +111,5 @@ extern void initDitherTables(ColorData* cData);
 
 
 #ifdef __cplusplus
-}; /* end of extern "C" */
+} /* end of extern "C" */
 #endif