8285306: Fix typos in java.desktop

src/java.desktop/aix/classes/sun/awt/X11InputMethod.java

@@ -125,7 +125,7 @@ public synchronized void deactivate(boolean isTemporary) {
         /* Usually as the client component, let's call it component A,
            loses the focus, this method is called. Then when another client
            component, let's call it component B,  gets the focus, activate is first called on
-           the previous focused compoent which is A, then endComposition is called on A,
+           the previous focused component which is A, then endComposition is called on A,
            deactivate is called on A again. And finally activate is called on the newly
            focused component B. Here is the call sequence.
 
@@ -466,7 +466,7 @@ public void setCompositionEnabled(boolean enable) {
            return.
            setCompositionEnabledNative may throw UnsupportedOperationException.
            Don't try to catch it since the method may be called by clients.
-           Use package private mthod 'resetCompositionState' if you want the
+           Use package private method 'resetCompositionState' if you want the
            exception to be caught.
         */
         boolean pre, post;

src/java.desktop/aix/native/libawt/porting_aix.h

@@ -27,12 +27,12 @@
 /*
  * Header file to contain porting-relevant code which does not have a
  * home anywhere else.
- * This is intially based on hotspot/src/os/aix/vm/{loadlib,porting}_aix.{hpp,cpp}
+ * This is initially based on hotspot/src/os/aix/vm/{loadlib,porting}_aix.{hpp,cpp}
  */
 
 /*
  * Aix' own version of dladdr().
- * This function tries to mimick dladdr(3) on Linux
+ * This function tries to mimic dladdr(3) on Linux
  * (see http://linux.die.net/man/3/dladdr)
  * dladdr(3) is not POSIX but a GNU extension, and is not available on AIX.
  *
@@ -50,7 +50,7 @@
 
 typedef struct {
   const char *dli_fname; /* file path of loaded library */
-  void *dli_fbase;       /* doesn't make sence on AIX */
+  void *dli_fbase;       /* doesn't make sense on AIX */
   const char *dli_sname; /* symbol name; "" if not known */
   void *dli_saddr;       /* address of *entry* of function; not function descriptor; */
 } Dl_info;

src/java.desktop/aix/native/libawt_xawt/awt/awt_InputMethod.c

@@ -992,7 +992,7 @@ createXIC(JNIEnv * env, X11InputMethodData *pX11IMData, Window w)
         pX11IMData->ic_passive = pX11IMData->ic_active;
     }
 
-    // The code set the IC mode that the preedit state is not initialied
+    // The code set the IC mode that the preedit state is not initialized
     // at XmbResetIC.  This attribute can be set at XCreateIC.  I separately
     // set the attribute to avoid the failure of XCreateIC at some platform
     // which does not support the attribute.

src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c

@@ -79,7 +79,7 @@ char* MIDI_IN_GetErrorStr(INT32 err) {
 INT32 MIDI_IN_GetNumDevices() {
 /* Workaround for 6842956: 32bit app on 64bit linux
  * gets assertion failure trying to open midiIn ports.
- * Untill the issue is fixed in ALSA
+ * Until the issue is fixed in ALSA
  * (https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4807)
  * report no midi in devices in the configuration.
  */

src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c

@@ -106,7 +106,7 @@ static int iterateRawmidiDevices(snd_rawmidi_stream_t direction,
                     snd_ctl_close(handle);
                 }
             }
-            // call calback function for the device
+            // call callback function for the device
             if (iterator != NULL) {
                 doContinue = (*iterator)(ALSA_DEFAULT_DEVICE_ID, rawmidi_info,
                                          defcardinfo, userData);

src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c

@@ -442,7 +442,7 @@ void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
                         control = createVolumeControl(creator, portControl, elem, isPlayback);
                         // We wrap in a compound control to provide the channel name.
                         if (control != NULL) {
-                            /* $$mp 2003-09-14: The following cast shouln't be necessary. Instead, the
+                            /* $$mp 2003-09-14: The following cast shouldn't be necessary. Instead, the
                                declaration of PORT_NewCompoundControlPtr in Ports.h should be changed
                                to take a const char* parameter. */
                             control = (creator->newCompoundControl)(creator, (char*) snd_mixer_selem_channel_name(channel), &control, 1);
@@ -481,7 +481,7 @@ void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
             }
         }
     }
-    /* $$mp 2003-09-14: The following cast shouln't be necessary. Instead, the
+    /* $$mp 2003-09-14: The following cast shouldn't be necessary. Instead, the
        declaration of PORT_NewCompoundControlPtr in Ports.h should be changed
        to take a const char* parameter. */
     portName = (char*) snd_mixer_selem_get_name(elem);

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

@@ -457,7 +457,7 @@ protected void paintIcon(final Graphics g, final AbstractButton b, final Rectang
     }
 
     /**
-     * As of Java 2 platform v 1.4 this method should not be used or overriden.
+     * As of Java 2 platform v 1.4 this method should not be used or overridden.
      * Use the paintText method which takes the AbstractButton argument.
      */
     protected void paintText(final Graphics g, final JComponent c, final Rectangle localTextRect, final String text) {
@@ -549,8 +549,8 @@ protected void uninstallHierListener(final AbstractButton b) {
     }
 
     static class AquaHierarchyButtonListener implements HierarchyListener {
-        // Everytime a hierarchy is change we need to check if the button if moved on or from
-        // a toolbar. If that is the case, we need to re-set the border of the button.
+        // Every time a hierarchy is changed we need to check if the button is moved on or from
+        // the toolbar. If that is the case, we need to re-set the border of the button.
         public void hierarchyChanged(final HierarchyEvent e) {
             if ((e.getChangeFlags() & HierarchyEvent.PARENT_CHANGED) == 0) return;
 

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

@@ -209,7 +209,7 @@ protected synchronized void damage(final Rectangle r) {
     // See <rdar://problem/3833837> 1.4.2_05-141.3: JTextField performance with
     // Aqua L&F. We are getting into a circular condition with the BasicCaret
     // paint code since it doesn't know about the fact that our damage routine
-    // above elminates the border. Sadly we can't easily change either one, so
+    // above eliminates the border. Sadly we can't easily change either one, so
     // we will add a painting flag and not damage during a repaint.
     @Override
     public void paint(final Graphics g) {

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

@@ -348,7 +348,7 @@ public void actionPerformed(final ActionEvent e) {
     }
 
     /**
-     * Hilight _but do not select_ the next item in the list.
+     * Highlight _but do not select_ the next item in the list.
      */
     @SuppressWarnings("serial") // anonymous class
     private Action highlightNextAction = new ComboBoxAction() {
@@ -365,7 +365,7 @@ public void performComboBoxAction(AquaComboBoxUI ui) {
     };
 
     /**
-     * Hilight _but do not select_ the previous item in the list.
+     * Highlight _but do not select_ the previous item in the list.
      */
     @SuppressWarnings("serial") // anonymous class
     private Action highlightPreviousAction = new ComboBoxAction() {

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

@@ -328,7 +328,7 @@ public NineSliceMetrics(final int minWidth, final int minHeight, final int westC
 
     /*
      * A "paintable" which holds nine images, which represent a sliced up initial
-     * image that can be streched from its middles.
+     * image that can be stretched from its middles.
      */
     public static class SlicedImageControl {
         final BufferedImage NW, N, NE;

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

@@ -206,7 +206,7 @@ public void deiconifyFrame(final JInternalFrame f) {
             removeIconFor(f);
             // <rdar://problem/3712485> removed f.show(). show() is now deprecated and
             // it wasn't sending our frame to front nor selecting it. Now, we move it
-            // to front and select it manualy. (vm)
+            // to front and select it manually. (vm)
             f.moveToFront();
             try {
                 f.setSelected(true);

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

@@ -697,7 +697,7 @@ public Object createValue(UIDefaults defaultsTable) {
             "MenuItem.selectedBackgroundPainter",(LazyValue) t -> AquaMenuPainter.getSelectedMenuItemPainter(),
 
             // *** OptionPane
-            // You can additionaly define OptionPane.messageFont which will
+            // You can additionally define OptionPane.messageFont which will
             // dictate the fonts used for the message, and
             // OptionPane.buttonFont, which defines the font for the buttons.
             "OptionPane.font", alertHeaderFont,

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

@@ -108,7 +108,7 @@ protected Container createMessageArea() {
      * This class should be treated as a "protected" inner class.
      * Instantiate it only within subclasses of BasicOptionPaneUI.
      *
-     * BasicOptionPaneUI expects that its buttons are layed out with
+     * BasicOptionPaneUI expects that its buttons are laid out with
      * a subclass of ButtonAreaLayout
      */
     public static class AquaButtonAreaLayout extends ButtonAreaLayout {

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

@@ -866,7 +866,7 @@ public void propertyChange(final PropertyChangeEvent e) {
         }
     }
 
-    // Syncronizes the ToolTip text for the components within the spinner
+    // Synchronizes the ToolTip text for the components within the spinner
     // to be the same value as the spinner ToolTip text.
     void updateToolTipTextForChildren(final JComponent spinnerComponent) {
         final String toolTipText = spinnerComponent.getToolTipText();

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

@@ -111,7 +111,7 @@ public class AquaTabbedPaneCopyFromBasicUI extends TabbedPaneUI implements Swing
     @Deprecated
     protected KeyStroke rightKey;
 
-// Transient variables (recalculated each time TabbedPane is layed out)
+// Transient variables (recalculated each time TabbedPane is laid out)
 
     protected int[] tabRuns = new int[10];
     protected int runCount = 0;
@@ -2243,7 +2243,7 @@ public void layoutContainer(final Container parent) {
 
             // In order to allow programs to use a single component
             // as the display for multiple tabs, we will not change
-            // the visible compnent if the currently selected tab
+            // the visible component if the currently selected tab
             // has a null component.  This is a bit dicey, as we don't
             // explicitly state we support this in the spec, but since
             // programs are now depending on this, we're making it work.
@@ -2742,7 +2742,7 @@ public void layoutContainer(final Container parent) {
 
             // In order to allow programs to use a single component
             // as the display for multiple tabs, we will not change
-            // the visible compnent if the currently selected tab
+            // the visible component if the currently selected tab
             // has a null component.  This is a bit dicey, as we don't
             // explicitly state we support this in the spec, but since
             // programs are now depending on this, we're making it work.

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

@@ -33,7 +33,7 @@
 
 /**
  * This class exists only as a hack to work around a Sun bug which parks the
- * insertion caret at the begining of a text field when it gets clicked on.
+ * insertion caret at the beginning of a text field when it gets clicked on.
  */
 public class AquaTextFieldFormattedUI extends AquaTextFieldUI implements MouseListener {
     public static ComponentUI createUI(final JComponent c) {

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

@@ -54,7 +54,7 @@ protected RootPaneContainer createFloatingWindow(final JToolBar toolbar) {
         return window;
     }
 
-    /* ToolBarBorder and drag-off handle, based loosly on MetalBumps */
+    /* ToolBarBorder and drag-off handle, based loosely on MetalBumps */
     @SuppressWarnings("serial") // Superclass is not serializable across versions
     static class ToolBarBorder extends AbstractBorder implements UIResource, javax.swing.SwingConstants {
         protected void fillHandle(final Graphics g, final int x1, final int y1, final int x2, final int y2, final boolean horizontal) {

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

@@ -177,7 +177,7 @@ public void run() {
     }
 
     /**
-     * Callback from JavaMenuUpdater.m -- called when menu item is hilighted.
+     * Callback from JavaMenuUpdater.m -- called when menu item is highlighted.
      *
      * @param inWhichItem The menu item selected by the user. -1 if mouse moves off the menu.
      * @param itemRectTop

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

@@ -219,7 +219,7 @@ public void put(final int index, final int value) {
             }
         }
 
-        public synchronized void get(int count, char[] indicies, int[] values)
+        public synchronized void get(int count, char[] indices, int[] values)
         {
             // "missed" is the count of 'char' that are not mapped.
             // Surrogates count for 2.
@@ -230,11 +230,11 @@ public synchronized void get(int count, char[] indicies, int[] values)
             int [] unmappedCharIndices = null;
 
             for (int i = 0; i < count; i++){
-                int code = indicies[i];
+                int code = indices[i];
                 if (code >= HI_SURROGATE_START &&
                     code <= HI_SURROGATE_END && i < count - 1)
                 {
-                    char low = indicies[i + 1];
+                    char low = indices[i + 1];
                     if (low >= LO_SURROGATE_START && low <= LO_SURROGATE_END) {
                         code = (code - HI_SURROGATE_START) * 0x400 +
                             low - LO_SURROGATE_START + 0x10000;
@@ -254,13 +254,13 @@ public synchronized void get(int count, char[] indicies, int[] values)
                     if (unmappedChars == null) {
                         // This is likely to be longer than we need,
                         // but is the simplest and cheapest option.
-                        unmappedChars = new char[indicies.length];
-                        unmappedCharIndices = new int[indicies.length];
+                        unmappedChars = new char[indices.length];
+                        unmappedCharIndices = new int[indices.length];
                     }
-                    unmappedChars[missed] = indicies[i];
+                    unmappedChars[missed] = indices[i];
                     unmappedCharIndices[missed] = i;
                     if (code >= 0x10000) { // was a surrogate pair
-                        unmappedChars[++missed] = indicies[++i];
+                        unmappedChars[++missed] = indices[++i];
                     }
                     missed++;
                 }

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

@@ -51,7 +51,7 @@ public CFontConfiguration(SunFontManager fm,
 
     /*
      * On Mac OS X we essentially ignore the font.properties file, and do
-     * it all programatically.  The intention is end users will use things
+     * it all programmatically.  The intention is end users will use things
      * like the Font Book to manage fonts. Plus our fonts automatically do
      * unicode substitution, so a localized font is not required.
      *

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

@@ -362,20 +362,20 @@ void composite(SunGraphics2D sg2d, OSXSurfaceData surfaceData, BufferedImage src
         int w = (int) compositingBounds.getWidth();
         int h = (int) compositingBounds.getHeight();
 
-        boolean succeded = false;
+        boolean succeeded = false;
 
         Composite composite = sg2d.getComposite();
         if (composite instanceof XORComposite) {
             // 1st native XOR try
             // we try to perform XOR using surface pixels directly
             try {
-                succeded = surfaceData.xorSurfacePixels(sg2d, srcPixels, x, y, w, h, ((XORComposite) composite).getXorColor().getRGB());
+                succeeded = surfaceData.xorSurfacePixels(sg2d, srcPixels, x, y, w, h, ((XORComposite) composite).getXorColor().getRGB());
             } catch (Exception e) {
-                succeded = false;
+                succeeded = false;
             }
         }
 
-        if (succeded == false) {
+        if (succeeded == false) {
             // create image with the original pixels of surface
             BufferedImage dstInPixels = getSurfacePixels(sg2d, surfaceData, x, y, w, h);
             BufferedImage dstOutPixels = null;
@@ -385,15 +385,15 @@ void composite(SunGraphics2D sg2d, OSXSurfaceData surfaceData, BufferedImage src
                 // we try to perform XOR on image's pixels (which were copied from surface first)
                 try {
                     OSXSurfaceData osxsd = (OSXSurfaceData) (BufImgSurfaceData.createData(dstInPixels));
-                    succeded = osxsd.xorSurfacePixels(sg2d, srcPixels, 0, 0, w, h, ((XORComposite) composite).getXorColor().getRGB());
+                    succeeded = osxsd.xorSurfacePixels(sg2d, srcPixels, 0, 0, w, h, ((XORComposite) composite).getXorColor().getRGB());
                     dstOutPixels = dstInPixels;
                 } catch (Exception e) {
-                    succeded = false;
+                    succeeded = false;
                 }
             }
 
             // either 2nd native XOR failed OR we have a case of custom compositing
-            if (succeded == false) {
+            if (succeeded == false) {
                 // create an image into which we'll composite result: we MUST use a different destination (compositing
                 // is NOT "in place" operation)
                 dstOutPixels = surfaceData.getCompositingDstOutImage(w, h);

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

@@ -57,7 +57,7 @@ public class OSXOffScreenSurfaceData extends OSXSurfaceData // implements Raster
     // these are extra image types we can handle
     private static final int TYPE_3BYTE_RGB = BufferedImage.TYPE_BYTE_INDEXED + 1;
 
-    // these are for callbacks when pixes have been touched
+    // these are for callbacks when pixels have been touched
     protected ByteBuffer fImageInfo;
     IntBuffer fImageInfoInt;
     private static final int kNeedToSyncFromJavaPixelsIndex = 0;
@@ -505,7 +505,7 @@ public boolean copyArea(SunGraphics2D sg2d, int x, int y, int w, int h, int dx,
         // src coordinates are in the coordinate space of the image)
         // sg2d.drawImage expects the destination rect to be in the coord space
         // of the graphics2d. <rdar://3746194> (vm)
-        // we need to substract the transX and transY to move it
+        // we need to subtract the transX and transY to move it
         // to the coordinate space of the graphics2d.
         int dstX = x + dx - sg2d.transX;
         int dstY = y + dy - sg2d.transY;

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

@@ -837,7 +837,7 @@ void setupGraphicsState(SunGraphics2D sg2d, int primitiveType, int x, int y, int
         setupGraphicsState(sg2d, primitiveType, sg2d.font, x, y, w, h);
     }
 
-    // the method below is overriden by CPeerSurface to check the last peer used to draw
+    // the method below is overridden by CPeerSurface to check the last peer used to draw
     // if the peer changed we finish lazy drawing
     void setupGraphicsState(SunGraphics2D sg2d, int primitiveType, Font font, int x, int y, int w, int h) {
         this.fChangeFlag = 0;

src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java

@@ -417,7 +417,7 @@ public Point getLocationOnScreen() {
     /**
      * Overridden from LWContainerPeer to return the correct insets.
      * Insets are queried from the delegate and are kept up to date by
-     * requiering when needed (i.e. when the window geometry is changed).
+     * requerying when needed (i.e. when the window geometry is changed).
      */
     @Override
     public Insets getInsets() {
@@ -1367,7 +1367,7 @@ private boolean isOneOfOwnersOf(LWWindowPeer peer) {
      */
     protected void changeFocusedWindow(boolean becomesFocused, Window opposite) {
         if (focusLog.isLoggable(PlatformLogger.Level.FINE)) {
-            focusLog.fine((becomesFocused?"gaining":"loosing") + " focus window: " + this);
+            focusLog.fine((becomesFocused?"gaining":"losing") + " focus window: " + this);
         }
         if (skipNextFocusChange) {
             focusLog.fine("skipping focus change");
@@ -1405,7 +1405,7 @@ protected void changeFocusedWindow(boolean becomesFocused, Window opposite) {
         KeyboardFocusManagerPeer kfmPeer = LWKeyboardFocusManagerPeer.getInstance();
 
         if (!becomesFocused && kfmPeer.getCurrentFocusedWindow() != getTarget()) {
-            // late window focus lost event - ingoring
+            // late window focus lost event - ignoring
             return;
         }