diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java index 6e6c86ccf7a..c16f956f114 100644 --- a/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java +++ b/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) { diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java index 2cfaa5a36ca..5461e25f7af 100644 --- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java +++ b/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(); diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java index b004093e23e..f29b63f6ba9 100644 --- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java +++ b/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; diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java index 14de5542642..7aa5fe67d58 100644 --- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java +++ b/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; } diff --git a/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java b/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java index d96def3c96d..5fa60f1b7ec 100644 --- a/src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java +++ b/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 diff --git a/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java b/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java index 61bfc0bc103..5e09d39692b 100644 --- a/src/java.desktop/macosx/classes/sun/java2d/MacOSFlags.java +++ b/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(); diff --git a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLLayer.java b/src/java.desktop/macosx/classes/sun/java2d/metal/MTLLayer.java index e03bdeb1e32..890c55376c7 100644 --- a/src/java.desktop/macosx/classes/sun/java2d/metal/MTLLayer.java +++ b/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(); } diff --git a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java index 4e2b56a59a3..eb6629a0ae9 100644 --- a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLLayer.java +++ b/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(); } diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m index 005d26954c2..bf66df162d1 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m +++ b/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; diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m index 4036775d275..424d44d94cb 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m +++ b/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 diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CellAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CellAccessibility.m index ba91dbb8b6f..63f4e755f60 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CellAccessibility.m +++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CellAccessibility.m @@ -34,7 +34,7 @@ - (NSAccessibilityRole)accessibilityRole { - return NSAccessibilityCellRole;; + return NSAccessibilityCellRole; } - (NSInteger)accessibilityIndex diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m index 33b4b7c579a..879a5fa57b4 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m +++ b/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; } diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonTextAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonTextAccessibility.m index 18e3f47e1eb..3e12f2985e0 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonTextAccessibility.m +++ b/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]); } diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/OutlineRowAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/OutlineRowAccessibility.m index 4653821283d..e80d60b958b 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/OutlineRowAccessibility.m +++ b/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 diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLClip.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLClip.m index effe7aebae6..3919d97c53a 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLClip.m +++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLClip.m @@ -276,7 +276,7 @@ static void initTemplatePipelineDescriptors() { - (id) stencilTextureRef { if (_dstOps == NULL) return nil; - return _dstOps->pStencilTexture;; + return _dstOps->pStencilTexture; } - (NSUInteger)shapeX { diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLGlyphCache.h b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLGlyphCache.h index 51fd9173b71..316a040ab81 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLGlyphCache.h +++ b/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 */ diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLPaints.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLPaints.m index 5686449a295..5a37fbd0c3f 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLPaints.m +++ b/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; diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderer.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderer.m index f8dc89c5cc2..84b76f8c8f3 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderer.m +++ b/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 mtlEncoder = [mtlc.encoderManager getRenderEncoder:dstOps];; + id mtlEncoder = [mtlc.encoderManager getRenderEncoder:dstOps]; if (mtlEncoder == nil) { J2dRlsTraceLn(J2D_TRACE_ERROR, "MTLRenderer_FillParallelogram: error creating MTLRenderCommandEncoder."); diff --git a/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp b/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp index 5f868f6e408..bf4f2e143a0 100644 --- a/src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Ports.cpp +++ b/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"); diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java index dd6e22e2bd8..34b034709f5 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java +++ b/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 { /* diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/RowFilter.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/RowFilter.java index 63ac14b49ed..6cc16b7fa10 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/RowFilter.java +++ b/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); diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java index a012ac990fd..b7a54a19897 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriteParam.java +++ b/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; - }; + } } diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java index 7f7286e4c0d..5ad3db345e2 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFOldJPEGDecompressor.java +++ b/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; diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java index d25188dc077..41f1bdbf8b1 100644 --- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java +++ b/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 } diff --git a/src/java.desktop/share/classes/java/awt/Component.java b/src/java.desktop/share/classes/java/awt/Component.java index 2e660d2308c..54acb64b70c 100644 --- a/src/java.desktop/share/classes/java/awt/Component.java +++ b/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) { diff --git a/src/java.desktop/share/classes/java/awt/Desktop.java b/src/java.desktop/share/classes/java/awt/Desktop.java index a2eb50e0093..e1dbb095ef6 100644 --- a/src/java.desktop/share/classes/java/awt/Desktop.java +++ b/src/java.desktop/share/classes/java/awt/Desktop.java @@ -261,7 +261,7 @@ public class Desktop { * @since 9 */ MOVE_TO_TRASH - }; + } private DesktopPeer peer; diff --git a/src/java.desktop/share/classes/java/awt/Dialog.java b/src/java.desktop/share/classes/java/awt/Dialog.java index 2c126e74ffc..cb1bb61a831 100644 --- a/src/java.desktop/share/classes/java/awt/Dialog.java +++ b/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 modalDialogs = new IdentityArrayList(); diff --git a/src/java.desktop/share/classes/java/awt/EventFilter.java b/src/java.desktop/share/classes/java/awt/EventFilter.java index d034e1a0aac..91229623280 100644 --- a/src/java.desktop/share/classes/java/awt/EventFilter.java +++ b/src/java.desktop/share/classes/java/awt/EventFilter.java @@ -55,7 +55,7 @@ interface EventFilter { * @see ModalEventFilter */ ACCEPT_IMMEDIATELY - }; + } FilterAction acceptEvent(AWTEvent ev); } diff --git a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java index c08c5580ae7..b5c5a7b54fb 100644 --- a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java +++ b/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 } /** diff --git a/src/java.desktop/share/classes/java/awt/TrayIcon.java b/src/java.desktop/share/classes/java/awt/TrayIcon.java index 080e4e3709f..f6091c37da8 100644 --- a/src/java.desktop/share/classes/java/awt/TrayIcon.java +++ b/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 diff --git a/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java b/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java index 4b8d4d5c9ea..bf1e43e850b 100644 --- a/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java +++ b/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java @@ -195,4 +195,4 @@ public class InputMethodHighlight { private int variation; private Map style; -}; +} diff --git a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java index 92ec515fe5f..2618d0ecaed 100644 --- a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java +++ b/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 */ diff --git a/src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java index 1eca65e7439..c5e44ebec9e 100644 --- a/src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java +++ b/src/java.desktop/share/classes/javax/accessibility/AccessibleAttributeSequence.java @@ -67,4 +67,4 @@ public class AccessibleAttributeSequence { endIndex = end; attributes = attr; } -}; +} diff --git a/src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java b/src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java index 20d0d313b1c..93e3b6a87c0 100644 --- a/src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java +++ b/src/java.desktop/share/classes/javax/accessibility/AccessibleTextSequence.java @@ -64,4 +64,4 @@ public class AccessibleTextSequence { endIndex = end; text = txt; } -}; +} diff --git a/src/java.desktop/share/classes/javax/print/StreamPrintService.java b/src/java.desktop/share/classes/javax/print/StreamPrintService.java index 5be233c47ad..318753cf047 100644 --- a/src/java.desktop/share/classes/javax/print/StreamPrintService.java +++ b/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. diff --git a/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java b/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java index 0e6460abf20..4f1a86f3516 100644 --- a/src/java.desktop/share/classes/javax/swing/DefaultDesktopManager.java +++ b/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++) { diff --git a/src/java.desktop/share/classes/javax/swing/LayoutStyle.java b/src/java.desktop/share/classes/javax/swing/LayoutStyle.java index 6ecda1e8a72..e45777565a8 100644 --- a/src/java.desktop/share/classes/javax/swing/LayoutStyle.java +++ b/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 * EAST or WEST. */ - INDENT; + INDENT } diff --git a/src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java b/src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java index dc16f1dd61b..8b65bfc962b 100644 --- a/src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java +++ b/src/java.desktop/share/classes/javax/swing/MultiUIDefaults.java @@ -149,7 +149,7 @@ class MultiUIDefaults extends UIDefaults private static class MultiUIDefaultsEnumerator implements Enumeration { - public static enum Type { KEYS, ELEMENTS }; + public static enum Type { KEYS, ELEMENTS } private Iterator> iterator; private Type type; diff --git a/src/java.desktop/share/classes/javax/swing/Spring.java b/src/java.desktop/share/classes/javax/swing/Spring.java index cf28f97b673..751eef76435 100644 --- a/src/java.desktop/share/classes/javax/swing/Spring.java +++ b/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) { diff --git a/src/java.desktop/share/classes/javax/swing/TransferHandler.java b/src/java.desktop/share/classes/javax/swing/TransferHandler.java index 445234e4bda..d12c393d66a 100644 --- a/src/java.desktop/share/classes/javax/swing/TransferHandler.java +++ b/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 diff --git a/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java index db5c7b43212..7d82866d6d2 100644 --- a/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java +++ b/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; } } diff --git a/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java index 1214bd40dcd..c5a5559b0dc 100644 --- a/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java +++ b/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. diff --git a/src/java.desktop/share/classes/javax/swing/filechooser/FileView.java b/src/java.desktop/share/classes/javax/swing/filechooser/FileView.java index 02514d75cb7..1a3ffffcc69 100644 --- a/src/java.desktop/share/classes/javax/swing/filechooser/FileView.java +++ b/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, diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java index 2725a047bf5..ae372a5ac61 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboPopup.java +++ b/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 EmptyListModel = new EmptyListModelClass(); diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java index 681ec227ccc..2b2c74536c4 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java +++ b/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 } diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java index 8b38a29e1ed..7d91b5280f8 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicIconFactory.java +++ b/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 { diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java index 0d2b0fde15e..c8a076ca89e 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java +++ b/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(); diff --git a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java index 94daa93f3b0..71e13e4b640 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java +++ b/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 /** diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java index 0353e9fbeb4..8597849e752 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java +++ b/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; diff --git a/src/java.desktop/share/classes/javax/swing/text/Caret.java b/src/java.desktop/share/classes/javax/swing/text/Caret.java index 90250366599..420b9731cb4 100644 --- a/src/java.desktop/share/classes/javax/swing/text/Caret.java +++ b/src/java.desktop/share/classes/javax/swing/text/Caret.java @@ -201,4 +201,4 @@ public interface Caret { */ public void moveDot(int dot); -}; +} diff --git a/src/java.desktop/share/classes/javax/swing/text/Highlighter.java b/src/java.desktop/share/classes/javax/swing/text/Highlighter.java index 7913e47b948..35547b88328 100644 --- a/src/java.desktop/share/classes/javax/swing/text/Highlighter.java +++ b/src/java.desktop/share/classes/javax/swing/text/Highlighter.java @@ -151,4 +151,4 @@ public interface Highlighter { public HighlightPainter getPainter(); } -}; +} diff --git a/src/java.desktop/share/classes/javax/swing/text/View.java b/src/java.desktop/share/classes/javax/swing/text/View.java index 7bdd3416796..4aec8b55f7f 100644 --- a/src/java.desktop/share/classes/javax/swing/text/View.java +++ b/src/java.desktop/share/classes/javax/swing/text/View.java @@ -1383,4 +1383,4 @@ public abstract class View implements SwingConstants { */ int lastUpdateIndex; -}; +} diff --git a/src/java.desktop/share/classes/sun/awt/AppContext.java b/src/java.desktop/share/classes/sun/awt/AppContext.java index d8c64c83426..fa098af556d 100644 --- a/src/java.desktop/share/classes/sun/awt/AppContext.java +++ b/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; diff --git a/src/java.desktop/share/classes/sun/awt/CausedFocusEvent.java b/src/java.desktop/share/classes/sun/awt/CausedFocusEvent.java index 88d0a06efa6..a19e4f394e1 100644 --- a/src/java.desktop/share/classes/sun/awt/CausedFocusEvent.java +++ b/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(){}; diff --git a/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java b/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java index 52f0f65187b..b79b06e3391 100644 --- a/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java +++ b/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 diff --git a/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/src/java.desktop/share/classes/sun/awt/SunToolkit.java index cd809df826b..615ab9f52df 100644 --- a/src/java.desktop/share/classes/sun/awt/SunToolkit.java +++ b/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. diff --git a/src/java.desktop/share/classes/sun/awt/image/ImageCache.java b/src/java.desktop/share/classes/sun/awt/image/ImageCache.java index cd22ccb7b15..eed1aa5bdb7 100644 --- a/src/java.desktop/share/classes/sun/awt/image/ImageCache.java +++ b/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 diff --git a/src/java.desktop/share/classes/sun/font/LayoutPathImpl.java b/src/java.desktop/share/classes/sun/font/LayoutPathImpl.java index 6e2b9b4c84d..5c83e8e9d0d 100644 --- a/src/java.desktop/share/classes/sun/font/LayoutPathImpl.java +++ b/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. diff --git a/src/java.desktop/share/classes/sun/font/SunFontManager.java b/src/java.desktop/share/classes/sun/font/SunFontManager.java index 8f262d778f0..f2e4e530b2e 100644 --- a/src/java.desktop/share/classes/sun/font/SunFontManager.java +++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java @@ -1325,7 +1325,7 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE { */ HashMap fontToFileMap2 = null; HashMap fontToFamilyNameMap2 = null; - HashMap> familyToFontListMap2 = null;; + HashMap> familyToFontListMap2 = null; for (String pathFile : getFontFilesFromPath(false)) { if (!registryFiles.contains(pathFile)) { diff --git a/src/java.desktop/share/classes/sun/java2d/Disposer.java b/src/java.desktop/share/classes/sun/java2d/Disposer.java index b64f77fe8a0..6b152dda3b0 100644 --- a/src/java.desktop/share/classes/sun/java2d/Disposer.java +++ b/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 deferredRecords = new ConcurrentLinkedDeque<>(); diff --git a/src/java.desktop/share/classes/sun/java2d/StateTrackable.java b/src/java.desktop/share/classes/sun/java2d/StateTrackable.java index 53896a81894..c2d6a2a624f 100644 --- a/src/java.desktop/share/classes/sun/java2d/StateTrackable.java +++ b/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 diff --git a/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java b/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java index 1f4d247d2fb..3679363a5ff 100644 --- a/src/java.desktop/share/classes/sun/java2d/cmm/lcms/LCMS.java +++ b/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; diff --git a/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java b/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java index 0fa1663d935..3a2a9675c24 100644 --- a/src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java +++ b/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. diff --git a/src/java.desktop/share/classes/sun/swing/plaf/synth/Paint9Painter.java b/src/java.desktop/share/classes/sun/swing/plaf/synth/Paint9Painter.java index f6adf173666..5c80bc5d6f9 100644 --- a/src/java.desktop/share/classes/sun/swing/plaf/synth/Paint9Painter.java +++ b/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); diff --git a/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java b/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java index a0b8168c3c1..74293b8ecbe 100644 --- a/src/java.desktop/share/classes/sun/swing/text/TextComponentPrintable.java +++ b/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(); diff --git a/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c b/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c index 6dfa0947222..6bb9b36e494 100644 --- a/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c +++ b/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; diff --git a/src/java.desktop/share/native/common/font/AccelGlyphCache.h b/src/java.desktop/share/native/common/font/AccelGlyphCache.h index 4ffb15a4ea5..05006aeea71 100644 --- a/src/java.desktop/share/native/common/font/AccelGlyphCache.h +++ b/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 */ diff --git a/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.h b/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.h index 353a2a2b649..974a6201e72 100644 --- a/src/java.desktop/share/native/common/java2d/opengl/OGLSurfaceData.h +++ b/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; diff --git a/src/java.desktop/share/native/libawt/java2d/Disposer.h b/src/java.desktop/share/native/libawt/java2d/Disposer.h index 148c33d9540..f8ed3f9e038 100644 --- a/src/java.desktop/share/native/libawt/java2d/Disposer.h +++ b/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 */ diff --git a/src/java.desktop/share/native/libawt/java2d/SurfaceData.h b/src/java.desktop/share/native/libawt/java2d/SurfaceData.h index 48504629703..745fd012e86 100644 --- a/src/java.desktop/share/native/libawt/java2d/SurfaceData.h +++ b/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 diff --git a/src/java.desktop/share/native/libawt/java2d/Trace.h b/src/java.desktop/share/native/libawt/java2d/Trace.h index 16414efac1a..322c63b0a60 100644 --- a/src/java.desktop/share/native/libawt/java2d/Trace.h +++ b/src/java.desktop/share/native/libawt/java2d/Trace.h @@ -176,7 +176,7 @@ J2dTraceInit(); } #ifdef __cplusplus -}; +} #endif /* __cplusplus */ #endif /* _Included_Trace */ diff --git a/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h b/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h index 2a3353aded8..3ba7574a0d5 100644 --- a/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.h +++ b/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 */ diff --git a/src/java.desktop/share/native/libawt/java2d/loops/ImageData.h b/src/java.desktop/share/native/libawt/java2d/loops/ImageData.h index f616bdd90ee..0e889435805 100644 --- a/src/java.desktop/share/native/libawt/java2d/loops/ImageData.h +++ b/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 diff --git a/src/java.desktop/share/native/libawt/java2d/pipe/Region.h b/src/java.desktop/share/native/libawt/java2d/pipe/Region.h index 487ea752d60..0f1081576b5 100644 --- a/src/java.desktop/share/native/libawt/java2d/pipe/Region.h +++ b/src/java.desktop/share/native/libawt/java2d/pipe/Region.h @@ -212,7 +212,7 @@ RegionToYXBandedRectangles(JNIEnv *env, #ifdef __cplusplus -}; +} #endif #endif diff --git a/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java b/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java index 31764c74948..2f77914f093 100644 --- a/src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java +++ b/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; diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java index 17fd55109f4..5962d5ea124 100644 --- a/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java +++ b/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java @@ -81,7 +81,7 @@ public class XBaseWindow { INITIALISING, INITIALISED, FAILED_INITIALISATION - }; + } private InitialiseState initialising; diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java b/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java index e0851249a38..acf8edf8c2d 100644 --- a/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java +++ b/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 keysym2JavaKeycodeHash = new Hashtable(); static Hashtable keysym2UCSHash = new Hashtable(); @@ -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); - }; + } } diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java b/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java index 7838a1dba0e..693970959be 100644 --- a/src/java.desktop/unix/classes/sun/awt/X11/XSelection.java +++ b/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; } } - }; + } } diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java index 6ba0364057a..a53dbebdd15 100644 --- a/src/java.desktop/unix/classes/sun/awt/X11/XTrayIconPeer.java +++ b/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 diff --git a/src/java.desktop/unix/classes/sun/font/NativeFont.java b/src/java.desktop/unix/classes/sun/font/NativeFont.java index da5c7e8ed4f..337d38c095a 100644 --- a/src/java.desktop/unix/classes/sun/font/NativeFont.java +++ b/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)); } diff --git a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java b/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java index c1c21ffc2f1..3fa1ff96676 100644 --- a/src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java +++ b/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 diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java b/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java index d665047c795..3b1738ad227 100644 --- a/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java +++ b/src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java @@ -614,8 +614,8 @@ class HTMLCodec extends InputStream { if (!stUpContext.contains(""; htmlSuffix = "" + 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); } diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java index d6b0b192491..e9f02a5d98c 100644 --- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java +++ b/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() { diff --git a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java index 425209dcae3..d03e2bc036c 100644 --- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DSurfaceData.java +++ b/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(); diff --git a/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.h b/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.h index 33f6253db4b..a50e9378bac 100644 --- a/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.h +++ b/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 */ diff --git a/src/java.desktop/windows/native/libawt/java2d/windows/GDIBlitLoops.cpp b/src/java.desktop/windows/native/libawt/java2d/windows/GDIBlitLoops.cpp index b41c4a22691..5969aae91db 100644 --- a/src/java.desktop/windows/native/libawt/java2d/windows/GDIBlitLoops.cpp +++ b/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 diff --git a/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp index 6f705b50962..93cbe1aa4c1 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp +++ b/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( diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h b/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h index 9b145df329c..db0406245a6 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h +++ b/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 diff --git a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp b/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp index 315ad94dc24..2c41ceeb699 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp +++ b/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; diff --git a/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp b/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp index 1e4091bd505..86aaa737dc9 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp +++ b/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); diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp index fb48e81dcb4..a9170f5ffae 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp +++ b/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}; diff --git a/src/java.desktop/windows/native/libawt/windows/img_util_md.h b/src/java.desktop/windows/native/libawt/windows/img_util_md.h index a4002d70a62..ebe7e85c095 100644 --- a/src/java.desktop/windows/native/libawt/windows/img_util_md.h +++ b/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