changeset 52654:2e330da7cbf4

8211300: Convert C-style array declarations in JDK client code Reviewed-by: prr, serb
author tvaleev
date Thu, 04 Oct 2018 12:40:55 -0700
parents f775f83d6b60
children 715642098c0b
files src/java.desktop/aix/classes/sun/awt/X11InputMethod.java src/java.desktop/macosx/classes/com/apple/eio/FileManager.java src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java src/java.desktop/macosx/classes/sun/java2d/CRenderer.java src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWUtil.java src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java src/java.desktop/share/classes/java/awt/AWTEvent.java src/java.desktop/share/classes/java/awt/BasicStroke.java src/java.desktop/share/classes/java/awt/BufferCapabilities.java src/java.desktop/share/classes/java/awt/Color.java src/java.desktop/share/classes/java/awt/Cursor.java src/java.desktop/share/classes/java/awt/Event.java src/java.desktop/share/classes/java/awt/FileDialog.java src/java.desktop/share/classes/java/awt/Font.java src/java.desktop/share/classes/java/awt/FontMetrics.java src/java.desktop/share/classes/java/awt/GradientPaintContext.java src/java.desktop/share/classes/java/awt/Graphics.java src/java.desktop/share/classes/java/awt/GridBagLayout.java src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java src/java.desktop/share/classes/java/awt/JobAttributes.java src/java.desktop/share/classes/java/awt/List.java src/java.desktop/share/classes/java/awt/MediaTracker.java src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java src/java.desktop/share/classes/java/awt/PageAttributes.java src/java.desktop/share/classes/java/awt/Polygon.java src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java src/java.desktop/share/classes/java/awt/Robot.java src/java.desktop/share/classes/java/awt/SystemColor.java src/java.desktop/share/classes/java/awt/TexturePaintContext.java src/java.desktop/share/classes/java/awt/Window.java src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java src/java.desktop/share/classes/java/awt/color/ICC_Profile.java src/java.desktop/share/classes/java/awt/font/TextLine.java src/java.desktop/share/classes/java/awt/geom/AffineTransform.java src/java.desktop/share/classes/java/awt/geom/Area.java src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java src/java.desktop/share/classes/java/awt/geom/Path2D.java src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java src/java.desktop/share/classes/java/awt/image/ColorModel.java src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java src/java.desktop/share/classes/java/awt/image/CropImageFilter.java src/java.desktop/share/classes/java/awt/image/DataBuffer.java src/java.desktop/share/classes/java/awt/image/DataBufferByte.java src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java src/java.desktop/share/classes/java/awt/image/DataBufferInt.java src/java.desktop/share/classes/java/awt/image/DataBufferShort.java src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java src/java.desktop/share/classes/java/awt/image/DirectColorModel.java src/java.desktop/share/classes/java/awt/image/ImageConsumer.java src/java.desktop/share/classes/java/awt/image/ImageFilter.java src/java.desktop/share/classes/java/awt/image/IndexColorModel.java src/java.desktop/share/classes/java/awt/image/Kernel.java src/java.desktop/share/classes/java/awt/image/LookupOp.java src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java src/java.desktop/share/classes/java/awt/image/PixelGrabber.java src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java src/java.desktop/share/classes/java/awt/image/Raster.java src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java src/java.desktop/share/classes/java/awt/image/RescaleOp.java src/java.desktop/share/classes/java/awt/image/SampleModel.java src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java src/java.desktop/share/classes/java/awt/image/WritableRaster.java src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java src/java.desktop/share/classes/java/beans/EventSetDescriptor.java src/java.desktop/share/classes/java/beans/Introspector.java src/java.desktop/share/classes/java/beans/MetaData.java src/java.desktop/share/classes/java/beans/MethodDescriptor.java src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java src/java.desktop/share/classes/javax/swing/AbstractButton.java src/java.desktop/share/classes/javax/swing/ArrayTable.java src/java.desktop/share/classes/javax/swing/DebugGraphics.java src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java src/java.desktop/share/classes/javax/swing/DefaultListModel.java src/java.desktop/share/classes/javax/swing/JComboBox.java src/java.desktop/share/classes/javax/swing/JComponent.java src/java.desktop/share/classes/javax/swing/JDesktopPane.java src/java.desktop/share/classes/javax/swing/JLabel.java src/java.desktop/share/classes/javax/swing/JMenu.java src/java.desktop/share/classes/javax/swing/JMenuBar.java src/java.desktop/share/classes/javax/swing/JMenuItem.java src/java.desktop/share/classes/javax/swing/JPasswordField.java src/java.desktop/share/classes/javax/swing/JPopupMenu.java src/java.desktop/share/classes/javax/swing/JTabbedPane.java src/java.desktop/share/classes/javax/swing/JTable.java src/java.desktop/share/classes/javax/swing/JViewport.java src/java.desktop/share/classes/javax/swing/MenuElement.java src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java src/java.desktop/share/classes/javax/swing/PopupFactory.java src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java src/java.desktop/share/classes/javax/swing/SizeSequence.java src/java.desktop/share/classes/javax/swing/SwingUtilities.java src/java.desktop/share/classes/javax/swing/ToolTipManager.java src/java.desktop/share/classes/javax/swing/TransferHandler.java src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java src/java.desktop/share/classes/javax/swing/text/ParagraphView.java src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java src/java.desktop/share/classes/javax/swing/text/html/CSS.java src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java src/java.desktop/share/classes/javax/swing/text/html/HTML.java src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java src/java.desktop/share/classes/javax/swing/text/html/TableView.java src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java src/java.desktop/share/classes/javax/swing/text/rtf/RTFGenerator.java src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java src/java.desktop/share/classes/javax/swing/text/rtf/RTFReader.java src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java src/java.desktop/share/classes/sun/awt/AWTAccessor.java src/java.desktop/share/classes/sun/awt/CharsetString.java src/java.desktop/share/classes/sun/awt/DebugSettings.java src/java.desktop/share/classes/sun/awt/FontConfiguration.java src/java.desktop/share/classes/sun/awt/IconInfo.java src/java.desktop/share/classes/sun/awt/PlatformFont.java src/java.desktop/share/classes/sun/awt/RepaintArea.java src/java.desktop/share/classes/sun/awt/TracedEventQueue.java src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java src/java.desktop/share/classes/sun/awt/geom/AreaOp.java src/java.desktop/share/classes/sun/awt/geom/Crossings.java src/java.desktop/share/classes/sun/awt/geom/Curve.java src/java.desktop/share/classes/sun/awt/geom/Edge.java src/java.desktop/share/classes/sun/awt/geom/Order0.java src/java.desktop/share/classes/sun/awt/geom/Order1.java src/java.desktop/share/classes/sun/awt/geom/Order2.java src/java.desktop/share/classes/sun/awt/geom/Order3.java src/java.desktop/share/classes/sun/awt/image/BufImgSurfaceData.java src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java src/java.desktop/share/classes/sun/awt/image/ByteBandedRaster.java src/java.desktop/share/classes/sun/awt/image/ByteComponentRaster.java src/java.desktop/share/classes/sun/awt/image/ByteInterleavedRaster.java src/java.desktop/share/classes/sun/awt/image/BytePackedRaster.java src/java.desktop/share/classes/sun/awt/image/GifImageDecoder.java src/java.desktop/share/classes/sun/awt/image/ImageDecoder.java src/java.desktop/share/classes/sun/awt/image/ImageRepresentation.java src/java.desktop/share/classes/sun/awt/image/IntegerComponentRaster.java src/java.desktop/share/classes/sun/awt/image/IntegerInterleavedRaster.java src/java.desktop/share/classes/sun/awt/image/JPEGImageDecoder.java src/java.desktop/share/classes/sun/awt/image/PNGImageDecoder.java src/java.desktop/share/classes/sun/awt/image/ShortBandedRaster.java src/java.desktop/share/classes/sun/awt/image/ShortComponentRaster.java src/java.desktop/share/classes/sun/awt/image/ShortInterleavedRaster.java src/java.desktop/share/classes/sun/awt/image/XbmImageDecoder.java src/java.desktop/share/classes/sun/awt/util/IdentityArrayList.java src/java.desktop/share/classes/sun/font/CompositeGlyphMapper.java src/java.desktop/share/classes/sun/font/Font2D.java src/java.desktop/share/classes/sun/font/FontDesignMetrics.java src/java.desktop/share/classes/sun/font/GlyphList.java src/java.desktop/share/classes/sun/font/ScriptRun.java src/java.desktop/share/classes/sun/font/SunFontManager.java src/java.desktop/share/classes/sun/font/TrueTypeFont.java src/java.desktop/share/classes/sun/font/Type1Font.java src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java src/java.desktop/share/classes/sun/java2d/loops/Blit.java src/java.desktop/share/classes/sun/java2d/loops/CustomComponent.java src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphList.java src/java.desktop/share/classes/sun/java2d/loops/DrawGlyphListAA.java src/java.desktop/share/classes/sun/java2d/loops/DrawPolygons.java src/java.desktop/share/classes/sun/java2d/loops/GeneralRenderer.java src/java.desktop/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java src/java.desktop/share/classes/sun/java2d/loops/MaskBlit.java src/java.desktop/share/classes/sun/java2d/loops/MaskFill.java src/java.desktop/share/classes/sun/java2d/loops/ProcessPath.java src/java.desktop/share/classes/sun/java2d/loops/RenderCache.java src/java.desktop/share/classes/sun/java2d/loops/TransformHelper.java src/java.desktop/share/classes/sun/java2d/pipe/AATileGenerator.java src/java.desktop/share/classes/sun/java2d/pipe/BufferedContext.java src/java.desktop/share/classes/sun/java2d/pipe/DrawImage.java src/java.desktop/share/classes/sun/java2d/pipe/GlyphListPipe.java src/java.desktop/share/classes/sun/java2d/pipe/LoopPipe.java src/java.desktop/share/classes/sun/java2d/pipe/NullPipe.java src/java.desktop/share/classes/sun/java2d/pipe/OutlineTextRenderer.java src/java.desktop/share/classes/sun/java2d/pipe/PixelDrawPipe.java src/java.desktop/share/classes/sun/java2d/pipe/PixelFillPipe.java src/java.desktop/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java src/java.desktop/share/classes/sun/java2d/pipe/PixelToShapeConverter.java src/java.desktop/share/classes/sun/java2d/pipe/Region.java src/java.desktop/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java src/java.desktop/share/classes/sun/java2d/pipe/RegionIterator.java src/java.desktop/share/classes/sun/java2d/pipe/RegionSpanIterator.java src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java src/java.desktop/share/classes/sun/java2d/pipe/ShapeSpanIterator.java src/java.desktop/share/classes/sun/java2d/pipe/SpanClipRenderer.java src/java.desktop/share/classes/sun/java2d/pipe/SpanIterator.java src/java.desktop/share/classes/sun/java2d/pipe/SpanShapeRenderer.java src/java.desktop/share/classes/sun/java2d/pipe/TextPipe.java src/java.desktop/share/classes/sun/java2d/pipe/TextRenderer.java src/java.desktop/share/classes/sun/java2d/pipe/ValidatePipe.java src/java.desktop/share/classes/sun/print/PSPrinterJob.java src/java.desktop/share/classes/sun/print/PSStreamPrintService.java src/java.desktop/share/classes/sun/print/PathGraphics.java src/java.desktop/share/classes/sun/print/PeekGraphics.java src/java.desktop/share/classes/sun/print/PrintJob2D.java src/java.desktop/share/classes/sun/print/ProxyGraphics.java src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java src/java.desktop/share/classes/sun/print/RasterPrinterJob.java src/java.desktop/share/classes/sun/swing/plaf/DesktopProperty.java src/java.desktop/unix/classes/sun/awt/UNIXToolkit.java src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java src/java.desktop/unix/classes/sun/awt/X11/MotifColorUtilities.java src/java.desktop/unix/classes/sun/awt/X11/XAWTLookAndFeel.java src/java.desktop/unix/classes/sun/awt/X11/XAWTXSettings.java src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java src/java.desktop/unix/classes/sun/awt/X11/XComponentPeer.java src/java.desktop/unix/classes/sun/awt/X11/XConstants.java src/java.desktop/unix/classes/sun/awt/X11/XEmbedServerTester.java src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java src/java.desktop/unix/classes/sun/awt/X11/XListPeer.java src/java.desktop/unix/classes/sun/awt/X11/XMSelection.java src/java.desktop/unix/classes/sun/awt/X11/XMenuBarPeer.java src/java.desktop/unix/classes/sun/awt/X11/XRobotPeer.java src/java.desktop/unix/classes/sun/awt/X11/XScrollPanePeer.java src/java.desktop/unix/classes/sun/awt/X11/XScrollbar.java src/java.desktop/unix/classes/sun/awt/X11/XSystemTrayPeer.java src/java.desktop/unix/classes/sun/awt/X11/XToolkit.java src/java.desktop/unix/classes/sun/awt/X11/XWM.java src/java.desktop/unix/classes/sun/awt/X11/XWindow.java src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java src/java.desktop/unix/classes/sun/awt/X11CustomCursor.java src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java src/java.desktop/unix/classes/sun/awt/X11InputMethod.java src/java.desktop/unix/classes/sun/awt/X11InputMethodBase.java src/java.desktop/unix/classes/sun/font/DoubleByteEncoder.java src/java.desktop/unix/classes/sun/font/X11GB18030_0.java src/java.desktop/unix/classes/sun/font/X11GB18030_1.java src/java.desktop/unix/classes/sun/font/X11Johab.java src/java.desktop/unix/classes/sun/font/X11SunUnicode_0.java src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java src/java.desktop/unix/classes/sun/java2d/x11/X11Renderer.java src/java.desktop/unix/classes/sun/java2d/xr/XRPaints.java src/java.desktop/unix/classes/sun/java2d/xr/XRRenderer.java src/java.desktop/unix/classes/sun/print/CUPSPrinter.java src/java.desktop/unix/classes/sun/print/IPPPrintService.java src/java.desktop/unix/classes/sun/print/UnixPrintJob.java src/java.desktop/unix/classes/sun/print/UnixPrintService.java src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java src/java.desktop/windows/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java src/java.desktop/windows/classes/sun/awt/Win32GraphicsDevice.java src/java.desktop/windows/classes/sun/awt/Win32GraphicsEnvironment.java src/java.desktop/windows/classes/sun/awt/windows/TranslucentWindowPainter.java src/java.desktop/windows/classes/sun/awt/windows/WCustomCursor.java src/java.desktop/windows/classes/sun/awt/windows/WDataTransferer.java src/java.desktop/windows/classes/sun/awt/windows/WDesktopProperties.java src/java.desktop/windows/classes/sun/awt/windows/WFontMetrics.java src/java.desktop/windows/classes/sun/awt/windows/WInputMethod.java src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java src/java.desktop/windows/classes/sun/awt/windows/WRobotPeer.java src/java.desktop/windows/classes/sun/awt/windows/WTrayIconPeer.java src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java src/java.desktop/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java src/java.desktop/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java src/java.desktop/windows/classes/sun/java2d/windows/GDIRenderer.java
diffstat 339 files changed, 1645 insertions(+), 1645 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/aix/classes/sun/awt/X11InputMethod.java	Thu Oct 04 12:40:55 2018 -0700
@@ -188,7 +188,7 @@
     //       to insure that it cannot be overridden by client subclasses.
     //       DO NOT INVOKE CLIENT CODE ON THIS THREAD!
     void dispatchComposedText(String chgText,
-                                           int chgStyles[],
+                                           int[] chgStyles,
                                            int chgOffset,
                                            int chgLength,
                                            int caretPosition,
--- a/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/com/apple/eio/FileManager.java	Thu Oct 04 12:40:55 2018 -0700
@@ -110,7 +110,7 @@
         public static int OSTypeToInt(String type) {
         int result = 0;
 
-                byte b[] = { (byte) 0, (byte) 0, (byte) 0, (byte) 0 };
+                byte[] b = { (byte) 0, (byte) 0, (byte) 0, (byte) 0 };
                 int len = type.length();
                 if (len > 0) {
                         if (len > 4) len = 4;
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileChooserUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1420,7 +1420,7 @@
         }
 
         // One sort state for each column.  Both are ascending by default
-        final boolean fSortAscending[] = {true, true};
+        final boolean[] fSortAscending = {true, true};
 
         // Instead of dragging, it selects which one to sort by
         public void setDraggedColumn(final TableColumn aColumn) {
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaFileSystemModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@
     Vector<File> directories = null;
     int fetchID = 0;
 
-    private final boolean fSortAscending[] = {true, true};
+    private final boolean[] fSortAscending = {true, true};
     // private boolean fSortAscending = true;
     private boolean fSortNames = true;
     private final String[] fColumnNames;
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuItemUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
 // TODO: no screen menu bar for now
 public class AquaMenuItemUI extends BasicMenuItemUI implements AquaMenuPainter.Client/*, ScreenMenuItemUI*/ {
     static final int kPlain = 0, kCheckBox = 1, kRadioButton = 2;
-    static final String sPropertyPrefixes[] = { "MenuItem", "CheckBoxMenuItem", "RadioButtonMenuItem" };
+    static final String[] sPropertyPrefixes = { "MenuItem", "CheckBoxMenuItem", "RadioButtonMenuItem" };
 
     boolean fIsScreenMenuItem = false;
     boolean fIsIndeterminate = false;
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,14 +96,14 @@
             if (menuItem.isEnabled() == false) return;
 
             final MenuSelectionManager manager = e.getMenuSelectionManager();
-            final MenuElement path[] = e.getPath();
+            final MenuElement[] path = e.getPath();
 
             // In Aqua, we always respect the menu's delay, if one is set.
             // Doesn't matter how the menu is clicked on or otherwise moused over.
             final Point p = e.getPoint();
             if (p.x >= 0 && p.x < menuItem.getWidth() && p.y >= 0 && p.y < menuItem.getHeight()) {
                 final JMenu menu = (JMenu)menuItem;
-                final MenuElement selectedPath[] = manager.getSelectedPath();
+                final MenuElement[] selectedPath = manager.getSelectedPath();
                 if (!(selectedPath.length > 0 && selectedPath[selectedPath.length - 1] == menu.getPopupMenu())) {
                     if (menu.getDelay() == 0) {
                         appendPath(path, menu.getPopupMenu());
@@ -124,7 +124,7 @@
     }
 
     static void appendPath(final MenuElement[] path, final MenuElement elem) {
-        final MenuElement newPath[] = new MenuElement[path.length + 1];
+        final MenuElement[] newPath = new MenuElement[path.length + 1];
         System.arraycopy(path, 0, newPath, 0, path.length);
         newPath[path.length] = elem;
         MenuSelectionManager.defaultManager().setSelectedPath(newPath);
@@ -144,7 +144,7 @@
             if (!menu.isEnabled()) return;
 
             final MenuSelectionManager manager = MenuSelectionManager.defaultManager();
-            final MenuElement selectedPath[] = manager.getSelectedPath();
+            final MenuElement[] selectedPath = manager.getSelectedPath();
 
             // In Aqua, we always have a menu delay, regardless of where the menu is.
             if (!(selectedPath.length > 0 && selectedPath[selectedPath.length - 1] == menu.getPopupMenu())) {
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -113,10 +113,10 @@
 
 // Transient variables (recalculated each time TabbedPane is layed out)
 
-    protected int tabRuns[] = new int[10];
+    protected int[] tabRuns = new int[10];
     protected int runCount = 0;
     protected int selectedRun = -1;
-    protected Rectangle rects[] = new Rectangle[0];
+    protected Rectangle[] rects = new Rectangle[0];
     protected int maxTabHeight;
     protected int maxTabWidth;
 
@@ -864,8 +864,8 @@
      * subtracting xCropLen[i] from (tab.y + tab.height) and adding yCropLen[i]
      * to (tab.x).
      */
-    private static int xCropLen[] = { 1, 1, 0, 0, 1, 1, 2, 2 };
-    private static int yCropLen[] = { 0, 3, 3, 6, 6, 9, 9, 12 };
+    private static int[] xCropLen = { 1, 1, 0, 0, 1, 1, 2, 2 };
+    private static int[] yCropLen = { 0, 3, 3, 6, 6, 9, 9, 12 };
     private static final int CROP_SEGMENT = 12;
 
     private static Polygon createCroppedTabShape(final int tabPlacement, final Rectangle tabRect, final int cropline) {
@@ -895,8 +895,8 @@
             rcnt++;
         }
         final int npts = 2 + (rcnt * 8);
-        final int xp[] = new int[npts];
-        final int yp[] = new int[npts];
+        final int[] xp = new int[npts];
+        final int[] yp = new int[npts];
         int pcnt = 0;
 
         xp[pcnt] = ostart;
--- a/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
     protected final Rectangle rightScrollTabRect = new Rectangle();
 
     protected int numberOfVisibleTabs = 0;
-    protected int visibleTabList[] = new int[10];
+    protected int[] visibleTabList = new int[10];
     protected int lastLeftmostTab;
     protected int lastReturnAt;
 
--- a/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/com/apple/laf/ScreenMenu.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@
     private ScreenMenuPropertyListener fPropertyListener;
 
     // Array of child hashes used to see if we need to recreate the Menu.
-    private int childHashArray[];
+    private int[] childHashArray;
 
     ScreenMenu(final JMenu invoker) {
         super(invoker.getText());
@@ -85,7 +85,7 @@
      * we do not get notified of it, because EDT is busy in our code. We only need to update if the menu contents have changed in some
      * way, such as the number of menu items, the text of the menuitems, icon, shortcut etc.
      */
-    private static boolean needsUpdate(final Component items[], final int childHashArray[]) {
+    private static boolean needsUpdate(final Component[] items, final int[] childHashArray) {
       if (items == null || childHashArray == null) {
         return true;
       }
--- a/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 public final class CCompositeGlyphMapper extends CompositeGlyphMapper {
 
     private CompositeFont font;
-    private CharToGlyphMapper slotMappers[];
+    private CharToGlyphMapper[] slotMappers;
 
     public CCompositeGlyphMapper(CompositeFont compFont) {
         super(compFont);
--- a/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/java2d/CRenderer.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -230,7 +230,7 @@
 
     native void doPoly(SurfaceData sData, int[] xpoints, int[] ypoints, int npoints, boolean ispolygon, boolean isfill);
 
-    public void drawPolyline(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+    public void drawPolyline(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
         OSXSurfaceData surfaceData = (OSXSurfaceData) sg2d.getSurfaceData();
         if ((sg2d.strokeState != SunGraphics2D.STROKE_CUSTOM) && (OSXSurfaceData.IsSimpleColor(sg2d.paint))) {
             surfaceData.doPolygon(this, sg2d, xpoints, ypoints, npoints, false, false);
@@ -244,7 +244,7 @@
         }
     }
 
-    public void drawPolygon(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+    public void drawPolygon(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
         OSXSurfaceData surfaceData = (OSXSurfaceData) sg2d.getSurfaceData();
         if ((sg2d.strokeState != SunGraphics2D.STROKE_CUSTOM) && (OSXSurfaceData.IsSimpleColor(sg2d.paint))) {
             surfaceData.doPolygon(this, sg2d, xpoints, ypoints, npoints, true, false);
@@ -259,7 +259,7 @@
         }
     }
 
-    public void fillPolygon(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+    public void fillPolygon(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
         OSXSurfaceData surfaceData = (OSXSurfaceData) sg2d.getSurfaceData();
         surfaceData.doPolygon(this, sg2d, xpoints, ypoints, npoints, true, true);
     }
--- a/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/java2d/CompositeCRenderer.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,11 +84,11 @@
         draw(sg2d, arc);
     }
 
-    public synchronized void drawPolyline(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+    public synchronized void drawPolyline(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
         doPolygon(sg2d, xpoints, ypoints, npoints, false, false);
     }
 
-    public synchronized void drawPolygon(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+    public synchronized void drawPolygon(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
         doPolygon(sg2d, xpoints, ypoints, npoints, true, false);
     }
 
@@ -120,11 +120,11 @@
         fill(sg2d, arc);
     }
 
-    public synchronized void fillPolygon(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints) {
+    public synchronized void fillPolygon(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints) {
         doPolygon(sg2d, xpoints, ypoints, npoints, true, true);
     }
 
-    public synchronized void doPolygon(SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints, boolean ispolygon, boolean isfill) {
+    public synchronized void doPolygon(SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints, boolean ispolygon, boolean isfill) {
         GeneralPath gp = new GeneralPath(Path2D.WIND_NON_ZERO, npoints);
         gp.moveTo(xpoints[0], ypoints[0]);
         for (int i = 1; i < npoints; i++) {
@@ -196,7 +196,7 @@
         drawGlyphVector(sg2d, sg2d.getFont().createGlyphVector(sg2d.getFontRenderContext(), str), x, y);
     }
 
-    public synchronized void drawChars(SunGraphics2D sg2d, char data[], int offset, int length, int x, int y) {
+    public synchronized void drawChars(SunGraphics2D sg2d, char[] data, int offset, int length, int x, int y) {
         drawString(sg2d, new String(data, offset, length), x, y);
     }
 
--- a/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/java2d/DataBufferNIOInt.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
     IntBuffer data;
 
     /** All data banks */
-    IntBuffer bankdata[];
+    IntBuffer[] bankdata;
 
     /**
      * Constructs an integer-based {@code DataBuffer} with a single bank
--- a/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 
     protected IntBuffer data;
 
-    public static WritableRaster createNIORaster(int w, int h, int bandMasks[], Point location) {
+    public static WritableRaster createNIORaster(int w, int h, int[] bandMasks, Point location) {
         if ((w <= 0) || (h <= 0)) {
             throw new IllegalArgumentException("Width (" + w + ") and height (" + h +
                                                ") cannot be <= 0");
--- a/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -171,7 +171,7 @@
                 int pixelSize = cm.getPixelSize();
                 int numOfComponents = cm.getNumColorComponents();
                 if ((numOfComponents == 3) && (cm instanceof ComponentColorModel) && (sm instanceof PixelInterleavedSampleModel)) {
-                    int sizes[] = cm.getComponentSize();
+                    int[] sizes = cm.getComponentSize();
                     boolean validsizes = (sizes[0] == 8) && (sizes[1] == 8) && (sizes[2] == 8);
                     int[] offs = ((ComponentSampleModel) sm).getBandOffsets();
                     int numBands = raster.getNumBands();
--- a/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/java2d/OSXSurfaceData.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -605,14 +605,14 @@
 
                     this.fGraphicsStatesInt.put(kColorStateIndex, kColorLinearGradient);
                     int numColor = color.getColors().length;
-                    int colorArray[] = new int[numColor];
+                    int[] colorArray = new int[numColor];
                     for (int i = 0; i < numColor; i++) {
                         colorArray[i] = color.getColors()[i].getRGB();
                     }
                     this.fGraphicsStatesObject[kColorArrayIndex] = colorArray;
 
                     int numFractions = color.getFractions().length;
-                    float fractionArray[] = new float[numFractions];
+                    float[] fractionArray = new float[numFractions];
                     for (int i = 0; i < numFractions; i++) {
                         fractionArray[i] = color.getFractions()[i];
                     }
@@ -639,14 +639,14 @@
 
                     this.fGraphicsStatesInt.put(kColorStateIndex, kColorRadialGradient);
                     int numColor = color.getColors().length;
-                    int colorArray[] = new int[numColor];
+                    int[] colorArray = new int[numColor];
                     for (int i = 0; i < numColor; i++) {
                         colorArray[i] = color.getColors()[i].getRGB();
                     }
                     this.fGraphicsStatesObject[kColorArrayIndex] = colorArray;
 
                     int numStops = color.getFractions().length;
-                    float stopsArray[] = new float[numStops];
+                    float[] stopsArray = new float[numStops];
                     for (int i = 0; i < numStops; i++) {
                         stopsArray[i] = color.getFractions()[i];
                     }
@@ -1031,7 +1031,7 @@
         renderer.doArc(this, x, y, width, height, startAngle, arcAngle, type, isfill);
     }
 
-    public void doPolygon(CRenderer renderer, SunGraphics2D sg2d, int xpoints[], int ypoints[], int npoints, boolean ispolygon, boolean isfill) {
+    public void doPolygon(CRenderer renderer, SunGraphics2D sg2d, int[] xpoints, int[] ypoints, int npoints, boolean ispolygon, boolean isfill) {
         // System.err.println("--- doPolygon");
 
         if ((isfill) && (isCustomPaint(sg2d))) {
@@ -1127,7 +1127,7 @@
         renderer.doDrawGlyphs(this, nativeStrikePtr, gv, x, y);
     }
 
-    public void drawUnicodes(CTextPipe renderer, SunGraphics2D sg2d, long nativeStrikePtr, char unicodes[], int offset, int length, float x, float y) {
+    public void drawUnicodes(CTextPipe renderer, SunGraphics2D sg2d, long nativeStrikePtr, char[] unicodes, int offset, int length, float x, float y) {
         // System.err.println("--- drawUnicodes "+(new String(unicodes, offset, length)));
         setupGraphicsState(sg2d, kUnicodes, sg2d.font, 0, 0, fBounds.width, fBounds.height);
         if (length == 1) {
--- a/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,7 @@
 
         long cfginfo = 0;
         int textureSize = 0;
-        final String ids[] = new String[1];
+        final String[] ids = new String[1];
         OGLRenderQueue rq = OGLRenderQueue.getInstance();
         rq.lock();
         try {
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
 public class CImage extends CFRetainedResource {
     private static native long nativeCreateNSImageFromArray(int[] buffer, int w, int h);
     private static native long nativeCreateNSImageFromBytes(byte[] buffer);
-    private static native long nativeCreateNSImageFromArrays(int[][] buffers, int w[], int h[]);
+    private static native long nativeCreateNSImageFromArrays(int[][] buffers, int[] w, int[] h);
     private static native long nativeCreateNSImageFromFileContents(String file);
     private static native long nativeCreateNSImageOfFileFromLaunchServices(String file);
     private static native long nativeCreateNSImageFromImageName(String name);
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethod.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@
     // Intitalize highlight mapping table and its mapper.
     static {
         @SuppressWarnings({"rawtypes", "unchecked"})
-        Map<TextAttribute, Integer> styles[] = new Map[4];
+        Map<TextAttribute, Integer>[] styles = new Map[4];
         HashMap<TextAttribute, Integer> map;
 
         // UNSELECTED_RAW_TEXT_HIGHLIGHT
@@ -613,7 +613,7 @@
                     }
 
                     // Get the characters from the iterator
-                    char selectedText[] = new char[theIterator.getEndIndex() - theIterator.getBeginIndex()];
+                    char[] selectedText = new char[theIterator.getEndIndex() - theIterator.getBeginIndex()];
                     char current = theIterator.first();
                     int index = 0;
                     while (current != CharacterIterator.DONE) {
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -106,7 +106,7 @@
     }
 
     public String toString() {
-        Locale loc[] = getAvailableLocales();
+        Locale[] loc = getAvailableLocales();
         String locnames = null;
 
         for (int i = 0; i < loc.length; i++) {
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CRobot.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -173,7 +173,7 @@
      */
     @Override
     public int getRGBPixel(int x, int y) {
-        int c[] = new int[1];
+        int[] c = new int[1];
         double scale = fDevice.getScaleFactor();
         getScreenPixels(new Rectangle(x, y, (int) scale, (int) scale), c);
         return c[0];
@@ -186,7 +186,7 @@
      */
     @Override
     public int [] getRGBPixels(final Rectangle bounds) {
-        int c[] = new int[bounds.width * bounds.height];
+        int[] c = new int[bounds.width * bounds.height];
         getScreenPixels(bounds, c);
 
         return c;
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTextPipe.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
 public class CTextPipe implements TextPipe {
     public native void doDrawString(SurfaceData sData, long nativeStrikePtr, String s, double x, double y);
     public native void doDrawGlyphs(SurfaceData sData, long nativeStrikePtr, GlyphVector gV, float x, float y);
-    public native void doUnicodes(SurfaceData sData, long nativeStrikePtr, char unicodes[], int offset, int length, float x, float y);
+    public native void doUnicodes(SurfaceData sData, long nativeStrikePtr, char[] unicodes, int offset, int length, float x, float y);
     public native void doOneUnicode(SurfaceData sData, long nativeStrikePtr, char aUnicode, float x, float y);
 
     long getNativeStrikePtr(final SunGraphics2D sg2d) {
@@ -95,7 +95,7 @@
         sg2d.setFont(prevFont);
     }
 
-    public void drawChars(final SunGraphics2D sg2d, final char data[], final int offset, final int length, final int x, final int y) {
+    public void drawChars(final SunGraphics2D sg2d, final char[] data, final int offset, final int length, final int x, final int y) {
         final long nativeStrikePtr = getNativeStrikePtr(sg2d);
         if (OSXSurfaceData.IsSimpleColor(sg2d.paint) && nativeStrikePtr != 0) {
             final OSXSurfaceData surfaceData = (OSXSurfaceData)sg2d.getSurfaceData();
@@ -120,7 +120,7 @@
             super.doDrawGlyphs(sData, nativeStrikePtr, gV, x, y);
         }
 
-        public void doUnicodes(final SurfaceData sData, final long nativeStrikePtr, final char unicodes[], final int offset, final int length, final float x, final float y) {
+        public void doUnicodes(final SurfaceData sData, final long nativeStrikePtr, final char[] unicodes, final int offset, final int length, final float x, final float y) {
             GraphicsPrimitive.tracePrimitive("QuartzDrawUnicodes");
             super.doUnicodes(sData, nativeStrikePtr, unicodes, offset, length, x, y);
         }
--- a/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/beans/editors/ColorEditor.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -195,11 +195,11 @@
     }
 
 
-    private String colorNames[] = { " ", "white", "lightGray", "gray", "darkGray",
+    private String[] colorNames = { " ", "white", "lightGray", "gray", "darkGray",
                         "black", "red", "pink", "orange",
                         "yellow", "green", "magenta", "cyan",
                         "blue"};
-    private Color colors[] = { null, Color.white, Color.lightGray, Color.gray, Color.darkGray,
+    private Color[] colors = { null, Color.white, Color.lightGray, Color.gray, Color.darkGray,
                         Color.black, Color.red, Color.pink, Color.orange,
                         Color.yellow, Color.green, Color.magenta, Color.cyan,
                         Color.blue};
--- a/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/beans/editors/FontEditor.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -213,7 +213,7 @@
     private Choice styleChoser;
     private Choice sizeChoser;
 
-    private String fonts[];
+    private String[] fonts;
     private String[] styleNames = { "plain", "bold", "italic" };
     private int[] styles = { Font.PLAIN, Font.BOLD, Font.ITALIC };
     private int[] pointSizes = { 3, 5, 8, 10, 12, 14, 18, 24, 36, 48 };
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java	Thu Oct 04 12:40:55 2018 -0700
@@ -122,7 +122,7 @@
     private long bitmapStart;
     private long compression;
     private long imageSize;
-    private byte palette[];
+    private byte[] palette;
     private int imageType;
     private int numBands;
     private boolean isBottomUp;
@@ -655,7 +655,7 @@
             }
 
             // Create IndexColorModel from the palette.
-            byte r[], g[], b[];
+            byte[] r, g, b;
             if (imageType == VERSION_2_1_BIT ||
                 imageType == VERSION_2_4_BIT ||
                 imageType == VERSION_2_8_BIT) {
@@ -885,9 +885,9 @@
             noTransform &=  destinationRegion.equals(raster.getBounds());
         }
 
-        byte bdata[] = null; // buffer for byte data
-        short sdata[] = null; // buffer for short data
-        int idata[] = null; // buffer for int data
+        byte[] bdata = null; // buffer for byte data
+        short[] sdata = null; // buffer for short data
+        int[] idata = null; // buffer for int data
 
         // the sampleModel can be null in case of embedded image
         if (sampleModel != null) {
@@ -1368,7 +1368,7 @@
         }
     }
 
-    private void read16Bit(short sdata[]) throws IOException {
+    private void read16Bit(short[] sdata) throws IOException {
         // Padding bytes at the end of each scanline
         // width * bitsPerPixel should be divisible by 32
         int padding = width * 2 % 4;
@@ -1434,7 +1434,7 @@
         }
     }
 
-    private void read32Bit(int idata[]) throws IOException {
+    private void read32Bit(int[] idata) throws IOException {
         if (noTransform) {
             int j = isBottomUp ? (height -1) * width : 0;
 
@@ -1490,7 +1490,7 @@
         }
     }
 
-    private void readRLE8(byte bdata[]) throws IOException {
+    private void readRLE8(byte[] bdata) throws IOException {
         // If imageSize field is not provided, calculate it.
         int imSize = (int)imageSize;
         if (imSize == 0) {
@@ -1506,7 +1506,7 @@
         }
 
         // Read till we have the whole image
-        byte values[] = new byte[imSize];
+        byte[] values = new byte[imSize];
         int bytesRead = 0;
         iis.readFully(values, 0, imSize);
 
@@ -1562,7 +1562,7 @@
                             byte[] values,
                             byte[] bdata) throws IOException {
 
-        byte val[] = new byte[width];
+        byte[] val = new byte[width];
         int count = 0, l = 0;
         int value;
         boolean flag = false;
@@ -1864,7 +1864,7 @@
                 // Ensure to check if the source index-count, does not
                 // exceed the source image size
                 if (count < imSize) {
-                    int alternate[] = { (values[count] & 0xf0) >> 4,
+                    int[] alternate = { (values[count] & 0xf0) >> 4,
                                         values[count] & 0x0f };
                     for (int i=0; (i < value) && (l < width); i++) {
                         val[l++] = (byte)alternate[i & 1];
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -295,7 +295,7 @@
 
         noTransform &= bgrOrder;
 
-        int sampleSize[] = sampleModel.getSampleSize();
+        int[] sampleSize = sampleModel.getSampleSize();
 
         //XXX: check more
 
@@ -322,7 +322,7 @@
                                   + BMPCompressionTypes.getName(compressionType));
         }
 
-        byte r[] = null, g[] = null, b[] = null, a[] = null;
+        byte[] r = null, g = null, b = null, a = null;
 
         if (compressionType == BI_BITFIELDS) {
             bitsPerPixel =
@@ -752,7 +752,7 @@
     }
 
     private void writePixels(int l, int scanlineBytes, int bitsPerPixel,
-                             int pixels[],
+                             int[] pixels,
                              int padding, int numBands,
                              IndexColorModel icm) throws IOException {
         int pixel = 0;
@@ -867,9 +867,9 @@
                 // Case where IndexColorModel had > 256 colors.
                 int entries = icm.getMapSize();
 
-                byte r[] = new byte[entries];
-                byte g[] = new byte[entries];
-                byte b[] = new byte[entries];
+                byte[] r = new byte[entries];
+                byte[] g = new byte[entries];
+                byte[] b = new byte[entries];
 
                 icm.getReds(r);
                 icm.getGreens(g);
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/BitFile.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
  */
 public class BitFile {
     ImageOutputStream output;
-    byte buffer[];
+    byte[] buffer;
     int index;
     int bitsLeft; // bits left at current index that are avail.
 
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
         return stream.read();
     }
 
-    public int read(byte b[], int off, int len) throws IOException {
+    public int read(byte[] b, int off, int len) throws IOException {
         return stream.read(b, off, len);
     }
 }
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/SimpleRenderedImage.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -263,7 +263,7 @@
      * property names.
      */
     public String[] getPropertyNames(String prefix) {
-        String propertyNames[] = getPropertyNames();
+        String[] propertyNames = getPropertyNames();
         if (propertyNames == null) {
             return null;
         }
@@ -282,7 +282,7 @@
         }
 
         // Copy the strings from the Vector over to a String array.
-        String prefixNames[] = new String[names.size()];
+        String[] prefixNames = new String[names.size()];
         int count = 0;
         for (Iterator<String> it = names.iterator(); it.hasNext(); ) {
             prefixNames[count++] = it.next();
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -71,13 +71,13 @@
     // Data structures needed to store changing elements for the previous
     // and the current scanline
     private int changingElemSize = 0;
-    private int prevChangingElems[];
-    private int currChangingElems[];
+    private int[] prevChangingElems;
+    private int[] currChangingElems;
 
     // Element at which to start search in getNextChangingElement
     private int lastChangingElement = 0;
 
-    private static int table1[] = {
+    private static int[] table1 = {
         0x00, // 0 bits are left in first byte - SHOULD NOT HAPPEN
         0x01, // 1 bits are left in first byte
         0x03, // 2 bits are left in first byte
@@ -89,7 +89,7 @@
         0xff  // 8 bits are left in first byte
     };
 
-    private static int table2[] = {
+    private static int[] table2 = {
         0x00, // 0
         0x80, // 1
         0xc0, // 2
@@ -103,7 +103,7 @@
 
     // Table to be used for flipping bytes when fillOrder is
     // BaselineTIFFTagSet.FILL_ORDER_RIGHT_TO_LEFT (2).
-    static byte flipTable[] = {
+    static byte[] flipTable = {
          0,  -128,    64,   -64,    32,   -96,    96,   -32,
         16,  -112,    80,   -48,    48,   -80,   112,   -16,
          8,  -120,    72,   -56,    40,   -88,   104,   -24,
@@ -139,7 +139,7 @@
     };
 
     // The main 10 bit white runs lookup table
-    private static short white[] = {
+    private static short[] white = {
         // 0 - 7
         6430,   6400,   6400,   6400,   3225,   3225,   3225,   3225,
         // 8 - 15
@@ -399,7 +399,7 @@
     };
 
     // Additional make up codes for both White and Black runs
-    private static short additionalMakeup[] = {
+    private static short[] additionalMakeup = {
         28679,  28679,  31752,  (short)32777,
         (short)33801,  (short)34825,  (short)35849,  (short)36873,
         (short)29703,  (short)29703,  (short)30727,  (short)30727,
@@ -407,7 +407,7 @@
     };
 
     // Initial black run look up table, uses the first 4 bits of a code
-    private static short initBlack[] = {
+    private static short[] initBlack = {
         // 0 - 7
         3226,  6412,    200,    168,    38,     38,    134,    134,
         // 8 - 15
@@ -415,10 +415,10 @@
     };
 
     //
-    private static short twoBitBlack[] = {292, 260, 226, 226};   // 0 - 3
+    private static short[] twoBitBlack = {292, 260, 226, 226};   // 0 - 3
 
     // Main black run table, using the last 9 bits of possible 13 bit code
-    private static short black[] = {
+    private static short[] black = {
         // 0 - 7
         62,     62,     30,     30,     0,      0,      0,      0,
         // 8 - 15
@@ -549,7 +549,7 @@
         390,    390,    390,    390,    390,    390,    390,    390,
     };
 
-    private static byte twoDCodes[] = {
+    private static byte[] twoDCodes = {
         // 0 - 7
         80,     88,     23,     71,     30,     30,     62,     62,
         // 8 - 15
@@ -853,7 +853,7 @@
         int entry, code, bits, color;
         boolean isWhite;
         int currIndex = 0;
-        int temp[];
+        int[] temp;
 
         if(data.length < 2) {
             throw new IIOException("Insufficient data to read initial EOL.");
@@ -1029,7 +1029,7 @@
         byte color;
         boolean isWhite;
         int currIndex;
-        int temp[];
+        int[] temp;
 
         // Return values from getNextChangingElement
         int[] b = new int[2];
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
     private static final int EOI_CODE   = 257;
     private static final int FIRST_CODE = 258;
 
-    private static final int andTable[] = {
+    private static final int[] andTable = {
         511,
         1023,
         2047,
@@ -53,7 +53,7 @@
     private int srcIndex;
     private int dstIndex;
 
-    private byte stringTable[][];
+    private byte[][] stringTable;
     private int tableIndex, bitsToGet = 9;
 
     private int nextData = 0;
@@ -215,7 +215,7 @@
     /**
      * Write out the string just uncompressed.
      */
-    public void writeString(byte string[]) {
+    public void writeString(byte[] string) {
         if(dstIndex < dstData.length) {
             int maxIndex = Math.min(string.length,
                                     dstData.length - dstIndex);
@@ -229,9 +229,9 @@
     /**
      * Add a new string to the string table.
      */
-    public void addStringToTable(byte oldString[], byte newString) {
+    public void addStringToTable(byte[] oldString, byte newString) {
         int length = oldString.length;
-        byte string[] = new byte[length + 1];
+        byte[] string = new byte[length + 1];
         System.arraycopy(oldString, 0, string, 0, length);
         string[length] = newString;
 
@@ -250,7 +250,7 @@
     /**
      * Add a new string to the string table.
      */
-    public void addStringToTable(byte string[]) {
+    public void addStringToTable(byte[] string) {
         // Add this new String to the table
         stringTable[tableIndex++] = string;
 
@@ -266,9 +266,9 @@
     /**
      * Append {@code newString} to the end of {@code oldString}.
      */
-    public byte[] composeString(byte oldString[], byte newString) {
+    public byte[] composeString(byte[] oldString, byte newString) {
         int length = oldString.length;
-        byte string[] = new byte[length + 1];
+        byte[] string = new byte[length + 1];
         System.arraycopy(oldString, 0, string, 0, length);
         string[length] = newString;
 
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWUtil.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWUtil.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,13 +37,13 @@
     byte[] dstData;
     int dstIndex = 0;
 
-    byte stringTable[][];
+    byte[][] stringTable;
     int tableIndex, bitsToGet = 9;
 
     int nextData = 0;
     int nextBits = 0;
 
-    private static final int andTable[] = {
+    private static final int[] andTable = {
         511,
         1023,
         2047,
@@ -143,7 +143,7 @@
     /**
      * Write out the string just uncompressed.
      */
-    public void writeString(byte string[]) {
+    public void writeString(byte[] string) {
         ensureCapacity(string.length);
         for (int i = 0; i < string.length; i++) {
             dstData[dstIndex++] = string[i];
@@ -153,9 +153,9 @@
     /**
      * Add a new string to the string table.
      */
-    public void addStringToTable(byte oldString[], byte newString) {
+    public void addStringToTable(byte[] oldString, byte newString) {
         int length = oldString.length;
-        byte string[] = new byte[length + 1];
+        byte[] string = new byte[length + 1];
         System.arraycopy(oldString, 0, string, 0, length);
         string[length] = newString;
 
@@ -174,7 +174,7 @@
     /**
      * Add a new string to the string table.
      */
-    public void addStringToTable(byte string[]) {
+    public void addStringToTable(byte[] string) {
         // Add this new String to the table
         stringTable[tableIndex++] = string;
 
@@ -190,9 +190,9 @@
     /**
      * Append {@code newString} to the end of {@code oldString}.
      */
-    public byte[] composeString(byte oldString[], byte newString) {
+    public byte[] composeString(byte[] oldString, byte newString) {
         int length = oldString.length;
-        byte string[] = new byte[length + 1];
+        byte[] string = new byte[length + 1];
         System.arraycopy(oldString, 0, string, 0, length);
         string[length] = newString;
 
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1497,7 +1497,7 @@
                             GTKIconFactory.resetIcons();
                         }
                         lnf.loadStyles();
-                        Window appWindows[] = Window.getWindows();
+                        Window[] appWindows = Window.getWindows();
                         for (int i = 0; i < appWindows.length; i++) {
                             SynthLookAndFeel.updateStyles(appWindows[i]);
                         }
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@
         PositionType.TOP, PositionType.LEFT
     };
 
-    private static final ShadowType SHADOWS[] = {
+    private static final ShadowType[] SHADOWS = {
         ShadowType.NONE, ShadowType.IN, ShadowType.OUT,
         ShadowType.ETCHED_IN, ShadowType.OUT
     };
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2028,8 +2028,8 @@
             AffineTransform affine;
             int index;
 
-            double ctrlpts[][];
-            int types[];
+            double[][] ctrlpts;
+            int[] types;
 
             private static final double angle = Math.PI / 4.0;
             private static final double a = 1.0 - Math.cos(angle);
@@ -2042,7 +2042,7 @@
             //     4 values for each point {v0, v1, v2, v3}:
             //         point = (x + v0 * w + v1 * arcWidth,
             //                  y + v2 * h + v3 * arcHeight);
-            private static final double CtrlPtTemplate[][] = {
+            private static final double[][] CtrlPtTemplate = {
                 {  0.0,  0.0,  1.0,  0.0 },     /* BOTTOM LEFT corner */
                 {  0.0,  0.0,  1.0, -0.5 },     /* BOTTOM LEFT arc start */
                 {  0.0,  0.0,  1.0, -acv,       /* BOTTOM LEFT arc curve */
@@ -2065,7 +2065,7 @@
                    0.0,  0.0,  0.0,  0.5 },
                 {},                             /* Closing path element */
             };
-            private static final int CornerFlags[] = {
+            private static final int[] CornerFlags = {
                 RoundRectClipShape.BOTTOM_LEFT,
                 RoundRectClipShape.BOTTOM_RIGHT,
                 RoundRectClipShape.TOP_RIGHT,
@@ -2126,7 +2126,7 @@
                 if (isDone()) {
                     throw new NoSuchElementException("roundrect iterator out of bounds");
                 }
-                double ctrls[] = ctrlpts[index];
+                double[] ctrls = ctrlpts[index];
                 int nc = 0;
                 for (int i = 0; i < ctrls.length; i += 4) {
                     coords[nc++] = (float) (x + ctrls[i + 0] * w + ctrls[i + 1] * aw);
@@ -2142,7 +2142,7 @@
                 if (isDone()) {
                     throw new NoSuchElementException("roundrect iterator out of bounds");
                 }
-                double ctrls[] = ctrlpts[index];
+                double[] ctrls = ctrlpts[index];
                 int nc = 0;
                 for (int i = 0; i < ctrls.length; i += 4) {
                     coords[nc++] = x + ctrls[i + 0] * w + ctrls[i + 1] * aw;
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@
         return new MotifChangeHandler((JMenu)c, this);
     }
 
-    private boolean popupIsOpen(JMenu m,MenuElement me[]) {
+    private boolean popupIsOpen(JMenu m,MenuElement[] me) {
         int i;
         JPopupMenu pm = m.getPopupMenu();
 
@@ -111,7 +111,7 @@
                     } else {
                         Container cnt = menu.getParent();
                         if(cnt != null && cnt instanceof JMenuBar) {
-                            MenuElement me[] = new MenuElement[2];
+                            MenuElement[] me = new MenuElement[2];
                             me[0]=(MenuElement)cnt;
                             me[1]=menu;
                             manager.setSelectedPath(me);
@@ -119,9 +119,9 @@
                     }
                 }
 
-                MenuElement path[] = getPath();
+                MenuElement[] path = getPath();
                 if (path.length > 0) {
-                    MenuElement newPath[] = new MenuElement[path.length+1];
+                    MenuElement[] newPath = new MenuElement[path.length+1];
                     System.arraycopy(path,0,newPath,0,path.length);
                     newPath[path.length] = menu.getPopupMenu();
                     manager.setSelectedPath(newPath);
--- a/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/AiffFileWriter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -234,7 +234,7 @@
         int bytesRead = 0;
         int bytesWritten = 0;
         InputStream fileStream = getFileStream(aiffFileFormat, in);
-        byte buffer[] = new byte[bisBufferSize];
+        byte[] buffer = new byte[bisBufferSize];
         int maxLength = aiffFileFormat.getByteLength();
 
         while( (bytesRead = fileStream.read( buffer )) >= 0 ) {
@@ -288,7 +288,7 @@
         float sampleFramesPerSecond = format.getSampleRate();
         int compCode = AiffFileFormat.AIFC_PCM;
 
-        byte header[] = null;
+        byte[] header = null;
         InputStream codedAudioStream = audioStream;
 
         // if we need to do any format conversion, do it here....
--- a/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
     private static final byte[] ALAW_TABH = new byte[256];
     private static final byte[] ALAW_TABL = new byte[256];
 
-    private static final short seg_end[] = {
+    private static final short[] seg_end = {
             0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF
     };
 
@@ -91,7 +91,7 @@
 
             if( sourceFormat.getSampleSizeInBits() == 16 ) {
 
-                AudioFormat.Encoding enc[] = new AudioFormat.Encoding[1];
+                AudioFormat.Encoding[] enc = new AudioFormat.Encoding[1];
                 enc[0] = AudioFormat.Encoding.ALAW;
                 return enc;
 
@@ -102,7 +102,7 @@
 
             if( sourceFormat.getSampleSizeInBits() == 8 ) {
 
-                AudioFormat.Encoding enc[] = new AudioFormat.Encoding[1];
+                AudioFormat.Encoding[] enc = new AudioFormat.Encoding[1];
                 enc[0] = AudioFormat.Encoding.PCM_SIGNED;
                 return enc;
 
@@ -246,7 +246,7 @@
 
         // tempBuffer required only for encoding (when encode is true)
         private static final int tempBufferSize = 64;
-        private byte tempBuffer [] = null;
+        private byte[] tempBuffer  = null;
 
         /**
          * True to encode to a-law, false to decode to linear
@@ -256,8 +256,8 @@
         AudioFormat encodeFormat;
         AudioFormat decodeFormat;
 
-        byte tabByte1[] = null;
-        byte tabByte2[] = null;
+        byte[] tabByte1 = null;
+        byte[] tabByte2 = null;
         int highByte = 0;
         int lowByte  = 1;
 
@@ -320,7 +320,7 @@
          * $$jb 2/23/99
          * Used to determine segment number in aLaw encoding
          */
-        private short search(short val, short table[], short size) {
+        private short search(short val, short[] table, short size) {
             for(short i = 0; i < size; i++) {
                 if (val <= table[i]) { return i; }
             }
--- a/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/AuFileWriter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -219,7 +219,7 @@
         int bytesRead = 0;
         int bytesWritten = 0;
         InputStream fileStream = getFileStream(auFileFormat, in);
-        byte buffer[] = new byte[bisBufferSize];
+        byte[] buffer = new byte[bisBufferSize];
         int maxLength = auFileFormat.getByteLength();
 
         while( (bytesRead = fileStream.read( buffer )) >= 0 ) {
--- a/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/DirectAudioDevice.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1148,7 +1148,7 @@
                     // to be allocated)
                     int MAX_READ_LIMIT = 16384;
                     DirectBAOS dbaos  = new DirectBAOS();
-                    byte tmp[] = new byte[MAX_READ_LIMIT];
+                    byte[] tmp = new byte[MAX_READ_LIMIT];
                     int thisRead = 0;
                     while (thisRead >= 0) {
                         thisRead = stream.read(tmp, 0, tmp.length);
--- a/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/EmergencySoundbank.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -635,7 +635,7 @@
 
     public static SF2Layer new_guitar_pick(SF2Soundbank sf2) {
 
-        double datab[];
+        double[] datab;
 
         // Make treble part
         {
@@ -814,7 +814,7 @@
 
     public static SF2Layer new_piano_hammer(SF2Soundbank sf2) {
 
-        double datab[];
+        double[] datab;
 
         // Make treble part
         {
@@ -1803,8 +1803,8 @@
 
     public static SF2Layer new_timpani(SF2Soundbank sf2) {
 
-        double datab[];
-        double datah[];
+        double[] datab;
+        double[] datah;
 
         // Make Bass Part
         {
@@ -1891,8 +1891,8 @@
 
     public static SF2Layer new_melodic_toms(SF2Soundbank sf2) {
 
-        double datab[];
-        double datah[];
+        double[] datab;
+        double[] datah;
 
         // Make Bass Part
         {
@@ -1969,7 +1969,7 @@
     }
 
     public static SF2Layer new_reverse_cymbal(SF2Soundbank sf2) {
-        double datah[];
+        double[] datah;
         {
             int fftlen = 4096 * 4;
             double[] data = new double[2 * fftlen];
@@ -2012,8 +2012,8 @@
 
     public static SF2Layer new_snare_drum(SF2Soundbank sf2) {
 
-        double datab[];
-        double datah[];
+        double[] datab;
+        double[] datah;
 
         // Make Bass Part
         {
@@ -2088,8 +2088,8 @@
 
     public static SF2Layer new_bass_drum(SF2Soundbank sf2) {
 
-        double datab[];
-        double datah[];
+        double[] datab;
+        double[] datah;
 
         // Make Bass Part
         {
@@ -2162,8 +2162,8 @@
 
     public static SF2Layer new_tom(SF2Soundbank sf2) {
 
-        double datab[];
-        double datah[];
+        double[] datab;
+        double[] datah;
 
         // Make Bass Part
         {
@@ -2240,7 +2240,7 @@
     }
 
     public static SF2Layer new_closed_hihat(SF2Soundbank sf2) {
-        double datah[];
+        double[] datah;
 
         // Make treble part
         {
@@ -2291,7 +2291,7 @@
     }
 
     public static SF2Layer new_open_hihat(SF2Soundbank sf2) {
-        double datah[];
+        double[] datah;
         {
             int fftlen = 4096 * 4;
             double[] data = new double[2 * fftlen];
@@ -2332,7 +2332,7 @@
     }
 
     public static SF2Layer new_crash_cymbal(SF2Soundbank sf2) {
-        double datah[];
+        double[] datah;
         {
             int fftlen = 4096 * 4;
             double[] data = new double[2 * fftlen];
@@ -2372,7 +2372,7 @@
     }
 
     public static SF2Layer new_side_stick(SF2Soundbank sf2) {
-        double datab[];
+        double[] datab;
 
         // Make treble part
         {
--- a/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java	Thu Oct 04 12:40:55 2018 -0700
@@ -66,7 +66,7 @@
     private long lastPlayCall = 0;
     private static final int MINIMUM_PLAY_DELAY = 30;
 
-    private byte loadedAudio[] = null;
+    private byte[] loadedAudio = null;
     private int loadedAudioByteLength = 0;
     private AudioFormat loadedAudioFormat = null;
 
@@ -383,7 +383,7 @@
     private void readStream(AudioInputStream as) throws IOException {
 
         DirectBAOS baos = new DirectBAOS();
-        byte buffer[] = new byte[16384];
+        byte[] buffer = new byte[16384];
         int bytesRead = 0;
         int totalBytesRead = 0;
 
--- a/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/ModelByteBuffer.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@
         }
 
         @Override
-        public int read(byte b[], int off, int len) throws IOException {
+        public int read(byte[] b, int off, int len) throws IOException {
             if (len > left)
                 len = (int)left;
             if (left == 0)
--- a/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/RIFFReader.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -156,11 +156,11 @@
         }
     }
 
-    public void readFully(byte b[]) throws IOException {
+    public void readFully(byte[] b) throws IOException {
         readFully(b, 0, b.length);
     }
 
-    public void readFully(byte b[], int off, int len) throws IOException {
+    public void readFully(byte[] b, int off, int len) throws IOException {
         if (len < 0)
             throw new IndexOutOfBoundsException();
         while (len > 0) {
--- a/src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/RIFFWriter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -279,7 +279,7 @@
     }
 
     @Override
-    public void write(byte b[], int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         if (!writeoverride) {
             if (chunktype != 2) {
                 throw new IllegalArgumentException(
--- a/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/RealTimeSequencer.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1126,7 +1126,7 @@
                 }
                 return;
             }
-            int temp[] = new int[ controllers.length + c.length ];
+            int[] temp = new int[ controllers.length + c.length ];
             int elements;
 
             // first add what we have
@@ -1149,7 +1149,7 @@
                 }
             }
             // now keep only the elements we need
-            int newc[] = new int[ elements ];
+            int[] newc = new int[ elements ];
             for(int i=0; i<elements; i++){
                 newc[i] = temp[i];
             }
@@ -1161,7 +1161,7 @@
             if (c==null) {
                 controllers = new int[0];
             } else {
-                int temp[] = new int[ controllers.length ];
+                int[] temp = new int[ controllers.length ];
                 int elements = 0;
 
 
@@ -1178,7 +1178,7 @@
                     }
                 }
                 // now keep only the elements remaining
-                int newc[] = new int[ elements ];
+                int[] newc = new int[ elements ];
                 for(int i=0; i<elements; i++) {
                     newc[i] = temp[i];
                 }
@@ -1195,7 +1195,7 @@
                 return null;
             }
 
-            int c[] = new int[controllers.length];
+            int[] c = new int[controllers.length];
 
             for(int i=0; i<controllers.length; i++){
                 c[i] = controllers[i];
--- a/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/SoftReverb.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@
             this.feedback = feedback;
         }
 
-        public void processReplace(float inout[]) {
+        public void processReplace(float[] inout) {
             int len = inout.length;
             int delaybuffersize = this.delaybuffersize;
             int rovepos = this.rovepos;
@@ -102,7 +102,7 @@
             this.rovepos = rovepos;
         }
 
-        public void processReplace(float in[], float out[]) {
+        public void processReplace(float[] in, float[] out) {
             int len = in.length;
             int delaybuffersize = this.delaybuffersize;
             int rovepos = this.rovepos;
@@ -138,7 +138,7 @@
             filtercoeff2 = (1 - filtercoeff1)* feedback;
         }
 
-        public void processMix(float in[], float out[]) {
+        public void processMix(float[] in, float[] out) {
             int len = in.length;
             int delaybuffersize = this.delaybuffersize;
             int rovepos = this.rovepos;
@@ -159,7 +159,7 @@
             this.rovepos = rovepos;
         }
 
-        public void processReplace(float in[], float out[]) {
+        public void processReplace(float[] in, float[] out) {
             int len = in.length;
             int delaybuffersize = this.delaybuffersize;
             int rovepos = this.rovepos;
--- a/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileWriter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,7 +74,7 @@
     /**
      * MIDI parser types.
      */
-    private static final int types[] = {
+    private static final int[] types = {
         MIDI_TYPE_0,
         MIDI_TYPE_1
     };
@@ -96,8 +96,8 @@
      */
     @Override
     public int[] getMidiFileTypes(Sequence sequence){
-        int typesArray[];
-        Track tracks[] = sequence.getTracks();
+        int[] typesArray;
+        Track[] tracks = sequence.getTracks();
 
         if( tracks.length==1 ) {
             typesArray = new int[2];
@@ -149,7 +149,7 @@
     //=================================================================================
 
     private InputStream getFileStream(int type, Sequence sequence) throws IOException {
-        Track tracks[] = sequence.getTracks();
+        Track[] tracks = sequence.getTracks();
         int bytesBuilt = 0;
         int headerLength = 14;
         int length = 0;
@@ -160,7 +160,7 @@
         DataOutputStream    hdos = null;
         PipedInputStream    headerStream = null;
 
-        InputStream         trackStreams [] = null;
+        InputStream[]         trackStreams  = null;
         InputStream         trackStream = null;
         InputStream fStream = null;
 
@@ -344,7 +344,7 @@
             int metatype;
             int data1, data2;
             int length;
-            byte data[] = null;
+            byte[] data = null;
             ShortMessage shortMessage = null;
             MetaMessage  metaMessage  = null;
             SysexMessage sysexMessage = null;
--- a/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/SunFileWriter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,12 +45,12 @@
     // buffer size for temporary input streams
     protected static final int bisBufferSize = 4096;
 
-    final AudioFileFormat.Type types[];
+    final AudioFileFormat.Type[] types;
 
     /**
      * Constructs a new SunParser object.
      */
-    SunFileWriter(AudioFileFormat.Type types[]) {
+    SunFileWriter(AudioFileFormat.Type[] types) {
         this.types = types;
     }
 
@@ -164,12 +164,12 @@
         }
 
         @Override
-        public int read(byte b[]) throws IOException {
+        public int read(byte[] b) throws IOException {
             return in.read(b);
         }
 
         @Override
-        public int read(byte b[], int off, int len) throws IOException {
+        public int read(byte[] b, int off, int len) throws IOException {
             return in.read(b, off, len);
         }
 
--- a/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
     private static final byte[] ULAW_TABH = new byte[256];
     private static final byte[] ULAW_TABL = new byte[256];
 
-    private static final short seg_end[] = {
+    private static final short[] seg_end = {
             0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF
     };
 
@@ -83,7 +83,7 @@
     public AudioFormat.Encoding[] getTargetEncodings(AudioFormat sourceFormat){
         if( AudioFormat.Encoding.PCM_SIGNED.equals(sourceFormat.getEncoding()) ) {
             if( sourceFormat.getSampleSizeInBits() == 16 ) {
-                AudioFormat.Encoding enc[] = new AudioFormat.Encoding[1];
+                AudioFormat.Encoding[] enc = new AudioFormat.Encoding[1];
                 enc[0] = AudioFormat.Encoding.ULAW;
                 return enc;
             } else {
@@ -91,7 +91,7 @@
             }
         } else if (AudioFormat.Encoding.ULAW.equals(sourceFormat.getEncoding())) {
             if (sourceFormat.getSampleSizeInBits() == 8) {
-                AudioFormat.Encoding enc[] = new AudioFormat.Encoding[1];
+                AudioFormat.Encoding[] enc = new AudioFormat.Encoding[1];
                 enc[0] = AudioFormat.Encoding.PCM_SIGNED;
                 return enc;
             } else {
@@ -234,7 +234,7 @@
     private final class UlawCodecStream extends AudioInputStream {
 
         private static final int tempBufferSize = 64;
-        private byte tempBuffer [] = null;
+        private byte[] tempBuffer  = null;
 
         /**
          * True to encode to u-law, false to decode to linear.
@@ -244,8 +244,8 @@
         AudioFormat encodeFormat;
         AudioFormat decodeFormat;
 
-        byte tabByte1[] = null;
-        byte tabByte2[] = null;
+        byte[] tabByte1 = null;
+        byte[] tabByte2 = null;
         int highByte = 0;
         int lowByte  = 1;
 
@@ -305,7 +305,7 @@
          * $$jb 2/23/99
          * Used to determine segment number in uLaw encoding
          */
-        private short search(short val, short table[], short size) {
+        private short search(short val, short[] table, short size) {
             for(short i = 0; i < size; i++) {
                 if (val <= table[i]) { return i; }
             }
--- a/src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/com/sun/media/sound/WaveFileWriter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -215,7 +215,7 @@
         int bytesRead = 0;
         int bytesWritten = 0;
         InputStream fileStream = getFileStream(waveFileFormat, in);
-        byte buffer[] = new byte[bisBufferSize];
+        byte[] buffer = new byte[bisBufferSize];
         int maxLength = waveFileFormat.getByteLength();
 
         while( (bytesRead = fileStream.read( buffer )) >= 0 ) {
--- a/src/java.desktop/share/classes/java/awt/AWTEvent.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/AWTEvent.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@
  */
 public abstract class AWTEvent extends EventObject {
 
-    private byte bdata[];
+    private byte[] bdata;
 
     /**
      * The event's id.
--- a/src/java.desktop/share/classes/java/awt/BasicStroke.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/BasicStroke.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -157,7 +157,7 @@
     int cap;
     float miterlimit;
 
-    float dash[];
+    float[] dash;
     float dash_phase;
 
     /**
@@ -189,7 +189,7 @@
      */
     @ConstructorProperties({ "lineWidth", "endCap", "lineJoin", "miterLimit", "dashArray", "dashPhase" })
     public BasicStroke(float width, int cap, int join, float miterlimit,
-                       float dash[], float dash_phase) {
+                       float[] dash, float dash_phase) {
         if (width < 0.0f) {
             throw new IllegalArgumentException("negative width");
         }
--- a/src/java.desktop/share/classes/java/awt/BufferCapabilities.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/BufferCapabilities.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -154,7 +154,7 @@
         private static int I_PRIOR = 2;
         private static int I_COPIED = 3;
 
-        private static final String NAMES[] =
+        private static final String[] NAMES =
             { "undefined", "background", "prior", "copied" };
 
         /**
--- a/src/java.desktop/share/classes/java/awt/Color.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/Color.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -219,7 +219,7 @@
      * @see #getRGBColorComponents
      * @see #getRGBComponents
      */
-    private float frgbvalue[] = null;
+    private float[] frgbvalue = null;
 
     /**
      * The color value in the native {@code ColorSpace} as
@@ -231,7 +231,7 @@
      * @see #getRGBColorComponents
      * @see #getRGBComponents
      */
-    private float fvalue[] = null;
+    private float[] fvalue = null;
 
     /**
      * The alpha value as a {@code float} component.
@@ -514,7 +514,7 @@
      * @see #getComponents
      * @see #getColorComponents
      */
-    public Color(ColorSpace cspace, float components[], float alpha) {
+    public Color(ColorSpace cspace, float[] components, float alpha) {
         boolean rangeError = false;
         String badComponentString = "";
         int n = cspace.getNumComponents();
@@ -1110,7 +1110,7 @@
         if (cs == null) {
             cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
         }
-        float f[];
+        float[] f;
         if (fvalue == null) {
             f = new float[3];
             f[0] = ((float)getRed())/255f;
@@ -1119,8 +1119,8 @@
         } else {
             f = fvalue;
         }
-        float tmp[] = cs.toCIEXYZ(f);
-        float tmpout[] = cspace.fromCIEXYZ(tmp);
+        float[] tmp = cs.toCIEXYZ(f);
+        float[] tmpout = cspace.fromCIEXYZ(tmp);
         if (compArray == null) {
             compArray = new float[tmpout.length + 1];
         }
@@ -1154,7 +1154,7 @@
         if (cs == null) {
             cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
         }
-        float f[];
+        float[] f;
         if (fvalue == null) {
             f = new float[3];
             f[0] = ((float)getRed())/255f;
@@ -1163,8 +1163,8 @@
         } else {
             f = fvalue;
         }
-        float tmp[] = cs.toCIEXYZ(f);
-        float tmpout[] = cspace.fromCIEXYZ(tmp);
+        float[] tmp = cs.toCIEXYZ(f);
+        float[] tmpout = cspace.fromCIEXYZ(tmp);
         if (compArray == null) {
             return tmpout;
         }
--- a/src/java.desktop/share/classes/java/awt/Cursor.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/Cursor.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,7 +119,7 @@
       * method should be used instead.
       */
     @Deprecated
-    protected static Cursor predefined[] = new Cursor[14];
+    protected static Cursor[] predefined = new Cursor[14];
 
     /**
      * This field is a private replacement for 'predefined' array.
--- a/src/java.desktop/share/classes/java/awt/Event.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/Event.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -550,7 +550,7 @@
     public Event evt;
 
     /* table for mapping old Event action keys to KeyEvent virtual keys. */
-    private static final int actionKeyCodes[][] = {
+    private static final int[][] actionKeyCodes = {
     /*    virtual key              action key   */
         { KeyEvent.VK_HOME,        Event.HOME         },
         { KeyEvent.VK_END,         Event.END          },
--- a/src/java.desktop/share/classes/java/awt/FileDialog.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/FileDialog.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -147,7 +147,7 @@
     static {
         AWTAccessor.setFileDialogAccessor(
             new AWTAccessor.FileDialogAccessor() {
-                public void setFiles(FileDialog fileDialog, File files[]) {
+                public void setFiles(FileDialog fileDialog, File[] files) {
                     fileDialog.setFiles(files);
                 }
                 public void setFile(FileDialog fileDialog, String file) {
@@ -497,7 +497,7 @@
      * @see #getFiles
      * @since 1.7
      */
-    private void setFiles(File files[]) {
+    private void setFiles(File[] files) {
         synchronized (getObjectLock()) {
             this.files = files;
         }
--- a/src/java.desktop/share/classes/java/awt/Font.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/Font.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2011,7 +2011,7 @@
     public Attribute[] getAvailableAttributes() {
         // FONT is not supported by Font
 
-        Attribute attributes[] = {
+        Attribute[] attributes = {
             TextAttribute.FAMILY,
             TextAttribute.WEIGHT,
             TextAttribute.WIDTH,
--- a/src/java.desktop/share/classes/java/awt/FontMetrics.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/FontMetrics.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -332,7 +332,7 @@
         if (ch < 256) {
             return getWidths()[ch];
         }
-        char data[] = {ch};
+        char[] data = {ch};
         return charsWidth(data, 0, 1);
     }
 
@@ -355,7 +355,7 @@
      */
     public int stringWidth(String str) {
         int len = str.length();
-        char data[] = new char[len];
+        char[] data = new char[len];
         str.getChars(0, len, data, 0);
         return charsWidth(data, 0, len);
     }
@@ -383,7 +383,7 @@
      * @see       #bytesWidth(byte[], int, int)
      * @see       #stringWidth(String)
      */
-    public int charsWidth(char data[], int off, int len) {
+    public int charsWidth(char[] data, int off, int len) {
         return stringWidth(new String(data, off, len));
     }
 
@@ -410,7 +410,7 @@
      * @see       #stringWidth(String)
      */
     @SuppressWarnings("deprecation")
-    public int bytesWidth(byte data[], int off, int len) {
+    public int bytesWidth(byte[] data, int off, int len) {
         return stringWidth(new String(data, 0, off, len));
     }
 
@@ -426,7 +426,7 @@
      *                 described by this {@code FontMetrics} object.
      */
     public int[] getWidths() {
-        int widths[] = new int[256];
+        int[] widths = new int[256];
         for (char ch = 0 ; ch < 256 ; ch++) {
             widths[ch] = charWidth(ch);
         }
--- a/src/java.desktop/share/classes/java/awt/GradientPaintContext.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/GradientPaintContext.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -84,7 +84,7 @@
     double dx;
     double dy;
     boolean cyclic;
-    int interp[];
+    int[] interp;
     Raster saved;
     ColorModel model;
 
--- a/src/java.desktop/share/classes/java/awt/Graphics.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/Graphics.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -696,7 +696,7 @@
      * @see         java.awt.Graphics#drawPolygon(int[], int[], int)
      * @since       1.1
      */
-    public abstract void drawPolyline(int xPoints[], int yPoints[],
+    public abstract void drawPolyline(int[] xPoints, int[] yPoints,
                                       int nPoints);
 
     /**
@@ -718,7 +718,7 @@
      * @see          java.awt.Graphics#fillPolygon
      * @see          java.awt.Graphics#drawPolyline
      */
-    public abstract void drawPolygon(int xPoints[], int yPoints[],
+    public abstract void drawPolygon(int[] xPoints, int[] yPoints,
                                      int nPoints);
 
     /**
@@ -752,7 +752,7 @@
      * @param        nPoints   a the total number of points.
      * @see          java.awt.Graphics#drawPolygon(int[], int[], int)
      */
-    public abstract void fillPolygon(int xPoints[], int yPoints[],
+    public abstract void fillPolygon(int[] xPoints, int[] yPoints,
                                      int nPoints);
 
     /**
@@ -818,7 +818,7 @@
      * @see         java.awt.Graphics#drawBytes
      * @see         java.awt.Graphics#drawString
      */
-    public void drawChars(char data[], int offset, int length, int x, int y) {
+    public void drawChars(char[] data, int offset, int length, int x, int y) {
         drawString(new String(data, offset, length), x, y);
     }
 
@@ -844,7 +844,7 @@
      * @see         java.awt.Graphics#drawString
      */
     @SuppressWarnings("deprecation")
-    public void drawBytes(byte data[], int offset, int length, int x, int y) {
+    public void drawBytes(byte[] data, int offset, int length, int x, int y) {
         drawString(new String(data, 0, offset, length), x, y);
     }
 
--- a/src/java.desktop/share/classes/java/awt/GridBagLayout.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/GridBagLayout.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -442,7 +442,7 @@
      * @serial
      * @see #getLayoutDimensions()
      */
-    public int columnWidths[];
+    public int[] columnWidths;
 
     /**
      * This field holds the overrides to the row minimum
@@ -456,7 +456,7 @@
      * @serial
      * @see #getLayoutDimensions()
      */
-    public int rowHeights[];
+    public int[] rowHeights;
 
     /**
      * This field holds the overrides to the column weights.
@@ -471,7 +471,7 @@
      *
      * @serial
      */
-    public double columnWeights[];
+    public double[] columnWeights;
 
     /**
      * This field holds the overrides to the row weights.
@@ -486,7 +486,7 @@
      *
      * @serial
      */
-    public double rowWeights[];
+    public double[] rowWeights;
 
     /**
      * The component being positioned.  This is set before calling into
@@ -592,7 +592,7 @@
         if (layoutInfo == null)
             return new int[2][0];
 
-        int dim[][] = new int [2][];
+        int[][] dim = new int [2][];
         dim[0] = new int[layoutInfo.width];
         dim[1] = new int[layoutInfo.height];
 
@@ -618,7 +618,7 @@
         if (layoutInfo == null)
             return new double[2][0];
 
-        double weights[][] = new double [2][];
+        double[][] weights = new double [2][];
         weights[0] = new double[layoutInfo.width];
         weights[1] = new double[layoutInfo.height];
 
@@ -929,7 +929,7 @@
      */
 
     private long[]  preInitMaximumArraySizes(Container parent){
-        Component components[] = parent.getComponents();
+        Component[] components = parent.getComponents();
         Component comp;
         GridBagConstraints constraints;
         int curX, curY;
@@ -1003,7 +1003,7 @@
             Component comp;
             GridBagConstraints constraints;
             Dimension d;
-            Component components[] = parent.getComponents();
+            Component[] components = parent.getComponents();
             // Code below will address index curX+curWidth in the case of yMaxArray, weightY
             // ( respectively curY+curHeight for xMaxArray, weightX ) where
             //  curX in 0 to preInitMaximumArraySizes.y
@@ -2063,7 +2063,7 @@
         int compindex;
         GridBagConstraints constraints;
         Insets insets = parent.getInsets();
-        Component components[] = parent.getComponents();
+        Component[] components = parent.getComponents();
         Dimension d;
         Rectangle r = new Rectangle();
         int i, diffw, diffh;
--- a/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/GridBagLayoutInfo.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,20 +42,20 @@
 
     int width, height;          /* number of  cells: horizontal and vertical */
     int startx, starty;         /* starting point for layout */
-    int minWidth[];             /* largest minWidth in each column */
-    int minHeight[];            /* largest minHeight in each row */
-    double weightX[];           /* largest weight in each column */
-    double weightY[];           /* largest weight in each row */
+    int[] minWidth;             /* largest minWidth in each column */
+    int[] minHeight;            /* largest minHeight in each row */
+    double[] weightX;           /* largest weight in each column */
+    double[] weightY;           /* largest weight in each row */
     boolean hasBaseline;        /* Whether or not baseline layout has been
                                  * requested and one of the components
                                  * has a valid baseline. */
     // These are only valid if hasBaseline is true and are indexed by
     // row.
-    short baselineType[];       /* The type of baseline for a particular
+    short[] baselineType;       /* The type of baseline for a particular
                                  * row.  A mix of the BaselineResizeBehavior
                                  * constants (1 << ordinal()) */
-    int maxAscent[];            /* Max ascent (baseline). */
-    int maxDescent[];           /* Max descent (height - baseline) */
+    int[] maxAscent;            /* Max ascent (baseline). */
+    int[] maxDescent;           /* Max descent (height - baseline) */
 
     /**
      * Creates an instance of GridBagLayoutInfo representing {@code GridBagLayout}
--- a/src/java.desktop/share/classes/java/awt/JobAttributes.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/JobAttributes.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@
         private static final int I_RANGE = 1;
         private static final int I_SELECTION = 2;
 
-        private static final String NAMES[] = {
+        private static final String[] NAMES = {
             "all", "range", "selection"
         };
 
@@ -103,7 +103,7 @@
         private static final int I_FILE = 0;
         private static final int I_PRINTER = 1;
 
-        private static final String NAMES[] = {
+        private static final String[] NAMES = {
             "file", "printer"
         };
 
@@ -134,7 +134,7 @@
         private static final int I_NATIVE = 1;
         private static final int I_NONE = 2;
 
-        private static final String NAMES[] = {
+        private static final String[] NAMES = {
             "common", "native", "none"
         };
 
@@ -170,7 +170,7 @@
         private static final int I_SEPARATE_DOCUMENTS_COLLATED_COPIES = 0;
         private static final int I_SEPARATE_DOCUMENTS_UNCOLLATED_COPIES = 1;
 
-        private static final String NAMES[] = {
+        private static final String[] NAMES = {
             "separate-documents-collated-copies",
             "separate-documents-uncollated-copies"
         };
@@ -207,7 +207,7 @@
         private static final int I_TWO_SIDED_LONG_EDGE = 1;
         private static final int I_TWO_SIDED_SHORT_EDGE = 2;
 
-        private static final String NAMES[] = {
+        private static final String[] NAMES = {
             "one-sided", "two-sided-long-edge", "two-sided-short-edge"
         };
 
--- a/src/java.desktop/share/classes/java/awt/List.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/List.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -152,7 +152,7 @@
      * @see #getSelectedIndexes()
      * @see #getSelectedIndex()
      */
-    int         selected[] = new int[0];
+    int[]         selected = new int[0];
 
     /**
      * This variable contains the value that will be used
@@ -321,7 +321,7 @@
      * @since        1.1
      */
     public synchronized String[] getItems() {
-        String itemCopies[] = new String[items.size()];
+        String[] itemCopies = new String[items.size()];
         items.copyInto(itemCopies);
         return itemCopies;
     }
@@ -488,7 +488,7 @@
      * @see           #isIndexSelected
      */
     public synchronized int getSelectedIndex() {
-        int sel[] = getSelectedIndexes();
+        int[] sel = getSelectedIndexes();
         return (sel.length == 1) ? sel[0] : -1;
     }
 
@@ -534,8 +534,8 @@
      * @see           #isIndexSelected
      */
     public synchronized String[] getSelectedItems() {
-        int sel[] = getSelectedIndexes();
-        String str[] = new String[sel.length];
+        int[] sel = getSelectedIndexes();
+        String[] str = new String[sel.length];
         for (int i = 0 ; i < sel.length ; i++) {
             str[i] = getItem(sel[i]);
         }
@@ -602,7 +602,7 @@
                         selected = new int[1];
                         selected[0] = index;
                     } else {
-                        int newsel[] = new int[selected.length + 1];
+                        int[] newsel = new int[selected.length + 1];
                         System.arraycopy(selected, 0, newsel, 0,
                                          selected.length);
                         newsel[selected.length] = index;
@@ -636,7 +636,7 @@
 
         for (int i = 0 ; i < selected.length ; i++) {
             if (selected[i] == index) {
-                int newsel[] = new int[selected.length - 1];
+                int[] newsel = new int[selected.length - 1];
                 System.arraycopy(selected, 0, newsel, 0, i);
                 System.arraycopy(selected, i+1, newsel, i, selected.length - (i+1));
                 selected = newsel;
@@ -669,7 +669,7 @@
      */
     @Deprecated
     public boolean isSelected(int index) {
-        int sel[] = getSelectedIndexes();
+        int[] sel = getSelectedIndexes();
         for (int i = 0 ; i < sel.length ; i++) {
             if (sel[i] == index) {
                 return true;
@@ -1493,7 +1493,7 @@
          */
          public void clearAccessibleSelection() {
              synchronized(List.this)  {
-                 int selectedIndexes[] = List.this.getSelectedIndexes();
+                 int[] selectedIndexes = List.this.getSelectedIndexes();
                  if (selectedIndexes == null)
                      return;
                  for (int i = selectedIndexes.length - 1; i >= 0; i--) {
--- a/src/java.desktop/share/classes/java/awt/MediaTracker.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/MediaTracker.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -369,7 +369,7 @@
         if (numerrors == 0) {
             return null;
         }
-        Object errors[] = new Object[numerrors];
+        Object[] errors = new Object[numerrors];
         cur = head;
         numerrors = 0;
         while (cur != null) {
@@ -598,7 +598,7 @@
         if (numerrors == 0) {
             return null;
         }
-        Object errors[] = new Object[numerrors];
+        Object[] errors = new Object[numerrors];
         cur = head;
         numerrors = 0;
         while (cur != null) {
--- a/src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/MultipleGradientPaintContext.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -118,8 +118,8 @@
     private int transparencyTest;
 
     /** Color space conversion lookup tables. */
-    private static final int SRGBtoLinearRGB[] = new int[256];
-    private static final int LinearRGBtoSRGB[] = new int[256];
+    private static final int[] SRGBtoLinearRGB = new int[256];
+    private static final int[] LinearRGBtoSRGB = new int[256];
 
     static {
         // build the tables
@@ -187,7 +187,7 @@
             // (incorrect) results than to throw an exception and/or no-op
             tInv = new AffineTransform();
         }
-        double m[] = new double[6];
+        double[] m = new double[6];
         tInv.getMatrix(m);
         a00 = (float)m[0];
         a10 = (float)m[1];
@@ -651,7 +651,7 @@
         return raster;
     }
 
-    protected abstract void fillRaster(int pixels[], int off, int adjust,
+    protected abstract void fillRaster(int[] pixels, int off, int adjust,
                                        int x, int y, int w, int h);
 
 
--- a/src/java.desktop/share/classes/java/awt/PageAttributes.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/PageAttributes.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,7 @@
         private static final int I_COLOR = 0;
         private static final int I_MONOCHROME = 1;
 
-        private static final String NAMES[] = {
+        private static final String[] NAMES = {
             "color", "monochrome"
         };
 
@@ -167,7 +167,7 @@
         private static final int I_MONARCH_ENVELOPE = 73;
         private static final int I_PERSONAL_ENVELOPE = 74;
 
-        private static final String NAMES[] = {
+        private static final String[] NAMES = {
             "iso-4a0", "iso-2a0", "iso-a0", "iso-a1", "iso-a2", "iso-a3",
             "iso-a4", "iso-a5", "iso-a6", "iso-a7", "iso-a8", "iso-a9",
             "iso-a10", "iso-b0", "iso-b1", "iso-b2", "iso-b3", "iso-b4",
@@ -812,7 +812,7 @@
         private static final int I_PORTRAIT = 0;
         private static final int I_LANDSCAPE = 1;
 
-        private static final String NAMES[] = {
+        private static final String[] NAMES = {
             "portrait", "landscape"
         };
 
@@ -842,7 +842,7 @@
         private static final int I_PHYSICAL = 0;
         private static final int I_PRINTABLE = 1;
 
-        private static final String NAMES[] = {
+        private static final String[] NAMES = {
             "physical", "printable"
         };
 
@@ -870,7 +870,7 @@
         private static final int I_NORMAL = 1;
         private static final int I_DRAFT = 2;
 
-        private static final String NAMES[] = {
+        private static final String[] NAMES = {
             "high", "normal", "draft"
         };
 
--- a/src/java.desktop/share/classes/java/awt/Polygon.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/Polygon.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -82,7 +82,7 @@
      * @see #addPoint(int, int)
      * @since 1.0
      */
-    public int xpoints[];
+    public int[] xpoints;
 
     /**
      * The array of Y coordinates.  The number of elements in
@@ -96,7 +96,7 @@
      * @see #addPoint(int, int)
      * @since 1.0
      */
-    public int ypoints[];
+    public int[] ypoints;
 
     /**
      * The bounds of this {@code Polygon}.
@@ -144,7 +144,7 @@
      *             {@code ypoints} is {@code null}.
      * @since 1.0
      */
-    public Polygon(int xpoints[], int ypoints[], int npoints) {
+    public Polygon(int[] xpoints, int[] ypoints, int npoints) {
         // Fix 4489009: should throw IndexOutOfBoundsException instead
         // of OutOfMemoryError if npoints is huge and > {x,y}points.length
         if (npoints > xpoints.length || npoints > ypoints.length) {
@@ -226,7 +226,7 @@
      * @param ypoints[] array of <i>y</i> coordinates
      * @param npoints the total number of points
      */
-    void calculateBounds(int xpoints[], int ypoints[], int npoints) {
+    void calculateBounds(int[] xpoints, int[] ypoints, int npoints) {
         int boundsMinX = Integer.MAX_VALUE;
         int boundsMinY = Integer.MAX_VALUE;
         int boundsMaxX = Integer.MIN_VALUE;
--- a/src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/RadialGradientPaintContext.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -170,7 +170,7 @@
      * @param x,y,w,h the area in device space for which colors are
      * generated.
      */
-    protected void fillRaster(int pixels[], int off, int adjust,
+    protected void fillRaster(int[] pixels, int off, int adjust,
                               int x, int y, int w, int h)
     {
         if (isSimpleFocus && isNonCyclic && isSimpleLookup) {
@@ -185,7 +185,7 @@
      * point, the gradient is noncyclic, and the gradient lookup method is
      * fast (single array index, no conversion necessary).
      */
-    private void simpleNonCyclicFillRaster(int pixels[], int off, int adjust,
+    private void simpleNonCyclicFillRaster(int[] pixels, int off, int adjust,
                                            int x, int y, int w, int h)
     {
         /* We calculate sqrt(X^2 + Y^2) relative to the radius
@@ -301,7 +301,7 @@
 
     // SQRT_LUT_SIZE must be a power of 2 for the test above to work.
     private static final int SQRT_LUT_SIZE = (1 << 11);
-    private static float sqrtLut[] = new float[SQRT_LUT_SIZE+1];
+    private static float[] sqrtLut = new float[SQRT_LUT_SIZE+1];
     static {
         for (int i = 0; i < sqrtLut.length; i++) {
             sqrtLut[i] = (float) Math.sqrt(i / ((float) SQRT_LUT_SIZE));
@@ -327,7 +327,7 @@
      * formula produces the following set of equations.  Constant factors have
      * been extracted out of the inner loop.
      */
-    private void cyclicCircularGradientFillRaster(int pixels[], int off,
+    private void cyclicCircularGradientFillRaster(int[] pixels, int off,
                                                   int adjust,
                                                   int x, int y,
                                                   int w, int h)
--- a/src/java.desktop/share/classes/java/awt/Robot.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/Robot.java	Thu Oct 04 12:40:55 2018 -0700
@@ -511,7 +511,7 @@
         AffineTransform tx = gc.getDefaultTransform();
         double uiScaleX = tx.getScaleX();
         double uiScaleY = tx.getScaleY();
-        int pixels[];
+        int[] pixels;
 
         if (uiScaleX == 1 && uiScaleY == 1) {
 
@@ -537,7 +537,7 @@
             int sY = (int) Math.floor(screenRect.y * uiScaleY);
             int sWidth = (int) Math.ceil(screenRect.width * uiScaleX);
             int sHeight = (int) Math.ceil(screenRect.height * uiScaleY);
-            int temppixels[];
+            int[] temppixels;
             Rectangle scaledRect = new Rectangle(sX, sY, sWidth, sHeight);
             temppixels = peer.getRGBPixels(scaledRect);
 
--- a/src/java.desktop/share/classes/java/awt/SystemColor.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/SystemColor.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -431,7 +431,7 @@
      */
     private transient int index;
 
-    private static SystemColor systemColorObjects [] = {
+    private static SystemColor[] systemColorObjects  = {
         SystemColor.desktop,
         SystemColor.activeCaption,
         SystemColor.activeCaptionText,
--- a/src/java.desktop/share/classes/java/awt/TexturePaintContext.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/TexturePaintContext.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -335,7 +335,7 @@
      * pixels to blend, when the error values reach 1.0 we move to the
      * next pixel and reset them to 0.0.
      */
-    public static int blend(int rgbs[], int xmul, int ymul) {
+    public static int blend(int[] rgbs, int xmul, int ymul) {
         // xmul/ymul are 31 bits wide, (0 => 2^31-1)
         // shift them to 12 bits wide, (0 => 2^12-1)
         xmul = (xmul >>> 19);
@@ -372,10 +372,10 @@
 
     static class Int extends TexturePaintContext {
         IntegerInterleavedRaster srcRas;
-        int inData[];
+        int[] inData;
         int inOff;
         int inSpan;
-        int outData[];
+        int[] outData;
         int outOff;
         int outSpan;
         boolean filter;
@@ -422,7 +422,7 @@
             if (normalx) {
                 outSpan -= w;
             }
-            int rgbs[] = filter ? new int[4] : null;
+            int[] rgbs = filter ? new int[4] : null;
             for (int j = 0; j < h; j++) {
                 if (normalx) {
                     int in = inOff + rowy * inSpan + bWidth;
@@ -508,10 +508,10 @@
 
     static class Byte extends TexturePaintContext {
         ByteInterleavedRaster srcRas;
-        byte inData[];
+        byte[] inData;
         int inOff;
         int inSpan;
-        byte outData[];
+        byte[] outData;
         int outOff;
         int outSpan;
 
@@ -628,11 +628,11 @@
 
     static class ByteFilter extends TexturePaintContext {
         ByteInterleavedRaster srcRas;
-        int inPalette[];
-        byte inData[];
+        int[] inPalette;
+        byte[] inData;
         int inOff;
         int inSpan;
-        int outData[];
+        int[] outData;
         int outOff;
         int outSpan;
 
@@ -677,7 +677,7 @@
             int rowy = y;
             int rowxerr = xerr;
             int rowyerr = yerr;
-            int rgbs[] = new int[4];
+            int[] rgbs = new int[4];
             for (int j = 0; j < h; j++) {
                 x = rowx;
                 y = rowy;
@@ -764,7 +764,7 @@
             int rowyerr = yerr;
             WritableRaster srcRas = this.srcRas;
             WritableRaster outRas = this.outRas;
-            int rgbs[] = filter ? new int[4] : null;
+            int[] rgbs = filter ? new int[4] : null;
             for (int j = 0; j < h; j++) {
                 x = rowx;
                 y = rowy;
--- a/src/java.desktop/share/classes/java/awt/Window.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/Window.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1477,7 +1477,7 @@
         return getOwnedWindows_NoClientCode();
     }
     final Window[] getOwnedWindows_NoClientCode() {
-        Window realCopy[];
+        Window[] realCopy;
 
         synchronized(ownedWindowList) {
             // Recall that ownedWindowList is actually a Vector of
@@ -1487,7 +1487,7 @@
             // all non-null get()s (realCopy with size realSize).
             int fullSize = ownedWindowList.size();
             int realSize = 0;
-            Window fullCopy[] = new Window[fullSize];
+            Window[] fullCopy = new Window[fullSize];
 
             for (int i = 0; i < fullSize; i++) {
                 fullCopy[realSize] = ownedWindowList.elementAt(i).get();
@@ -1555,14 +1555,14 @@
 
     private static Window[] getWindows(AppContext appContext) {
         synchronized (Window.class) {
-            Window realCopy[];
+            Window[] realCopy;
             @SuppressWarnings("unchecked")
             Vector<WeakReference<Window>> windowList =
                 (Vector<WeakReference<Window>>)appContext.get(Window.class);
             if (windowList != null) {
                 int fullSize = windowList.size();
                 int realSize = 0;
-                Window fullCopy[] = new Window[fullSize];
+                Window[] fullCopy = new Window[fullSize];
                 for (int i = 0; i < fullSize; i++) {
                     Window w = windowList.get(i).get();
                     if (w != null) {
--- a/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -186,7 +186,7 @@
         }
 
         int nc = this.getNumComponents();
-        short tmp[] = new short[nc];
+        short[] tmp = new short[nc];
         for (int i = 0; i < nc; i++) {
             tmp[i] = (short)
                 ((colorvalue[i] - minVal[i]) * invDiffMinMax[i] + 0.5f);
@@ -237,7 +237,7 @@
             }
         }
 
-        short tmp[] = new short[3];
+        short[] tmp = new short[3];
         for (int i = 0; i < 3; i++) {
             tmp[i] = (short) ((rgbvalue[i] * 65535.0f) + 0.5f);
         }
@@ -379,7 +379,7 @@
         }
 
         int nc = this.getNumComponents();
-        short tmp[] = new short[nc];
+        short[] tmp = new short[nc];
         for (int i = 0; i < nc; i++) {
             tmp[i] = (short)
                 ((colorvalue[i] - minVal[i]) * invDiffMinMax[i] + 0.5f);
@@ -522,7 +522,7 @@
             }
         }
 
-        short tmp[] = new short[3];
+        short[] tmp = new short[3];
         float ALMOST_TWO = 1.0f + (32767.0f / 32768.0f);
         float factor = 65535.0f / ALMOST_TWO;
         // For CIEXYZ, min = 0.0, max = ALMOST_TWO for all components
--- a/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/color/ICC_Profile.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1016,7 +1016,7 @@
      * contain valid ICC Profile data.
      */
     public static ICC_Profile getInstance(InputStream s) throws IOException {
-    byte profileData[];
+    byte[] profileData;
 
         if (s instanceof ProfileDeferralInfo) {
             /* hack to detect profiles whose loading can be deferred */
@@ -1032,10 +1032,10 @@
 
 
     static byte[] getProfileDataFromStream(InputStream s) throws IOException {
-    byte profileData[];
+    byte[] profileData;
     int profileSize;
 
-        byte header[] = new byte[128];
+        byte[] header = new byte[128];
         int bytestoread = 128;
         int bytesread = 0;
         int n;
@@ -1098,7 +1098,7 @@
 
 
     void activateDeferredProfile() throws ProfileDataException {
-        byte profileData[];
+        byte[] profileData;
         final String fileName = deferralInfo.filename;
 
         profileActivator = null;
@@ -1286,7 +1286,7 @@
      */
     public void write(String fileName) throws IOException {
     FileOutputStream outputFile;
-    byte profileData[];
+    byte[] profileData;
 
         profileData = getData(); /* this will activate deferred
                                     profiles if necessary */
@@ -1305,7 +1305,7 @@
      * stream.
      */
     public void write(OutputStream s) throws IOException {
-    byte profileData[];
+    byte[] profileData;
 
         profileData = getData(); /* this will activate deferred
                                     profiles if necessary */
--- a/src/java.desktop/share/classes/java/awt/font/TextLine.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/font/TextLine.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1293,7 +1293,7 @@
   /*
    * The new version requires that chunks be at the same level.
    */
-    private static int firstVisualChunk(int order[], byte direction[],
+    private static int firstVisualChunk(int[] order, byte[] direction,
                                         int start, int limit)
     {
         if (order != null && direction != null) {
--- a/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1344,7 +1344,7 @@
     // Utility methods to optimize rotate methods.
     // These tables translate the flags during predictable quadrant
     // rotations where the shear and scale values are swapped and negated.
-    private static final int rot90conversion[] = {
+    private static final int[] rot90conversion = {
         /* IDENTITY => */        APPLY_SHEAR,
         /* TRANSLATE (TR) => */  APPLY_SHEAR | APPLY_TRANSLATE,
         /* SCALE (SC) => */      APPLY_SHEAR,
--- a/src/java.desktop/share/classes/java/awt/geom/Area.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/geom/Area.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,7 +144,7 @@
         //             0-2 horizontal splitting parameters
         //             OR
         //             3 parametric equation derivative coefficients
-        double coords[] = new double[23];
+        double[] coords = new double[23];
         double movx = 0, movy = 0;
         double curx = 0, cury = 0;
         double newx, newy;
@@ -702,8 +702,8 @@
         }
     }
 
-    public int currentSegment(float coords[]) {
-        double dcoords[] = new double[6];
+    public int currentSegment(float[] coords) {
+        double[] dcoords = new double[6];
         int segtype = currentSegment(dcoords);
         int numpoints = (segtype == SEG_CLOSE ? 0
                          : (segtype == SEG_QUADTO ? 2
@@ -715,7 +715,7 @@
         return segtype;
     }
 
-    public int currentSegment(double coords[]) {
+    public int currentSegment(double[] coords) {
         int segtype;
         int numpoints;
         if (prevcurve != null) {
--- a/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -860,7 +860,7 @@
      *          the specified offset.
      * @since 1.2
      */
-    public static double getFlatnessSq(double coords[], int offset) {
+    public static double getFlatnessSq(double[] coords, int offset) {
         return getFlatnessSq(coords[offset + 0], coords[offset + 1],
                              coords[offset + 2], coords[offset + 3],
                              coords[offset + 4], coords[offset + 5],
@@ -880,7 +880,7 @@
      *          the specified offset.
      * @since 1.2
      */
-    public static double getFlatness(double coords[], int offset) {
+    public static double getFlatness(double[] coords, int offset) {
         return getFlatness(coords[offset + 0], coords[offset + 1],
                            coords[offset + 2], coords[offset + 3],
                            coords[offset + 4], coords[offset + 5],
@@ -1000,9 +1000,9 @@
      * the 6 right coordinates
      * @since 1.2
      */
-    public static void subdivide(double src[], int srcoff,
-                                 double left[], int leftoff,
-                                 double right[], int rightoff) {
+    public static void subdivide(double[] src, int srcoff,
+                                 double[] left, int leftoff,
+                                 double[] right, int rightoff) {
         double x1 = src[srcoff + 0];
         double y1 = src[srcoff + 1];
         double ctrlx1 = src[srcoff + 2];
@@ -1065,7 +1065,7 @@
      * @return the number of roots, or -1 if the equation is a constant.
      * @since 1.2
      */
-    public static int solveCubic(double eqn[]) {
+    public static int solveCubic(double[] eqn) {
         return solveCubic(eqn, eqn);
     }
 
@@ -1086,7 +1086,7 @@
      * @return the number of roots, or -1 if the equation is a constant
      * @since 1.3
      */
-    public static int solveCubic(double eqn[], double res[]) {
+    public static int solveCubic(double[] eqn, double[] res) {
         // From Graphics Gems:
         // http://tog.acm.org/resources/GraphicsGems/gems/Roots3And4.c
         final double d = eqn[3];
@@ -1369,7 +1369,7 @@
         return (x1 < 0 && x2 > 0) || (x1 > 0 && x2 < 0);
     }
 
-    private static double solveEqn(double eqn[], int order, double t) {
+    private static double solveEqn(double[] eqn, int order, double t) {
         double v = eqn[order];
         while (--order >= 0) {
             v = v * t + eqn[order];
--- a/src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/geom/EllipseIterator.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@
      */
     private static final double pcv = 0.5 + CtrlVal * 0.5;
     private static final double ncv = 0.5 - CtrlVal * 0.5;
-    private static double ctrlpts[][] = {
+    private static double[][] ctrlpts = {
         {  1.0,  pcv,  pcv,  1.0,  0.5,  1.0 },
         {  ncv,  1.0,  0.0,  pcv,  0.0,  0.5 },
         {  0.0,  ncv,  ncv,  0.0,  0.5,  0.0 },
@@ -119,7 +119,7 @@
             return SEG_CLOSE;
         }
         if (index == 0) {
-            double ctrls[] = ctrlpts[3];
+            double[] ctrls = ctrlpts[3];
             coords[0] = (float) (x + ctrls[4] * w);
             coords[1] = (float) (y + ctrls[5] * h);
             if (affine != null) {
@@ -127,7 +127,7 @@
             }
             return SEG_MOVETO;
         }
-        double ctrls[] = ctrlpts[index - 1];
+        double[] ctrls = ctrlpts[index - 1];
         coords[0] = (float) (x + ctrls[0] * w);
         coords[1] = (float) (y + ctrls[1] * h);
         coords[2] = (float) (x + ctrls[2] * w);
@@ -166,7 +166,7 @@
             return SEG_CLOSE;
         }
         if (index == 0) {
-            double ctrls[] = ctrlpts[3];
+            double[] ctrls = ctrlpts[3];
             coords[0] = x + ctrls[4] * w;
             coords[1] = y + ctrls[5] * h;
             if (affine != null) {
@@ -174,7 +174,7 @@
             }
             return SEG_MOVETO;
         }
-        double ctrls[] = ctrlpts[index - 1];
+        double[] ctrls = ctrlpts[index - 1];
         coords[0] = x + ctrls[0] * w;
         coords[1] = y + ctrls[1] * h;
         coords[2] = x + ctrls[2] * w;
--- a/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
 
     int limit;                          // Maximum number of recursion levels
 
-    double hold[] = new double[14];     // The cache of interpolated coords
+    double[] hold = new double[14];     // The cache of interpolated coords
                                         // Note that this must be long enough
                                         // to store a full cubic segment and
                                         // a relative cubic segment to avoid
@@ -71,7 +71,7 @@
                                         // returned in the next call to
                                         // currentSegment().
 
-    int levels[];                       // The recursion level at which
+    int[] levels;                       // The recursion level at which
                                         // each curve being held in storage
                                         // was generated.
 
@@ -175,7 +175,7 @@
         if (holdIndex - want < 0) {
             int have = hold.length - holdIndex;
             int newsize = hold.length + GROW_SIZE;
-            double newhold[] = new double[newsize];
+            double[] newhold = new double[newsize];
             System.arraycopy(hold, holdIndex,
                              newhold, holdIndex + GROW_SIZE,
                              have);
--- a/src/java.desktop/share/classes/java/awt/geom/Path2D.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/geom/Path2D.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -187,7 +187,7 @@
      * @since 1.6
      */
     public static class Float extends Path2D implements Serializable {
-        transient float floatCoords[];
+        transient float[] floatCoords;
 
         /**
          * Constructs a new empty single precision {@code Path2D} object
@@ -290,7 +290,7 @@
         @Override
         float[] cloneCoordsFloat(AffineTransform at) {
             // trim arrays:
-            float ret[];
+            float[] ret;
             if (at == null) {
                 ret = Arrays.copyOf(floatCoords, numCoords);
             } else {
@@ -303,7 +303,7 @@
         @Override
         double[] cloneCoordsDouble(AffineTransform at) {
             // trim arrays:
-            double ret[] = new double[numCoords];
+            double[] ret = new double[numCoords];
             if (at == null) {
                 for (int i = 0; i < numCoords; i++) {
                     ret[i] = floatCoords[i];
@@ -555,7 +555,7 @@
                 return 0;
             }
             double movx, movy, curx, cury, endx, endy;
-            float coords[] = floatCoords;
+            float[] coords = floatCoords;
             curx = movx = coords[0];
             cury = movy = coords[1];
             int crossings = 0;
@@ -634,7 +634,7 @@
             if (numTypes == 0) {
                 return 0;
             }
-            float coords[] = floatCoords;
+            float[] coords = floatCoords;
             double curx, cury, movx, movy, endx, endy;
             curx = movx = coords[0];
             cury = movy = coords[1];
@@ -736,7 +736,7 @@
          * @since 1.6
          */
         public final void append(PathIterator pi, boolean connect) {
-            float coords[] = new float[6];
+            float[] coords = new float[6];
             while (!pi.isDone()) {
                 switch (pi.currentSegment(coords)) {
                 case SEG_MOVETO:
@@ -1004,7 +1004,7 @@
         }
 
         static class CopyIterator extends Path2D.Iterator {
-            float floatCoords[];
+            float[] floatCoords;
 
             CopyIterator(Path2D.Float p2df) {
                 super(p2df);
@@ -1034,7 +1034,7 @@
         }
 
         static class TxIterator extends Path2D.Iterator {
-            float floatCoords[];
+            float[] floatCoords;
             AffineTransform affine;
 
             TxIterator(Path2D.Float p2df, AffineTransform at) {
@@ -1073,7 +1073,7 @@
      * @since 1.6
      */
     public static class Double extends Path2D implements Serializable {
-        transient double doubleCoords[];
+        transient double[] doubleCoords;
 
         /**
          * Constructs a new empty double precision {@code Path2D} object
@@ -1176,7 +1176,7 @@
         @Override
         float[] cloneCoordsFloat(AffineTransform at) {
             // trim arrays:
-            float ret[] = new float[numCoords];
+            float[] ret = new float[numCoords];
             if (at == null) {
                 for (int i = 0; i < numCoords; i++) {
                     ret[i] = (float) doubleCoords[i];
@@ -1190,7 +1190,7 @@
         @Override
         double[] cloneCoordsDouble(AffineTransform at) {
             // trim arrays:
-            double ret[];
+            double[] ret;
             if (at == null) {
                 ret = Arrays.copyOf(doubleCoords, numCoords);
             } else {
@@ -1330,7 +1330,7 @@
                 return 0;
             }
             double movx, movy, curx, cury, endx, endy;
-            double coords[] = doubleCoords;
+            double[] coords = doubleCoords;
             curx = movx = coords[0];
             cury = movy = coords[1];
             int crossings = 0;
@@ -1409,7 +1409,7 @@
             if (numTypes == 0) {
                 return 0;
             }
-            double coords[] = doubleCoords;
+            double[] coords = doubleCoords;
             double curx, cury, movx, movy, endx, endy;
             curx = movx = coords[0];
             cury = movy = coords[1];
@@ -1512,7 +1512,7 @@
          * @since 1.6
          */
         public final void append(PathIterator pi, boolean connect) {
-            double coords[] = new double[6];
+            double[] coords = new double[6];
             while (!pi.isDone()) {
                 switch (pi.currentSegment(coords)) {
                 case SEG_MOVETO:
@@ -1779,7 +1779,7 @@
         }
 
         static class CopyIterator extends Path2D.Iterator {
-            double doubleCoords[];
+            double[] doubleCoords;
 
             CopyIterator(Path2D.Double p2dd) {
                 super(p2dd);
@@ -1809,7 +1809,7 @@
         }
 
         static class TxIterator extends Path2D.Iterator {
-            double doubleCoords[];
+            double[] doubleCoords;
             AffineTransform affine;
 
             TxIterator(Path2D.Double p2dd, AffineTransform at) {
@@ -2537,8 +2537,8 @@
     {
         s.defaultWriteObject();
 
-        float fCoords[];
-        double dCoords[];
+        float[] fCoords;
+        double[] dCoords;
 
         if (isdbl) {
             dCoords = ((Path2D.Double) this).doubleCoords;
@@ -2726,7 +2726,7 @@
         int pointIdx;
         Path2D path;
 
-        static final int curvecoords[] = {2, 2, 4, 6, 0};
+        static final int[] curvecoords = {2, 2, 4, 6, 0};
 
         Iterator(Path2D path) {
             this.path = path;
--- a/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -664,7 +664,7 @@
      *          values in the specified array at the specified index.
      * @since 1.2
      */
-    public static double getFlatnessSq(double coords[], int offset) {
+    public static double getFlatnessSq(double[] coords, int offset) {
         return Line2D.ptSegDistSq(coords[offset + 0], coords[offset + 1],
                                   coords[offset + 4], coords[offset + 5],
                                   coords[offset + 2], coords[offset + 3]);
@@ -682,7 +682,7 @@
      *          specified array at the specified offset.
      * @since 1.2
      */
-    public static double getFlatness(double coords[], int offset) {
+    public static double getFlatness(double[] coords, int offset) {
         return Line2D.ptSegDist(coords[offset + 0], coords[offset + 1],
                                 coords[offset + 4], coords[offset + 5],
                                 coords[offset + 2], coords[offset + 3]);
@@ -797,9 +797,9 @@
      * the 6 right coordinates
      * @since 1.2
      */
-    public static void subdivide(double src[], int srcoff,
-                                 double left[], int leftoff,
-                                 double right[], int rightoff) {
+    public static void subdivide(double[] src, int srcoff,
+                                 double[] left, int leftoff,
+                                 double[] right, int rightoff) {
         double x1 = src[srcoff + 0];
         double y1 = src[srcoff + 1];
         double ctrlx = src[srcoff + 2];
@@ -851,7 +851,7 @@
      *          a constant
      * @since 1.2
      */
-    public static int solveQuadratic(double eqn[]) {
+    public static int solveQuadratic(double[] eqn) {
         return solveQuadratic(eqn, eqn);
     }
 
@@ -875,7 +875,7 @@
      *  a constant.
      * @since 1.3
      */
-    public static int solveQuadratic(double eqn[], double res[]) {
+    public static int solveQuadratic(double[] eqn, double[] res) {
         double a = eqn[2];
         double b = eqn[1];
         double c = eqn[0];
@@ -1036,7 +1036,7 @@
      *     B = 2*CP - 2*C1
      *     A = C1 - 2*CP + C2
      */
-    private static void fillEqn(double eqn[], double val,
+    private static void fillEqn(double[] eqn, double val,
                                 double c1, double cp, double c2) {
         eqn[0] = c1 - val;
         eqn[1] = cp + cp - c1 - c1;
@@ -1053,10 +1053,10 @@
      * then any points which represent a point of inflection for that
      * quadratic equation are also ignored.
      */
-    private static int evalQuadratic(double vals[], int num,
+    private static int evalQuadratic(double[] vals, int num,
                                      boolean include0,
                                      boolean include1,
-                                     double inflect[],
+                                     double[] inflect,
                                      double c1, double ctrl, double c2) {
         int j = 0;
         for (int i = 0; i < num; i++) {
--- a/src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/geom/RoundRectIterator.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,7 +90,7 @@
     //     4 values for each point {v0, v1, v2, v3}:
     //         point = (x + v0 * w + v1 * arcWidth,
     //                  y + v2 * h + v3 * arcHeight);
-    private static double ctrlpts[][] = {
+    private static double[][] ctrlpts = {
         {  0.0,  0.0,  0.0,  0.5 },
         {  0.0,  0.0,  1.0, -0.5 },
         {  0.0,  0.0,  1.0, -acv,
@@ -110,7 +110,7 @@
            0.0,  0.0,  0.0,  0.5 },
         {},
     };
-    private static int types[] = {
+    private static int[] types = {
         SEG_MOVETO,
         SEG_LINETO, SEG_CUBICTO,
         SEG_LINETO, SEG_CUBICTO,
@@ -141,7 +141,7 @@
         if (isDone()) {
             throw new NoSuchElementException("roundrect iterator out of bounds");
         }
-        double ctrls[] = ctrlpts[index];
+        double[] ctrls = ctrlpts[index];
         int nc = 0;
         for (int i = 0; i < ctrls.length; i += 4) {
             coords[nc++] = (float) (x + ctrls[i + 0] * w + ctrls[i + 1] * aw);
@@ -175,7 +175,7 @@
         if (isDone()) {
             throw new NoSuchElementException("roundrect iterator out of bounds");
         }
-        double ctrls[] = ctrlpts[index];
+        double[] ctrls = ctrlpts[index];
         int nc = 0;
         for (int i = 0; i < ctrls.length; i += 4) {
             coords[nc++] = (x + ctrls[i + 0] * w + ctrls[i + 1] * aw);
--- a/src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/AreaAveragingScaleFilter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@
                                             | COMPLETESCANLINES);
 
     private boolean passthrough;
-    private float reds[], greens[], blues[], alphas[];
+    private float[] reds, greens, blues, alphas;
     private int savedy;
     private int savedyrem;
 
@@ -208,7 +208,7 @@
                 }
             }
             if ((dyrem -= amty) == 0) {
-                int outpix[] = calcRow();
+                int[] outpix = calcRow();
                 do {
                     consumer.setPixels(0, dy, destWidth, 1,
                                        rgbmodel, outpix, 0, destWidth);
@@ -244,7 +244,7 @@
      * @see ReplicateScaleFilter
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, byte pixels[], int off,
+                          ColorModel model, byte[] pixels, int off,
                           int scansize) {
         if (passthrough) {
             super.setPixels(x, y, w, h, model, pixels, off, scansize);
@@ -270,7 +270,7 @@
      * @see ReplicateScaleFilter
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, int pixels[], int off,
+                          ColorModel model, int[] pixels, int off,
                           int scansize) {
         if (passthrough) {
             super.setPixels(x, y, w, h, model, pixels, off, scansize);
--- a/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -106,8 +106,8 @@
     public BandedSampleModel(int dataType,
                              int w, int h,
                              int scanlineStride,
-                             int bankIndices[],
-                             int bandOffsets[]) {
+                             int[] bankIndices,
+                             int[] bandOffsets) {
 
         super(dataType, w, h, 1,scanlineStride, bankIndices, bandOffsets);
     }
@@ -157,13 +157,13 @@
      * @throws IllegalArgumentException if {@code dataType} is not
      *         one of the supported data types
      */
-    public SampleModel createSubsetSampleModel(int bands[]) {
+    public SampleModel createSubsetSampleModel(int[] bands) {
         if (bands.length > bankIndices.length)
             throw new RasterFormatException("There are only " +
                                             bankIndices.length +
                                             " bands");
-        int newBankIndices[] = new int[bands.length];
-        int newBandOffsets[] = new int[bands.length];
+        int[] newBankIndices = new int[bands.length];
+        int[] newBandOffsets = new int[bands.length];
 
         for (int i=0; i<bands.length; i++) {
             newBankIndices[i] = bankIndices[bands[i]];
@@ -396,7 +396,7 @@
      * @return the samples for the specified pixel.
      * @see #setPixel(int, int, int[], DataBuffer)
      */
-    public int[] getPixel(int x, int y, int iArray[], DataBuffer data) {
+    public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
@@ -433,7 +433,7 @@
      * @see #setPixels(int, int, int, int, int[], DataBuffer)
      */
     public int[] getPixels(int x, int y, int w, int h,
-                           int iArray[], DataBuffer data) {
+                           int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
@@ -557,13 +557,13 @@
      * @see #setSamples(int, int, int, int, int, int[], DataBuffer)
      */
     public int[] getSamples(int x, int y, int w, int h, int b,
-                            int iArray[], DataBuffer data) {
+                            int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
         if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
-        int samples[];
+        int[] samples;
         if (iArray != null) {
            samples = iArray;
         } else {
@@ -694,7 +694,7 @@
      * @param data      The DataBuffer containing the image data
      * @see #getPixel(int, int, int[], DataBuffer)
      */
-    public void setPixel(int x, int y, int iArray[], DataBuffer data) {
+    public void setPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
@@ -720,7 +720,7 @@
      * @see #getPixels(int, int, int, int, int[], DataBuffer)
      */
     public void setPixels(int x, int y, int w, int h,
-                          int iArray[], DataBuffer data) {
+                          int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
@@ -833,7 +833,7 @@
      * @see #getSamples(int, int, int, int, int, int[], DataBuffer)
      */
     public void setSamples(int x, int y, int w, int h, int b,
-                           int iArray[], DataBuffer data) {
+                           int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
         if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
--- a/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/BufferedImageFilter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -127,7 +127,7 @@
 
     private void convertToRGB() {
         int size = width * height;
-        int newpixels[] = new int[size];
+        int[] newpixels = new int[size];
         if (bytePixels != null) {
             for (int i = 0; i < size; i++) {
                 newpixels[i] = this.model.getRGB(bytePixels[i] & 0xff);
@@ -159,7 +159,7 @@
                                     int, int)
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, byte pixels[], int off,
+                          ColorModel model, byte[] pixels, int off,
                           int scansize) {
         // Fix 4184230
         if (w < 0 || h < 0) {
@@ -246,7 +246,7 @@
                                     int, int)
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, int pixels[], int off,
+                          ColorModel model, int[] pixels, int off,
                           int scansize) {
         // Fix 4184230
         if (w < 0 || h < 0) {
--- a/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
      * Constants
      */
 
-    byte data[][];
+    byte[][] data;
 
     /**
      * Constructs a ByteLookupTable object from an array of byte
@@ -63,7 +63,7 @@
      *         is less than 0 or if the length of {@code data}
      *         is less than 1
      */
-    public ByteLookupTable(int offset, byte data[][]) {
+    public ByteLookupTable(int offset, byte[][] data) {
         super(offset,data.length);
         numComponents = data.length;
         numEntries    = data[0].length;
@@ -87,7 +87,7 @@
      *         is less than 0 or if the length of {@code data}
      *         is less than 1
      */
-    public ByteLookupTable(int offset, byte data[]) {
+    public ByteLookupTable(int offset, byte[] data) {
         super(offset,data.length);
         numComponents = 1;
         numEntries    = data.length;
--- a/src/java.desktop/share/classes/java/awt/image/ColorModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/ColorModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -160,7 +160,7 @@
      * The total number of bits in the pixel.
      */
     protected int pixel_bits;
-    int nBits[];
+    int[] nBits;
     int transparency = Transparency.TRANSLUCENT;
     boolean supportsAlpha = true;
     boolean isAlphaPremultiplied = false;
@@ -645,17 +645,17 @@
         int pixel=0,length=0;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                pixel = bdata[0] & 0xff;
                length = bdata.length;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
+               short[] sdata = (short[])inData;
                pixel = sdata[0] & 0xffff;
                length = sdata.length;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                pixel = idata[0];
                length = idata.length;
             break;
@@ -712,17 +712,17 @@
         int pixel=0,length=0;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                pixel = bdata[0] & 0xff;
                length = bdata.length;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
+               short[] sdata = (short[])inData;
                pixel = sdata[0] & 0xffff;
                length = sdata.length;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                pixel = idata[0];
                length = idata.length;
             break;
@@ -779,17 +779,17 @@
         int pixel=0,length=0;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                pixel = bdata[0] & 0xff;
                length = bdata.length;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
+               short[] sdata = (short[])inData;
                pixel = sdata[0] & 0xffff;
                length = sdata.length;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                pixel = idata[0];
                length = idata.length;
             break;
@@ -842,17 +842,17 @@
         int pixel=0,length=0;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                pixel = bdata[0] & 0xff;
                length = bdata.length;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
+               short[] sdata = (short[])inData;
                pixel = sdata[0] & 0xffff;
                length = sdata.length;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                pixel = idata[0];
                length = idata.length;
             break;
@@ -1333,7 +1333,7 @@
      * @since 1.4
      */
     public int getDataElement(float[] normComponents, int normOffset) {
-        int components[] = getUnnormalizedComponents(normComponents,
+        int[] components = getUnnormalizedComponents(normComponents,
                                                      normOffset, null, 0);
         return getDataElement(components, 0);
     }
@@ -1381,7 +1381,7 @@
      */
     public Object getDataElements(float[] normComponents, int normOffset,
                                   Object obj) {
-        int components[] = getUnnormalizedComponents(normComponents,
+        int[] components = getUnnormalizedComponents(normComponents,
                                                      normOffset, null, 0);
         return getDataElements(components, 0, obj);
     }
@@ -1442,7 +1442,7 @@
     public float[] getNormalizedComponents(Object pixel,
                                            float[] normComponents,
                                            int normOffset) {
-        int components[] = getComponents(pixel, null, 0);
+        int[] components = getComponents(pixel, null, 0);
         return getNormalizedComponents(components, 0,
                                        normComponents, normOffset);
     }
--- a/src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/ComponentColorModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -802,7 +802,7 @@
             // Note: we do no clamping of the pixel data here - we
             // assume that the data is scaled properly
             case DataBuffer.TYPE_SHORT: {
-                short sdata[] = (short[]) inData;
+                short[] sdata = (short[]) inData;
                 float scalefactor = (float) ((1 << precision) - 1);
                 if (needAlpha) {
                     short s = sdata[numColorComponents];
@@ -817,7 +817,7 @@
                 }
             }
             case DataBuffer.TYPE_FLOAT: {
-                float fdata[] = (float[]) inData;
+                float[] fdata = (float[]) inData;
                 float scalefactor = (float) ((1 << precision) - 1);
                 if (needAlpha) {
                     float f = fdata[numColorComponents];
@@ -831,7 +831,7 @@
                 }
             }
             case DataBuffer.TYPE_DOUBLE: {
-                double ddata[] = (double[]) inData;
+                double[] ddata = (double[]) inData;
                 double scalefactor = (double) ((1 << precision) - 1);
                 if (needAlpha) {
                     double d = ddata[numColorComponents];
@@ -845,7 +845,7 @@
                 }
             }
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                comp = bdata[idx] & mask;
                precision = 8;
                if (needAlpha) {
@@ -853,14 +853,14 @@
                }
             break;
             case DataBuffer.TYPE_USHORT:
-               short usdata[] = (short[])inData;
+               short[] usdata = (short[])inData;
                comp = usdata[idx] & mask;
                if (needAlpha) {
                    alp = usdata[numColorComponents] & mask;
                }
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                comp = idata[idx];
                if (needAlpha) {
                    alp = idata[numColorComponents];
@@ -1054,27 +1054,27 @@
 
         switch (transferType) {
             case DataBuffer.TYPE_SHORT:
-                short sdata[] = (short[])inData;
+                short[] sdata = (short[])inData;
                 alpha = (int) ((sdata[aIdx] / 32767.0f) * 255.0f + 0.5f);
                 return alpha;
             case DataBuffer.TYPE_FLOAT:
-                float fdata[] = (float[])inData;
+                float[] fdata = (float[])inData;
                 alpha = (int) (fdata[aIdx] * 255.0f + 0.5f);
                 return alpha;
             case DataBuffer.TYPE_DOUBLE:
-                double ddata[] = (double[])inData;
+                double[] ddata = (double[])inData;
                 alpha = (int) (ddata[aIdx] * 255.0 + 0.5);
                 return alpha;
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                alpha = bdata[aIdx] & mask;
             break;
             case DataBuffer.TYPE_USHORT:
-               short usdata[] = (short[])inData;
+               short[] usdata = (short[])inData;
                alpha = usdata[aIdx] & mask;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                alpha = idata[aIdx];
             break;
             default:
@@ -1201,7 +1201,7 @@
             switch(transferType) {
             case DataBuffer.TYPE_SHORT:
                 {
-                    short sdata[];
+                    short[] sdata;
                     if (pixel == null) {
                         sdata = new short[numComponents];
                     } else {
@@ -1264,7 +1264,7 @@
                         sdata[0] = (short) (gray * factor + 0.5f);
                     } else {
                         factor = 1.0f / 255.0f;
-                        float norm[] = new float[3];
+                        float[] norm = new float[3];
                         norm[0] = red * factor;
                         norm[1] = grn * factor;
                         norm[2] = blu * factor;
@@ -1300,7 +1300,7 @@
                 }
             case DataBuffer.TYPE_FLOAT:
                 {
-                    float fdata[];
+                    float[] fdata;
                     if (pixel == null) {
                         fdata = new float[numComponents];
                     } else {
@@ -1357,7 +1357,7 @@
                             }
                         }
                     } else {
-                        float norm[] = new float[3];
+                        float[] norm = new float[3];
                         factor = 1.0f / 255.0f;
                         norm[0] = red * factor;
                         norm[1] = grn * factor;
@@ -1381,7 +1381,7 @@
                 }
             case DataBuffer.TYPE_DOUBLE:
                 {
-                    double ddata[];
+                    double[] ddata;
                     if (pixel == null) {
                         ddata = new double[numComponents];
                     } else {
@@ -1439,7 +1439,7 @@
                         }
                     } else {
                         float factor = 1.0f / 255.0f;
-                        float norm[] = new float[3];
+                        float[] norm = new float[3];
                         norm[0] = red * factor;
                         norm[1] = grn * factor;
                         norm[2] = blu * factor;
@@ -1466,7 +1466,7 @@
         // Handle BYTE, USHORT, & INT here
         //REMIND: maybe more efficient not to use int array for
         //DataBuffer.TYPE_USHORT and DataBuffer.TYPE_INT
-        int intpixel[];
+        int[] intpixel;
         if (transferType == DataBuffer.TYPE_INT &&
             pixel != null) {
            intpixel = (int[])pixel;
@@ -1615,7 +1615,7 @@
 
         switch (transferType) {
             case DataBuffer.TYPE_BYTE: {
-               byte bdata[];
+               byte[] bdata;
                if (pixel == null) {
                    bdata = new byte[numComponents];
                } else {
@@ -1627,7 +1627,7 @@
                return bdata;
             }
             case DataBuffer.TYPE_USHORT:{
-               short sdata[];
+               short[] sdata;
                if (pixel == null) {
                    sdata = new short[numComponents];
                } else {
@@ -1741,7 +1741,7 @@
      * enough to hold a pixel value for this ColorModel.
      */
     public int[] getComponents(Object pixel, int[] components, int offset) {
-        int intpixel[];
+        int[] intpixel;
         if (needScaleInit) {
             initScale();
         }
@@ -2057,7 +2057,7 @@
         switch (transferType) {
         case DataBuffer.TYPE_BYTE:
             {
-                byte bpixel[] = (byte[]) pixel;
+                byte[] bpixel = (byte[]) pixel;
                 return bpixel[0] & 0xff;
             }
         case DataBuffer.TYPE_USHORT:
@@ -2468,8 +2468,8 @@
         if (isAlphaPremultiplied) {
             switch (transferType) {
                 case DataBuffer.TYPE_BYTE: {
-                    byte pixel[] = null;
-                    byte zpixel[] = null;
+                    byte[] pixel = null;
+                    byte[] zpixel = null;
                     float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
@@ -2495,8 +2495,8 @@
                 }
                 break;
                 case DataBuffer.TYPE_USHORT: {
-                    short pixel[] = null;
-                    short zpixel[] = null;
+                    short[] pixel = null;
+                    short[] zpixel = null;
                     float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
@@ -2523,8 +2523,8 @@
                 }
                 break;
                 case DataBuffer.TYPE_INT: {
-                    int pixel[] = null;
-                    int zpixel[] = null;
+                    int[] pixel = null;
+                    int[] zpixel = null;
                     float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
@@ -2550,8 +2550,8 @@
                 }
                 break;
                 case DataBuffer.TYPE_SHORT: {
-                    short pixel[] = null;
-                    short zpixel[] = null;
+                    short[] pixel = null;
+                    short[] zpixel = null;
                     float alphaScale = 1.0f / 32767.0f;
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
@@ -2577,8 +2577,8 @@
                 }
                 break;
                 case DataBuffer.TYPE_FLOAT: {
-                    float pixel[] = null;
-                    float zpixel[] = null;
+                    float[] pixel = null;
+                    float[] zpixel = null;
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
                         for (int x = 0; x < w; x++, rX++) {
@@ -2602,8 +2602,8 @@
                 }
                 break;
                 case DataBuffer.TYPE_DOUBLE: {
-                    double pixel[] = null;
-                    double zpixel[] = null;
+                    double[] pixel = null;
+                    double[] zpixel = null;
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
                         for (int x = 0; x < w; x++, rX++) {
@@ -2635,7 +2635,7 @@
             // We are premultiplied and want to divide it out
             switch (transferType) {
                 case DataBuffer.TYPE_BYTE: {
-                    byte pixel[] = null;
+                    byte[] pixel = null;
                     float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
@@ -2656,7 +2656,7 @@
                 }
                 break;
                 case DataBuffer.TYPE_USHORT: {
-                    short pixel[] = null;
+                    short[] pixel = null;
                     float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
@@ -2677,7 +2677,7 @@
                 }
                 break;
                 case DataBuffer.TYPE_INT: {
-                    int pixel[] = null;
+                    int[] pixel = null;
                     float alphaScale = 1.0f / ((float) ((1<<nBits[aIdx]) - 1));
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
@@ -2698,7 +2698,7 @@
                 }
                 break;
                 case DataBuffer.TYPE_SHORT: {
-                    short pixel[] = null;
+                    short[] pixel = null;
                     float alphaScale = 1.0f / 32767.0f;
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
@@ -2719,7 +2719,7 @@
                 }
                 break;
                 case DataBuffer.TYPE_FLOAT: {
-                    float pixel[] = null;
+                    float[] pixel = null;
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
                         for (int x = 0; x < w; x++, rX++) {
@@ -2738,7 +2738,7 @@
                 }
                 break;
                 case DataBuffer.TYPE_DOUBLE: {
-                    double pixel[] = null;
+                    double[] pixel = null;
                     for (int y = 0; y < h; y++, rY++) {
                         rX = rminX;
                         for (int x = 0; x < w; x++, rX++) {
--- a/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/ComponentSampleModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,7 @@
 public class ComponentSampleModel extends SampleModel
 {
     /** Offsets for all bands in data array elements. */
-    protected int bandOffsets[];
+    protected int[] bandOffsets;
 
     /** Index for each bank storing a band of image data. */
     protected int[] bankIndices;
@@ -136,7 +136,7 @@
                                 int w, int h,
                                 int pixelStride,
                                 int scanlineStride,
-                                int bandOffsets[]) {
+                                int[] bandOffsets) {
         super(dataType, w, h, bandOffsets.length);
         this.dataType = dataType;
         this.pixelStride = pixelStride;
@@ -199,8 +199,8 @@
                                 int w, int h,
                                 int pixelStride,
                                 int scanlineStride,
-                                int bankIndices[],
-                                int bandOffsets[]) {
+                                int[] bankIndices,
+                                int[] bandOffsets) {
         super(dataType, w, h, bandOffsets.length);
         this.dataType = dataType;
         this.pixelStride = pixelStride;
@@ -292,9 +292,9 @@
      /**
       * Preserves band ordering with new step factor...
       */
-    int []orderBands(int orig[], int step) {
-        int map[] = new int[orig.length];
-        int ret[] = new int[orig.length];
+    int []orderBands(int[] orig, int step) {
+        int[] map = new int[orig.length];
+        int[] ret = new int[orig.length];
 
         for (int i=0; i<map.length; i++) map[i] = i;
 
@@ -334,7 +334,7 @@
         maxBandOff -= minBandOff;
 
         int bands   = bandOffsets.length;
-        int bandOff[];
+        int[] bandOff;
         int pStride = Math.abs(pixelStride);
         int lStride = Math.abs(scanlineStride);
         int bStride = Math.abs(maxBandOff);
@@ -402,13 +402,13 @@
      * @return a {@code ComponentSampleModel} created with a subset
      *          of bands from this {@code ComponentSampleModel}.
      */
-    public SampleModel createSubsetSampleModel(int bands[]) {
+    public SampleModel createSubsetSampleModel(int[] bands) {
        if (bands.length > bankIndices.length)
             throw new RasterFormatException("There are only " +
                                             bankIndices.length +
                                             " bands");
-        int newBankIndices[] = new int[bands.length];
-        int newBandOffsets[] = new int[bands.length];
+        int[] newBankIndices = new int[bands.length];
+        int[] newBandOffsets = new int[bands.length];
 
         for (int i=0; i<bands.length; i++) {
             newBankIndices[i] = bankIndices[bands[i]];
@@ -499,7 +499,7 @@
      *          represents a band.
      */
     public final int[] getSampleSize() {
-        int sampleSize[] = new int [numBands];
+        int[] sampleSize = new int [numBands];
         int sizeInBits = getSampleSize(0);
 
         for (int i=0; i<numBands; i++)
@@ -728,12 +728,12 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if iArray is too small to hold the output.
      */
-    public int[] getPixel(int x, int y, int iArray[], DataBuffer data) {
+    public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
-        int pixels[];
+        int[] pixels;
         if (iArray != null) {
            pixels = iArray;
         } else {
@@ -762,7 +762,7 @@
      * @see #setPixels(int, int, int, int, int[], DataBuffer)
      */
     public int[] getPixels(int x, int y, int w, int h,
-                           int iArray[], DataBuffer data) {
+                           int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
@@ -772,7 +772,7 @@
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
-        int pixels[];
+        int[] pixels;
         if (iArray != null) {
            pixels = iArray;
         } else {
@@ -886,13 +886,13 @@
      * @see #setSamples(int, int, int, int, int, int[], DataBuffer)
      */
     public int[] getSamples(int x, int y, int w, int h, int b,
-                            int iArray[], DataBuffer data) {
+                            int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
         if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
-        int samples[];
+        int[] samples;
         if (iArray != null) {
            samples = iArray;
         } else {
@@ -1027,7 +1027,7 @@
      * @param data      The DataBuffer containing the image data
      * @see #getPixel(int, int, int[], DataBuffer)
      */
-    public void setPixel(int x, int y, int iArray[], DataBuffer data) {
+    public void setPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
@@ -1053,7 +1053,7 @@
      * @see #getPixels(int, int, int, int, int[], DataBuffer)
      */
     public void setPixels(int x, int y, int w, int h,
-                          int iArray[], DataBuffer data) {
+                          int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
@@ -1168,7 +1168,7 @@
      * @see #getSamples(int, int, int, int, int, int[], DataBuffer)
      */
     public void setSamples(int x, int y, int w, int h, int b,
-                           int iArray[], DataBuffer data) {
+                           int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
         if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
--- a/src/java.desktop/share/classes/java/awt/image/CropImageFilter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/CropImageFilter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,7 +114,7 @@
      * with the filtering operation.
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, byte pixels[], int off,
+                          ColorModel model, byte[] pixels, int off,
                           int scansize) {
         int x1 = x;
         if (x1 < cropX) {
@@ -154,7 +154,7 @@
      * with the filtering operation.
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, int pixels[], int off,
+                          ColorModel model, int[] pixels, int off,
                           int scansize) {
         int x1 = x;
         if (x1 < cropX) {
--- a/src/java.desktop/share/classes/java/awt/image/DataBuffer.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/DataBuffer.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -103,13 +103,13 @@
     protected int size;
 
     /** Offsets into all banks. */
-    protected int offsets[];
+    protected int[] offsets;
 
     /* The current StateTrackable state. */
     StateTrackableDelegate theTrackable;
 
     /** Size of the data types indexed by DataType tags defined above. */
-    private static final int dataTypeSize[] = {8,16,16,32,32,64};
+    private static final int[] dataTypeSize = {8,16,16,32,32,64};
 
     /** Returns the size (in bits) of the data type, given a datatype tag.
       * @param type the value of one of the defined datatype tags
@@ -246,7 +246,7 @@
      *  @throws ArrayIndexOutOfBoundsException if {@code numBanks}
      *          does not equal the length of {@code offsets}
      */
-    protected DataBuffer(int dataType, int size, int numBanks, int offsets[]) {
+    protected DataBuffer(int dataType, int size, int numBanks, int[] offsets) {
         this(UNTRACKABLE, dataType, size, numBanks, offsets);
     }
 
@@ -268,7 +268,7 @@
      *  @since 1.7
      */
     DataBuffer(State initialState,
-               int dataType, int size, int numBanks, int offsets[])
+               int dataType, int size, int numBanks, int[] offsets)
     {
         if (numBanks != offsets.length) {
             throw new ArrayIndexOutOfBoundsException("Number of banks" +
@@ -498,15 +498,15 @@
         } else if (obj == null) {
             return null;
         } else if (obj instanceof short[]) {
-            short sdata[] = (short[])obj;
-            int idata[] = new int[sdata.length];
+            short[] sdata = (short[])obj;
+            int[] idata = new int[sdata.length];
             for (int i = 0; i < sdata.length; i++) {
                 idata[i] = (int)sdata[i] & 0xffff;
             }
             return idata;
         } else if (obj instanceof byte[]) {
-            byte bdata[] = (byte[])obj;
-            int idata[] = new int[bdata.length];
+            byte[] bdata = (byte[])obj;
+            int[] idata = new int[bdata.length];
             for (int i = 0; i < bdata.length; i++) {
                 idata[i] = 0xff & (int)bdata[i];
             }
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferByte.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferByte.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,10 +60,10 @@
 public final class DataBufferByte extends DataBuffer
 {
     /** The default data bank. */
-    byte data[];
+    byte[] data;
 
     /** All data banks */
-    byte bankdata[][];
+    byte[][] bankdata;
 
     /**
      * Constructs a byte-based {@code DataBuffer} with a single bank and the
@@ -109,7 +109,7 @@
      * @param dataArray The byte array for the {@code DataBuffer}.
      * @param size The size of the {@code DataBuffer} bank.
      */
-    public DataBufferByte(byte dataArray[], int size) {
+    public DataBufferByte(byte[] dataArray, int size) {
         super(UNTRACKABLE, TYPE_BYTE, size);
         data = dataArray;
         bankdata = new byte[1][];
@@ -133,7 +133,7 @@
      * @param offset The offset into the {@code dataArray}. {@code dataArray}
      * must have at least {@code offset} + {@code size} elements.
      */
-    public DataBufferByte(byte dataArray[], int size, int offset){
+    public DataBufferByte(byte[] dataArray, int size, int offset){
         super(UNTRACKABLE, TYPE_BYTE, size, 1, offset);
         data = dataArray;
         bankdata = new byte[1][];
@@ -154,7 +154,7 @@
      * @param dataArray The byte arrays for the {@code DataBuffer}.
      * @param size The size of the banks in the {@code DataBuffer}.
      */
-    public DataBufferByte(byte dataArray[][], int size) {
+    public DataBufferByte(byte[][] dataArray, int size) {
         super(UNTRACKABLE, TYPE_BYTE, size, dataArray.length);
         bankdata = dataArray.clone();
         data = bankdata[0];
@@ -179,7 +179,7 @@
      * @param size The size of the banks in the {@code DataBuffer}.
      * @param offsets The offsets into each array.
      */
-    public DataBufferByte(byte dataArray[][], int size, int offsets[]) {
+    public DataBufferByte(byte[][] dataArray, int size, int[] offsets) {
         super(UNTRACKABLE, TYPE_BYTE, size, dataArray.length, offsets);
         bankdata = dataArray.clone();
         data = bankdata[0];
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferDouble.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,10 +52,10 @@
 public final class DataBufferDouble extends DataBuffer {
 
     /** The array of data banks. */
-    double bankdata[][];
+    double[][] bankdata;
 
     /** A reference to the default data bank. */
-    double data[];
+    double[] data;
 
     /**
      * Constructs a {@code double}-based {@code DataBuffer}
@@ -104,7 +104,7 @@
      *                  first and only bank of this {@code DataBuffer}.
      * @param size The number of elements of the array to be used.
      */
-    public DataBufferDouble(double dataArray[], int size) {
+    public DataBufferDouble(double[] dataArray, int size) {
         super(UNTRACKABLE, TYPE_DOUBLE, size);
         data = dataArray;
         bankdata = new double[1][];
@@ -129,7 +129,7 @@
      * @param offset The offset of the first element of the array
      *               that will be used.
      */
-    public DataBufferDouble(double dataArray[], int size, int offset) {
+    public DataBufferDouble(double[] dataArray, int size, int offset) {
         super(UNTRACKABLE, TYPE_DOUBLE, size, 1, offset);
         data = dataArray;
         bankdata = new double[1][];
@@ -152,7 +152,7 @@
      *        used as the banks of this {@code DataBuffer}.
      * @param size The number of elements of each array to be used.
      */
-    public DataBufferDouble(double dataArray[][], int size) {
+    public DataBufferDouble(double[][] dataArray, int size) {
         super(UNTRACKABLE, TYPE_DOUBLE, size, dataArray.length);
         bankdata = dataArray.clone();
         data = bankdata[0];
@@ -176,7 +176,7 @@
      * @param size The number of elements of each array to be used.
      * @param offsets An array of integer offsets, one for each bank.
      */
-    public DataBufferDouble(double dataArray[][], int size, int offsets[]) {
+    public DataBufferDouble(double[][] dataArray, int size, int[] offsets) {
         super(UNTRACKABLE, TYPE_DOUBLE, size, dataArray.length, offsets);
         bankdata = dataArray.clone();
         data = bankdata[0];
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferFloat.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,10 +52,10 @@
 public final class DataBufferFloat extends DataBuffer {
 
     /** The array of data banks. */
-    float bankdata[][];
+    float[][] bankdata;
 
     /** A reference to the default data bank. */
-    float data[];
+    float[] data;
 
     /**
      * Constructs a {@code float}-based {@code DataBuffer}
@@ -105,7 +105,7 @@
      *                  first and only bank of this {@code DataBuffer}.
      * @param size The number of elements of the array to be used.
      */
-    public DataBufferFloat(float dataArray[], int size) {
+    public DataBufferFloat(float[] dataArray, int size) {
         super(UNTRACKABLE, TYPE_FLOAT, size);
         data = dataArray;
         bankdata = new float[1][];
@@ -131,7 +131,7 @@
      * @param offset The offset of the first element of the array
      *               that will be used.
      */
-    public DataBufferFloat(float dataArray[], int size, int offset) {
+    public DataBufferFloat(float[] dataArray, int size, int offset) {
         super(UNTRACKABLE, TYPE_FLOAT, size, 1, offset);
         data = dataArray;
         bankdata = new float[1][];
@@ -154,7 +154,7 @@
      *                  used as the banks of this {@code DataBuffer}.
      * @param size The number of elements of each array to be used.
      */
-    public DataBufferFloat(float dataArray[][], int size) {
+    public DataBufferFloat(float[][] dataArray, int size) {
         super(UNTRACKABLE, TYPE_FLOAT, size, dataArray.length);
         bankdata = dataArray.clone();
         data = bankdata[0];
@@ -178,7 +178,7 @@
      * @param size The number of elements of each array to be used.
      * @param offsets An array of integer offsets, one for each bank.
      */
-    public DataBufferFloat(float dataArray[][], int size, int offsets[]) {
+    public DataBufferFloat(float[][] dataArray, int size, int[] offsets) {
         super(UNTRACKABLE, TYPE_FLOAT, size,dataArray.length, offsets);
         bankdata = dataArray.clone();
         data = bankdata[0];
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferInt.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferInt.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,10 +59,10 @@
 public final class DataBufferInt extends DataBuffer
 {
     /** The default data bank. */
-    int data[];
+    int[] data;
 
     /** All data banks */
-    int bankdata[][];
+    int[][] bankdata;
 
     /**
      * Constructs an integer-based {@code DataBuffer} with a single bank
@@ -108,7 +108,7 @@
      * @param dataArray The integer array for the {@code DataBuffer}.
      * @param size The size of the {@code DataBuffer} bank.
      */
-    public DataBufferInt(int dataArray[], int size) {
+    public DataBufferInt(int[] dataArray, int size) {
         super(UNTRACKABLE, TYPE_INT, size);
         data = dataArray;
         bankdata = new int[1][];
@@ -131,7 +131,7 @@
      * @param size The size of the {@code DataBuffer} bank.
      * @param offset The offset into the {@code dataArray}.
      */
-    public DataBufferInt(int dataArray[], int size, int offset) {
+    public DataBufferInt(int[] dataArray, int size, int offset) {
         super(UNTRACKABLE, TYPE_INT, size, 1, offset);
         data = dataArray;
         bankdata = new int[1][];
@@ -152,7 +152,7 @@
      * @param dataArray The integer arrays for the {@code DataBuffer}.
      * @param size The size of the banks in the {@code DataBuffer}.
      */
-    public DataBufferInt(int dataArray[][], int size) {
+    public DataBufferInt(int[][] dataArray, int size) {
         super(UNTRACKABLE, TYPE_INT, size, dataArray.length);
         bankdata = dataArray.clone();
         data = bankdata[0];
@@ -177,7 +177,7 @@
      * @param size The size of the banks in the {@code DataBuffer}.
      * @param offsets The offsets into each array.
      */
-    public DataBufferInt(int dataArray[][], int size, int offsets[]) {
+    public DataBufferInt(int[][] dataArray, int size, int[] offsets) {
         super(UNTRACKABLE, TYPE_INT, size, dataArray.length, offsets);
         bankdata = dataArray.clone();
         data = bankdata[0];
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferShort.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferShort.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,10 +58,10 @@
 public final class DataBufferShort extends DataBuffer
 {
     /** The default data bank. */
-    short data[];
+    short[] data;
 
     /** All data banks */
-    short bankdata[][];
+    short[][] bankdata;
 
     /**
      * Constructs a short-based {@code DataBuffer} with a single bank and the
@@ -107,7 +107,7 @@
      * @param dataArray The short array for the {@code DataBuffer}.
      * @param size The size of the {@code DataBuffer} bank.
      */
-    public DataBufferShort(short dataArray[], int size) {
+    public DataBufferShort(short[] dataArray, int size) {
         super(UNTRACKABLE, TYPE_SHORT, size);
         data = dataArray;
         bankdata = new short[1][];
@@ -130,7 +130,7 @@
      * @param size The size of the {@code DataBuffer} bank.
      * @param offset The offset into the {@code dataArray}.
      */
-    public DataBufferShort(short dataArray[], int size, int offset) {
+    public DataBufferShort(short[] dataArray, int size, int offset) {
         super(UNTRACKABLE, TYPE_SHORT, size, 1, offset);
         data = dataArray;
         bankdata = new short[1][];
@@ -151,7 +151,7 @@
      * @param dataArray The short arrays for the {@code DataBuffer}.
      * @param size The size of the banks in the {@code DataBuffer}.
      */
-    public DataBufferShort(short dataArray[][], int size) {
+    public DataBufferShort(short[][] dataArray, int size) {
         super(UNTRACKABLE, TYPE_SHORT, size, dataArray.length);
         bankdata = dataArray.clone();
         data = bankdata[0];
@@ -176,7 +176,7 @@
      * @param size The size of the banks in the {@code DataBuffer}.
      * @param offsets The offsets into each array.
      */
-    public DataBufferShort(short dataArray[][], int size, int offsets[]) {
+    public DataBufferShort(short[][] dataArray, int size, int[] offsets) {
         super(UNTRACKABLE, TYPE_SHORT, size, dataArray.length, offsets);
         bankdata = dataArray.clone();
         data = bankdata[0];
--- a/src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/DataBufferUShort.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,10 +60,10 @@
 public final class DataBufferUShort extends DataBuffer
 {
     /** The default data bank. */
-    short data[];
+    short[] data;
 
     /** All data banks */
-    short bankdata[][];
+    short[][] bankdata;
 
     /**
      * Constructs an unsigned-short based {@code DataBuffer} with a single bank and the
@@ -109,7 +109,7 @@
      * @param dataArray The unsigned-short array for the {@code DataBuffer}.
      * @param size The size of the {@code DataBuffer} bank.
      */
-    public DataBufferUShort(short dataArray[], int size) {
+    public DataBufferUShort(short[] dataArray, int size) {
         super(UNTRACKABLE, TYPE_USHORT, size);
         if (dataArray == null) {
             throw new NullPointerException("dataArray is null");
@@ -135,7 +135,7 @@
      * @param size The size of the {@code DataBuffer} bank.
      * @param offset The offset into the {@code dataArray}.
      */
-    public DataBufferUShort(short dataArray[], int size, int offset) {
+    public DataBufferUShort(short[] dataArray, int size, int offset) {
         super(UNTRACKABLE, TYPE_USHORT, size, 1, offset);
         if (dataArray == null) {
             throw new NullPointerException("dataArray is null");
@@ -163,7 +163,7 @@
      * @param dataArray The unsigned-short arrays for the {@code DataBuffer}.
      * @param size The size of the banks in the {@code DataBuffer}.
      */
-    public DataBufferUShort(short dataArray[][], int size) {
+    public DataBufferUShort(short[][] dataArray, int size) {
         super(UNTRACKABLE, TYPE_USHORT, size, dataArray.length);
         if (dataArray == null) {
             throw new NullPointerException("dataArray is null");
@@ -197,7 +197,7 @@
      * @param size The size of the banks in the {@code DataBuffer}.
      * @param offsets The offsets into each array.
      */
-    public DataBufferUShort(short dataArray[][], int size, int offsets[]) {
+    public DataBufferUShort(short[][] dataArray, int size, int[] offsets) {
         super(UNTRACKABLE, TYPE_USHORT, size, dataArray.length, offsets);
         if (dataArray == null) {
             throw new NullPointerException("dataArray is null");
--- a/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -311,8 +311,8 @@
      * components as float values between 0.0 and 1.0.
      */
     private float[] getDefaultRGBComponents(int pixel) {
-        int components[] = getComponents(pixel, null, 0);
-        float norm[] = getNormalizedComponents(components, 0, null, 0);
+        int[] components = getComponents(pixel, null, 0);
+        float[] norm = getNormalizedComponents(components, 0, null, 0);
         // Note that getNormalizedComponents returns non-premultiplied values
         return colorSpace.toRGB(norm);
     }
@@ -371,7 +371,7 @@
         } else if (is_LinearRGB) {
             return getsRGBComponentFromLinearRGB(pixel, 0);
         }
-        float rgb[] = getDefaultRGBComponents(pixel);
+        float[] rgb = getDefaultRGBComponents(pixel);
         return (int) (rgb[0] * 255.0f + 0.5f);
     }
 
@@ -394,7 +394,7 @@
         } else if (is_LinearRGB) {
             return getsRGBComponentFromLinearRGB(pixel, 1);
         }
-        float rgb[] = getDefaultRGBComponents(pixel);
+        float[] rgb = getDefaultRGBComponents(pixel);
         return (int) (rgb[1] * 255.0f + 0.5f);
     }
 
@@ -417,7 +417,7 @@
         } else if (is_LinearRGB) {
             return getsRGBComponentFromLinearRGB(pixel, 2);
         }
-        float rgb[] = getDefaultRGBComponents(pixel);
+        float[] rgb = getDefaultRGBComponents(pixel);
         return (int) (rgb[2] * 255.0f + 0.5f);
     }
 
@@ -457,7 +457,7 @@
                 | (getGreen(pixel) << 8)
                 | (getBlue(pixel) << 0);
         }
-        float rgb[] = getDefaultRGBComponents(pixel);
+        float[] rgb = getDefaultRGBComponents(pixel);
         return (getAlpha(pixel) << 24)
             | (((int) (rgb[0] * 255.0f + 0.5f)) << 16)
             | (((int) (rgb[1] * 255.0f + 0.5f)) << 8)
@@ -499,15 +499,15 @@
         int pixel=0;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                pixel = bdata[0] & 0xff;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
+               short[] sdata = (short[])inData;
                pixel = sdata[0] & 0xffff;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                pixel = idata[0];
             break;
             default:
@@ -552,15 +552,15 @@
         int pixel=0;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                pixel = bdata[0] & 0xff;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
+               short[] sdata = (short[])inData;
                pixel = sdata[0] & 0xffff;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                pixel = idata[0];
             break;
             default:
@@ -605,15 +605,15 @@
         int pixel=0;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                pixel = bdata[0] & 0xff;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
+               short[] sdata = (short[])inData;
                pixel = sdata[0] & 0xffff;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                pixel = idata[0];
             break;
             default:
@@ -655,15 +655,15 @@
         int pixel=0;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                pixel = bdata[0] & 0xff;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
+               short[] sdata = (short[])inData;
                pixel = sdata[0] & 0xffff;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                pixel = idata[0];
             break;
             default:
@@ -703,15 +703,15 @@
         int pixel=0;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                pixel = bdata[0] & 0xff;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
+               short[] sdata = (short[])inData;
                pixel = sdata[0] & 0xffff;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                pixel = idata[0];
             break;
             default:
@@ -758,7 +758,7 @@
     public Object getDataElements(int rgb, Object pixel) {
         //REMIND: maybe more efficient not to use int array for
         //DataBuffer.TYPE_USHORT and DataBuffer.TYPE_INT
-        int intpixel[] = null;
+        int[] intpixel = null;
         if (transferType == DataBuffer.TYPE_INT &&
             pixel != null) {
             intpixel = (int[])pixel;
@@ -876,7 +876,7 @@
 
         switch (transferType) {
             case DataBuffer.TYPE_BYTE: {
-               byte bdata[];
+               byte[] bdata;
                if (pixel == null) {
                    bdata = new byte[1];
                } else {
@@ -886,7 +886,7 @@
                return bdata;
             }
             case DataBuffer.TYPE_USHORT:{
-               short sdata[];
+               short[] sdata;
                if (pixel == null) {
                    sdata = new short[1];
                } else {
@@ -979,15 +979,15 @@
         int intpixel=0;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])pixel;
+               byte[] bdata = (byte[])pixel;
                intpixel = bdata[0] & 0xff;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])pixel;
+               short[] sdata = (short[])pixel;
                intpixel = sdata[0] & 0xffff;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])pixel;
+               int[] idata = (int[])pixel;
                intpixel = idata[0];
             break;
             default:
@@ -1118,29 +1118,29 @@
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
                if (obj instanceof byte[]) {
-                   byte bdata[] = (byte[])obj;
+                   byte[] bdata = (byte[])obj;
                    bdata[0] = (byte)(pixel&0xff);
                    return bdata;
                } else {
-                   byte bdata[] = {(byte)(pixel&0xff)};
+                   byte[] bdata = {(byte)(pixel&0xff)};
                    return bdata;
                }
             case DataBuffer.TYPE_USHORT:
                if (obj instanceof short[]) {
-                   short sdata[] = (short[])obj;
+                   short[] sdata = (short[])obj;
                    sdata[0] = (short)(pixel&0xffff);
                    return sdata;
                } else {
-                   short sdata[] = {(short)(pixel&0xffff)};
+                   short[] sdata = {(short)(pixel&0xffff)};
                    return sdata;
                }
             case DataBuffer.TYPE_INT:
                if (obj instanceof int[]) {
-                   int idata[] = (int[])obj;
+                   int[] idata = (int[])obj;
                    idata[0] = pixel;
                    return idata;
                } else {
-                   int idata[] = {pixel};
+                   int[] idata = {pixel};
                    return idata;
                }
             default:
@@ -1190,8 +1190,8 @@
         int rminX = raster.getMinX();
         int rY = raster.getMinY();
         int rX;
-        int pixel[] = null;
-        int zpixel[] = null;
+        int[] pixel = null;
+        int[] zpixel = null;
 
         if (isAlphaPremultiplied) {
             // Must mean that we are currently not premultiplied so
--- a/src/java.desktop/share/classes/java/awt/image/ImageConsumer.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/ImageConsumer.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,7 +158,7 @@
      * @see ColorModel
      */
     void setPixels(int x, int y, int w, int h,
-                   ColorModel model, byte pixels[], int off, int scansize);
+                   ColorModel model, byte[] pixels, int off, int scansize);
 
     /**
      * The pixels of the image are delivered using one or more calls
@@ -184,7 +184,7 @@
      * @see ColorModel
      */
     void setPixels(int x, int y, int w, int h,
-                   ColorModel model, int pixels[], int off, int scansize);
+                   ColorModel model, int[] pixels, int off, int scansize);
 
     /**
      * The imageComplete method is called when the ImageProducer is
--- a/src/java.desktop/share/classes/java/awt/image/ImageFilter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/ImageFilter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -157,7 +157,7 @@
      * @see ImageConsumer#setPixels
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, byte pixels[], int off,
+                          ColorModel model, byte[] pixels, int off,
                           int scansize) {
         consumer.setPixels(x, y, w, h, model, pixels, off, scansize);
     }
@@ -174,7 +174,7 @@
      * @see ImageConsumer#setPixels
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, int pixels[], int off,
+                          ColorModel model, int[] pixels, int off,
                           int scansize) {
         consumer.setPixels(x, y, w, h, model, pixels, off, scansize);
     }
--- a/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/IndexColorModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -124,7 +124,7 @@
  *
  */
 public class IndexColorModel extends ColorModel {
-    private int rgb[];
+    private int[] rgb;
     private int map_size;
     private int pixel_mask;
     private int transparent_index = -1;
@@ -166,7 +166,7 @@
      *         than 1
      */
     public IndexColorModel(int bits, int size,
-                           byte r[], byte g[], byte b[]) {
+                           byte[] r, byte[] g, byte[] b) {
         super(bits, opaqueBits,
               ColorSpace.getInstance(ColorSpace.CS_sRGB),
               false, false, OPAQUE,
@@ -206,7 +206,7 @@
      *          1
      */
     public IndexColorModel(int bits, int size,
-                           byte r[], byte g[], byte b[], int trans) {
+                           byte[] r, byte[] g, byte[] b, int trans) {
         super(bits, opaqueBits,
               ColorSpace.getInstance(ColorSpace.CS_sRGB),
               false, false, OPAQUE,
@@ -245,7 +245,7 @@
      *           than 1
      */
     public IndexColorModel(int bits, int size,
-                           byte r[], byte g[], byte b[], byte a[]) {
+                           byte[] r, byte[] g, byte[] b, byte[] a) {
         super (bits, alphaBits,
                ColorSpace.getInstance(ColorSpace.CS_sRGB),
                true, false, TRANSLUCENT,
@@ -284,7 +284,7 @@
      * @throws IllegalArgumentException if {@code size} is less
      *           than 1
      */
-    public IndexColorModel(int bits, int size, byte cmap[], int start,
+    public IndexColorModel(int bits, int size, byte[] cmap, int start,
                            boolean hasalpha) {
         this(bits, size, cmap, start, hasalpha, -1);
         if (bits < 1 || bits > 16) {
@@ -321,7 +321,7 @@
      * @throws IllegalArgumentException if {@code size} is less than
      *               1
      */
-    public IndexColorModel(int bits, int size, byte cmap[], int start,
+    public IndexColorModel(int bits, int size, byte[] cmap, int start,
                            boolean hasalpha, int trans) {
         // REMIND: This assumes the ordering: RGB[A]
         super(bits, opaqueBits,
@@ -406,7 +406,7 @@
      *           {@code DataBuffer.TYPE_USHORT}
      */
     public IndexColorModel(int bits, int size,
-                           int cmap[], int start,
+                           int[] cmap, int start,
                            boolean hasalpha, int trans, int transferType) {
         // REMIND: This assumes the ordering: RGB[A]
         super(bits, opaqueBits,
@@ -472,7 +472,7 @@
      *
      * @since 1.3
      */
-    public IndexColorModel(int bits, int size, int cmap[], int start,
+    public IndexColorModel(int bits, int size, int[] cmap, int start,
                            int transferType, BigInteger validBits) {
         super (bits, alphaBits,
                ColorSpace.getInstance(ColorSpace.CS_sRGB),
@@ -507,7 +507,7 @@
         calculatePixelMask();
     }
 
-    private void setRGBs(int size, byte r[], byte g[], byte b[], byte a[]) {
+    private void setRGBs(int size, byte[] r, byte[] g, byte[] b, byte[] a) {
         if (size < 1) {
             throw new IllegalArgumentException("Map size ("+size+
                                                ") must be >= 1");
@@ -544,7 +544,7 @@
         setTransparency(transparency);
     }
 
-    private void setRGBs(int size, int cmap[], int start, boolean hasalpha) {
+    private void setRGBs(int size, int[] cmap, int start, boolean hasalpha) {
         map_size = size;
         rgb = new int[calcRealMapSize(pixel_bits, size)];
         int j = start;
@@ -663,7 +663,7 @@
      * @param r the specified array into which the elements of the
      *      array of red color components are copied
      */
-    public final void getReds(byte r[]) {
+    public final void getReds(byte[] r) {
         for (int i = 0; i < map_size; i++) {
             r[i] = (byte) (rgb[i] >> 16);
         }
@@ -676,7 +676,7 @@
      * @param g the specified array into which the elements of the
      *      array of green color components are copied
      */
-    public final void getGreens(byte g[]) {
+    public final void getGreens(byte[] g) {
         for (int i = 0; i < map_size; i++) {
             g[i] = (byte) (rgb[i] >> 8);
         }
@@ -689,7 +689,7 @@
      * @param b the specified array into which the elements of the
      *      array of blue color components are copied
      */
-    public final void getBlues(byte b[]) {
+    public final void getBlues(byte[] b) {
         for (int i = 0; i < map_size; i++) {
             b[i] = (byte) rgb[i];
         }
@@ -702,7 +702,7 @@
      * @param a the specified array into which the elements of the
      *      array of alpha components are copied
      */
-    public final void getAlphas(byte a[]) {
+    public final void getAlphas(byte[] a) {
         for (int i = 0; i < map_size; i++) {
             a[i] = (byte) (rgb[i] >> 24);
         }
@@ -719,7 +719,7 @@
      *        values from this array of color and alpha components
      *        are copied.
      */
-    public final void getRGBs(int rgb[]) {
+    public final void getRGBs(int[] rgb) {
         System.arraycopy(this.rgb, 0, rgb, 0, map_size);
     }
 
@@ -841,7 +841,7 @@
     }
 
     private static final int CACHESIZE = 40;
-    private int lookupcache[] = new int[CACHESIZE];
+    private int[] lookupcache = new int[CACHESIZE];
 
     /**
      * Returns a data element array representation of a pixel in this
@@ -945,7 +945,7 @@
             // exact match.
 
             int smallestError = Integer.MAX_VALUE;
-            int lut[] = this.rgb;
+            int[] lut = this.rgb;
             int lutrgb;
             for (int i=0; i < map_size; i++) {
                 lutrgb = lut[i];
@@ -992,7 +992,7 @@
             // Euclidean distance formula.
 
             int smallestError = Integer.MAX_VALUE;
-            int lut[] = this.rgb;
+            int[] lut = this.rgb;
             for (int i=0; i < map_size; i++) {
                 int lutrgb = lut[i];
                 if (lutrgb == rgb) {
@@ -1162,15 +1162,15 @@
         int intpixel;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])pixel;
+               byte[] bdata = (byte[])pixel;
                intpixel = bdata[0] & 0xff;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])pixel;
+               short[] sdata = (short[])pixel;
                intpixel = sdata[0] & 0xffff;
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])pixel;
+               int[] idata = (int[])pixel;
                intpixel = idata[0];
             break;
             default:
@@ -1217,15 +1217,15 @@
         int pixel;
         switch (transferType) {
             case DataBuffer.TYPE_BYTE:
-               byte bdata[] = (byte[])inData;
+               byte[] bdata = (byte[])inData;
                pixel = bdata[0] & 0xff;
             break;
             case DataBuffer.TYPE_USHORT:
-               short sdata[] = (short[])inData;
+               short[] sdata = (short[])inData;
                pixel = sdata[0];
             break;
             case DataBuffer.TYPE_INT:
-               int idata[] = (int[])inData;
+               int[] idata = (int[])inData;
                pixel = idata[0];
             break;
             default:
--- a/src/java.desktop/share/classes/java/awt/image/Kernel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/Kernel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
     private int  height;
     private int  xOrigin;
     private int  yOrigin;
-    private float data[];
+    private float[] data;
 
     private static native void initIDs();
     static {
@@ -63,7 +63,7 @@
      *         is less than the product of {@code width} and
      *         {@code height}
      */
-    public Kernel(int width, int height, float data[]) {
+    public Kernel(int width, int height, float[] data) {
         this.width  = width;
         this.height = height;
         this.xOrigin  = (width-1)>>1;
--- a/src/java.desktop/share/classes/java/awt/image/LookupOp.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/LookupOp.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -255,7 +255,7 @@
         int numBands  = src.getNumBands();
         int height    = src.getHeight();
         int width     = src.getWidth();
-        int srcPix[]  = new int[numBands];
+        int[] srcPix  = new int[numBands];
 
         // Create a new destination Raster, if needed
 
--- a/src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/MemoryImageSource.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -223,7 +223,7 @@
      * @see java.awt.Component#createImage
      * @see ColorModel#getRGBdefault
      */
-    public MemoryImageSource(int w, int h, int pix[], int off, int scan) {
+    public MemoryImageSource(int w, int h, int[] pix, int off, int scan) {
         initialize(w, h, ColorModel.getRGBdefault(),
                    (Object) pix, off, scan, null);
     }
@@ -243,7 +243,7 @@
      * @see java.awt.Component#createImage
      * @see ColorModel#getRGBdefault
      */
-    public MemoryImageSource(int w, int h, int pix[], int off, int scan,
+    public MemoryImageSource(int w, int h, int[] pix, int off, int scan,
                              Hashtable<?,?> props)
     {
         initialize(w, h, ColorModel.getRGBdefault(),
--- a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -229,7 +229,7 @@
      * @return the number of bits per sample.
      */
     public int[] getSampleSize() {
-        int sampleSize[] = {pixelBitStride};
+        int[] sampleSize = {pixelBitStride};
         return sampleSize;
     }
 
@@ -326,7 +326,7 @@
      * @throws IllegalArgumentException if {@code w} or
      *         {@code h} is not greater than 0
      */
-    public SampleModel createSubsetSampleModel(int bands[]) {
+    public SampleModel createSubsetSampleModel(int[] bands) {
         if (bands != null) {
            if (bands.length != 1)
             throw new RasterFormatException("MultiPixelPackedSampleModel has "
@@ -530,12 +530,12 @@
      *  are not in bounds
      * @see #setPixel(int, int, int[], DataBuffer)
      */
-    public int[] getPixel(int x, int y, int iArray[], DataBuffer data) {
+    public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
-        int pixels[];
+        int[] pixels;
         if (iArray != null) {
            pixels = iArray;
         } else {
--- a/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -429,7 +429,7 @@
 
     private void convertToRGB() {
         int size = dstW * dstH;
-        int newpixels[] = new int[size];
+        int[] newpixels = new int[size];
         if (bytePixels != null) {
             for (int i = 0; i < size; i++) {
                 newpixels[i] = imageModel.getRGB(bytePixels[i] & 0xff);
@@ -470,7 +470,7 @@
      */
     public void setPixels(int srcX, int srcY, int srcW, int srcH,
                           ColorModel model,
-                          byte pixels[], int srcOff, int srcScan) {
+                          byte[] pixels, int srcOff, int srcScan) {
         if (srcY < dstY) {
             int diff = dstY - srcY;
             if (diff >= srcH) {
@@ -557,7 +557,7 @@
      */
     public void setPixels(int srcX, int srcY, int srcW, int srcH,
                           ColorModel model,
-                          int pixels[], int srcOff, int srcScan) {
+                          int[] pixels, int srcOff, int srcScan) {
         if (srcY < dstY) {
             int diff = dstY - srcY;
             if (diff >= srcH) {
--- a/src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/PixelInterleavedSampleModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,7 +83,7 @@
                                        int w, int h,
                                        int pixelStride,
                                        int scanlineStride,
-                                       int bandOffsets[]) {
+                                       int[] bandOffsets) {
         super(dataType, w, h, pixelStride, scanlineStride, bandOffsets);
         int minBandOff=this.bandOffsets[0];
         int maxBandOff=this.bandOffsets[0];
@@ -154,8 +154,8 @@
      * an image with a subset of the bands of the original
      * PixelInterleavedSampleModel/DataBuffer combination.
      */
-    public SampleModel createSubsetSampleModel(int bands[]) {
-        int newBandOffsets[] = new int[bands.length];
+    public SampleModel createSubsetSampleModel(int[] bands) {
+        int[] newBandOffsets = new int[bands.length];
         for (int i=0; i<bands.length; i++) {
             newBandOffsets[i] = bandOffsets[bands[i]];
         }
--- a/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -146,10 +146,10 @@
      */
     public IndexColorModel filterIndexColorModel(IndexColorModel icm) {
         int mapsize = icm.getMapSize();
-        byte r[] = new byte[mapsize];
-        byte g[] = new byte[mapsize];
-        byte b[] = new byte[mapsize];
-        byte a[] = new byte[mapsize];
+        byte[] r = new byte[mapsize];
+        byte[] g = new byte[mapsize];
+        byte[] b = new byte[mapsize];
+        byte[] a = new byte[mapsize];
         icm.getReds(r);
         icm.getGreens(g);
         icm.getBlues(b);
@@ -192,7 +192,7 @@
      * @see #filterRGB
      */
     public void filterRGBPixels(int x, int y, int w, int h,
-                                int pixels[], int off, int scansize) {
+                                int[] pixels, int off, int scansize) {
         int index = off;
         for (int cy = 0; cy < h; cy++) {
             for (int cx = 0; cx < w; cx++) {
@@ -222,12 +222,12 @@
      * @see #filterRGBPixels
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, byte pixels[], int off,
+                          ColorModel model, byte[] pixels, int off,
                           int scansize) {
         if (model == origmodel) {
             consumer.setPixels(x, y, w, h, newmodel, pixels, off, scansize);
         } else {
-            int filteredpixels[] = new int[w];
+            int[] filteredpixels = new int[w];
             int index = off;
             for (int cy = 0; cy < h; cy++) {
                 for (int cx = 0; cx < w; cx++) {
@@ -259,12 +259,12 @@
      * @see #filterRGBPixels
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, int pixels[], int off,
+                          ColorModel model, int[] pixels, int off,
                           int scansize) {
         if (model == origmodel) {
             consumer.setPixels(x, y, w, h, newmodel, pixels, off, scansize);
         } else {
-            int filteredpixels[] = new int[w];
+            int[] filteredpixels = new int[w];
             int index = off;
             for (int cy = 0; cy < h; cy++) {
                 for (int cx = 0; cx < w; cx++) {
--- a/src/java.desktop/share/classes/java/awt/image/Raster.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/Raster.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -254,7 +254,7 @@
                                                          int w, int h,
                                                          int scanlineStride,
                                                          int pixelStride,
-                                                         int bandOffsets[],
+                                                         int[] bandOffsets,
                                                          Point location) {
         DataBuffer d;
 
@@ -365,8 +365,8 @@
     public static WritableRaster createBandedRaster(int dataType,
                                                     int w, int h,
                                                     int scanlineStride,
-                                                    int bankIndices[],
-                                                    int bandOffsets[],
+                                                    int[] bankIndices,
+                                                    int[] bandOffsets,
                                                     Point location) {
         DataBuffer d;
         int bands = bandOffsets.length;
@@ -450,7 +450,7 @@
      */
     public static WritableRaster createPackedRaster(int dataType,
                                                     int w, int h,
-                                                    int bandMasks[],
+                                                    int[] bandMasks,
                                                     Point location) {
         DataBuffer d;
 
@@ -628,7 +628,7 @@
                                                          int w, int h,
                                                          int scanlineStride,
                                                          int pixelStride,
-                                                         int bandOffsets[],
+                                                         int[] bandOffsets,
                                                          Point location)
     {
         if (dataBuffer == null) {
@@ -701,8 +701,8 @@
     public static WritableRaster createBandedRaster(DataBuffer dataBuffer,
                                                     int w, int h,
                                                     int scanlineStride,
-                                                    int bankIndices[],
-                                                    int bandOffsets[],
+                                                    int[] bankIndices,
+                                                    int[] bandOffsets,
                                                     Point location)
     {
         if (dataBuffer == null) {
@@ -784,7 +784,7 @@
     public static WritableRaster createPackedRaster(DataBuffer dataBuffer,
                                                     int w, int h,
                                                     int scanlineStride,
-                                                    int bandMasks[],
+                                                    int[] bandMasks,
                                                     Point location)
     {
         if (dataBuffer == null) {
@@ -1397,7 +1397,7 @@
     public Raster createChild(int parentX, int parentY,
                               int width, int height,
                               int childMinX, int childMinY,
-                              int bandList[]) {
+                              int[] bandList) {
         if (parentX < this.minX) {
             throw new RasterFormatException("parentX lies outside raster");
         }
@@ -1601,7 +1601,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are not
      * in bounds, or if iArray is too small to hold the output.
      */
-    public int[] getPixel(int x, int y, int iArray[]) {
+    public int[] getPixel(int x, int y, int[] iArray) {
         return sampleModel.getPixel(x - sampleModelTranslateX,
                                     y - sampleModelTranslateY,
                                     iArray, dataBuffer);
@@ -1621,7 +1621,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are not
      * in bounds, or if fArray is too small to hold the output.
      */
-    public float[] getPixel(int x, int y, float fArray[]) {
+    public float[] getPixel(int x, int y, float[] fArray) {
         return sampleModel.getPixel(x - sampleModelTranslateX,
                                     y - sampleModelTranslateY,
                                     fArray, dataBuffer);
@@ -1640,7 +1640,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are not
      * in bounds, or if dArray is too small to hold the output.
      */
-    public double[] getPixel(int x, int y, double dArray[]) {
+    public double[] getPixel(int x, int y, double[] dArray) {
         return sampleModel.getPixel(x - sampleModelTranslateX,
                                     y - sampleModelTranslateY,
                                     dArray, dataBuffer);
@@ -1662,7 +1662,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are not
      * in bounds, or if iArray is too small to hold the output.
      */
-    public int[] getPixels(int x, int y, int w, int h, int iArray[]) {
+    public int[] getPixels(int x, int y, int w, int h, int[] iArray) {
         return sampleModel.getPixels(x - sampleModelTranslateX,
                                      y - sampleModelTranslateY, w, h,
                                      iArray, dataBuffer);
@@ -1685,7 +1685,7 @@
      * in bounds, or if fArray is too small to hold the output.
      */
     public float[] getPixels(int x, int y, int w, int h,
-                             float fArray[]) {
+                             float[] fArray) {
         return sampleModel.getPixels(x - sampleModelTranslateX,
                                      y - sampleModelTranslateY, w, h,
                                      fArray, dataBuffer);
@@ -1708,7 +1708,7 @@
      * in bounds, or if dArray is too small to hold the output.
      */
     public double[] getPixels(int x, int y, int w, int h,
-                              double dArray[]) {
+                              double[] dArray) {
         return sampleModel.getPixels(x - sampleModelTranslateX,
                                      y - sampleModelTranslateY,
                                      w, h, dArray, dataBuffer);
@@ -1798,7 +1798,7 @@
      * hold the output.
      */
     public int[] getSamples(int x, int y, int w, int h, int b,
-                            int iArray[]) {
+                            int[] iArray) {
         return sampleModel.getSamples(x - sampleModelTranslateX,
                                       y - sampleModelTranslateY,
                                       w, h, b, iArray,
@@ -1825,7 +1825,7 @@
      * hold the output.
      */
     public float[] getSamples(int x, int y, int w, int h, int b,
-                              float fArray[]) {
+                              float[] fArray) {
         return sampleModel.getSamples(x - sampleModelTranslateX,
                                       y - sampleModelTranslateY,
                                       w, h, b, fArray, dataBuffer);
@@ -1851,7 +1851,7 @@
      * hold the output.
      */
     public double[] getSamples(int x, int y, int w, int h, int b,
-                               double dArray[]) {
+                               double[] dArray) {
          return sampleModel.getSamples(x - sampleModelTranslateX,
                                        y - sampleModelTranslateY,
                                        w, h, b, dArray, dataBuffer);
--- a/src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/ReplicateScaleFilter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,13 +74,13 @@
      * An {@code int} array containing information about a
      * row of pixels.
      */
-    protected int srcrows[];
+    protected int[] srcrows;
 
     /**
      * An {@code int} array containing information about a
      * column of pixels.
      */
-    protected int srccols[];
+    protected int[] srccols;
 
     /**
      * A {@code byte} array initialized with a size of
@@ -185,7 +185,7 @@
      * with the filtering operation.
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, byte pixels[], int off,
+                          ColorModel model, byte[] pixels, int off,
                           int scansize) {
         if (srcrows == null || srccols == null) {
             calculateMaps();
@@ -193,7 +193,7 @@
         int sx, sy;
         int dx1 = (2 * x * destWidth + srcWidth - 1) / (2 * srcWidth);
         int dy1 = (2 * y * destHeight + srcHeight - 1) / (2 * srcHeight);
-        byte outpix[];
+        byte[] outpix;
         if (outpixbuf != null && outpixbuf instanceof byte[]) {
             outpix = (byte[]) outpixbuf;
         } else {
@@ -226,7 +226,7 @@
      * with the filtering operation.
      */
     public void setPixels(int x, int y, int w, int h,
-                          ColorModel model, int pixels[], int off,
+                          ColorModel model, int[] pixels, int off,
                           int scansize) {
         if (srcrows == null || srccols == null) {
             calculateMaps();
@@ -234,7 +234,7 @@
         int sx, sy;
         int dx1 = (2 * x * destWidth + srcWidth - 1) / (2 * srcWidth);
         int dy1 = (2 * y * destHeight + srcHeight - 1) / (2 * srcHeight);
-        int outpix[];
+        int[] outpix;
         if (outpixbuf != null && outpixbuf instanceof int[]) {
             outpix = (int[]) outpixbuf;
         } else {
--- a/src/java.desktop/share/classes/java/awt/image/RescaleOp.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/RescaleOp.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,7 +144,7 @@
      *        this {@code RescaleOp}
      * @return the scale factors of this {@code RescaleOp}.
      */
-    public final float[] getScaleFactors (float scaleFactors[]) {
+    public final float[] getScaleFactors (float[] scaleFactors) {
         if (scaleFactors == null) {
             return this.scaleFactors.clone();
         }
@@ -162,7 +162,7 @@
      *        this {@code RescaleOp}
      * @return the offsets of this {@code RescaleOp}.
      */
-    public final float[] getOffsets(float offsets[]) {
+    public final float[] getOffsets(float[] offsets) {
         if (offsets == null) {
             return this.offsets.clone();
         }
@@ -190,8 +190,8 @@
      *                  This will generally be 256 for byte and
      *                  65536 for short.
      */
-    private ByteLookupTable createByteLut(float scale[],
-                                          float off[],
+    private ByteLookupTable createByteLut(float[] scale,
+                                          float[] off,
                                           int   nBands,
                                           int   nElems) {
 
@@ -237,8 +237,8 @@
      *                  This will generally be 256 for byte and
      *                  65536 for short.
      */
-    private ShortLookupTable createShortLut(float scale[],
-                                            float off[],
+    private ShortLookupTable createShortLut(float[] scale,
+                                            float[] off,
                                             int   nBands,
                                             int   nElems) {
 
@@ -562,8 +562,8 @@
             //  REMIND: This must change if we ever support signed data types.
             //
             int nbits;
-            int dstMax[] = new int[numBands];
-            int dstMask[] = new int[numBands];
+            int[] dstMax = new int[numBands];
+            int[] dstMask = new int[numBands];
             SampleModel dstSM = dst.getSampleModel();
             for (int z=0; z<numBands; z++) {
                 nbits = dstSM.getSampleSize(z);
--- a/src/java.desktop/share/classes/java/awt/image/SampleModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/SampleModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -234,9 +234,9 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if iArray is too small to hold the output.
      */
-    public int[] getPixel(int x, int y, int iArray[], DataBuffer data) {
+    public int[] getPixel(int x, int y, int[] iArray, DataBuffer data) {
 
-        int pixels[];
+        int[] pixels;
 
         if (iArray != null)
             pixels = iArray;
@@ -698,10 +698,10 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if fArray is too small to hold the output.
      */
-    public float[] getPixel(int x, int y, float fArray[],
+    public float[] getPixel(int x, int y, float[] fArray,
                             DataBuffer data) {
 
-        float pixels[];
+        float[] pixels;
 
         if (fArray != null)
             pixels = fArray;
@@ -729,10 +729,10 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if dArray is too small to hold the output.
      */
-    public double[] getPixel(int x, int y, double dArray[],
+    public double[] getPixel(int x, int y, double[] dArray,
                              DataBuffer data) {
 
-        double pixels[];
+        double[] pixels;
 
         if(dArray != null)
             pixels = dArray;
@@ -764,9 +764,9 @@
      * not in bounds, or if iArray is too small to hold the output.
      */
     public int[] getPixels(int x, int y, int w, int h,
-                           int iArray[], DataBuffer data) {
+                           int[] iArray, DataBuffer data) {
 
-        int pixels[];
+        int[] pixels;
         int Offset=0;
         int x1 = x + w;
         int y1 = y + h;
@@ -812,9 +812,9 @@
      * not in bounds, or if fArray is too small to hold the output.
      */
     public float[] getPixels(int x, int y, int w, int h,
-                             float fArray[], DataBuffer data) {
+                             float[] fArray, DataBuffer data) {
 
-        float pixels[];
+        float[] pixels;
         int Offset = 0;
         int x1 = x + w;
         int y1 = y + h;
@@ -860,8 +860,8 @@
      * not in bounds, or if dArray is too small to hold the output.
      */
     public double[] getPixels(int x, int y, int w, int h,
-                              double dArray[], DataBuffer data) {
-        double pixels[];
+                              double[] dArray, DataBuffer data) {
+        double[] pixels;
         int    Offset = 0;
         int x1 = x + w;
         int y1 = y + h;
@@ -976,8 +976,8 @@
      * hold the output.
      */
     public int[] getSamples(int x, int y, int w, int h, int b,
-                            int iArray[], DataBuffer data) {
-        int pixels[];
+                            int[] iArray, DataBuffer data) {
+        int[] pixels;
         int Offset=0;
         int x1 = x + w;
         int y1 = y + h;
@@ -1024,9 +1024,9 @@
      * hold the output.
      */
     public float[] getSamples(int x, int y, int w, int h,
-                              int b, float fArray[],
+                              int b, float[] fArray,
                               DataBuffer data) {
-        float pixels[];
+        float[] pixels;
         int   Offset=0;
         int x1 = x + w;
         int y1 = y + h;
@@ -1073,9 +1073,9 @@
      * hold the output.
      */
     public double[] getSamples(int x, int y, int w, int h,
-                               int b, double dArray[],
+                               int b, double[] dArray,
                                DataBuffer data) {
-        double pixels[];
+        double[] pixels;
         int    Offset=0;
         int x1 = x + w;
         int y1 = y + h;
@@ -1114,7 +1114,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if iArray is too small to hold the input.
      */
-    public void setPixel(int x, int y, int iArray[], DataBuffer data) {
+    public void setPixel(int x, int y, int[] iArray, DataBuffer data) {
 
         for (int i=0; i<numBands; i++)
             setSample(x, y, i, iArray[i], data);
@@ -1134,7 +1134,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if fArray is too small to hold the input.
      */
-    public void setPixel(int x, int y, float fArray[], DataBuffer data) {
+    public void setPixel(int x, int y, float[] fArray, DataBuffer data) {
 
         for (int i=0; i<numBands; i++)
             setSample(x, y, i, fArray[i], data);
@@ -1153,7 +1153,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are
      * not in bounds, or if fArray is too small to hold the input.
      */
-    public void setPixel(int x, int y, double dArray[], DataBuffer data) {
+    public void setPixel(int x, int y, double[] dArray, DataBuffer data) {
 
         for (int i=0; i<numBands; i++)
             setSample(x, y, i, dArray[i], data);
@@ -1177,7 +1177,7 @@
      * not in bounds, or if iArray is too small to hold the input.
      */
     public void setPixels(int x, int y, int w, int h,
-                          int iArray[], DataBuffer data) {
+                          int[] iArray, DataBuffer data) {
         int Offset=0;
         int x1 = x + w;
         int y1 = y + h;
@@ -1215,7 +1215,7 @@
      * not in bounds, or if fArray is too small to hold the input.
      */
     public void setPixels(int x, int y, int w, int h,
-                          float fArray[], DataBuffer data) {
+                          float[] fArray, DataBuffer data) {
         int Offset=0;
         int x1 = x + w;
         int y1 = y + h;
@@ -1253,7 +1253,7 @@
      * not in bounds, or if dArray is too small to hold the input.
      */
     public void setPixels(int x, int y, int w, int h,
-                          double dArray[], DataBuffer data) {
+                          double[] dArray, DataBuffer data) {
         int Offset=0;
         int x1 = x + w;
         int y1 = y + h;
@@ -1369,7 +1369,7 @@
      * hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
-                           int iArray[], DataBuffer data) {
+                           int[] iArray, DataBuffer data) {
 
         int Offset=0;
         int x1 = x + w;
@@ -1407,7 +1407,7 @@
      * hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
-                           float fArray[], DataBuffer data) {
+                           float[] fArray, DataBuffer data) {
         int Offset=0;
         int x1 = x + w;
         int y1 = y + h;
@@ -1445,7 +1445,7 @@
      * hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
-                           double dArray[], DataBuffer data) {
+                           double[] dArray, DataBuffer data) {
         int Offset=0;
         int x1 = x + w;
         int y1 = y + h;
@@ -1483,7 +1483,7 @@
      * @return a {@code SampleModel} with a subset of bands of this
      *         {@code SampleModel}.
      */
-    public abstract SampleModel createSubsetSampleModel(int bands[]);
+    public abstract SampleModel createSubsetSampleModel(int[] bands);
 
     /**
      * Creates a DataBuffer that corresponds to this SampleModel.
--- a/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
      * Constants
      */
 
-    short data[][];
+    short[][] data;
 
     /**
      * Constructs a ShortLookupTable object from an array of short
@@ -60,7 +60,7 @@
      * @param data an array of short arrays representing a lookup
      *        table for each band
      */
-    public ShortLookupTable(int offset, short data[][]) {
+    public ShortLookupTable(int offset, short[][] data) {
         super(offset,data.length);
         numComponents = data.length;
         numEntries    = data[0].length;
@@ -81,7 +81,7 @@
      *        before indexing into the arrays
      * @param data an array of shorts
      */
-    public ShortLookupTable(int offset, short data[]) {
+    public ShortLookupTable(int offset, short[] data) {
         super(offset,data.length);
         numComponents = 1;
         numEntries    = data.length;
--- a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,13 +66,13 @@
 public class SinglePixelPackedSampleModel extends SampleModel
 {
     /** Bit masks for all bands of the image data. */
-    private int bitMasks[];
+    private int[] bitMasks;
 
     /** Bit Offsets for all bands of the image data. */
-    private int bitOffsets[];
+    private int[] bitOffsets;
 
     /** Bit sizes for all the bands of the image data. */
-    private int bitSizes[];
+    private int[] bitSizes;
 
     /** Maximum bit size. */
     private int maxBitSize;
@@ -106,7 +106,7 @@
      *         {@code DataBuffer.TYPE_INT}
      */
     public SinglePixelPackedSampleModel(int dataType, int w, int h,
-                                   int bitMasks[]) {
+                                   int[] bitMasks) {
         this(dataType, w, h, w, bitMasks);
         if (dataType != DataBuffer.TYPE_BYTE &&
             dataType != DataBuffer.TYPE_USHORT &&
@@ -140,7 +140,7 @@
      *         {@code DataBuffer.TYPE_INT}
      */
     public SinglePixelPackedSampleModel(int dataType, int w, int h,
-                                   int scanlineStride, int bitMasks[]) {
+                                   int scanlineStride, int[] bitMasks) {
         super(dataType, w, h, bitMasks.length);
         if (dataType != DataBuffer.TYPE_BYTE &&
             dataType != DataBuffer.TYPE_USHORT &&
@@ -306,12 +306,12 @@
      *                                  greater than the number of bands in
      *                                  the sample model.
      */
-    public SampleModel createSubsetSampleModel(int bands[]) {
+    public SampleModel createSubsetSampleModel(int[] bands) {
         if (bands.length > numBands)
             throw new RasterFormatException("There are only " +
                                             numBands +
                                             " bands");
-        int newBitMasks[] = new int[bands.length];
+        int[] newBitMasks = new int[bands.length];
         for (int i=0; i<bands.length; i++)
             newBitMasks[i] = bitMasks[bands[i]];
 
@@ -426,12 +426,12 @@
      * @return all samples for the specified pixel.
      * @see #setPixel(int, int, int[], DataBuffer)
      */
-    public int [] getPixel(int x, int y, int iArray[], DataBuffer data) {
+    public int [] getPixel(int x, int y, int[] iArray, DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
-        int pixels[];
+        int[] pixels;
         if (iArray == null) {
             pixels = new int [numBands];
         } else {
@@ -460,7 +460,7 @@
      * @see #setPixels(int, int, int, int, int[], DataBuffer)
      */
     public int[] getPixels(int x, int y, int w, int h,
-                           int iArray[], DataBuffer data) {
+                           int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
@@ -470,7 +470,7 @@
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
-        int pixels[];
+        int[] pixels;
         if (iArray != null) {
            pixels = iArray;
         } else {
@@ -532,13 +532,13 @@
      * @see #setSamples(int, int, int, int, int, int[], DataBuffer)
      */
     public int[] getSamples(int x, int y, int w, int h, int b,
-                           int iArray[], DataBuffer data) {
+                           int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
         if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
                 ("Coordinate out of bounds!");
         }
-        int samples[];
+        int[] samples;
         if (iArray != null) {
            samples = iArray;
         } else {
@@ -634,7 +634,7 @@
      * @see #getPixel(int, int, int[], DataBuffer)
      */
     public void setPixel(int x, int y,
-                         int iArray[],
+                         int[] iArray,
                          DataBuffer data) {
         if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) {
             throw new ArrayIndexOutOfBoundsException
@@ -663,7 +663,7 @@
      * @see #getPixels(int, int, int, int, int[], DataBuffer)
      */
     public void setPixels(int x, int y, int w, int h,
-                          int iArray[], DataBuffer data) {
+                          int[] iArray, DataBuffer data) {
         int x1 = x + w;
         int y1 = y + h;
 
@@ -732,7 +732,7 @@
      * @see #getSamples(int, int, int, int, int, int[], DataBuffer)
      */
     public void setSamples(int x, int y, int w, int h, int b,
-                          int iArray[], DataBuffer data) {
+                          int[] iArray, DataBuffer data) {
         // Bounds check for 'b' will be performed automatically
         if ((x < 0) || (y < 0) || (x + w > width) || (y + h > height)) {
             throw new ArrayIndexOutOfBoundsException
--- a/src/java.desktop/share/classes/java/awt/image/WritableRaster.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/WritableRaster.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -217,7 +217,7 @@
     public WritableRaster createWritableChild(int parentX, int parentY,
                                               int w, int h,
                                               int childMinX, int childMinY,
-                                              int bandList[]) {
+                                              int[] bandList) {
         if (parentX < this.minX) {
             throw new RasterFormatException("parentX lies outside raster");
         }
@@ -504,7 +504,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are not
      * in bounds, or if iArray is too small to hold the input.
      */
-    public void setPixel(int x, int y, int iArray[]) {
+    public void setPixel(int x, int y, int[] iArray) {
         sampleModel.setPixel(x-sampleModelTranslateX,y-sampleModelTranslateY,
                              iArray,dataBuffer);
     }
@@ -522,7 +522,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are not
      * in bounds, or if fArray is too small to hold the input.
      */
-    public void setPixel(int x, int y, float fArray[]) {
+    public void setPixel(int x, int y, float[] fArray) {
         sampleModel.setPixel(x-sampleModelTranslateX,y-sampleModelTranslateY,
                              fArray,dataBuffer);
     }
@@ -540,7 +540,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are not
      * in bounds, or if dArray is too small to hold the input.
      */
-    public void setPixel(int x, int y, double dArray[]) {
+    public void setPixel(int x, int y, double[] dArray) {
         sampleModel.setPixel(x-sampleModelTranslateX,y-sampleModelTranslateY,
                              dArray,dataBuffer);
     }
@@ -561,7 +561,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are not
      * in bounds, or if iArray is too small to hold the input.
      */
-    public void setPixels(int x, int y, int w, int h, int iArray[]) {
+    public void setPixels(int x, int y, int w, int h, int[] iArray) {
         sampleModel.setPixels(x-sampleModelTranslateX,y-sampleModelTranslateY,
                               w,h,iArray,dataBuffer);
     }
@@ -582,7 +582,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are not
      * in bounds, or if fArray is too small to hold the input.
      */
-    public void setPixels(int x, int y, int w, int h, float fArray[]) {
+    public void setPixels(int x, int y, int w, int h, float[] fArray) {
         sampleModel.setPixels(x-sampleModelTranslateX,y-sampleModelTranslateY,
                               w,h,fArray,dataBuffer);
     }
@@ -603,7 +603,7 @@
      * @throws ArrayIndexOutOfBoundsException if the coordinates are not
      * in bounds, or if dArray is too small to hold the input.
      */
-    public void setPixels(int x, int y, int w, int h, double dArray[]) {
+    public void setPixels(int x, int y, int w, int h, double[] dArray) {
         sampleModel.setPixels(x-sampleModelTranslateX,y-sampleModelTranslateY,
                               w,h,dArray,dataBuffer);
     }
@@ -685,7 +685,7 @@
      * hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
-                           int iArray[]) {
+                           int[] iArray) {
         sampleModel.setSamples(x-sampleModelTranslateX,y-sampleModelTranslateY,
                                w,h,b,iArray,dataBuffer);
     }
@@ -709,7 +709,7 @@
      * hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
-                           float fArray[]) {
+                           float[] fArray) {
         sampleModel.setSamples(x-sampleModelTranslateX,y-sampleModelTranslateY,
                                w,h,b,fArray,dataBuffer);
     }
@@ -733,7 +733,7 @@
      * hold the input.
      */
     public void setSamples(int x, int y, int w, int h, int b,
-                           double dArray[]) {
+                           double[] dArray) {
         sampleModel.setSamples(x-sampleModelTranslateX,y-sampleModelTranslateY,
                               w,h,b,dArray,dataBuffer);
     }
--- a/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageProducer.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -192,10 +192,10 @@
 
         // Get RGB pixels from the raster scanline by scanline and
         // send to consumers.
-        int pix[] = new int[width];
+        int[] pix = new int[width];
         int i,j;
         int numBands = sampleModel.getNumBands();
-        int tmpPixel[] = new int[numBands];
+        int[] tmpPixel = new int[numBands];
         for (j = 0; j < height; j++) {
             for(i = 0; i < width; i++) {
                 sampleModel.getPixel(i, j, tmpPixel, dataBuffer);
--- a/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/beans/EventSetDescriptor.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -120,7 +120,7 @@
     public EventSetDescriptor(Class<?> sourceClass,
                 String eventSetName,
                 Class<?> listenerType,
-                String listenerMethodNames[],
+                String[] listenerMethodNames,
                 String addListenerMethodName,
                 String removeListenerMethodName)
                 throws IntrospectionException {
@@ -153,7 +153,7 @@
     public EventSetDescriptor(Class<?> sourceClass,
                 String eventSetName,
                 Class<?> listenerType,
-                String listenerMethodNames[],
+                String[] listenerMethodNames,
                 String addListenerMethodName,
                 String removeListenerMethodName,
                 String getListenerMethodName)
@@ -215,7 +215,7 @@
      */
     public EventSetDescriptor(String eventSetName,
                 Class<?> listenerType,
-                Method listenerMethods[],
+                Method[] listenerMethods,
                 Method addListenerMethod,
                 Method removeListenerMethod)
                 throws IntrospectionException {
@@ -243,7 +243,7 @@
      */
     public EventSetDescriptor(String eventSetName,
                 Class<?> listenerType,
-                Method listenerMethods[],
+                Method[] listenerMethods,
                 Method addListenerMethod,
                 Method removeListenerMethod,
                 Method getListenerMethod)
@@ -285,7 +285,7 @@
      */
     public EventSetDescriptor(String eventSetName,
                 Class<?> listenerType,
-                MethodDescriptor listenerMethodDescriptors[],
+                MethodDescriptor[] listenerMethodDescriptors,
                 Method addListenerMethod,
                 Method removeListenerMethod)
                 throws IntrospectionException {
--- a/src/java.desktop/share/classes/java/beans/Introspector.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/beans/Introspector.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -121,7 +121,7 @@
     private Class<?> beanClass;
     private BeanInfo explicitBeanInfo;
     private BeanInfo superBeanInfo;
-    private BeanInfo additionalBeanInfo[];
+    private BeanInfo[] additionalBeanInfo;
 
     private boolean propertyChangeSource = false;
 
@@ -322,7 +322,7 @@
                         Character.isUpperCase(name.charAt(0))){
             return name;
         }
-        char chars[] = name.toCharArray();
+        char[] chars = name.toCharArray();
         chars[0] = Character.toLowerCase(chars[0]);
         return new String(chars);
     }
@@ -459,9 +459,9 @@
         // event sets and locate PropertyChangeListeners before we
         // look for properties.
         BeanDescriptor bd = getTargetBeanDescriptor();
-        MethodDescriptor mds[] = getTargetMethodInfo();
-        EventSetDescriptor esds[] = getTargetEventInfo();
-        PropertyDescriptor pds[] = getTargetPropertyInfo();
+        MethodDescriptor[] mds = getTargetMethodInfo();
+        EventSetDescriptor[] esds = getTargetEventInfo();
+        PropertyDescriptor[] pds = getTargetPropertyInfo();
 
         int defaultEvent = getTargetDefaultEventIndex();
         int defaultProperty = getTargetDefaultPropertyIndex();
@@ -526,7 +526,7 @@
         processPropertyDescriptors();
 
         // Allocate and populate the result array.
-        PropertyDescriptor result[] =
+        PropertyDescriptor[] result =
                 properties.values().toArray(new PropertyDescriptor[properties.size()]);
 
         // Set the default index.
@@ -924,7 +924,7 @@
 
         if (explicitEvents == null && superBeanInfo != null) {
             // We have no explicit BeanInfo events.  Check with our parent.
-            EventSetDescriptor supers[] = superBeanInfo.getEventSetDescriptors();
+            EventSetDescriptor[] supers = superBeanInfo.getEventSetDescriptors();
             for (int i = 0 ; i < supers.length; i++) {
                 addEvent(supers[i]);
             }
@@ -935,7 +935,7 @@
         }
 
         for (int i = 0; i < additionalBeanInfo.length; i++) {
-            EventSetDescriptor additional[] = additionalBeanInfo[i].getEventSetDescriptors();
+            EventSetDescriptor[] additional = additionalBeanInfo[i].getEventSetDescriptors();
             if (additional != null) {
                 for (int j = 0 ; j < additional.length; j++) {
                     addEvent(additional[j]);
@@ -1020,14 +1020,14 @@
 
         if (explicitMethods == null && superBeanInfo != null) {
             // We have no explicit BeanInfo methods.  Check with our parent.
-            MethodDescriptor supers[] = superBeanInfo.getMethodDescriptors();
+            MethodDescriptor[] supers = superBeanInfo.getMethodDescriptors();
             for (int i = 0 ; i < supers.length; i++) {
                 addMethod(supers[i]);
             }
         }
 
         for (int i = 0; i < additionalBeanInfo.length; i++) {
-            MethodDescriptor additional[] = additionalBeanInfo[i].getMethodDescriptors();
+            MethodDescriptor[] additional = additionalBeanInfo[i].getMethodDescriptors();
             if (additional != null) {
                 for (int j = 0 ; j < additional.length; j++) {
                     addMethod(additional[j]);
@@ -1049,7 +1049,7 @@
         }
 
         // Allocate and populate the result array.
-        MethodDescriptor result[] = new MethodDescriptor[methods.size()];
+        MethodDescriptor[] result = new MethodDescriptor[methods.size()];
         result = methods.values().toArray(result);
 
         return result;
@@ -1155,7 +1155,7 @@
     private boolean isEventHandler(Method m) {
         // We assume that a method is an event handler if it has a single
         // argument, whose type inherit from java.util.Event.
-        Type argTypes[] = m.getGenericParameterTypes();
+        Type[] argTypes = m.getGenericParameterTypes();
         if (argTypes.length != 1) {
             return false;
         }
@@ -1171,7 +1171,7 @@
      * parameter list on a given class.
      */
     private static Method internalFindMethod(Class<?> start, String methodName,
-                                                 int argCount, Class<?> args[]) {
+                                                 int argCount, Class<?>[] args) {
         // For overriden methods we need to find the most derived version.
         // So we start with the given class and walk up the superclass chain.
         for (Class<?> cl = start; cl != null; cl = cl.getSuperclass()) {
--- a/src/java.desktop/share/classes/java/beans/MetaData.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/beans/MetaData.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -756,7 +756,7 @@
 static class StaticFieldsPersistenceDelegate extends PersistenceDelegate {
     protected void installFields(Encoder out, Class<?> cls) {
         if (Modifier.isPublic(cls.getModifiers()) && isPackageAccessible(cls)) {
-            Field fields[] = cls.getFields();
+            Field[] fields = cls.getFields();
             for(int i = 0; i < fields.length; i++) {
                 Field field = fields[i];
                 // Don't install primitives, their identity will not be preserved
--- a/src/java.desktop/share/classes/java/beans/MethodDescriptor.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/java/beans/MethodDescriptor.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
 
     private List<WeakReference<Class<?>>> params;
 
-    private ParameterDescriptor parameterDescriptors[];
+    private ParameterDescriptor[] parameterDescriptors;
 
     /**
      * Constructs a {@code MethodDescriptor} from a
@@ -69,7 +69,7 @@
      *                          method's parameters.
      */
     public MethodDescriptor(Method method,
-                ParameterDescriptor parameterDescriptors[]) {
+                ParameterDescriptor[] parameterDescriptors) {
         setName(method.getName());
         setMethod(method);
         this.parameterDescriptors = (parameterDescriptors != null)
--- a/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStream.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@
      * {@code null}.
      * @exception IOException if an I/O error occurs.
      */
-    void write(byte b[]) throws IOException;
+    void write(byte[] b) throws IOException;
 
     /**
      * Writes a sequence of bytes to the stream at the current
@@ -114,7 +114,7 @@
      * {@code null}.
      * @exception IOException if an I/O error occurs.
      */
-    void write(byte b[], int off, int len) throws IOException;
+    void write(byte[] b, int off, int len) throws IOException;
 
     /**
      * Writes a {@code boolean} value to the stream.  If
--- a/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,11 +47,11 @@
 
     public abstract void write(int b) throws IOException;
 
-    public void write(byte b[]) throws IOException {
+    public void write(byte[] b) throws IOException {
         write(b, 0, b.length);
     }
 
-    public abstract void write(byte b[], int off, int len) throws IOException;
+    public abstract void write(byte[] b, int off, int len) throws IOException;
 
     public void writeBoolean(boolean v) throws IOException {
         write(v ? 1 : 0);
--- a/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java	Thu Oct 04 12:40:55 2018 -0700
@@ -853,7 +853,7 @@
                 allTypes.add(types[j]);
             }
         }
-        int resultTypes[] = new int[allTypes.size()];
+        int[] resultTypes = new int[allTypes.size()];
         int index = 0;
         Iterator<Integer> iterator = allTypes.iterator();
         while (iterator.hasNext()) {
@@ -908,7 +908,7 @@
                 allTypes.add(types[j]);
             }
         }
-        int resultTypes[] = new int[allTypes.size()];
+        int[] resultTypes = new int[allTypes.size()];
         int index = 0;
         Iterator<Integer> iterator = allTypes.iterator();
         while (iterator.hasNext()) {
--- a/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java	Thu Oct 04 12:40:55 2018 -0700
@@ -676,7 +676,7 @@
         List<FormatConversionProvider> codecs = getFormatConversionProviders();
         Vector<AudioFormat.Encoding> encodings = new Vector<>();
 
-        AudioFormat.Encoding encs[] = null;
+        AudioFormat.Encoding[] encs = null;
 
         // gather from all the codecs
         for(int i=0; i<codecs.size(); i++ ) {
@@ -1084,7 +1084,7 @@
                 returnTypesSet.add(fileTypes[j]);
             }
         }
-        AudioFileFormat.Type returnTypes[] =
+        AudioFileFormat.Type[] returnTypes =
             returnTypesSet.toArray(new AudioFileFormat.Type[0]);
         return returnTypes;
     }
@@ -1133,7 +1133,7 @@
                 returnTypesSet.add(fileTypes[j]);
             }
         }
-        AudioFileFormat.Type returnTypes[] =
+        AudioFileFormat.Type[] returnTypes =
             returnTypesSet.toArray(new AudioFileFormat.Type[0]);
         return returnTypes;
     }
--- a/src/java.desktop/share/classes/javax/swing/AbstractButton.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/AbstractButton.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2605,7 +2605,7 @@
                 }
                 Rectangle2D.Float shape =
                     new Rectangle2D.Float(r.x, r.y, r.width, r.height);
-                Position.Bias bias[] = new Position.Bias[1];
+                Position.Bias[] bias = new Position.Bias[1];
                 return view.viewToModel(p.x, p.y, shape, bias);
             } else {
                 return -1;
--- a/src/java.desktop/share/classes/javax/swing/ArrayTable.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/ArrayTable.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@
      * AbstractAction use to avoid having the same code in each class.
      */
     static void writeArrayTable(ObjectOutputStream s, ArrayTable table) throws IOException {
-        Object keys[];
+        Object[] keys;
 
         if (table == null || (keys = table.getKeys(null)) == null) {
             s.writeInt(0);
--- a/src/java.desktop/share/classes/javax/swing/DebugGraphics.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/DebugGraphics.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -770,7 +770,7 @@
     /**
      * Overrides <code>Graphics.drawPolyline</code>.
      */
-    public void drawPolyline(int xPoints[], int yPoints[], int nPoints) {
+    public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) {
         DebugGraphicsInfo info = info();
 
         if (debugLog()) {
@@ -805,7 +805,7 @@
     /**
      * Overrides <code>Graphics.drawPolygon</code>.
      */
-    public void drawPolygon(int xPoints[], int yPoints[], int nPoints) {
+    public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) {
         DebugGraphicsInfo info = info();
 
         if (debugLog()) {
@@ -840,7 +840,7 @@
     /**
      * Overrides <code>Graphics.fillPolygon</code>.
      */
-    public void fillPolygon(int xPoints[], int yPoints[], int nPoints) {
+    public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) {
         DebugGraphicsInfo info = info();
 
         if (debugLog()) {
@@ -945,7 +945,7 @@
     /**
      * Overrides <code>Graphics.drawBytes</code>.
      */
-    public void drawBytes(byte data[], int offset, int length, int x, int y) {
+    public void drawBytes(byte[] data, int offset, int length, int x, int y) {
         DebugGraphicsInfo info = info();
 
         Font font = graphics.getFont();
@@ -981,7 +981,7 @@
     /**
      * Overrides <code>Graphics.drawChars</code>.
      */
-    public void drawChars(char data[], int offset, int length, int x, int y) {
+    public void drawChars(char[] data, int offset, int length, int x, int y) {
         DebugGraphicsInfo info = info();
 
         Font font = graphics.getFont();
--- a/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/DefaultComboBoxModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -55,7 +55,7 @@
      *
      * @param items  an array of Object objects
      */
-    public DefaultComboBoxModel(final E items[]) {
+    public DefaultComboBoxModel(final E[] items) {
         objects = new Vector<E>(items.length);
 
         int i,c;
--- a/src/java.desktop/share/classes/javax/swing/DefaultListModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -98,7 +98,7 @@
      * @param   anArray   the array into which the components get copied
      * @see Vector#copyInto(Object[])
      */
-    public void copyInto(Object anArray[]) {
+    public void copyInto(Object[] anArray) {
         delegate.copyInto(anArray);
     }
 
--- a/src/java.desktop/share/classes/javax/swing/JComboBox.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JComboBox.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1305,7 +1305,7 @@
         if ( selectedObject == null )
             return new Object[0];
         else {
-            Object result[] = new Object[1];
+            Object[] result = new Object[1];
             result[0] = selectedObject;
             return result;
         }
--- a/src/java.desktop/share/classes/javax/swing/JComponent.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JComponent.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3461,7 +3461,7 @@
     // This class is used by the KeyboardState class to provide a single
     // instance that can be stored in the AppContext.
     static final class IntVector {
-        int array[] = null;
+        int[] array = null;
         int count = 0;
         int capacity = 0;
 
--- a/src/java.desktop/share/classes/javax/swing/JDesktopPane.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JDesktopPane.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,7 @@
 
         setFocusTraversalPolicy(new LayoutFocusTraversalPolicy() {
             public Component getDefaultComponent(Container c) {
-                JInternalFrame jifArray[] = getAllFrames();
+                JInternalFrame[] jifArray = getAllFrames();
                 Component comp = null;
                 for (JInternalFrame jif : jifArray) {
                     comp = jif.getFocusTraversalPolicy().getDefaultComponent(jif);
--- a/src/java.desktop/share/classes/javax/swing/JLabel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JLabel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1149,7 +1149,7 @@
                 }
                 Rectangle2D.Float shape =
                     new Rectangle2D.Float(r.x, r.y, r.width, r.height);
-                Position.Bias bias[] = new Position.Bias[1];
+                Position.Bias[] bias = new Position.Bias[1];
                 return view.viewToModel(p.x, p.y, shape, bias);
             } else {
                 return -1;
--- a/src/java.desktop/share/classes/javax/swing/JMenu.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JMenu.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1202,7 +1202,7 @@
         if(popupMenu == null)
             return new MenuElement[0];
         else {
-            MenuElement result[] = new MenuElement[1];
+            MenuElement[] result = new MenuElement[1];
             result[0] = popupMenu;
             return result;
         }
@@ -1285,7 +1285,7 @@
      *          button was pressed for
      */
     public void doClick(int pressTime) {
-        MenuElement me[] = buildMenuElementArray(this);
+        MenuElement[] me = buildMenuElementArray(this);
         MenuSelectionManager.defaultManager().setSelectedPath(me);
     }
 
@@ -1319,7 +1319,7 @@
                 break;
             }
         }
-        MenuElement me[] = new MenuElement[elements.size()];
+        MenuElement[] me = new MenuElement[elements.size()];
         elements.copyInto(me);
         return me;
     }
@@ -1471,7 +1471,7 @@
          * @return 1 if a menu is currently selected, else 0
          */
         public int getAccessibleSelectionCount() {
-            MenuElement me[] =
+            MenuElement[] me =
                 MenuSelectionManager.defaultManager().getSelectedPath();
             if (me != null) {
                 for (int i = 0; i < me.length; i++) {
@@ -1496,7 +1496,7 @@
             if (i < 0 || i >= getItemCount()) {
                 return null;
             }
-            MenuElement me[] =
+            MenuElement[] me =
                 MenuSelectionManager.defaultManager().getSelectedPath();
             if (me != null) {
                 for (int j = 0; j < me.length; j++) {
@@ -1524,7 +1524,7 @@
          */
         public boolean isAccessibleChildSelected(int i) {
             // if i is a sub-menu and is pop-ed up, return true, else false
-            MenuElement me[] =
+            MenuElement[] me =
                 MenuSelectionManager.defaultManager().getSelectedPath();
             if (me != null) {
                 JMenuItem mi = JMenu.this.getItem(i);
@@ -1556,7 +1556,7 @@
             JMenuItem mi = getItem(i);
             if (mi != null) {
                 if (mi instanceof JMenu) {
-                    MenuElement me[] = buildMenuElementArray((JMenu) mi);
+                    MenuElement[] me = buildMenuElementArray((JMenu) mi);
                     MenuSelectionManager.defaultManager().setSelectedPath(me);
                 } else {
                     MenuSelectionManager.defaultManager().setSelectedPath(null);
@@ -1578,9 +1578,9 @@
             JMenuItem mi = getItem(i);
             if (mi != null && mi instanceof JMenu) {
                 if (mi.isSelected()) {
-                    MenuElement old[] =
+                    MenuElement[] old =
                         MenuSelectionManager.defaultManager().getSelectedPath();
-                    MenuElement me[] = new MenuElement[old.length-2];
+                    MenuElement[] me = new MenuElement[old.length-2];
                     for (int j = 0; j < old.length -2; j++) {
                         me[j] = old[j];
                     }
@@ -1596,12 +1596,12 @@
         public void clearAccessibleSelection() {
             // if this menu is selected, reset selection to only go
             // to this menu; else do nothing
-            MenuElement old[] =
+            MenuElement[] old =
                 MenuSelectionManager.defaultManager().getSelectedPath();
             if (old != null) {
                 for (int j = 0; j < old.length; j++) {
                     if (old[j] == JMenu.this) {  // menu is in the selection!
-                        MenuElement me[] = new MenuElement[j+1];
+                        MenuElement[] me = new MenuElement[j+1];
                         System.arraycopy(old, 0, me, 0, j);
                         me[j] = JMenu.this.getPopupMenu();
                         MenuSelectionManager.defaultManager().setSelectedPath(me);
--- a/src/java.desktop/share/classes/javax/swing/JMenuBar.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JMenuBar.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -391,7 +391,7 @@
      *
      * @see #getSubElements
      */
-    public void processMouseEvent(MouseEvent event,MenuElement path[],MenuSelectionManager manager) {
+    public void processMouseEvent(MouseEvent event,MenuElement[] path,MenuSelectionManager manager) {
     }
 
     /**
@@ -399,7 +399,7 @@
      *
      * @see #getSubElements
      */
-    public void processKeyEvent(KeyEvent e,MenuElement path[],MenuSelectionManager manager) {
+    public void processKeyEvent(KeyEvent e,MenuElement[] path,MenuSelectionManager manager) {
     }
 
     /**
@@ -420,7 +420,7 @@
      */
     @BeanProperty(bound = false)
     public MenuElement[] getSubElements() {
-        MenuElement result[];
+        MenuElement[] result;
         Vector<MenuElement> tmp = new Vector<MenuElement>();
         int c = getComponentCount();
         int i;
@@ -610,7 +610,7 @@
             getSelectionModel().setSelectedIndex(i);
             JMenu menu = getMenu(i);
             if (menu != null) {
-                MenuElement me[] = new MenuElement[3];
+                MenuElement[] me = new MenuElement[3];
                 me[0] = JMenuBar.this;
                 me[1] = menu;
                 me[2] = menu.getPopupMenu();
--- a/src/java.desktop/share/classes/javax/swing/JMenuItem.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JMenuItem.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -413,7 +413,7 @@
      * @param manager   the <code>MenuSelectionManager</code>
      */
     @SuppressWarnings("deprecation")
-    public void processMouseEvent(MouseEvent e,MenuElement path[],MenuSelectionManager manager) {
+    public void processMouseEvent(MouseEvent e,MenuElement[] path,MenuSelectionManager manager) {
         processMenuDragMouseEvent(
                  new MenuDragMouseEvent(e.getComponent(), e.getID(),
                                         e.getWhen(),
@@ -437,7 +437,7 @@
      * @param manager   the <code>MenuSelectionManager</code>
      */
     @SuppressWarnings("deprecation")
-    public void processKeyEvent(KeyEvent e,MenuElement path[],MenuSelectionManager manager) {
+    public void processKeyEvent(KeyEvent e,MenuElement[] path,MenuSelectionManager manager) {
         if (DEBUG) {
             System.out.println("in JMenuItem.processKeyEvent/3 for " + getText() +
                                    "  " + KeyStroke.getKeyStrokeForEvent(e));
--- a/src/java.desktop/share/classes/javax/swing/JPasswordField.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JPasswordField.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -471,7 +471,7 @@
             } else {
                 // Treat the text displayed in the JPasswordField
                 // as one word and sentence.
-                char password[] = getPassword();
+                char[] password = getPassword();
                 if (password == null ||
                     index < 0 || index >= password.length) {
                     return null;
@@ -582,7 +582,7 @@
             } else {
                 // Treat the text displayed in the JPasswordField
                 // as one word, sentence, line and attribute run
-                char password[] = getPassword();
+                char[] password = getPassword();
                 if (password == null ||
                     index < 0 || index >= password.length) {
                     return null;
--- a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -774,7 +774,7 @@
             // This is a popup menu with MenuElement children,
             // set selection path before popping up!
             if (isPopupMenu()) {
-                MenuElement me[] = new MenuElement[1];
+                MenuElement[] me = new MenuElement[1];
                 me[0] = this;
                 MenuSelectionManager.defaultManager().setSelectedPath(me);
             }
@@ -1371,7 +1371,7 @@
      * <code>MenuElement</code> interface, but it not implemented.
      * @see MenuElement#processMouseEvent(MouseEvent, MenuElement[], MenuSelectionManager)
      */
-    public void processMouseEvent(MouseEvent event,MenuElement path[],MenuSelectionManager manager) {}
+    public void processMouseEvent(MouseEvent event,MenuElement[] path,MenuSelectionManager manager) {}
 
     /**
      * Processes a key event forwarded from the
@@ -1386,7 +1386,7 @@
      * @param manager   the <code>MenuSelectionManager</code>
      */
     @SuppressWarnings("deprecation")
-    public void processKeyEvent(KeyEvent e, MenuElement path[],
+    public void processKeyEvent(KeyEvent e, MenuElement[] path,
                                 MenuSelectionManager manager) {
         MenuKeyEvent mke = new MenuKeyEvent(e.getComponent(), e.getID(),
                                              e.getWhen(), e.getModifiers(),
@@ -1504,7 +1504,7 @@
      */
     @BeanProperty(bound = false)
     public MenuElement[] getSubElements() {
-        MenuElement result[];
+        MenuElement[] result;
         Vector<MenuElement> tmp = new Vector<MenuElement>();
         int c = getComponentCount();
         int i;
--- a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1000,7 +1000,7 @@
         // container's children array indices, so make sure we
         // remove the correct child!
         if (component != null) {
-            Component components[] = getComponents();
+            Component[] components = getComponents();
             for (int i = components.length; --i >= 0; ) {
                 if (components[i] == component) {
                     super.remove(i);
@@ -1034,7 +1034,7 @@
         } else {
             // Container#remove(comp) invokes Container#remove(int)
             // so make sure JTabbedPane#remove(int) isn't called here
-            Component children[] = getComponents();
+            Component[] children = getComponents();
             for (int i=0; i < children.length; i++) {
                 if (component == children[i]) {
                     super.remove(i);
@@ -1548,7 +1548,7 @@
                 // why not if (page.component.getParent() == this) remove(component)
                 synchronized(getTreeLock()) {
                     int count = getComponentCount();
-                    Component children[] = getComponents();
+                    Component[] children = getComponents();
                     for (int i = 0; i < count; i++) {
                         if (children[i] == page.component) {
                             super.remove(i);
--- a/src/java.desktop/share/classes/javax/swing/JTable.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -7217,8 +7217,8 @@
 
             int rowsSel = JTable.this.getSelectedRowCount();
             int colsSel = JTable.this.getSelectedColumnCount();
-            int rowIndicies[] = getSelectedRows();
-            int colIndicies[] = getSelectedColumns();
+            int[] rowIndicies = getSelectedRows();
+            int[] colIndicies = getSelectedColumns();
             int ttlCols = JTable.this.getColumnCount();
             int ttlRows = JTable.this.getRowCount();
             int r;
--- a/src/java.desktop/share/classes/javax/swing/JViewport.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/JViewport.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1809,7 +1809,7 @@
 
             if(lastParent != null && parent instanceof JComponent &&
                !((JComponent)parent).isOptimizedDrawingEnabled()) {
-                Component comps[] = parent.getComponents();
+                Component[] comps = parent.getComponents();
                 int index = 0;
 
                 for(int i = comps.length - 1 ;i >= 0; i--) {
--- a/src/java.desktop/share/classes/javax/swing/MenuElement.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/MenuElement.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@
      * @param path the path of the receiving element in the menu hierarchy
      * @param manager the {@code MenuSelectionManager} for the menu hierarchy
      */
-    public void processMouseEvent(MouseEvent event, MenuElement path[], MenuSelectionManager manager);
+    public void processMouseEvent(MouseEvent event, MenuElement[] path, MenuSelectionManager manager);
 
 
     /**
@@ -63,7 +63,7 @@
      * @param path the path of the receiving element in the menu hierarchy
      * @param manager the {@code MenuSelectionManager} for the menu hierarchy
      */
-    public void processKeyEvent(KeyEvent event, MenuElement path[], MenuSelectionManager manager);
+    public void processKeyEvent(KeyEvent event, MenuElement[] path, MenuSelectionManager manager);
 
     /**
      * Call by the {@code MenuSelectionManager} when the {@code MenuElement} is
--- a/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/MenuSelectionManager.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,7 +139,7 @@
      * @return an array of MenuElement objects representing the selected path
      */
     public MenuElement[] getSelectedPath() {
-        MenuElement res[] = new MenuElement[selection.size()];
+        MenuElement[] res = new MenuElement[selection.size()];
         int i,c;
         for(i=0,c=selection.size();i<c;i++)
             res[i] = selection.elementAt(i);
@@ -223,8 +223,8 @@
         Rectangle r2;
         int cWidth,cHeight;
         MenuElement menuElement;
-        MenuElement subElements[];
-        MenuElement path[];
+        MenuElement[] subElements;
+        MenuElement[] path;
         int selectionSize;
         p = event.getPoint();
 
@@ -292,7 +292,7 @@
                             path[k] = tmp.elementAt(k);
                     }
                     path[i+1] = subElements[j];
-                    MenuElement currentSelection[] = getSelectedPath();
+                    MenuElement[] currentSelection = getSelectedPath();
 
                     // Enter/exit detection -- needs tuning...
                     if (currentSelection[currentSelection.length-1] !=
@@ -347,11 +347,11 @@
         }
     }
 
-    private void printMenuElementArray(MenuElement path[]) {
+    private void printMenuElementArray(MenuElement[] path) {
         printMenuElementArray(path, false);
     }
 
-    private void printMenuElementArray(MenuElement path[], boolean dumpStack) {
+    private void printMenuElementArray(MenuElement[] path, boolean dumpStack) {
         System.out.println("Path is(");
         int i, j;
         for(i=0,j=path.length; i<j ;i++){
@@ -396,7 +396,7 @@
         Rectangle r2;
         int cWidth,cHeight;
         MenuElement menuElement;
-        MenuElement subElements[];
+        MenuElement[] subElements;
         int selectionSize;
 
         SwingUtilities.convertPointToScreen(p,source);
@@ -504,7 +504,7 @@
     }
 
     private boolean isComponentPartOfCurrentMenu(MenuElement root,Component c) {
-        MenuElement children[];
+        MenuElement[] children;
         int i,d;
 
         if (root == null)
--- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -367,7 +367,7 @@
             if(contents != null && contents.isFocusable()) {
                 if(contents instanceof JPopupMenu) {
                     JPopupMenu jpm = (JPopupMenu) contents;
-                    Component popComps[] = jpm.getComponents();
+                    Component[] popComps = jpm.getComponents();
                     for (Component popComp : popComps) {
                         if (!(popComp instanceof MenuElement) &&
                                 !(popComp instanceof JSeparator)) {
--- a/src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/ProgressMonitorInputStream.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -124,7 +124,7 @@
      * Overrides <code>FilterInputStream.read</code>
      * to update the progress monitor after the read.
      */
-    public int read(byte b[]) throws IOException {
+    public int read(byte[] b) throws IOException {
         int nr = in.read(b);
         if (nr > 0) monitor.setProgress(nread += nr);
         if (monitor.isCanceled()) {
@@ -141,7 +141,7 @@
      * Overrides <code>FilterInputStream.read</code>
      * to update the progress monitor after the read.
      */
-    public int read(byte b[],
+    public int read(byte[] b,
                     int off,
                     int len) throws IOException {
         int nr = in.read(b, off, len);
--- a/src/java.desktop/share/classes/javax/swing/SizeSequence.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/SizeSequence.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -122,7 +122,7 @@
 public class SizeSequence {
 
     private static int[] emptyArray = new int[0];
-    private int a[];
+    private int[] a;
 
     /**
      * Creates a new <code>SizeSequence</code> object
@@ -360,7 +360,7 @@
      *   (<code>0 &lt;= start &lt; (getSizes().length)) AND (length &gt;= 0)</code>
      */
     public void insertEntries(int start, int length, int value) {
-        int sizes[] = getSizes();
+        int[] sizes = getSizes();
         int end = start + length;
         int n = a.length + length;
         a = new int[n];
@@ -390,7 +390,7 @@
      * @param length  the number of entries to be removed
      */
     public void removeEntries(int start, int length) {
-        int sizes[] = getSizes();
+        int[] sizes = getSizes();
         int end = start + length;
         int n = a.length - length;
         a = new int[n];
--- a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -310,7 +310,7 @@
             return null;
         }
         if (parent instanceof Container) {
-            Component components[] = ((Container)parent).getComponents();
+            Component[] components = ((Container)parent).getComponents();
             for (Component comp : components) {
                 if (comp != null && comp.isVisible()) {
                     Point loc = comp.getLocation();
@@ -606,7 +606,7 @@
 
         Rectangle t = new Rectangle();
         Rectangle a=null,b=null,c=null,d=null;
-        Rectangle result[];
+        Rectangle[] result;
         int rectCount = 0;
 
         /* rectA contains rectB */
--- a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -230,7 +230,7 @@
     // Point(20000, 20000))
     private GraphicsConfiguration getDrawingGC(Point toFind) {
         GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        GraphicsDevice devices[] = env.getScreenDevices();
+        GraphicsDevice[] devices = env.getScreenDevices();
         for (GraphicsDevice device : devices) {
             GraphicsConfiguration config = device.getDefaultConfiguration();
             Rectangle rect = config.getBounds();
--- a/src/java.desktop/share/classes/javax/swing/TransferHandler.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/TransferHandler.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1067,7 +1067,7 @@
         } catch (IntrospectionException ex) {
             return null;
         }
-        PropertyDescriptor props[] = bi.getPropertyDescriptors();
+        PropertyDescriptor[] props = bi.getPropertyDescriptors();
         for (int i=0; i < props.length; i++) {
             if (propertyName.equals(props[i].getName())) {
                 Method reader = props[i].getReadMethod();
--- a/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
  */
 @SuppressWarnings("serial")
 public class MenuDragMouseEvent extends MouseEvent {
-    private MenuElement path[];
+    private MenuElement[] path;
     private MenuSelectionManager manager;
 
     /**
@@ -78,7 +78,7 @@
      */
     public MenuDragMouseEvent(Component source, int id, long when,
                               int modifiers, int x, int y, int clickCount,
-                              boolean popupTrigger, MenuElement p[],
+                              boolean popupTrigger, MenuElement[] p,
                               MenuSelectionManager m) {
         super(source, id, when, modifiers, x, y, clickCount, popupTrigger);
         path = p;
@@ -117,7 +117,7 @@
     public MenuDragMouseEvent(Component source, int id, long when,
                               int modifiers, int x, int y, int xAbs,
                               int yAbs, int clickCount,
-                              boolean popupTrigger, MenuElement p[],
+                              boolean popupTrigger, MenuElement[] p,
                               MenuSelectionManager m) {
         super(source, id, when, modifiers, x, y, xAbs, yAbs, clickCount,
               popupTrigger, MouseEvent.NOBUTTON);
--- a/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
  */
 @SuppressWarnings("serial")
 public class MenuKeyEvent extends KeyEvent {
-    private MenuElement path[];
+    private MenuElement[] path;
     private MenuSelectionManager manager;
 
     /**
@@ -71,7 +71,7 @@
      */
     public MenuKeyEvent(Component source, int id, long when, int modifiers,
                         int keyCode, char keyChar,
-                        MenuElement p[], MenuSelectionManager m) {
+                        MenuElement[] p, MenuSelectionManager m) {
         super(source, id, when, modifiers, keyCode, keyChar);
         path = p;
         manager = m;
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@
      * @param path an array of {@code MenuElement}
      * @param manager an instance of {@code MenuSelectionManager}
      */
-    public void processMouseEvent(JMenuItem item,MouseEvent e,MenuElement path[],MenuSelectionManager manager) {
+    public void processMouseEvent(JMenuItem item,MouseEvent e,MenuElement[] path,MenuSelectionManager manager) {
         Point p = e.getPoint();
         if(p.x >= 0 && p.x < item.getWidth() &&
            p.y >= 0 && p.y < item.getHeight()) {
@@ -71,7 +71,7 @@
             } else
                 manager.setSelectedPath(path);
         } else if(item.getModel().isArmed()) {
-            MenuElement newPath[] = new MenuElement[path.length-1];
+            MenuElement[] newPath = new MenuElement[path.length-1];
             int i,c;
             for(i=0,c=path.length-1;i<c;i++)
                 newPath[i] = path[i];
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -269,8 +269,8 @@
             // TAKE_FOCUS
             JMenuBar menuBar = (JMenuBar)e.getSource();
             MenuSelectionManager defaultManager = MenuSelectionManager.defaultManager();
-            MenuElement me[];
-            MenuElement subElements[];
+            MenuElement[] me;
+            MenuElement[] subElements;
             JMenu menu = menuBar.getMenu(0);
             if (menu!=null) {
                     me = new MenuElement[3];
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -868,8 +868,8 @@
      */
     public MenuElement[] getPath() {
         MenuSelectionManager m = MenuSelectionManager.defaultManager();
-        MenuElement oldPath[] = m.getSelectedPath();
-        MenuElement newPath[];
+        MenuElement[] oldPath = m.getSelectedPath();
+        MenuElement[] newPath;
         int i = oldPath.length;
         if (i == 0)
             return new MenuElement[0];
@@ -905,7 +905,7 @@
         return newPath;
     }
 
-    void printMenuElementArray(MenuElement path[], boolean dumpStack) {
+    void printMenuElementArray(MenuElement[] path, boolean dumpStack) {
         System.out.println("Path is(");
         int i, j;
         for(i=0,j=path.length; i<j ;i++){
@@ -1089,9 +1089,9 @@
                 MenuSelectionManager.defaultManager().processMouseEvent(e);
             } else {
 
-                MenuElement path[] = manager.getSelectedPath();
+                MenuElement[] path = manager.getSelectedPath();
                 if (path.length > 1 && path[path.length-1] == menuItem) {
-                    MenuElement newPath[] = new MenuElement[path.length-1];
+                    MenuElement[] newPath = new MenuElement[path.length-1];
                     int i,c;
                     for(i=0,c=path.length-1;i<c;i++)
                         newPath[i] = path[i];
@@ -1111,12 +1111,12 @@
         //
         public void menuDragMouseEntered(MenuDragMouseEvent e) {
             MenuSelectionManager manager = e.getMenuSelectionManager();
-            MenuElement path[] = e.getPath();
+            MenuElement[] path = e.getPath();
             manager.setSelectedPath(path);
         }
         public void menuDragMouseDragged(MenuDragMouseEvent e) {
             MenuSelectionManager manager = e.getMenuSelectionManager();
-            MenuElement path[] = e.getPath();
+            MenuElement[] path = e.getPath();
             manager.setSelectedPath(path);
         }
         public void menuDragMouseExited(MenuDragMouseEvent e) {}
@@ -1125,7 +1125,7 @@
                 return;
             }
             MenuSelectionManager manager = e.getMenuSelectionManager();
-            MenuElement path[] = e.getPath();
+            MenuElement[] path = e.getPath();
             Point p = e.getPoint();
             if (p.x >= 0 && p.x < menuItem.getWidth() &&
                     p.y >= 0 && p.y < menuItem.getHeight()) {
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicMenuUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -253,7 +253,7 @@
     }
 
     private static void appendPath(MenuElement[] path, MenuElement elem) {
-        MenuElement newPath[] = new MenuElement[path.length+1];
+        MenuElement[] newPath = new MenuElement[path.length+1];
         System.arraycopy(path, 0, newPath, 0, path.length);
         newPath[path.length] = elem;
         MenuSelectionManager.defaultManager().setSelectedPath(newPath);
@@ -293,8 +293,8 @@
             if(force) {
                 Container cnt = menu.getParent();
                 if(cnt != null && cnt instanceof JMenuBar) {
-                    MenuElement me[];
-                    MenuElement subElements[];
+                    MenuElement[] me;
+                    MenuElement[] subElements;
 
                     subElements = menu.getPopupMenu().getSubElements();
                     if(subElements.length > 0) {
@@ -312,7 +312,7 @@
                     defaultManager.setSelectedPath(me);
                 }
             } else {
-                MenuElement path[] = defaultManager.getSelectedPath();
+                MenuElement[] path = defaultManager.getSelectedPath();
                 if(path.length > 0 && path[path.length-1] == menu) {
                     appendPath(path, menu.getPopupMenu());
                 }
@@ -503,7 +503,7 @@
                 } else {
                     Container cnt = menu.getParent();
                     if(cnt != null && cnt instanceof JMenuBar) {
-                        MenuElement me[] = new MenuElement[2];
+                        MenuElement[] me = new MenuElement[2];
                         me[0]=(MenuElement)cnt;
                         me[1]=menu;
                         manager.setSelectedPath(me);
@@ -511,7 +511,7 @@
                 }
             }
 
-            MenuElement selectedPath[] = manager.getSelectedPath();
+            MenuElement[] selectedPath = manager.getSelectedPath();
             if (selectedPath.length > 0 &&
                 selectedPath[selectedPath.length-1] != menu.getPopupMenu()) {
 
@@ -559,7 +559,7 @@
 
             MenuSelectionManager manager =
                 MenuSelectionManager.defaultManager();
-            MenuElement selectedPath[] = manager.getSelectedPath();
+            MenuElement[] selectedPath = manager.getSelectedPath();
             if (!menu.isTopLevelMenu()) {
                 if(!(selectedPath.length > 0 &&
                      selectedPath[selectedPath.length-1] ==
@@ -574,7 +574,7 @@
             } else {
                 if(selectedPath.length > 0 &&
                    selectedPath[0] == menu.getParent()) {
-                    MenuElement newPath[] = new MenuElement[3];
+                    MenuElement[] newPath = new MenuElement[3];
                     // A top level menu's parent is by definition
                     // a JMenuBar
                     newPath[0] = (MenuElement)menu.getParent();
@@ -615,13 +615,13 @@
                 return;
 
             MenuSelectionManager manager = e.getMenuSelectionManager();
-            MenuElement path[] = e.getPath();
+            MenuElement[] path = e.getPath();
 
             Point p = e.getPoint();
             if(p.x >= 0 && p.x < menuItem.getWidth() &&
                p.y >= 0 && p.y < menuItem.getHeight()) {
                 JMenu menu = (JMenu)menuItem;
-                MenuElement selectedPath[] = manager.getSelectedPath();
+                MenuElement[] selectedPath = manager.getSelectedPath();
                 if(!(selectedPath.length > 0 &&
                      selectedPath[selectedPath.length-1] ==
                      menu.getPopupMenu())) {
@@ -665,19 +665,19 @@
             }
 
             char key = Character.toLowerCase((char)menuItem.getMnemonic());
-            MenuElement path[] = e.getPath();
+            MenuElement[] path = e.getPath();
             if (key == Character.toLowerCase(e.getKeyChar())) {
                 JPopupMenu popupMenu = ((JMenu)menuItem).getPopupMenu();
                 ArrayList<MenuElement> newList = new ArrayList<>(Arrays.asList(path));
                 newList.add(popupMenu);
-                MenuElement subs[] = popupMenu.getSubElements();
+                MenuElement[] subs = popupMenu.getSubElements();
                 MenuElement sub =
                         BasicPopupMenuUI.findEnabledChild(subs, -1, true);
                 if(sub != null) {
                     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();
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -327,7 +327,7 @@
                 if (subitem != null) {
                     lst.add(subitem);
                 }
-                MenuElement newPath[] = new MenuElement[0];
+                MenuElement[] newPath = new MenuElement[0];
                 newPath = lst.toArray(newPath);
                 MenuSelectionManager.defaultManager().setSelectedPath(newPath);
                 e.consume();
@@ -344,12 +344,12 @@
             }
 
             MenuSelectionManager manager = e.getMenuSelectionManager();
-            MenuElement path[] = e.getPath();
-            MenuElement items[] = popupMenu.getSubElements();
+            MenuElement[] path = e.getPath();
+            MenuElement[] items = popupMenu.getSubElements();
             int currentIndex = -1;
             int matches = 0;
             int firstMatch = -1;
-            int indexes[] = null;
+            int[] indexes = null;
 
             for (int j = 0; j < items.length; j++) {
                 if (! (items[j] instanceof JMenuItem)) {
@@ -397,7 +397,7 @@
 
                 newItem = items[indexes[(currentIndex + 1) % matches]];
 
-                MenuElement newPath[] = new MenuElement[path.length+1];
+                MenuElement[] newPath = new MenuElement[path.length+1];
                 System.arraycopy(path, 0, newPath, 0, path.length);
                 newPath[path.length] = newItem;
                 manager.setSelectedPath(newPath);
@@ -470,12 +470,12 @@
             }
 
             MenuSelectionManager msm = MenuSelectionManager.defaultManager();
-            MenuElement path[] = msm.getSelectedPath();
+            MenuElement[] path = msm.getSelectedPath();
             MenuElement lastElement;
             if(path.length > 0) {
                 lastElement = path[path.length-1];
                 if(lastElement instanceof JMenu) {
-                    MenuElement newPath[] = new MenuElement[path.length+1];
+                    MenuElement[] newPath = new MenuElement[path.length+1];
                     System.arraycopy(path,0,newPath,0,path.length);
                     newPath[path.length] = ((JMenu)lastElement).getPopupMenu();
                     msm.setSelectedPath(newPath);
@@ -494,7 +494,7 @@
         }
         private void selectParentChild(boolean direction) {
             MenuSelectionManager msm = MenuSelectionManager.defaultManager();
-            MenuElement path[] = msm.getSelectedPath();
+            MenuElement[] path = msm.getSelectedPath();
             int len = path.length;
 
             if (direction == PARENT) {
@@ -510,7 +510,7 @@
                     !((JMenu)path[popupIndex-1]).isTopLevelMenu()) {
 
                     // we have a submenu, just close it
-                    MenuElement newPath[] = new MenuElement[popupIndex];
+                    MenuElement[] newPath = new MenuElement[popupIndex];
                     System.arraycopy(path, 0, newPath, 0, popupIndex);
                     msm.setSelectedPath(newPath);
                     return;
@@ -548,7 +548,7 @@
                     path[0].getSubElements(), currentMenu, direction);
 
                 if (nextMenu != null && nextMenu != currentMenu) {
-                    MenuElement newSelection[];
+                    MenuElement[] newSelection;
                     if (len == 2) {
                         // menu is selected but its popup not shown
                         newSelection = new MenuElement[2];
@@ -568,7 +568,7 @@
 
         private void selectItem(boolean direction) {
             MenuSelectionManager msm = MenuSelectionManager.defaultManager();
-            MenuElement path[] = msm.getSelectedPath();
+            MenuElement[] path = msm.getSelectedPath();
             if (path.length == 0) {
                 return;
             }
@@ -638,7 +638,7 @@
 
             } else {
                 // just select the next item, no path expansion needed
-                MenuElement subs[] = path[len-2].getSubElements();
+                MenuElement[] subs = path[len-2].getSubElements();
                 MenuElement nextChild =
                     findEnabledChild(subs, path[len-1], direction);
                 if (nextChild == null) {
@@ -668,7 +668,7 @@
         }
 
         private void shortenSelectedPath() {
-            MenuElement path[] = MenuSelectionManager.defaultManager().getSelectedPath();
+            MenuElement[] path = MenuSelectionManager.defaultManager().getSelectedPath();
             if (path.length <= 2) {
                 MenuSelectionManager.defaultManager().clearSelectedPath();
                 return;
@@ -695,13 +695,13 @@
                 // clear selection for the topLevelMenu
                 value = path.length;
             }
-            MenuElement newPath[] = new MenuElement[path.length - value];
+            MenuElement[] newPath = new MenuElement[path.length - value];
             System.arraycopy(path, 0, newPath, 0, path.length - value);
             MenuSelectionManager.defaultManager().setSelectedPath(newPath);
         }
     }
 
-    private static MenuElement nextEnabledChild(MenuElement e[],
+    private static MenuElement nextEnabledChild(MenuElement[] e,
                                                 int fromIndex, int toIndex) {
         for (int i=fromIndex; i<=toIndex; i++) {
             if (e[i] != null) {
@@ -716,7 +716,7 @@
         return null;
     }
 
-    private static MenuElement previousEnabledChild(MenuElement e[],
+    private static MenuElement previousEnabledChild(MenuElement[] e,
                                                 int fromIndex, int toIndex) {
         for (int i=fromIndex; i>=toIndex; i--) {
             if (e[i] != null) {
@@ -731,7 +731,7 @@
         return null;
     }
 
-    static MenuElement findEnabledChild(MenuElement e[], int fromIndex,
+    static MenuElement findEnabledChild(MenuElement[] e, int fromIndex,
                                                 boolean forward) {
         MenuElement result;
         if (forward) {
@@ -745,7 +745,7 @@
         return result;
     }
 
-    static MenuElement findEnabledChild(MenuElement e[],
+    static MenuElement findEnabledChild(MenuElement[] e,
                                    MenuElement elem, boolean forward) {
         for (int i=0; i<e.length; i++) {
             if (e[i] == elem) {
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@
      * @param path an array of {@code MenuElement}
      * @param manager an instance of {@code MenuSelectionManager}
      */
-    public void processMouseEvent(JMenuItem item,MouseEvent e,MenuElement path[],MenuSelectionManager manager) {
+    public void processMouseEvent(JMenuItem item,MouseEvent e,MenuElement[] path,MenuSelectionManager manager) {
         Point p = e.getPoint();
         if(p.x >= 0 && p.x < item.getWidth() &&
            p.y >= 0 && p.y < item.getHeight()) {
@@ -72,7 +72,7 @@
             } else
                 manager.setSelectedPath(path);
         } else if(item.getModel().isArmed()) {
-            MenuElement newPath[] = new MenuElement[path.length-1];
+            MenuElement[] newPath = new MenuElement[path.length-1];
             int i,c;
             for(i=0,c=path.length-1;i<c;i++)
                 newPath[i] = path[i];
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java	Thu Oct 04 12:40:55 2018 -0700
@@ -132,13 +132,13 @@
 
 // Transient variables (recalculated each time TabbedPane is layed out)
     /** Tab runs */
-    protected int tabRuns[] = new int[10];
+    protected int[] tabRuns = new int[10];
     /** Run count */
     protected int runCount = 0;
     /** Selected run */
     protected int selectedRun = -1;
     /** Tab rects */
-    protected Rectangle rects[] = new Rectangle[0];
+    protected Rectangle[] rects = new Rectangle[0];
     /** Maximum tab height */
     protected int maxTabHeight;
     /** Maximum tab width */
@@ -986,8 +986,8 @@
      * subtracting xCropLen[i] from (tab.y + tab.height) and adding yCropLen[i]
      * to (tab.x).
      */
-    private static int xCropLen[] = {1,1,0,0,1,1,2,2};
-    private static int yCropLen[] = {0,3,3,6,6,9,9,12};
+    private static int[] xCropLen = {1,1,0,0,1,1,2,2};
+    private static int[] yCropLen = {0,3,3,6,6,9,9,12};
     private static final int CROP_SEGMENT = 12;
 
     private static Polygon createCroppedTabShape(int tabPlacement, Rectangle tabRect, int cropline) {
@@ -1017,8 +1017,8 @@
             rcnt++;
         }
         int npts = 2 + (rcnt*8);
-        int xp[] = new int[npts];
-        int yp[] = new int[npts];
+        int[] xp = new int[npts];
+        int[] yp = new int[npts];
         int pcnt = 0;
 
         xp[pcnt] = ostart;
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -360,7 +360,7 @@
             USER_TEXT_FONT, CONTROL_TEXT_FONT,
             CONTROL_TEXT_FONT, SUB_TEXT_FONT
         };
-        FontUIResource fonts[];
+        FontUIResource[] fonts;
 
         // menu and window are mapped to controlFont
         public FontDelegate() {
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalBumps.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -224,7 +224,7 @@
                        Transparency.BITMASK);
         }
         else {
-            int cmap[] = { backColor.getRGB(), topColor.getRGB(),
+            int[] cmap = { backColor.getRGB(), topColor.getRGB(),
                            shadowColor.getRGB() };
             IndexColorModel icm = new IndexColorModel(8, 3, cmap, 0, false,
                       (backColor == MetalBumps.ALPHA) ? 0 : -1,
--- a/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2226,7 +2226,7 @@
          */
         private static void updateWindowUI(Window window) {
             SwingUtilities.updateComponentTreeUI(window);
-            Window ownedWins[] = window.getOwnedWindows();
+            Window[] ownedWins = window.getOwnedWindows();
             for (Window w : ownedWins) {
                 updateWindowUI(w);
             }
@@ -2236,7 +2236,7 @@
          * Updates the UIs of all the known Frames.
          */
         private static void updateAllUIs() {
-            Frame appFrames[] = Frame.getFrames();
+            Frame[] appFrames = Frame.getFrames();
             for (Frame frame : appFrames) {
                 updateWindowUI(frame);
             }
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -303,7 +303,7 @@
         //there are no custom states or custom state ordering
         String statesString = (String)defaults.get(prefix + ".States");
         if (statesString != null) {
-            String s[] = statesString.split(",");
+            String[] s = statesString.split(",");
             for (int i=0; i<s.length; i++) {
                 s[i] = s[i].trim();
                 if (!State.isStandardStateName(s[i])) {
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -863,7 +863,7 @@
          */
         private static void updateWindowUI(Window window) {
             updateStyles(window);
-            Window ownedWins[] = window.getOwnedWindows();
+            Window[] ownedWins = window.getOwnedWindows();
             for (Window w : ownedWins) {
                 updateWindowUI(w);
             }
@@ -873,7 +873,7 @@
          * Updates the UIs of all the known Frames.
          */
         private static void updateAllUIs() {
-            Frame appFrames[] = Frame.getFrames();
+            Frame[] appFrames = Frame.getFrames();
             for (Frame frame : appFrames) {
                 updateWindowUI(frame);
             }
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1245,14 +1245,14 @@
         }
     }
 
-    public void characters(char ch[], int start, int length)
+    public void characters(char[] ch, int start, int length)
                            throws SAXException {
         if (isForwarding()) {
             getHandler().characters(ch, start, length);
         }
     }
 
-    public void ignorableWhitespace (char ch[], int start, int length)
+    public void ignorableWhitespace (char[] ch, int start, int length)
         throws SAXException {
         if (isForwarding()) {
             getHandler().ignorableWhitespace(ch, start, length);
--- a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1057,7 +1057,7 @@
         // Calculate the bidi levels for the affected range of paragraphs.  The
         // levels array will contain a bidi level for each character in the
         // affected text.
-        byte levels[] = calculateBidiLevels( firstPStart, lastPEnd );
+        byte[] levels = calculateBidiLevels( firstPStart, lastPEnd );
 
 
         Vector<Element> newElements = new Vector<Element>();
@@ -1185,7 +1185,7 @@
      */
     private byte[] calculateBidiLevels( int firstPStart, int lastPEnd ) {
 
-        byte levels[] = new byte[ lastPEnd - firstPStart ];
+        byte[] levels = new byte[ lastPEnd - firstPStart ];
         int  levelsEnd = 0;
         Boolean defaultDirection = null;
         Object d = getProperty(TextAttribute.RUN_DIRECTION);
--- a/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1002,7 +1002,7 @@
         @Override
         protected SizeRequirements calculateMajorAxisRequirements(int axis,
                 SizeRequirements r) {
-            int oldJustficationData[] = justificationData;
+            int[] oldJustficationData = justificationData;
             justificationData = null;
             SizeRequirements ret = super.calculateMajorAxisRequirements(axis, r);
             if (isJustifyEnabled()) {
@@ -1014,7 +1014,7 @@
         @Override
         protected void layoutMajorAxis(int targetSpan, int axis,
                                        int[] offsets, int[] spans) {
-            int oldJustficationData[] = justificationData;
+            int[] oldJustficationData = justificationData;
             justificationData = null;
             super.layoutMajorAxis(targetSpan, axis, offsets, spans);
             if (! isJustifyEnabled()) {
@@ -1045,7 +1045,7 @@
 
             int rowStartOffset = getStartOffset();
             int rowEndOffset = getEndOffset();
-            int spaceMap[] = new int[rowEndOffset - rowStartOffset];
+            int[] spaceMap = new int[rowEndOffset - rowStartOffset];
             Arrays.fill(spaceMap, 0);
             for (int i = getViewCount() - 1; i >= 0 ; i--) {
                 View view = getView(i);
@@ -1179,7 +1179,7 @@
         //this should be the last index in justificationData
         static final int END_JUSTIFIABLE = 3;
 
-        int justificationData[] = null;
+        int[] justificationData = null;
     }
 
 }
--- a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1975,7 +1975,7 @@
                             vec.addElement(Integer.valueOf(i));
                         }
                     }
-                    int retval[] = new int[vec.size()];
+                    int[] retval = new int[vec.size()];
                     for (int i = 0; i < retval.length; i++) {
                         retval[i] = vec.elementAt(i).intValue();
                     }
@@ -2000,7 +2000,7 @@
                             vec.addElement(Integer.valueOf(i));
                         }
                     }
-                    int retval[] = new int[vec.size()];
+                    int[] retval = new int[vec.size()];
                     for (int i = 0; i < retval.length; i++) {
                         retval[i] = vec.elementAt(i).intValue();
                     }
--- a/src/java.desktop/share/classes/javax/swing/text/html/CSS.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/CSS.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3373,9 +3373,9 @@
         int n = iter.getCount();
         int adjustmentWeightsCount = LayoutIterator.WorstAdjustmentWeight + 1;
         //max gain we can get adjusting elements with adjustmentWeight <= i
-        long gain[] = new long[adjustmentWeightsCount];
+        long[] gain = new long[adjustmentWeightsCount];
         //max loss we can get adjusting elements with adjustmentWeight <= i
-        long loss[] = new long[adjustmentWeightsCount];
+        long[] loss = new long[adjustmentWeightsCount];
 
         for (int i = 0; i < adjustmentWeightsCount; i++) {
             gain[i] = loss[i] = 0;
@@ -3414,7 +3414,7 @@
         // determine the adjustment to be made
         int allocated = targetSpan - totalSpacing;
         long desiredAdjustment = allocated - preferred;
-        long adjustmentsArray[] = (desiredAdjustment > 0) ? gain : loss;
+        long[] adjustmentsArray = (desiredAdjustment > 0) ? gain : loss;
         desiredAdjustment = Math.abs(desiredAdjustment);
         int adjustmentLevel = 0;
         for (;adjustmentLevel <= LayoutIterator.WorstAdjustmentWeight;
--- a/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/CSSBorder.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,7 @@
     };
 
     /** Parsers for the border properties.  */
-    static final CssValue PARSERS[] = {
+    static final CssValue[] PARSERS = {
         new ColorValue(), new BorderStyle(), new BorderWidthValue(null, 0),
     };
 
--- a/src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/FrameSetView.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -184,7 +184,7 @@
 
     protected SizeRequirements[] getChildRequests(int targetSpan, int axis) {
 
-        int span[] = new int[children.length];
+        int[] span = new int[children.length];
 
         spread(targetSpan, span);
         int n = getViewCount();
@@ -215,7 +215,7 @@
      * computes this based on the information that extracted
      * from the value of the ROW/COL attribute.
      */
-    private void spread(int targetSpan, int span[]) {
+    private void spread(int targetSpan, int[] span) {
 
         if (targetSpan == 0) {
             return;
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTML.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTML.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -553,7 +553,7 @@
          */
         public static final Tag COMMENT = new Tag("comment");
 
-        static final Tag allTags[]  = {
+        static final Tag[] allTags  = {
             A, ADDRESS, APPLET, AREA, B, BASE, BASEFONT, BIG,
             BLOCKQUOTE, BODY, BR, CAPTION, CENTER, CITE, CODE,
             DD, DFN, DIR, DIV, DL, DT, EM, FONT, FORM, FRAME,
@@ -1060,7 +1060,7 @@
         public static final Attribute COMMENT = new Attribute("comment");
         static final Attribute MEDIA = new Attribute("media");
 
-        static final Attribute allAttributes[] = {
+        static final Attribute[] allAttributes = {
             FACE,
             COMMENT,
             SIZE,
--- a/src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/MuxingAttributeSet.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,7 @@
     protected synchronized void insertAttributeSetAt(AttributeSet as,
                                                      int index) {
         int numAttrs = attrs.length;
-        AttributeSet newAttrs[] = new AttributeSet[numAttrs + 1];
+        AttributeSet[] newAttrs = new AttributeSet[numAttrs + 1];
         if (index < numAttrs) {
             if (index > 0) {
                 System.arraycopy(attrs, 0, newAttrs, 0, index);
--- a/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/ObjectView.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,7 +133,7 @@
             System.err.println("introspector failed, ex: "+ex);
             return;             // quit for now
         }
-        PropertyDescriptor props[] = bi.getPropertyDescriptors();
+        PropertyDescriptor[] props = bi.getPropertyDescriptors();
         for (int i=0; i < props.length; i++) {
             //      System.err.println("checking on props[i]: "+props[i].getName());
             Object v = attr.getAttribute(props[i].getName());
--- a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1514,9 +1514,9 @@
         int numElements = elements.size();
         // Build three arrays, one for tags, one for class's, and one for
         // id's
-        String tags[] = new String[numElements];
-        String ids[] = new String[numElements];
-        String classes[] = new String[numElements];
+        String[] tags = new String[numElements];
+        String[] ids = new String[numElements];
+        String[] classes = new String[numElements];
         for (int counter = 0; counter < numElements; counter++) {
             Element e = elements.elementAt(counter);
             AttributeSet attr = e.getAttributes();
@@ -2447,7 +2447,7 @@
         }
 
         /* list of roman numerals */
-        static final char romanChars[][] = {
+        static final char[][] romanChars = {
             {'i', 'v'},
             {'x', 'l' },
             {'c', 'd' },
@@ -3410,8 +3410,8 @@
      * The HTML/CSS size model has seven slots
      * that one can assign sizes to.
      */
-    static final int sizeMapDefault[] = { 8, 10, 12, 14, 18, 24, 36 };
+    static final int[] sizeMapDefault = { 8, 10, 12, 14, 18, 24, 36 };
 
-    private int sizeMap[] = sizeMapDefault;
+    private int[] sizeMap = sizeMapDefault;
     private boolean w3cLengthUnits = false;
 }
--- a/src/java.desktop/share/classes/javax/swing/text/html/TableView.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/TableView.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1054,7 +1054,7 @@
         /**
          * Set the layout arrays to use for holding layout results
          */
-        public void setLayoutArrays(int offsets[], int spans[], int targetSpan) {
+        public void setLayoutArrays(int[] offsets, int[] spans, int targetSpan) {
             this.offsets = offsets;
             this.spans = spans;
             updatePercentagesAndAdjustmentWeights(targetSpan);
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/ContentModel.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -156,8 +156,8 @@
          }
      }
 
-     private boolean valSet[];
-     private boolean val[];
+     private boolean[] valSet;
+     private boolean[] val;
      // A cache used by first().  This cache was found to speed parsing
      // by about 10% (based on measurements of the 4-12 code base after
      // buffering was fixed).
@@ -264,7 +264,7 @@
           case ',':
           case '|':
           case '&':
-            char data[] = {' ', (char)type, ' '};
+            char[] data = {' ', (char)type, ' '};
             String str = "";
             for (ContentModel m = (ContentModel)content ; m != null ; m = m.next) {
                 str = str + m;
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/DTD.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -237,7 +237,7 @@
      * @return the <code>Entity</code> requested or a new <code>Entity</code>
      *   if not found
      */
-    public Entity defineEntity(String name, int type, char data[]) {
+    public Entity defineEntity(String name, int type, char[] data) {
         Entity ent = entityHash.get(name);
         if (ent == null) {
             ent = new Entity(name, type, data);
@@ -304,7 +304,7 @@
      * @return the new character <code>Entity</code>
      */
     public Entity defEntity(String name, int type, int ch) {
-        char data[] = {(char)ch};
+        char[] data = {(char)ch};
         return defineEntity(name, type, data);
     }
 
@@ -317,7 +317,7 @@
      */
     protected Entity defEntity(String name, int type, String str) {
         int len = str.length();
-        char data[] = new char[len];
+        char[] data = new char[len];
         str.getChars(0, len, data, 0);
         return defineEntity(name, type, data);
     }
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/DocumentParser.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -177,7 +177,7 @@
     }
 
 
-    protected void handleComment(char text[]) {
+    protected void handleComment(char[] text) {
         if (debugFlag) {
             debug("comment: ->" + new String(text) + "<-"
                   + " pos: " + getCurrentPos());
@@ -257,7 +257,7 @@
     /**
      * Handle Text.
      */
-    protected void handleText(char data[]) {
+    protected void handleText(char[] data) {
         if (data != null) {
             if (inscript != 0) {
                 callback.handleComment(data, getBlockStartPosition());
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/Entity.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@
     /**
      * The char array of data.
      */
-    public char data[];
+    public char[] data;
 
     /**
      * Creates an entity.
@@ -63,7 +63,7 @@
      * @param type the type of the entity
      * @param data the char array of data
      */
-    public Entity(String name, int type, char data[]) {
+    public Entity(String name, int type, char[] data) {
         this.name = name;
         this.type = type;
         this.data = data;
@@ -105,7 +105,7 @@
      * Returns the <code>data</code>.
      * @return the <code>data</code>
      */
-    public char getData()[] {
+    public char[] getData() {
         return data;
     }
 
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,12 +78,12 @@
 public
 class Parser implements DTDConstants {
 
-    private char text[] = new char[1024];
+    private char[] text = new char[1024];
     private int textpos = 0;
     private TagElement last;
     private boolean space;
 
-    private char str[] = new char[128];
+    private char[] str = new char[128];
     private int strpos = 0;
 
     /**
@@ -273,7 +273,7 @@
      *
      * @param text  the section text
      */
-    protected void handleText(char text[]) {
+    protected void handleText(char[] text) {
     }
 
     /**
@@ -281,7 +281,7 @@
      *
      * @param text  the title text
      */
-    protected void handleTitle(char text[]) {
+    protected void handleTitle(char[] text) {
         // default behavior is to call handleText. Subclasses
         // can override if necessary.
         handleText(text);
@@ -292,7 +292,7 @@
      *
      * @param text  the comment being handled
      */
-    protected void handleComment(char text[]) {
+    protected void handleComment(char[] text) {
     }
 
     /**
@@ -386,7 +386,7 @@
             if (!ignoreSpace) {
                 // enlarge buffer if needed
                 if (textpos + 1 > text.length) {
-                    char newtext[] = new char[text.length + 200];
+                    char[] newtext = new char[text.length + 200];
                     System.arraycopy(text, 0, newtext, 0, text.length);
                     text = newtext;
                 }
@@ -399,7 +399,7 @@
             }
             space = false;
         }
-        char newtext[] = new char[textpos];
+        char[] newtext = new char[textpos];
         System.arraycopy(text, 0, newtext, 0, textpos);
         // Handles cases of bad html where the title tag
         // was getting lost when we did error recovery.
@@ -837,7 +837,7 @@
      */
     void addString(int c) {
         if (strpos  == str.length) {
-            char newstr[] = new char[str.length + 128];
+            char[] newstr = new char[str.length + 128];
             System.arraycopy(str, 0, newstr, 0, str.length);
             str = newstr;
         }
@@ -848,21 +848,21 @@
      * Get the string that's been accumulated.
      */
     String getString(int pos) {
-        char newStr[] = new char[strpos - pos];
+        char[] newStr = new char[strpos - pos];
         System.arraycopy(str, pos, newStr, 0, strpos - pos);
         strpos = pos;
         return new String(newStr);
     }
 
     char[] getChars(int pos) {
-        char newStr[] = new char[strpos - pos];
+        char[] newStr = new char[strpos - pos];
         System.arraycopy(str, pos, newStr, 0, strpos - pos);
         strpos = pos;
         return newStr;
     }
 
     char[] getChars(int pos, int endPos) {
-        char newStr[] = new char[endPos - pos];
+        char[] newStr = new char[endPos - pos];
         System.arraycopy(str, pos, newStr, 0, endPos - pos);
         // REMIND: it's not clear whether this version should set strpos or not
         // strpos = pos;
@@ -1034,18 +1034,18 @@
                         ch = readCh();
                         break;
                 }
-                char data[] = mapNumericReference(n);
+                char[] data = mapNumericReference(n);
                 return data;
             }
             addString('#');
             if (!parseIdentifier(false)) {
                 error("ident.expected");
                 strpos = pos;
-                char data[] = {'&', '#'};
+                char[] data = {'&', '#'};
                 return data;
             }
         } else if (!parseIdentifier(false)) {
-            char data[] = {'&'};
+            char[] data = {'&'};
             return data;
         }
 
@@ -1095,7 +1095,7 @@
             /* given that there is not a match restore the entity reference */
             String str = "&" + nm + (semicolon ? ";" : "");
 
-            char b[] = new char[str.length()];
+            char[] b = new char[str.length()];
             str.getChars(0, b.length, b, 0);
             return b;
         }
@@ -1251,9 +1251,9 @@
                 break;
 
               case '&':
-                char data[] = parseEntityReference();
+                char[] data = parseEntityReference();
                 if (textpos + data.length > text.length) {
-                    char newtext[] = new char[Math.max(textpos + data.length + 128, text.length * 2)];
+                    char[] newtext = new char[Math.max(textpos + data.length + 128, text.length * 2)];
                     System.arraycopy(text, 0, newtext, 0, text.length);
                     text = newtext;
                 }
@@ -1285,7 +1285,7 @@
 
             // output character
             if (textpos == text.length) {
-                char newtext[] = new char[text.length + 128];
+                char[] newtext = new char[text.length + 128];
                 System.arraycopy(text, 0, newtext, 0, text.length);
                 text = newtext;
             }
@@ -1395,7 +1395,7 @@
                     break;
                 }
 
-                char data[] = parseEntityReference();
+                char[] data = parseEntityReference();
                 for (int i = 0 ; i < data.length ; i++) {
                     c = data[i];
                     addString((lower && (c >= 'A') && (c <= 'Z')) ? 'a' + c - 'A' : c);
@@ -1506,7 +1506,7 @@
                         }
                     }
                 } else {
-                    char str[] = {(char)ch};
+                    char[] str = {(char)ch};
                     error("invalid.tagchar", new String(str), elem.getName());
                     ch = readCh();
                     continue;
@@ -1526,7 +1526,7 @@
                 error("attvalerr");
                 return;
             } else {
-                char str[] = {(char)ch};
+                char[] str = {(char)ch};
                 error("invalid.tagchar", new String(str), elem.getName());
                 if (!strict) {
                     ch = readCh();
@@ -1674,7 +1674,7 @@
                             // before parsing and sending the
                             // comment
                             if (textpos != 0) {
-                                char newtext[] = new char[textpos];
+                                char[] newtext = new char[textpos];
                                 System.arraycopy(text, 0, newtext, 0, textpos);
                                 handleText(newtext);
                                 lastBlockStartPos = currentBlockStartPos;
@@ -2224,9 +2224,9 @@
                             space = false;
                         }
                     }
-                    char data[] = parseEntityReference();
+                    char[] data = parseEntityReference();
                     if (textpos + data.length + 1 > text.length) {
-                        char newtext[] = new char[Math.max(textpos + data.length + 128, text.length * 2)];
+                        char[] newtext = new char[Math.max(textpos + data.length + 128, text.length * 2)];
                         System.arraycopy(text, 0, newtext, 0, text.length);
                         text = newtext;
                     }
@@ -2306,7 +2306,7 @@
 
             // enlarge buffer if needed
             if (textpos + 2 > text.length) {
-                char newtext[] = new char[text.length + 128];
+                char[] newtext = new char[text.length + 128];
                 System.arraycopy(text, 0, newtext, 0, text.length);
                 text = newtext;
             }
@@ -2412,7 +2412,7 @@
      * this reason the initial size is 1 and when the body is encountered the
      * size is adjusted to 256.
      */
-    private char buf[] = new char[1];
+    private char[] buf = new char[1];
     private int pos;
     private int len;
     /*
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/AbstractFilter.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,17 +49,17 @@
 abstract class AbstractFilter extends OutputStream
 {
     /** A table mapping bytes to characters */
-    protected char translationTable[];
+    protected char[] translationTable;
     /** A table indicating which byte values should be interpreted as
      *  characters and which should be treated as formatting codes */
-    protected boolean specialsTable[];
+    protected boolean[] specialsTable;
 
     /** A translation table which does ISO Latin-1 (trivial) */
-    static final char latin1TranslationTable[];
+    static final char[] latin1TranslationTable;
     /** A specials table which indicates that no characters are special */
-    static final boolean noSpecialsTable[];
+    static final boolean[] noSpecialsTable;
     /** A specials table which indicates that all characters are special */
-    static final boolean allSpecialsTable[];
+    static final boolean[] allSpecialsTable;
 
     static {
       int i;
@@ -93,7 +93,7 @@
     public void readFromStream(InputStream in)
       throws IOException
     {
-        byte buf[];
+        byte[] buf;
         int count;
 
         buf = new byte[16384];
@@ -110,7 +110,7 @@
     public void readFromReader(Reader in)
       throws IOException
     {
-        char buf[];
+        char[] buf;
         int count;
 
         buf = new char[2048];
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java	Thu Oct 04 11:07:30 2018 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFAttributes.java	Thu Oct 04 12:40:55 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
 
 class RTFAttributes
 {
-    static RTFAttribute attributes[];
+    static RTFAttribute[] attributes;
 
     static {
         Vector<RTFAttribute&g