# HG changeset patch
# User serb
# Date 1493036155 -10800
# Node ID 4e9dedef0231332b67ab9471c181343352c6ea45
# Parent  3c425404d90adc17c1a2a3d7c85541913ba4ca08
8178971: Uncommon formatting and typos in java.desktop module
Reviewed-by: prr, ssadetsky

diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java
--- a/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java	Mon Apr 24 15:15:55 2017 +0300
@@ -29,7 +29,8 @@
 
 /**
  * This class provides default implementations of several {@code Image} methods
- * for classes that want to implement the {@MultiResolutionImage} interface.
+ * for classes that want to implement the {@code MultiResolutionImage}
+ * interface.
  *
  * For example,
  * <pre> {@code
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/java/awt/package-info.java
--- a/jdk/src/java.desktop/share/classes/java/awt/package-info.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/java/awt/package-info.java	Mon Apr 24 15:15:55 2017 +0300
@@ -35,10 +35,10 @@
  * components can fire. See AWTEvent for a description of the AWT event model.
  * <p>
  * A container is a component that can contain components and other containers.
- * A con tainer can also have a layout manager that controls the visual
- * placement of components in the container. The AWT package contains several
- * layout manager classes and an interface for building your own layout manager.
- * See Container and LayoutManager for more information.
+ * A container can also have a layout manager that controls the visual placement
+ * of components in the container. The AWT package contains several layout
+ * manager classes and an interface for building your own layout manager. See
+ * Container and LayoutManager for more information.
  * <p>
  * Each {@code Component} object is limited in its maximum size and its location
  * because the values are stored as an integer. Also, a platform may further
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/MetaMessage.java	Mon Apr 24 15:15:55 2017 +0300
@@ -59,7 +59,7 @@
      *
      * @see MidiMessage#getStatus
      */
-    public static final int META                                                = 0xFF; // 255
+    public static final int META = 0xFF; // 255
 
     /**
      * The length of the actual message in the data array. This is used to
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequence.java	Mon Apr 24 15:15:55 2017 +0300
@@ -58,7 +58,7 @@
      *
      * @see #Sequence(float, int)
      */
-    public static final float PPQ                                                       = 0.0f;
+    public static final float PPQ = 0.0f;
 
     /**
      * The SMPTE-based timing type with 24 frames per second (resolution is
@@ -66,7 +66,7 @@
      *
      * @see #Sequence(float, int)
      */
-    public static final float SMPTE_24                                          = 24.0f;
+    public static final float SMPTE_24 = 24.0f;
 
     /**
      * The SMPTE-based timing type with 25 frames per second (resolution is
@@ -74,7 +74,7 @@
      *
      * @see #Sequence(float, int)
      */
-    public static final float SMPTE_25                                          = 25.0f;
+    public static final float SMPTE_25 = 25.0f;
 
     /**
      * The SMPTE-based timing type with 29.97 frames per second (resolution is
@@ -82,7 +82,7 @@
      *
      * @see #Sequence(float, int)
      */
-    public static final float SMPTE_30DROP                                      = 29.97f;
+    public static final float SMPTE_30DROP = 29.97f;
 
     /**
      * The SMPTE-based timing type with 30 frames per second (resolution is
@@ -90,7 +90,7 @@
      *
      * @see #Sequence(float, int)
      */
-    public static final float SMPTE_30                                          = 30.0f;
+    public static final float SMPTE_30 = 30.0f;
 
     // Variables
 
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java	Mon Apr 24 15:15:55 2017 +0300
@@ -733,7 +733,7 @@
          * information from its internal clock. This is not a legal slave sync
          * mode.
          */
-        public static final SyncMode INTERNAL_CLOCK             = new SyncMode("Internal Clock");
+        public static final SyncMode INTERNAL_CLOCK = new SyncMode("Internal Clock");
 
         /**
          * A master or slave synchronization mode that specifies the use of MIDI
@@ -745,7 +745,7 @@
          * receiver. MIDI clock messages are sent at a rate of 24 per quarter
          * note.
          */
-        public static final SyncMode MIDI_SYNC                  = new SyncMode("MIDI Sync");
+        public static final SyncMode MIDI_SYNC = new SyncMode("MIDI Sync");
 
         /**
          * A master or slave synchronization mode that specifies the use of MIDI
@@ -756,13 +756,13 @@
          * sequencer sends MIDI Time Code messages to its receiver. (See the
          * MIDI 1.0 Detailed Specification for a description of MIDI Time Code.)
          */
-        public static final SyncMode MIDI_TIME_CODE             = new SyncMode("MIDI Time Code");
+        public static final SyncMode MIDI_TIME_CODE = new SyncMode("MIDI Time Code");
 
         /**
          * A slave synchronization mode indicating that no timing information
          * should be sent to the receiver. This is not a legal master sync mode.
          */
-        public static final SyncMode NO_SYNC                            = new SyncMode("No Timing");
+        public static final SyncMode NO_SYNC = new SyncMode("No Timing");
 
     }
 }
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/ShortMessage.java	Mon Apr 24 15:15:55 2017 +0300
@@ -61,35 +61,35 @@
      *
      * @see MidiMessage#getStatus
      */
-    public static final int MIDI_TIME_CODE                              = 0xF1; // 241
+    public static final int MIDI_TIME_CODE = 0xF1; // 241
 
     /**
      * Status byte for Song Position Pointer message (0xF2, or 242).
      *
      * @see MidiMessage#getStatus
      */
-    public static final int SONG_POSITION_POINTER               = 0xF2; // 242
+    public static final int SONG_POSITION_POINTER = 0xF2; // 242
 
     /**
      * Status byte for MIDI Song Select message (0xF3, or 243).
      *
      * @see MidiMessage#getStatus
      */
-    public static final int SONG_SELECT                                 = 0xF3; // 243
+    public static final int SONG_SELECT = 0xF3; // 243
 
     /**
      * Status byte for Tune Request message (0xF6, or 246).
      *
      * @see MidiMessage#getStatus
      */
-    public static final int TUNE_REQUEST                                = 0xF6; // 246
+    public static final int TUNE_REQUEST = 0xF6; // 246
 
     /**
      * Status byte for End of System Exclusive message (0xF7, or 247).
      *
      * @see MidiMessage#getStatus
      */
-    public static final int END_OF_EXCLUSIVE                    = 0xF7; // 247
+    public static final int END_OF_EXCLUSIVE = 0xF7; // 247
 
     // System real-time messages
 
@@ -98,80 +98,80 @@
      *
      * @see MidiMessage#getStatus
      */
-    public static final int TIMING_CLOCK                                = 0xF8; // 248
+    public static final int TIMING_CLOCK = 0xF8; // 248
 
     /**
      * Status byte for Start message (0xFA, or 250).
      *
      * @see MidiMessage#getStatus
      */
-    public static final int START                                               = 0xFA; // 250
+    public static final int START = 0xFA; // 250
 
     /**
      * Status byte for Continue message (0xFB, or 251).
      *
      * @see MidiMessage#getStatus
      */
-    public static final int CONTINUE                                    = 0xFB; // 251
+    public static final int CONTINUE = 0xFB; // 251
 
     /**
      * Status byte for Stop message (0xFC, or 252).
      *
      * @see MidiMessage#getStatus
      */
-    public static final int STOP                                                = 0xFC; //252
+    public static final int STOP = 0xFC; //252
 
     /**
      * Status byte for Active Sensing message (0xFE, or 254).
      *
      * @see MidiMessage#getStatus
      */
-    public static final int ACTIVE_SENSING                              = 0xFE; // 254
+    public static final int ACTIVE_SENSING = 0xFE; // 254
 
     /**
      * Status byte for System Reset message (0xFF, or 255).
      *
      * @see MidiMessage#getStatus
      */
-    public static final int SYSTEM_RESET                                = 0xFF; // 255
+    public static final int SYSTEM_RESET = 0xFF; // 255
 
     // Channel voice message upper nibble defines
 
     /**
      * Command value for Note Off message (0x80, or 128).
      */
-    public static final int NOTE_OFF                                    = 0x80;  // 128
+    public static final int NOTE_OFF = 0x80;  // 128
 
     /**
      * Command value for Note On message (0x90, or 144).
      */
-    public static final int NOTE_ON                                             = 0x90;  // 144
+    public static final int NOTE_ON = 0x90;  // 144
 
     /**
      * Command value for Polyphonic Key Pressure (Aftertouch) message (0xA0, or
      * 160).
      */
-    public static final int POLY_PRESSURE                               = 0xA0;  // 160
+    public static final int POLY_PRESSURE = 0xA0;  // 160
 
     /**
      * Command value for Control Change message (0xB0, or 176).
      */
-    public static final int CONTROL_CHANGE                              = 0xB0;  // 176
+    public static final int CONTROL_CHANGE = 0xB0;  // 176
 
     /**
      * Command value for Program Change message (0xC0, or 192).
      */
-    public static final int PROGRAM_CHANGE                              = 0xC0;  // 192
+    public static final int PROGRAM_CHANGE = 0xC0;  // 192
 
     /**
      * Command value for Channel Pressure (Aftertouch) message (0xD0, or 208).
      */
-    public static final int CHANNEL_PRESSURE                    = 0xD0;  // 208
+    public static final int CHANNEL_PRESSURE = 0xD0;  // 208
 
     /**
      * Command value for Pitch Bend message (0xE0, or 224).
      */
-    public static final int PITCH_BEND                                  = 0xE0;  // 224
+    public static final int PITCH_BEND = 0xE0;  // 224
 
     /**
      * Constructs a new {@code ShortMessage}. The contents of the new message
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java
--- a/jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/sound/midi/SysexMessage.java	Mon Apr 24 15:15:55 2017 +0300
@@ -81,7 +81,7 @@
      *
      * @see MidiMessage#getStatus
      */
-    public static final int SYSTEM_EXCLUSIVE                    = 0xF0; // 240
+    public static final int SYSTEM_EXCLUSIVE = 0xF0; // 240
 
     /**
      * Status byte for Special System Exclusive message (0xF7, or 247), which is
@@ -90,7 +90,7 @@
      *
      * @see MidiMessage#getStatus
      */
-    public static final int SPECIAL_SYSTEM_EXCLUSIVE    = 0xF7; // 247
+    public static final int SPECIAL_SYSTEM_EXCLUSIVE = 0xF7; // 247
 
     /**
      * The data bytes for this system exclusive message. These are initialized
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/javax/sound/sampled/BooleanControl.java
--- a/jdk/src/java.desktop/share/classes/javax/sound/sampled/BooleanControl.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/sound/sampled/BooleanControl.java	Mon Apr 24 15:15:55 2017 +0300
@@ -141,14 +141,14 @@
          * Represents a control for the mute status of a line. Note that mute
          * status does not affect gain.
          */
-        public static final Type MUTE                           = new Type("Mute");
+        public static final Type MUTE = new Type("Mute");
 
         /**
          * Represents a control for whether reverberation is applied to a line.
          * Note that the status of this control not affect the reverberation
          * settings for a line, but does affect whether these settings are used.
          */
-        public static final Type APPLY_REVERB           = new Type("Apply Reverb");
+        public static final Type APPLY_REVERB = new Type("Apply Reverb");
 
         /**
          * Constructs a new boolean control type.
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/javax/sound/sampled/FloatControl.java
--- a/jdk/src/java.desktop/share/classes/javax/sound/sampled/FloatControl.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/sound/sampled/FloatControl.java	Mon Apr 24 15:15:55 2017 +0300
@@ -386,7 +386,7 @@
          * @see #REVERB_RETURN
          * @see #VOLUME
          */
-        public static final Type MASTER_GAIN            = new Type("Master Gain");
+        public static final Type MASTER_GAIN = new Type("Master Gain");
 
         /**
          * Represents a control for the auxiliary send gain on a line.
@@ -394,7 +394,7 @@
          * @see #MASTER_GAIN
          * @see #AUX_RETURN
          */
-        public static final Type AUX_SEND                       = new Type("AUX Send");
+        public static final Type AUX_SEND = new Type("AUX Send");
 
         /**
          * Represents a control for the auxiliary return gain on a line.
@@ -402,7 +402,7 @@
          * @see #MASTER_GAIN
          * @see #AUX_SEND
          */
-        public static final Type AUX_RETURN                     = new Type("AUX Return");
+        public static final Type AUX_RETURN = new Type("AUX Return");
 
         /**
          * Represents a control for the pre-reverb gain on a line. This control
@@ -413,7 +413,7 @@
          * @see #REVERB_RETURN
          * @see EnumControl.Type#REVERB
          */
-        public static final Type REVERB_SEND            = new Type("Reverb Send");
+        public static final Type REVERB_SEND = new Type("Reverb Send");
 
         /**
          * Represents a control for the post-reverb gain on a line. This control
@@ -423,7 +423,7 @@
          * @see #MASTER_GAIN
          * @see #REVERB_SEND
          */
-        public static final Type REVERB_RETURN          = new Type("Reverb Return");
+        public static final Type REVERB_RETURN = new Type("Reverb Return");
 
         /**
          * Represents a control for the volume on a line.
@@ -431,7 +431,7 @@
         /*
          * $$kk: 08.30.99: ISSUE: what units?  linear or dB?
          */
-        public static final Type VOLUME                         = new Type("Volume");
+        public static final Type VOLUME = new Type("Volume");
 
         /**
          * Represents a control for the relative pan (left-right positioning) of
@@ -442,7 +442,7 @@
          *
          * @see #BALANCE
          */
-        public static final Type PAN                            = new Type("Pan");
+        public static final Type PAN = new Type("Pan");
 
         /**
          * Represents a control for the relative balance of a stereo signal
@@ -452,7 +452,7 @@
          *
          * @see #PAN
          */
-        public static final Type BALANCE                        = new Type("Balance");
+        public static final Type BALANCE = new Type("Balance");
 
         /**
          * Represents a control that changes the sample rate of audio playback.
@@ -470,7 +470,7 @@
          * doubling the sample rate has the effect of doubling the frequencies
          * in the sound's spectrum, which raises the pitch by an octave.
          */
-        public static final Type SAMPLE_RATE            = new Type("Sample Rate");
+        public static final Type SAMPLE_RATE = new Type("Sample Rate");
 
         /**
          * Constructs a new float control type.
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/javax/sound/sampled/LineEvent.java
--- a/jdk/src/java.desktop/share/classes/javax/sound/sampled/LineEvent.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/sound/sampled/LineEvent.java	Mon Apr 24 15:15:55 2017 +0300
@@ -220,7 +220,7 @@
          * @see #CLOSE
          * @see Line#open
          */
-        public static final Type OPEN   = new Type("Open");
+        public static final Type OPEN = new Type("Open");
 
         /**
          * A type of event that is sent when a line closes, freeing the system
@@ -229,7 +229,7 @@
          * @see #OPEN
          * @see Line#close
          */
-        public static final Type CLOSE  = new Type("Close");
+        public static final Type CLOSE = new Type("Close");
 
         /**
          * A type of event that is sent when a line begins to engage in active
@@ -239,7 +239,7 @@
          * @see #STOP
          * @see DataLine#start
          */
-        public static final Type START  = new Type("Start");
+        public static final Type START = new Type("Start");
 
         /**
          * A type of event that is sent when a line ceases active input or
@@ -249,7 +249,7 @@
          * @see #START
          * @see DataLine#stop
          */
-        public static final Type STOP   = new Type("Stop");
+        public static final Type STOP = new Type("Stop");
 
         /**
          * A type of event that is sent when a line ceases to engage in active
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/javax/swing/JComponent.java
--- a/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JComponent.java	Mon Apr 24 15:15:55 2017 +0300
@@ -3735,7 +3735,7 @@
          * @since 1.3
          * @deprecated This class is no longer used or needed.
          * {@code java.awt.Component.AccessibleAWTComponent} provides
-         * the same functionality and it is handled in {@Component}.
+         * the same functionality and it is handled in {@code Component}.
          */
         @Deprecated
         protected class AccessibleFocusHandler implements FocusListener {
diff -r 3c425404d90a -r 4e9dedef0231 jdk/src/java.desktop/share/classes/module-info.java
--- a/jdk/src/java.desktop/share/classes/module-info.java	Thu Apr 20 11:06:28 2017 -0700
+++ b/jdk/src/java.desktop/share/classes/module-info.java	Mon Apr 24 15:15:55 2017 +0300
@@ -114,10 +114,17 @@
     uses javax.sound.sampled.spi.FormatConversionProvider;
     uses javax.sound.sampled.spi.MixerProvider;
 
-    provides sun.datatransfer.DesktopDatatransferService with sun.awt.datatransfer.DesktopDatatransferServiceImpl;
-    provides java.net.ContentHandlerFactory with sun.awt.www.content.MultimediaContentHandlers;
-    provides javax.print.PrintServiceLookup with sun.print.PrintServiceLookupProvider;
-    provides javax.print.StreamPrintServiceFactory with sun.print.PSStreamPrinterFactory;
+    provides sun.datatransfer.DesktopDatatransferService with
+        sun.awt.datatransfer.DesktopDatatransferServiceImpl;
+
+    provides java.net.ContentHandlerFactory with
+        sun.awt.www.content.MultimediaContentHandlers;
+
+    provides javax.print.PrintServiceLookup with
+        sun.print.PrintServiceLookupProvider;
+
+    provides javax.print.StreamPrintServiceFactory with
+        sun.print.PSStreamPrinterFactory;
 
     provides javax.sound.midi.spi.MidiDeviceProvider with
         com.sun.media.sound.MidiInDeviceProvider,
@@ -125,14 +132,17 @@
         com.sun.media.sound.RealTimeSequencerProvider,
         com.sun.media.sound.SoftProvider;
 
-    provides javax.sound.midi.spi.MidiFileReader with com.sun.media.sound.StandardMidiFileReader;
-    provides javax.sound.midi.spi.MidiFileWriter with com.sun.media.sound.StandardMidiFileWriter;
+    provides javax.sound.midi.spi.MidiFileReader with
+        com.sun.media.sound.StandardMidiFileReader;
+
+    provides javax.sound.midi.spi.MidiFileWriter with
+        com.sun.media.sound.StandardMidiFileWriter;
 
     provides javax.sound.midi.spi.SoundbankReader with
-         com.sun.media.sound.AudioFileSoundbankReader,
-         com.sun.media.sound.DLSSoundbankReader,
-         com.sun.media.sound.JARSoundbankReader,
-         com.sun.media.sound.SF2SoundbankReader;
+        com.sun.media.sound.AudioFileSoundbankReader,
+        com.sun.media.sound.DLSSoundbankReader,
+        com.sun.media.sound.JARSoundbankReader,
+        com.sun.media.sound.SF2SoundbankReader;
 
     provides javax.sound.sampled.spi.AudioFileReader with
         com.sun.media.sound.AiffFileReader,
@@ -158,4 +168,3 @@
         com.sun.media.sound.DirectAudioDeviceProvider,
         com.sun.media.sound.PortMixerProvider;
 }
-