--- old/src/java.desktop/share/classes/java/applet/AppletContext.java 2017-09-03 00:46:34.000000000 -0700
+++ new/src/java.desktop/share/classes/java/applet/AppletContext.java 2017-09-03 00:46:33.000000000 -0700
@@ -117,24 +117,30 @@
*
--- old/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java 2017-09-03 00:46:35.000000000 -0700
+++ new/src/java.desktop/share/classes/java/awt/AWTKeyStroke.java 2017-09-03 00:46:34.000000000 -0700
@@ -94,25 +94,23 @@
*
- *
- * accessClipboard |
- * Posting and retrieval of information to and from the AWT clipboard |
- * This would allow malfeasant code to share
- * potentially sensitive or confidential information. |
- *
- *
- *
- * accessEventQueue |
- * Access to the AWT event queue |
- * After retrieving the AWT event queue,
- * malicious code may peek at and even remove existing events
- * from its event queue, as well as post bogus events which may purposefully
- * cause the application or applet to misbehave in an insecure manner. |
- *
- *
- *
- * accessSystemTray |
- * Access to the AWT SystemTray instance |
- * This would allow malicious code to add tray icons to the system tray.
- * First, such an icon may look like the icon of some known application
- * (such as a firewall or anti-virus) and order a user to do something unsafe
- * (with help of balloon messages). Second, the system tray may be glutted with
- * tray icons so that no one could add a tray icon anymore. |
- *
- *
- *
- * createRobot |
- * Create java.awt.Robot objects |
- * The java.awt.Robot object allows code to generate native-level
- * mouse and keyboard events as well as read the screen. It could allow
- * malicious code to control the system, run other programs, read the
- * display, and deny mouse and keyboard access to the user. |
- *
- *
- *
- * fullScreenExclusive |
- * Enter full-screen exclusive mode |
- * Entering full-screen exclusive mode allows direct access to
- * low-level graphics card memory. This could be used to spoof the
- * system, since the program is in direct control of rendering. Depending on
- * the implementation, the security warning may not be shown for the windows
- * used to enter the full-screen exclusive mode (assuming that the {@code
- * fullScreenExclusive} permission has been granted to this application). Note
- * that this behavior does not mean that the {@code
- * showWindowWithoutWarningBanner} permission will be automatically granted to
- * the application which has the {@code fullScreenExclusive} permission:
- * non-full-screen windows will continue to be shown with the security
- * warning. |
- *
- *
- *
- * listenToAllAWTEvents |
- * Listen to all AWT events, system-wide |
- * After adding an AWT event listener,
- * malicious code may scan all AWT events dispatched in the system,
- * allowing it to read all user input (such as passwords). Each
- * AWT event listener is called from within the context of that
- * event queue's EventDispatchThread, so if the accessEventQueue
- * permission is also enabled, malicious code could modify the
- * contents of AWT event queues system-wide, causing the application
- * or applet to misbehave in an insecure manner. |
- *
- *
- *
- * readDisplayPixels |
- * Readback of pixels from the display screen |
- * Interfaces such as the java.awt.Composite interface or the
- * java.awt.Robot class allow arbitrary code to examine pixels on the
- * display enable malicious code to snoop on the activities of the user. |
- *
- *
- *
- * replaceKeyboardFocusManager |
- * Sets the {@code KeyboardFocusManager} for
- * a particular thread.
- * | When {@code SecurityManager} is installed, the invoking
- * thread must be granted this permission in order to replace
- * the current {@code KeyboardFocusManager}. If permission
- * is not granted, a {@code SecurityException} will be thrown.
- * |
- *
- *
- * setAppletStub |
- * Setting the stub which implements Applet container services |
- * Malicious code could set an applet's stub and result in unexpected
- * behavior or denial of service to an applet. |
- *
- *
- *
- * setWindowAlwaysOnTop |
- * Setting always-on-top property of the window: {@link Window#setAlwaysOnTop} |
- * The malicious window might make itself look and behave like a real full desktop, so that
- * information entered by the unsuspecting user is captured and subsequently misused |
- *
- *
- *
- * showWindowWithoutWarningBanner |
- * Display of a window without also displaying a banner warning
- * that the window was created by an applet |
- * Without this warning,
- * an applet may pop up windows without the user knowing that they
- * belong to an applet. Since users may make security-sensitive
- * decisions based on whether or not the window belongs to an applet
- * (entering a username and password into a dialog box, for example),
- * disabling this warning banner may allow applets to trick the user
- * into entering such information. |
- *
- *
- *
- * toolkitModality |
- * Creating {@link Dialog.ModalityType#TOOLKIT_MODAL TOOLKIT_MODAL} dialogs
- * and setting the {@link Dialog.ModalExclusionType#TOOLKIT_EXCLUDE
- * TOOLKIT_EXCLUDE} window property. |
- * When a toolkit-modal dialog is shown from an applet, it blocks all other
- * applets in the browser. When launching applications from Java Web Start,
- * its windows (such as the security dialog) may also be blocked by toolkit-modal
- * dialogs, shown from these applications. |
- *
- *
- *
- * watchMousePointer |
- * Getting the information about the mouse pointer position at any
- * time |
- * Constantly watching the mouse pointer,
- * an applet can make guesses about what the user is doing, i.e. moving
- * the mouse to the lower left corner of the screen most likely means that
- * the user is about to launch an application. If a virtual keypad is used
- * so that keyboard is emulated using the mouse, an applet may guess what
- * is being typed. |
- *
+ *
+ * accessClipboard
+ * | Posting and retrieval of information to and from the AWT clipboard
+ * | This would allow malfeasant code to share potentially sensitive or
+ * confidential information.
+ * |
+ * accessEventQueue
+ * | Access to the AWT event queue
+ * | After retrieving the AWT event queue, malicious code may peek at and
+ * even remove existing events from its event queue, as well as post bogus
+ * events which may purposefully cause the application or applet to
+ * misbehave in an insecure manner.
+ * |
+ * accessSystemTray
+ * | Access to the AWT SystemTray instance
+ * | This would allow malicious code to add tray icons to the system tray.
+ * First, such an icon may look like the icon of some known application
+ * (such as a firewall or anti-virus) and order a user to do something
+ * unsafe (with help of balloon messages). Second, the system tray may be
+ * glutted with tray icons so that no one could add a tray icon anymore.
+ * |
+ * createRobot
+ * | Create java.awt.Robot objects
+ * | The java.awt.Robot object allows code to generate native-level mouse
+ * and keyboard events as well as read the screen. It could allow malicious
+ * code to control the system, run other programs, read the display, and
+ * deny mouse and keyboard access to the user.
+ * |
+ * fullScreenExclusive
+ * | Enter full-screen exclusive mode
+ * | Entering full-screen exclusive mode allows direct access to low-level
+ * graphics card memory. This could be used to spoof the system, since the
+ * program is in direct control of rendering. Depending on the
+ * implementation, the security warning may not be shown for the windows
+ * used to enter the full-screen exclusive mode (assuming that the
+ * {@code fullScreenExclusive} permission has been granted to this
+ * application). Note that this behavior does not mean that the
+ * {@code showWindowWithoutWarningBanner} permission will be automatically
+ * granted to the application which has the {@code fullScreenExclusive}
+ * permission: non-full-screen windows will continue to be shown with the
+ * security warning.
+ * |
+ * listenToAllAWTEvents
+ * | Listen to all AWT events, system-wide
+ * | After adding an AWT event listener, malicious code may scan all AWT
+ * events dispatched in the system, allowing it to read all user input (such
+ * as passwords). Each AWT event listener is called from within the context
+ * of that event queue's EventDispatchThread, so if the accessEventQueue
+ * permission is also enabled, malicious code could modify the contents of
+ * AWT event queues system-wide, causing the application or applet to
+ * misbehave in an insecure manner.
+ * |
+ * readDisplayPixels
+ * | Readback of pixels from the display screen
+ * | Interfaces such as the java.awt.Composite interface or the
+ * java.awt.Robot class allow arbitrary code to examine pixels on the
+ * display enable malicious code to snoop on the activities of the user.
+ * |
+ * replaceKeyboardFocusManager
+ * | Sets the {@code KeyboardFocusManager} for a particular thread.
+ * | When {@code SecurityManager} is installed, the invoking thread must
+ * be granted this permission in order to replace the current
+ * {@code KeyboardFocusManager}. If permission is not granted, a
+ * {@code SecurityException} will be thrown.
+ * |
+ * setAppletStub
+ * | Setting the stub which implements Applet container services
+ * | Malicious code could set an applet's stub and result in unexpected
+ * behavior or denial of service to an applet.
+ * |
+ * setWindowAlwaysOnTop
+ * | Setting always-on-top property of the window:
+ * {@link Window#setAlwaysOnTop}
+ * | The malicious window might make itself look and behave like a real
+ * full desktop, so that information entered by the unsuspecting user is
+ * captured and subsequently misused
+ * |
+ * showWindowWithoutWarningBanner
+ * | Display of a window without also displaying a banner warning that the
+ * window was created by an applet
+ * | Without this warning, an applet may pop up windows without the user
+ * knowing that they belong to an applet. Since users may make
+ * security-sensitive decisions based on whether or not the window belongs
+ * to an applet (entering a username and password into a dialog box, for
+ * example), disabling this warning banner may allow applets to trick the
+ * user into entering such information.
+ * |
+ * toolkitModality
+ * | Creating {@link Dialog.ModalityType#TOOLKIT_MODAL TOOLKIT_MODAL}
+ * dialogs and setting the
+ * {@link Dialog.ModalExclusionType#TOOLKIT_EXCLUDE TOOLKIT_EXCLUDE} window
+ * property.
+ * | When a toolkit-modal dialog is shown from an applet, it blocks all
+ * other applets in the browser. When launching applications from Java Web
+ * Start, its windows (such as the security dialog) may also be blocked by
+ * toolkit-modal dialogs, shown from these applications.
+ * |
+ * watchMousePointer
+ * | Getting the information about the mouse pointer position at any time
+ * | Constantly watching the mouse pointer, an applet can make guesses
+ * about what the user is doing, i.e. moving the mouse to the lower left
+ * corner of the screen most likely means that the user is about to launch
+ * an application. If a virtual keypad is used so that keyboard is emulated
+ * using the mouse, an applet may guess what is being typed.
* |
*
*
@@ -195,11 +167,9 @@
* @see java.security.PermissionCollection
* @see java.lang.SecurityManager
*
- *
* @author Marianne Mueller
* @author Roland Schemers
*/
-
public final class AWTPermission extends BasicPermission {
/** use serialVersionUID from the Java 2 platform for interoperability */
--- old/src/java.desktop/share/classes/java/awt/AlphaComposite.java 2017-09-03 00:46:37.000000000 -0700
+++ new/src/java.desktop/share/classes/java/awt/AlphaComposite.java 2017-09-03 00:46:36.000000000 -0700
@@ -72,22 +72,40 @@
* The following factors are used in the description of the blending
* equation in the Porter and Duff paper:
*
- *
- *
+ *
* Factors
- * Factor | Definition
- * |
---|
As | the alpha component of the source pixel
- * |
Cs | a color component of the source pixel in premultiplied form
- * |
Ad | the alpha component of the destination pixel
- * |
Cd | a color component of the destination pixel in premultiplied form
- * |
Fs | the fraction of the source pixel that contributes to the output
- * |
Fd | the fraction of the destination pixel that contributes
- * to the output
- * |
Ar | the alpha component of the result
- * |
Cr | a color component of the result in premultiplied form
+ *
+ *
+ * Factor
+ * | Definition
+ * |
+ * |
+ *
+ * As
+ * | the alpha component of the source pixel
+ * |
+ * Cs
+ * | a color component of the source pixel in premultiplied form
+ * |
+ * Ad
+ * | the alpha component of the destination pixel
+ * |
+ * Cd
+ * | a color component of the destination pixel in premultiplied form
+ * |
+ * Fs
+ * | the fraction of the source pixel that contributes to the output
+ * |
+ * Fd
+ * | the fraction of the destination pixel that contributes to the output
+ * |
+ * Ar
+ * | the alpha component of the result
+ * |
+ * Cr
+ * | a color component of the result in premultiplied form
+ * |
*
- *
- *
*
* Using these factors, Porter and Duff define 12 ways of choosing
* the blending factors Fs and Fd to
@@ -113,19 +131,37 @@
* The following factors will be used to discuss our extensions to
* the blending equation in the Porter and Duff paper:
*
- *
- *
+ *
* Factors
- * Factor | Definition
- * |
---|
Csr | one of the raw color components of the source pixel
- * |
Cdr | one of the raw color components of the destination pixel
- * |
Aac | the "extra" alpha component from the AlphaComposite instance
- * |
Asr | the raw alpha component of the source pixel
- * |
Adr | the raw alpha component of the destination pixel
- * |
Adf | the final alpha component stored in the destination
- * |
Cdf | the final raw color component stored in the destination
+ *
+ *
+ * Factor
+ * | Definition
+ * |
+ * |
+ *
+ * Csr
+ * | one of the raw color components of the source pixel
+ * |
+ * Cdr
+ * | one of the raw color components of the destination pixel
+ * |
+ * Aac
+ * | the "extra" alpha component from the AlphaComposite instance
+ * |
+ * Asr
+ * | the raw alpha component of the source pixel
+ * |
+ * Adr
+ * | the raw alpha component of the destination pixel
+ * |
+ * Adf
+ * | the final alpha component stored in the destination
+ * |
+ * Cdf
+ * | the final raw color component stored in the destination
+ * |
*
- *
*
* Preparing Inputs
*
--- old/src/java.desktop/share/classes/java/awt/Component.java 2017-09-03 00:46:38.000000000 -0700
+++ new/src/java.desktop/share/classes/java/awt/Component.java 2017-09-03 00:46:37.000000000 -0700
@@ -7241,28 +7241,24 @@
* Recommended default values for a Component's focus traversal
* keys
*
- *
- * Identifier |
- * Meaning |
- * Default |
- *
+ *
+ * Identifier
+ * | Meaning
+ * | Default
* |
*
- *
- * KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS |
- * Normal forward keyboard traversal |
- * TAB on KEY_PRESSED, CTRL-TAB on KEY_PRESSED |
- *
- *
- * KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS |
- * Normal reverse keyboard traversal |
- * SHIFT-TAB on KEY_PRESSED, CTRL-SHIFT-TAB on KEY_PRESSED |
- *
- *
- * KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS |
- * Go up one focus traversal cycle |
- * none |
- *
+ *
+ * KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS
+ * | Normal forward keyboard traversal
+ * | TAB on KEY_PRESSED, CTRL-TAB on KEY_PRESSED
+ * |
+ * KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS
+ * | Normal reverse keyboard traversal
+ * | SHIFT-TAB on KEY_PRESSED, CTRL-SHIFT-TAB on KEY_PRESSED
+ * |
+ * KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS
+ * | Go up one focus traversal cycle
+ * | none
* |
*
*
--- old/src/java.desktop/share/classes/java/awt/Container.java 2017-09-03 00:46:39.000000000 -0700
+++ new/src/java.desktop/share/classes/java/awt/Container.java 2017-09-03 00:46:39.000000000 -0700
@@ -3068,33 +3068,28 @@
* Recommended default values for a Container's focus traversal
* keys
*
- *
- * Identifier |
- * Meaning |
- * Default |
- *
+ *
+ * Identifier
+ * | Meaning
+ * | Default
* |
*
- *
- * KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS |
- * Normal forward keyboard traversal |
- * TAB on KEY_PRESSED, CTRL-TAB on KEY_PRESSED |
- *
- *
- * KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS |
- * Normal reverse keyboard traversal |
- * SHIFT-TAB on KEY_PRESSED, CTRL-SHIFT-TAB on KEY_PRESSED |
- *
- *
- * KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS |
- * Go up one focus traversal cycle |
- * none |
- *
- *
- * KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS |
- * Go down one focus traversal cycle |
- * none |
- *
+ *
+ * KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS
+ * | Normal forward keyboard traversal
+ * | TAB on KEY_PRESSED, CTRL-TAB on KEY_PRESSED
+ * |
+ * KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS
+ * | Normal reverse keyboard traversal
+ * | SHIFT-TAB on KEY_PRESSED, CTRL-SHIFT-TAB on KEY_PRESSED
+ * |
+ * KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS
+ * | Go up one focus traversal cycle
+ * | none
+ * |
+ * KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS
+ * | Go down one focus traversal cycle
+ * | none
* |
*
*
--- old/src/java.desktop/share/classes/java/awt/EventQueue.java 2017-09-03 00:46:40.000000000 -0700
+++ new/src/java.desktop/share/classes/java/awt/EventQueue.java 2017-09-03 00:46:40.000000000 -0700
@@ -671,33 +671,28 @@
*
* Event types, source types, and dispatch methods
*
- *
- * Event Type |
- * Source Type |
- * Dispatched To |
- *
+ *
+ * Event Type
+ * | Source Type
+ * | Dispatched To
* |
*
- *
- * ActiveEvent |
- * Any |
- * event.dispatch() |
- *
- *
- * Other |
- * Component |
- * source.dispatchEvent(AWTEvent) |
- *
- *
- * Other |
- * MenuComponent |
- * source.dispatchEvent(AWTEvent) |
- *
- *
- * Other |
- * Other |
- * No action (ignored) |
- *
+ *
+ * ActiveEvent
+ * | Any
+ * | event.dispatch()
+ * |
+ * Other
+ * | Component
+ * | source.dispatchEvent(AWTEvent)
+ * |
+ * Other
+ * | MenuComponent
+ * | source.dispatchEvent(AWTEvent)
+ * |
+ * Other
+ * | Other
+ * | No action (ignored)
* |
*
*
--- old/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java 2017-09-03 00:46:41.000000000 -0700
+++ new/src/java.desktop/share/classes/java/awt/KeyboardFocusManager.java 2017-09-03 00:46:41.000000000 -0700
@@ -1042,35 +1042,30 @@
*
* Recommended default values for focus traversal keys
*
- *
- * Identifier |
- * Meaning |
- * Default |
- *
+ *
+ * Identifier
+ * | Meaning
+ * | Default
* |
*
- *
- * {@code KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS} |
- * Normal forward keyboard traversal |
- * {@code TAB} on {@code KEY_PRESSED},
- * {@code CTRL-TAB} on {@code KEY_PRESSED} |
- *
- *
- * {@code KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS} |
- * Normal reverse keyboard traversal |
- * {@code SHIFT-TAB} on {@code KEY_PRESSED},
- * {@code CTRL-SHIFT-TAB} on {@code KEY_PRESSED} |
- *
- *
- * {@code KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS} |
- * Go up one focus traversal cycle |
- * none |
- *
- *
- * {@code KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS} |
- * Go down one focus traversal cycle |
- * none |
- *
+ *
+ * {@code KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS}
+ * | Normal forward keyboard traversal
+ * | {@code TAB} on {@code KEY_PRESSED}, {@code CTRL-TAB} on
+ * {@code KEY_PRESSED}
+ * |
+ * {@code KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS}
+ * | Normal reverse keyboard traversal
+ * | {@code SHIFT-TAB} on {@code KEY_PRESSED}, {@code CTRL-SHIFT-TAB}
+ * on {@code KEY_PRESSED}
+ * |
+ * {@code KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS}
+ * | Go up one focus traversal cycle
+ * | none
+ * |
+ * {@code KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS}
+ * | Go down one focus traversal cycle
+ * | none
* |
*
*
--- old/src/java.desktop/share/classes/java/awt/Scrollbar.java 2017-09-03 00:46:42.000000000 -0700
+++ new/src/java.desktop/share/classes/java/awt/Scrollbar.java 2017-09-03 00:46:42.000000000 -0700
@@ -299,58 +299,44 @@
*
* Scrollbar default properties
*
- *
- * Property |
- * Description |
- * Default Value |
- *
+ *
+ * Property
+ * | Description
+ * | Default Value
* |
*
- *
- * orientation |
- * indicates whether the scroll bar is vertical
- * or horizontal |
- * {@code Scrollbar.VERTICAL} |
- *
- *
- * value |
- * value which controls the location
- * of the scroll bar's bubble |
- * 0 |
- *
- *
- * visible amount |
- * visible amount of the scroll bar's range,
- * typically represented by the size of the
- * scroll bar's bubble |
- * 10 |
- *
- *
- * minimum |
- * minimum value of the scroll bar |
- * 0 |
- *
- *
- * maximum |
- * maximum value of the scroll bar |
- * 100 |
- *
- *
- * unit increment |
- * amount the value changes when the
- * Line Up or Line Down key is pressed,
- * or when the end arrows of the scrollbar
- * are clicked |
- * 1 |
- *
- *
- * block increment |
- * amount the value changes when the
- * Page Up or Page Down key is pressed,
- * or when the scrollbar track is clicked
- * on either side of the bubble |
- * 10 |
- *
+ *
+ * orientation
+ * | indicates whether the scroll bar is vertical or horizontal
+ * | {@code Scrollbar.VERTICAL}
+ * |
+ * value
+ * | value which controls the location of the scroll bar's bubble
+ * | 0
+ * |
+ * visible amount
+ * | visible amount of the scroll bar's range, typically represented
+ * by the size of the scroll bar's bubble
+ * | 10
+ * |
+ * minimum
+ * | minimum value of the scroll bar
+ * | 0
+ * |
+ * maximum
+ * | maximum value of the scroll bar
+ * | 100
+ * |
+ * unit increment
+ * | amount the value changes when the Line Up or Line Down key is
+ * pressed, or when the end arrows of the scrollbar are clicked
+ * | 1
+ * |
+ * block increment
+ * | amount the value changes when the Page Up or Page Down key is
+ * pressed, or when the scrollbar track is clicked on either side of
+ * the bubble
+ * | 10
* |
*
*
--- old/src/java.desktop/share/classes/java/awt/SystemTray.java 2017-09-03 00:46:43.000000000 -0700
+++ new/src/java.desktop/share/classes/java/awt/SystemTray.java 2017-09-03 00:46:43.000000000 -0700
@@ -371,28 +371,26 @@
*
* SystemTray properties
*
- *
- * Property |
- * Description |
- *
+ *
+ * Property
+ * | Description
* |
*
- *
- * {@code trayIcons} |
- * The {@code SystemTray}'s array of {@code TrayIcon} objects.
- * The array is accessed via the {@link #getTrayIcons} method.
- * This property is changed when a tray icon is added to (or removed
- * from) the system tray. For example, this property is changed
- * when the system tray becomes unavailable on the desktop
- * and the tray icons are automatically removed. |
- *
- *
- * {@code systemTray} |
- * This property contains {@code SystemTray} instance when the system tray
- * is available or {@code null} otherwise. This property is changed
- * when the system tray becomes available or unavailable on the desktop.
- * The property is accessed by the {@link #getSystemTray} method. |
- *
+ *
+ * {@code trayIcons}
+ * | The {@code SystemTray}'s array of {@code TrayIcon} objects. The
+ * array is accessed via the {@link #getTrayIcons} method. This property
+ * is changed when a tray icon is added to (or removed from) the system
+ * tray. For example, this property is changed when the system tray
+ * becomes unavailable on the desktop and the tray icons are
+ * automatically removed.
+ * |
+ * {@code systemTray}
+ * | This property contains {@code SystemTray} instance when the
+ * system tray is available or {@code null} otherwise. This property is
+ * changed when the system tray becomes available or unavailable on the
+ * desktop. The property is accessed by the {@link #getSystemTray}
+ * method.
* |
*
*
--- old/src/java.desktop/share/classes/java/awt/font/NumericShaper.java 2017-09-03 00:46:44.000000000 -0700
+++ new/src/java.desktop/share/classes/java/awt/font/NumericShaper.java 2017-09-03 00:46:43.000000000 -0700
@@ -108,39 +108,36 @@
*
*
* NumericShaper constants precedence
- *
- *
- * Unicode Range |
- * {@code NumericShaper} Constants |
- * Precedence |
- *
- *
- *
- *
- * Arabic |
- * {@link NumericShaper#ARABIC NumericShaper.ARABIC}
- * {@link NumericShaper#EASTERN_ARABIC NumericShaper.EASTERN_ARABIC} |
- * {@link NumericShaper#EASTERN_ARABIC NumericShaper.EASTERN_ARABIC} |
- *
- *
- * {@link NumericShaper.Range#ARABIC}
- * {@link NumericShaper.Range#EASTERN_ARABIC} |
- * {@link NumericShaper.Range#EASTERN_ARABIC} |
- *
- *
- *
- *
- * Tai Tham |
- * {@link NumericShaper.Range#TAI_THAM_HORA}
- * {@link NumericShaper.Range#TAI_THAM_THAM} |
- * {@link NumericShaper.Range#TAI_THAM_THAM} |
- *
- *
+ *
+ *
+ * Unicode Range
+ * | {@code NumericShaper} Constants
+ * | Precedence
+ * |
+ *
+ *
+ * Arabic
+ * | {@link NumericShaper#ARABIC NumericShaper.ARABIC}
+ *
+ * {@link NumericShaper#EASTERN_ARABIC NumericShaper.EASTERN_ARABIC}
+ * | {@link NumericShaper#EASTERN_ARABIC NumericShaper.EASTERN_ARABIC}
+ * |
+ *
+ * {@link NumericShaper.Range#ARABIC}
+ *
+ * {@link NumericShaper.Range#EASTERN_ARABIC}
+ * | {@link NumericShaper.Range#EASTERN_ARABIC}
+ * |
+ * Tai Tham
+ * | {@link NumericShaper.Range#TAI_THAM_HORA}
+ *
+ * {@link NumericShaper.Range#TAI_THAM_THAM}
+ * | {@link NumericShaper.Range#TAI_THAM_THAM}
+ * |
*
*
* @since 1.4
*/
-
public final class NumericShaper implements java.io.Serializable {
// For access from java.text.Bidi
--- old/src/java.desktop/share/classes/java/awt/font/TextAttribute.java 2017-09-03 00:46:44.000000000 -0700
+++ new/src/java.desktop/share/classes/java/awt/font/TextAttribute.java 2017-09-03 00:46:44.000000000 -0700
@@ -96,159 +96,141 @@
*
*
* Summary of attributes
- *
- * Key, value type, principal constants, and
- * default value behavior of all TextAttributes
+ *
+ *
+ * Key, value type, principal constants, and default value behavior of
+ * all TextAttributes
*
- *
- * Key |
- * Value Type |
- * Principal Constants |
- * Default Value |
- *
+ *
+ * Key
+ * | Value Type
+ * | Principal Constants
+ * | Default Value
* |
*
- *
- * {@link #FAMILY} |
- * String |
- * See Font {@link java.awt.Font#DIALOG DIALOG},
- * {@link java.awt.Font#DIALOG_INPUT DIALOG_INPUT}, {@link java.awt.Font#SERIF SERIF},
- * {@link java.awt.Font#SANS_SERIF SANS_SERIF}, and {@link java.awt.Font#MONOSPACED MONOSPACED}.
- * |
- * "Default" (use platform default) |
- *
- *
- * {@link #WEIGHT} |
- * Number |
- * WEIGHT_REGULAR, WEIGHT_BOLD |
- * WEIGHT_REGULAR |
- *
- *
- * {@link #WIDTH} |
- * Number |
- * WIDTH_CONDENSED, WIDTH_REGULAR, WIDTH_EXTENDED |
- * WIDTH_REGULAR |
- *
- *
- * {@link #POSTURE} |
- * Number |
- * POSTURE_REGULAR, POSTURE_OBLIQUE |
- * POSTURE_REGULAR |
- *
- *
- * {@link #SIZE} |
- * Number |
- * none |
- * 12.0 |
- *
- *
- * {@link #TRANSFORM} |
- * {@link TransformAttribute} |
- * See TransformAttribute {@link TransformAttribute#IDENTITY IDENTITY} |
- * TransformAttribute.IDENTITY |
- *
- *
- * {@link #SUPERSCRIPT} |
- * Integer |
- * SUPERSCRIPT_SUPER, SUPERSCRIPT_SUB |
- * 0 (use the standard glyphs and metrics) |
- *
- *
- * {@link #FONT} |
- * {@link java.awt.Font} |
- * none |
- * null (do not override font resolution) |
- *
- *
- * {@link #CHAR_REPLACEMENT} |
- * {@link GraphicAttribute} |
- * none |
- * null (draw text using font glyphs) |
- *
- *
- * {@link #FOREGROUND} |
- * {@link java.awt.Paint} |
- * none |
- * null (use current graphics paint) |
- *
- *
- * {@link #BACKGROUND} |
- * {@link java.awt.Paint} |
- * none |
- * null (do not render background) |
- *
- *
- * {@link #UNDERLINE} |
- * Integer |
- * UNDERLINE_ON |
- * -1 (do not render underline) |
- *
- *
- * {@link #STRIKETHROUGH} |
- * Boolean |
- * STRIKETHROUGH_ON |
- * false (do not render strikethrough) |
- *
- *
- * {@link #RUN_DIRECTION} |
- * Boolean |
- * RUN_DIRECTION_LTR RUN_DIRECTION_RTL |
- * null (use {@link java.text.Bidi} standard default) |
- *
- *
- * {@link #BIDI_EMBEDDING} |
- * Integer |
- * none |
- * 0 (use base line direction) |
- *
- *
- * {@link #JUSTIFICATION} |
- * Number |
- * JUSTIFICATION_FULL |
- * JUSTIFICATION_FULL |
- *
- *
- * {@link #INPUT_METHOD_HIGHLIGHT} |
- * {@link java.awt.im.InputMethodHighlight}, {@link java.text.Annotation} |
- * (see class) |
- * null (do not apply input highlighting) |
- *
- *
- * {@link #INPUT_METHOD_UNDERLINE} |
- * Integer |
- * UNDERLINE_LOW_ONE_PIXEL, UNDERLINE_LOW_TWO_PIXEL |
- * -1 (do not render underline) |
- *
- *
- * {@link #SWAP_COLORS} |
- * Boolean |
- * SWAP_COLORS_ON |
- * false (do not swap colors) |
- *
- *
- * {@link #NUMERIC_SHAPING} |
- * {@link java.awt.font.NumericShaper} |
- * none |
- * null (do not shape digits) |
- *
- *
- * {@link #KERNING} |
- * Integer |
- * KERNING_ON |
- * 0 (do not request kerning) |
- *
- *
- * {@link #LIGATURES} |
- * Integer |
- * LIGATURES_ON |
- * 0 (do not form optional ligatures) |
- *
- *
- * {@link #TRACKING} |
- * Number |
- * TRACKING_LOOSE, TRACKING_TIGHT |
- * 0 (do not add tracking) |
- *
+ *
+ * {@link #FAMILY}
+ * | String
+ * | See Font {@link java.awt.Font#DIALOG DIALOG},
+ * {@link java.awt.Font#DIALOG_INPUT DIALOG_INPUT},
+ *
+ * {@link java.awt.Font#SERIF SERIF},
+ * {@link java.awt.Font#SANS_SERIF SANS_SERIF}, and
+ * {@link java.awt.Font#MONOSPACED MONOSPACED}.
+ * | "Default" (use platform default)
+ * |
+ * {@link #WEIGHT}
+ * | Number
+ * | WEIGHT_REGULAR, WEIGHT_BOLD
+ * | WEIGHT_REGULAR
+ * |
+ * {@link #WIDTH}
+ * | Number
+ * | WIDTH_CONDENSED, WIDTH_REGULAR, WIDTH_EXTENDED
+ * | WIDTH_REGULAR
+ * |
+ * {@link #POSTURE}
+ * | Number
+ * | POSTURE_REGULAR, POSTURE_OBLIQUE
+ * | POSTURE_REGULAR
+ * |
+ * {@link #SIZE}
+ * | Number
+ * | none
+ * | 12.0
+ * |
+ * {@link #TRANSFORM}
+ * | {@link TransformAttribute}
+ * | See TransformAttribute {@link TransformAttribute#IDENTITY IDENTITY}
+ * | TransformAttribute.IDENTITY
+ * |
+ * {@link #SUPERSCRIPT}
+ * | Integer
+ * | SUPERSCRIPT_SUPER, SUPERSCRIPT_SUB
+ * | 0 (use the standard glyphs and metrics)
+ * |
+ * {@link #FONT}
+ * | {@link java.awt.Font}
+ * | none
+ * | null (do not override font resolution)
+ * |
+ * {@link #CHAR_REPLACEMENT}
+ * | {@link GraphicAttribute}
+ * | none
+ * | null (draw text using font glyphs)
+ * |
+ * {@link #FOREGROUND}
+ * | {@link java.awt.Paint}
+ * | none
+ * | null (use current graphics paint)
+ * |
+ * {@link #BACKGROUND}
+ * | {@link java.awt.Paint}
+ * | none
+ * | null (do not render background)
+ * |
+ * {@link #UNDERLINE}
+ * | Integer
+ * | UNDERLINE_ON
+ * | -1 (do not render underline)
+ * |
+ * {@link #STRIKETHROUGH}
+ * | Boolean
+ * | STRIKETHROUGH_ON
+ * | false (do not render strikethrough)
+ * |
+ * {@link #RUN_DIRECTION}
+ * | Boolean
+ * | RUN_DIRECTION_LTR RUN_DIRECTION_RTL
+ * | null (use {@link java.text.Bidi} standard default)
+ * |
+ * {@link #BIDI_EMBEDDING}
+ * | Integer
+ * | none
+ * | 0 (use base line direction)
+ * |
+ * {@link #JUSTIFICATION}
+ * | Number
+ * | JUSTIFICATION_FULL
+ * | JUSTIFICATION_FULL
+ * |
+ * {@link #INPUT_METHOD_HIGHLIGHT}
+ * | {@link java.awt.im.InputMethodHighlight},
+ *
+ * {@link java.text.Annotation}
+ * | (see class)
+ * | null (do not apply input highlighting)
+ * |
+ * {@link #INPUT_METHOD_UNDERLINE}
+ * | Integer
+ * | UNDERLINE_LOW_ONE_PIXEL, UNDERLINE_LOW_TWO_PIXEL
+ * | -1 (do not render underline)
+ * |
+ * {@link #SWAP_COLORS}
+ * | Boolean
+ * | SWAP_COLORS_ON
+ * | false (do not swap colors)
+ * |
+ * {@link #NUMERIC_SHAPING}
+ * | {@link java.awt.font.NumericShaper}
+ * | none
+ * | null (do not shape digits)
+ * |
+ * {@link #KERNING}
+ * | Integer
+ * | KERNING_ON
+ * | 0 (do not request kerning)
+ * |
+ * {@link #LIGATURES}
+ * | Integer
+ * | LIGATURES_ON
+ * | 0 (do not form optional ligatures)
+ * |
+ * {@link #TRACKING}
+ * | Number
+ * | TRACKING_LOOSE, TRACKING_TIGHT
+ * | 0 (do not add tracking)
+ * |
*
*
*
--- old/src/java.desktop/share/classes/javax/imageio/package-info.java 2017-09-03 00:46:45.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/imageio/package-info.java 2017-09-03 00:46:45.000000000 -0700
@@ -39,84 +39,77 @@
*
* All implementations of javax.imageio provide the following standard image
* format plug-ins:
- *
- *
- *
- * | Reading | Writing | Notes |
- * Metadata |
- *
*
+ *
- *
- *
- *
- *
*
* Standard Plug-in Notes
*
--- old/src/java.desktop/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java 2017-09-03 00:46:46.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java 2017-09-03 00:46:46.000000000 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -54,13 +54,32 @@
* listed in the following
* table:
*
- *
- * Compression Types
- * Type String | Description | Image Types |
- * BI_RGB | Uncompressed RLE | {@literal <= } 8-bits/sample |
- * BI_RLE8 | 8-bit Run Length Encoding | {@literal <=} 8-bits/sample |
- * BI_RLE4 | 4-bit Run Length Encoding | {@literal <=} 4-bits/sample |
- * BI_BITFIELDS | Packed data | 16 or 32 bits/sample |
+ *
+ * Compression Types
+ *
+ *
+ * Type String
+ * | Description
+ * | Image Types
+ * |
+ *
+ *
+ * BI_RGB
+ * | Uncompressed RLE
+ * | {@literal <= } 8-bits/sample
+ * |
+ * BI_RLE8
+ * | 8-bit Run Length Encoding
+ * | {@literal <=} 8-bits/sample
+ * |
+ * BI_RLE4
+ * | 4-bit Run Length Encoding
+ * | {@literal <=} 4-bits/sample
+ * |
+ * BI_BITFIELDS
+ * | Packed data
+ * | 16 or 32 bits/sample
+ * |
*
*/
public class BMPImageWriteParam extends ImageWriteParam {
--- old/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java 2017-09-03 00:46:47.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java 2017-09-03 00:46:47.000000000 -0700
@@ -40,221 +40,83 @@
* TIFF data types are referred to by Java constants and mapped internally
* onto Java language data types and type names as follows:
*
- *
- *
- *
+ *
* TIFF Data Type to Java Data Type Mapping
- *
- *
- *
- * TIFF Data Type
- * |
- *
- * Java Constant
- * |
- *
- * Java Data Type
- * |
- *
- * Java Type Name
- * |
- *
- *
- *
- *
- * {@code BYTE}
- * |
- *
- * {@link TIFFTag#TIFF_BYTE}
- * |
- *
- * {@code byte}
- * |
- *
- * {@code "Byte"}
- * |
- *
- *
- *
- *
- * {@code ASCII}
- * |
- *
- * {@link TIFFTag#TIFF_ASCII}
- * |
- *
- * {@code String}
- * |
- *
- * {@code "Ascii"}
- * |
- *
- *
- *
- *
- * {@code SHORT}
- * |
- *
- * {@link TIFFTag#TIFF_SHORT}
- * |
- *
- * {@code char}
- * |
- *
- * {@code "Short"}
- * |
- *
- *
- *
- *
- * {@code LONG}
- * |
- *
- * {@link TIFFTag#TIFF_LONG}
- * |
- *
- * {@code long}
- * |
- *
- * {@code "Long"}
- * |
- *
- *
- *
- *
- * {@code RATIONAL}
- * |
- *
- * {@link TIFFTag#TIFF_RATIONAL}
- * |
- *
- * {@code long[2]} {numerator, denominator}
- * |
- *
- * {@code "Rational"}
- * |
- *
- *
- *
- *
- * {@code SBYTE}
- * |
- *
- * {@link TIFFTag#TIFF_SBYTE}
- * |
- *
- * {@code byte}
- * |
- *
- * {@code "SByte"}
- * |
- *
- *
- *
- *
- * {@code UNDEFINED}
- * |
- *
- * {@link TIFFTag#TIFF_UNDEFINED}
- * |
- *
- * {@code byte}
- * |
- *
- * {@code "Undefined"}
- * |
- *
- *
- *
- *
- * {@code SSHORT}
- * |
- *
- * {@link TIFFTag#TIFF_SSHORT}
- * |
- *
- * {@code short}
- * |
- *
- * {@code "SShort"}
- * |
- *
- *
- *
- *
- * {@code SLONG}
- * |
- *
- * {@link TIFFTag#TIFF_SLONG}
- * |
- *
- * {@code int}
- * |
- *
- * {@code "SLong"}
- * |
- *
- *
- *
- *
- * {@code SRATIONAL}
- * |
- *
- * {@link TIFFTag#TIFF_SRATIONAL}
- * |
- *
- * {@code int[2]} {numerator, denominator}
- * |
- *
- * {@code "SRational"}
- * |
- *
- *
- *
- *
- * {@code FLOAT}
- * |
- *
- * {@link TIFFTag#TIFF_FLOAT}
- * |
- *
- * {@code float}
- * |
- *
- * {@code "Float"}
- * |
- *
- *
- *
- *
- * {@code DOUBLE}
- * |
- *
- * {@link TIFFTag#TIFF_DOUBLE}
- * |
- *
- * {@code double}
- * |
- *
- * {@code "Double"}
- * |
- *
- *
- *
- *
- * {@code IFD}
- * |
- *
- * {@link TIFFTag#TIFF_IFD_POINTER}
- * |
- *
- * {@code long}
- * |
- *
- * {@code "IFDPointer"}
- * |
- *
- *
+ *
+ *
+ * TIFF Data Type
+ * | Java Constant
+ * | Java Data Type
+ * | Java Type Name
+ * |
+ *
+ *
+ * {@code BYTE}
+ * | {@link TIFFTag#TIFF_BYTE}
+ * | {@code byte}
+ * | {@code "Byte"}
+ * |
+ * {@code ASCII}
+ * | {@link TIFFTag#TIFF_ASCII}
+ * | {@code String}
+ * | {@code "Ascii"}
+ * |
+ * {@code SHORT}
+ * | {@link TIFFTag#TIFF_SHORT}
+ * | {@code char}
+ * | {@code "Short"}
+ * |
+ * {@code LONG}
+ * | {@link TIFFTag#TIFF_LONG}
+ * | {@code long}
+ * | {@code "Long"}
+ * |
+ * {@code RATIONAL}
+ * | {@link TIFFTag#TIFF_RATIONAL}
+ * | {@code long[2]} {numerator, denominator}
+ * | {@code "Rational"}
+ * |
+ * {@code SBYTE}
+ * | {@link TIFFTag#TIFF_SBYTE}
+ * | {@code byte}
+ * | {@code "SByte"}
+ * |
+ * {@code UNDEFINED}
+ * | {@link TIFFTag#TIFF_UNDEFINED}
+ * | {@code byte}
+ * | {@code "Undefined"}
+ * |
+ * {@code SSHORT}
+ * | {@link TIFFTag#TIFF_SSHORT}
+ * | {@code short}
+ * | {@code "SShort"}
+ * |
+ * {@code SLONG}
+ * | {@link TIFFTag#TIFF_SLONG}
+ * | {@code int}
+ * | {@code "SLong"}
+ * |
+ * {@code SRATIONAL}
+ * | {@link TIFFTag#TIFF_SRATIONAL}
+ * | {@code int[2]} {numerator, denominator}
+ * | {@code "SRational"}
+ * |
+ * {@code FLOAT}
+ * | {@link TIFFTag#TIFF_FLOAT}
+ * | {@code float}
+ * | {@code "Float"}
+ * |
+ * {@code DOUBLE}
+ * | {@link TIFFTag#TIFF_DOUBLE}
+ * | {@code double}
+ * | {@code "Double"}
+ * |
+ * {@code IFD}
+ * | {@link TIFFTag#TIFF_IFD_POINTER}
+ * | {@code long}
+ * | {@code "IFDPointer"}
+ * |
+ *
*
*
* @since 9
--- old/src/java.desktop/share/classes/javax/print/DocFlavor.java 2017-09-03 00:46:48.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/print/DocFlavor.java 2017-09-03 00:46:48.000000000 -0700
@@ -175,21 +175,21 @@
* MIME-Types and their descriptions
*
*
- * MIME-Type
- * | Description
+ * | MIME-Type
+ * | Description
* |
*
*
- * {@code "text/plain"}
+ * | {@code "text/plain"}
* | Plain text in the default character set (US-ASCII)
* |
- * "text/plain; charset=xxx"
+ * | "text/plain; charset=xxx"
* | Plain text in character set xxx
* |
- * {@code "text/html"}
+ * | {@code "text/html"}
* | HyperText Markup Language in the default character set (US-ASCII)
* |
- * "text/html; charset=xxx"
+ * | "text/html; charset=xxx"
* | HyperText Markup Language in character set xxx
* |
*
@@ -201,18 +201,18 @@
* MIME-Types and their descriptions
*
*
- * MIME-Type
- * | Description
+ * | MIME-Type
+ * | Description
* |
*
*
- * {@code "application/pdf"}
+ * | {@code "application/pdf"}
* | Portable Document Format document
* |
- * {@code "application/postscript"}
+ * | {@code "application/postscript"}
* | PostScript document
* |
- * {@code "application/vnd.hp-PCL"}
+ * | {@code "application/vnd.hp-PCL"}
* | Printer Control Language document
* |
*
@@ -223,18 +223,18 @@
* MIME-Types and their descriptions
*
*
- * MIME-Type
- * | Description
+ * | MIME-Type
+ * | Description
* |
*
*
- * {@code "image/gif"}
+ * | {@code "image/gif"}
* | Graphics Interchange Format image
* |
- * {@code "image/jpeg"}
+ * | {@code "image/jpeg"}
* | Joint Photographic Experts Group image
* |
- * {@code "image/png"}
+ * | {@code "image/png"}
* | Portable Network Graphics image
* |
*
@@ -245,12 +245,12 @@
*
MIME-Types and their descriptions
*
*
- * MIME-Type
- * | Description
+ * | MIME-Type
+ * | Description
* |
*
*
- * {@code "application/octet-stream"}
+ * | {@code "application/octet-stream"}
* | The print data format is unspecified (just an octet stream)
* |
*
--- old/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java 2017-09-03 00:46:49.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/print/attribute/standard/Chromaticity.java 2017-09-03 00:46:49.000000000 -0700
@@ -42,22 +42,23 @@
* The table below shows the effects of specifying a Chromaticity attribute of
* {@link #MONOCHROME MONOCHROME} or {@link #COLOR COLOR} for a monochrome or
* color document.
+ *
*
* Shows effects of specifying {@code MONOCHROME} or {@code COLOR}
* Chromaticity attributes
*
*
- * Chromaticity Attribute
- * | Effect on Monochrome Document
- * | Effect on Color Document
+ * | Chromaticity Attribute
+ * | Effect on Monochrome Document
+ * | Effect on Color Document
* |
*
*
- * {@link #MONOCHROME MONOCHROME}
+ * | {@link #MONOCHROME MONOCHROME}
* | Printed as is, in monochrome
* | Printed in monochrome, with colors converted to shades of gray
* |
- * {@link #COLOR COLOR}
+ * | {@link #COLOR COLOR}
* | Printed as is, in monochrome
* | Printed as is, in color
* |
--- old/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java 2017-09-03 00:46:50.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/print/attribute/standard/JobKOctets.java 2017-09-03 00:46:50.000000000 -0700
@@ -69,40 +69,41 @@
* The size of a doc is computed based on the print data representation class as
* specified by the doc's {@link javax.print.DocFlavor DocFlavor}, as shown in
* the table below.
+ *
*
* Table showing computation of doc sizes
*
*
- * Representation Class
- * | Document Size
+ * | Representation Class
+ * | Document Size
* |
*
*
- * {@code byte[]}
+ * | {@code byte[]}
* | Length of the byte array
* |
- * {@code java.io.InputStream}
+ * | {@code java.io.InputStream}
* | Number of bytes read from the stream
* |
- * {@code char[]}
+ * | {@code char[]}
* | Length of the character array x 2
* |
- * {@code java.lang.String}
+ * | {@code java.lang.String}
* | Length of the string x 2
* |
- * {@code java.io.Reader}
+ * | {@code java.io.Reader}
* | Number of characters read from the stream x 2
* |
- * {@code java.net.URL}
+ * | {@code java.net.URL}
* | Number of bytes read from the file at the given {@code URL} address
* |
- * {@code java.awt.image.renderable.RenderableImage}
+ * | {@code java.awt.image.renderable.RenderableImage}
* | Implementation dependent*
* |
- * {@code java.awt.print.Printable}
+ * | {@code java.awt.print.Printable}
* | Implementation dependent*
* |
- * {@code java.awt.print.Pageable}
+ * | {@code java.awt.print.Pageable}
* | Implementation dependent*
* |
*
--- old/src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java 2017-09-03 00:46:51.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/print/attribute/standard/package-info.java 2017-09-03 00:46:50.000000000 -0700
@@ -150,412 +150,437 @@
* attribute, the column marked "SupportedValuesAttribute" lists the
* supported-values attribute class, if any, with which a print service
* indicates the supported values for that attribute category.
- *
- *
- * Attribute Class
- * | Doc Attribute
- * | Print Request Attribute
- * | Print Job Attribute
- * | Print Service Attribute
- * | SupportedValuesAttribute
+ *
+ *
*
* Please note: In the {@code javax.print} APIs, a {@code null} reference
--- old/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java 2017-09-03 00:46:52.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/sound/midi/MidiFileFormat.java 2017-09-03 00:46:51.000000000 -0700
@@ -43,32 +43,36 @@
* The following table lists some common properties that should be used in
* implementations:
*
- *
+ *
* MIDI File Format Properties
+ *
*
- * Property key
- * | Value type
- * | Description
+ * | Property key
+ * | Value type
+ * | Description
+ * |
+ *
*
- * "author"
+ * | "author"
* | {@link String String}
* | name of the author of this file
* |
- * "title"
+ * | "title"
* | {@link String String}
* | title of this file
* |
- * "copyright"
+ * | "copyright"
* | {@link String String}
* | copyright message
* |
- * "date"
+ * | "date"
* | {@link java.util.Date Date}
* | date of the recording or release
* |
- * "comment"
+ * | "comment"
* | {@link String String}
* | an arbitrary text
+ * |
*
*
* @author Kara Kytle
--- old/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java 2017-09-03 00:46:52.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/sound/midi/MidiSystem.java 2017-09-03 00:46:52.000000000 -0700
@@ -78,32 +78,32 @@
* MIDI System Property Keys
*
*
- * Property Key
- * | Interface
- * | Affected Method
+ * | Property Key
+ * | Interface
+ * | Affected Method
* |
*
*
- * {@code javax.sound.midi.Receiver}
+ * | {@code javax.sound.midi.Receiver}
* | {@link Receiver}
* | {@link #getReceiver}
* |
- * {@code javax.sound.midi.Sequencer}
+ * | {@code javax.sound.midi.Sequencer}
* | {@link Sequencer}
* | {@link #getSequencer}
* |
- * {@code javax.sound.midi.Synthesizer}
+ * | {@code javax.sound.midi.Synthesizer}
* | {@link Synthesizer}
* | {@link #getSynthesizer}
* |
- * {@code javax.sound.midi.Transmitter}
+ * | {@code javax.sound.midi.Transmitter}
* | {@link Transmitter}
* | {@link #getTransmitter}
* |
*
*
* The property value consists of the provider class name and the device name,
- * separated by the hash mark ("#"). The provider class name is the
+ * separated by the hash mark ("#"). The provider class name is the
* fully-qualified name of a concrete
* {@link MidiDeviceProvider MIDI device provider} class. The device name is
* matched against the {@code String} returned by the {@code getName} method of
--- old/src/java.desktop/share/classes/javax/sound/sampled/AudioFileFormat.java 2017-09-03 00:46:53.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/sound/sampled/AudioFileFormat.java 2017-09-03 00:46:53.000000000 -0700
@@ -50,36 +50,40 @@
* The following table lists some common properties that should be used in
* implementations:
*
- *
+ *
* Audio File Format Properties
+ *
*
- * Property key
- * | Value type
- * | Description
+ * | Property key
+ * | Value type
+ * | Description
+ * |
+ *
*
- * "duration"
+ * | "duration"
* | {@link Long Long}
* | playback duration of the file in microseconds
* |
- * "author"
+ * | "author"
* | {@link String String}
* | name of the author of this file
* |
- * "title"
+ * | "title"
* | {@link String String}
* | title of this file
* |
- * "copyright"
+ * | "copyright"
* | {@link String String}
* | copyright message
* |
- * "date"
+ * | "date"
* | {@link java.util.Date Date}
* | date of the recording or release
* |
- * "comment"
+ * | "comment"
* | {@link String String}
* | an arbitrary text
+ * |
*
*
* @author David Rivas
--- old/src/java.desktop/share/classes/javax/sound/sampled/AudioFormat.java 2017-09-03 00:46:54.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/sound/sampled/AudioFormat.java 2017-09-03 00:46:54.000000000 -0700
@@ -94,21 +94,21 @@
* Audio Format Properties
*
*
- * Property key
- * | Value type
- * | Description
+ * | Property key
+ * | Value type
+ * | Description
* |
*
*
- * "bitrate"
+ * | "bitrate"
* | {@link java.lang.Integer Integer}
* | average bit rate in bits per second
* |
- * "vbr"
+ * | "vbr"
* | {@link java.lang.Boolean Boolean}
* | {@code true}, if the file is encoded in variable bit rate (VBR)
* |
- * "quality"
+ * | "quality"
* | {@link java.lang.Integer Integer}
* | encoding/conversion quality, 1..100
* |
--- old/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java 2017-09-03 00:46:55.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/sound/sampled/AudioPermission.java 2017-09-03 00:46:55.000000000 -0700
@@ -46,13 +46,13 @@
* risks
*
*
- * Permission Target Name
- * | What the Permission Allows
- * | Risks of Allowing this Permission
+ * | Permission Target Name
+ * | What the Permission Allows
+ * | Risks of Allowing this Permission
* |
*
*
- * play
+ * | play
* | Audio playback through the audio device or devices on the system.
* Allows the application to obtain and manipulate lines and mixers for
* audio playback (rendering).
@@ -61,7 +61,7 @@
* audio being played on the system, or because manipulation of a mixer
* affects the audio for all lines using that mixer.
* |
- * record
+ * | record
* | Audio recording through the audio device or devices on the system.
* Allows the application to obtain and manipulate lines and mixers for
* audio recording (capture).
--- old/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java 2017-09-03 00:46:56.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/sound/sampled/AudioSystem.java 2017-09-03 00:46:56.000000000 -0700
@@ -75,32 +75,32 @@
* Audio System Property Keys
*
*
- * Property Key
- * | Interface
- * | Affected Method(s)
+ * | Property Key
+ * | Interface
+ * | Affected Method(s)
* |
* |
*
- * {@code javax.sound.sampled.Clip}
+ * | {@code javax.sound.sampled.Clip}
* | {@link Clip}
* | {@link #getLine}, {@link #getClip}
* |
- * {@code javax.sound.sampled.Port}
+ * | {@code javax.sound.sampled.Port}
* | {@link Port}
* | {@link #getLine}
* |
- * {@code javax.sound.sampled.SourceDataLine}
+ * | {@code javax.sound.sampled.SourceDataLine}
* | {@link SourceDataLine}
* | {@link #getLine}, {@link #getSourceDataLine}
* |
- * {@code javax.sound.sampled.TargetDataLine}
+ * | {@code javax.sound.sampled.TargetDataLine}
* | {@link TargetDataLine}
* | {@link #getLine}, {@link #getTargetDataLine}
* |
*
*
* The property value consists of the provider class name and the mixer name,
- * separated by the hash mark ("#"). The provider class name is the
+ * separated by the hash mark ("#"). The provider class name is the
* fully-qualified name of a concrete {@link MixerProvider mixer provider}
* class. The mixer name is matched against the {@code String} returned by the
* {@code getName} method of {@code Mixer.Info}. Either the class name, or the
--- old/src/java.desktop/share/classes/javax/sound/sampled/ReverbType.java 2017-09-03 00:46:57.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/sound/sampled/ReverbType.java 2017-09-03 00:46:57.000000000 -0700
@@ -75,44 +75,44 @@
* early intensity, and early delay
*
*
- * Type
- * | Decay Time (ms)
- * | Late Intensity (dB)
- * | Late Delay (ms)
- * | Early Intensity (dB)
- * | Early Delay(ms)
+ * | Type
+ * | Decay Time (ms)
+ * | Late Intensity (dB)
+ * | Late Delay (ms)
+ * | Early Intensity (dB)
+ * | Early Delay(ms)
* |
* |
*
- * Cavern
+ * | Cavern
* | 2250
* | -2.0
* | 41.3
* | -1.4
* | 10.3
* |
- * Dungeon
+ * | Dungeon
* | 1600
* | -1.0
* | 10.3
* | -0.7
* | 2.6
* |
- * Garage
+ * | Garage
* | 900
* | -6.0
* | 14.7
* | -4.0
* | 3.9
* |
- * Acoustic Lab
+ * | Acoustic Lab
* | 280
* | -3.0
* | 8.0
* | -2.0
* | 2.0
* |
- * Closet
+ * | Closet
* | 150
* | -10.0
* | 2.5
--- old/src/java.desktop/share/classes/javax/swing/Action.java 2017-09-03 00:46:58.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/Action.java 2017-09-03 00:46:57.000000000 -0700
@@ -98,102 +98,88 @@
* Supported Action properties
*
*
- * Component Property
- * | Components
- * | Action Key
- * | Notes
+ * | Component Property
+ * | Components
+ * | Action Key
+ * | Notes
* |
* |
- *
- * enabled
- * | All
- * | The isEnabled method
- * |
- * |
- * toolTipText
- * | All
- * | SHORT_DESCRIPTION
- * |
- * |
- * actionCommand
- * | All
- * | ACTION_COMMAND_KEY
- * |
- * |
- * mnemonic
- * | All buttons
- * | MNEMONIC_KEY
- * | A null value or Action results in the
- * button's mnemonic property being set to
- * '\0' .
- * |
- * text
- * | All buttons
- * | NAME
- * | If you do not want the text of the button to mirror that
- * of the Action , set the property
- * hideActionText to true . If
- * hideActionText is true , setting the
- * Action changes the text of the button to
- * null and any changes to NAME
- * are ignored. hideActionText is useful for
- * tool bar buttons that typically only show an Icon .
- * JToolBar.add(Action) sets the property to
- * true if the Action has a
- * non-null value for LARGE_ICON_KEY or
- * SMALL_ICON .
- * |
- * displayedMnemonicIndex
- * | All buttons
- * | DISPLAYED_MNEMONIC_INDEX_KEY
- * | If the value of DISPLAYED_MNEMONIC_INDEX_KEY is
- * beyond the bounds of the text, it is ignored. When
- * setAction is called, if the value from the
- * Action is null , the displayed
- * mnemonic index is not updated. In any subsequent changes to
- * DISPLAYED_MNEMONIC_INDEX_KEY , null
- * is treated as -1.
- * |
- * icon
- * | All buttons except of JCheckBox ,
- * JToggleButton and JRadioButton .
- * | either LARGE_ICON_KEY or
- * SMALL_ICON
- * | The JMenuItem subclasses only use
- * SMALL_ICON . All other buttons will use
- * LARGE_ICON_KEY ; if the value is null they
- * use SMALL_ICON .
- * |
- * accelerator
- * | All JMenuItem subclasses, with the exception of
- * JMenu .
- * | ACCELERATOR_KEY
- * |
- * |
- * selected
- * | JToggleButton , JCheckBox ,
- * JRadioButton , JCheckBoxMenuItem and
- * JRadioButtonMenuItem
- * | SELECTED_KEY
- * | Components that honor this property only use
- * the value if it is {@code non-null}. For example, if
- * you set an {@code Action} that has a {@code null}
- * value for {@code SELECTED_KEY} on a {@code JToggleButton}, the
- * {@code JToggleButton} will not update it's selected state in
- * any way. Similarly, any time the {@code JToggleButton}'s
- * selected state changes it will only set the value back on
- * the {@code Action} if the {@code Action} has a {@code non-null}
- * value for {@code SELECTED_KEY}.
- *
- * Components that honor this property keep their selected state
- * in sync with this property. When the same {@code Action} is used
- * with multiple components, all the components keep their selected
- * state in sync with this property. Mutually exclusive
- * buttons, such as {@code JToggleButton}s in a {@code ButtonGroup},
- * force only one of the buttons to be selected. As such, do not
- * use the same {@code Action} that defines a value for the
- * {@code SELECTED_KEY} property with multiple mutually
- * exclusive buttons.
+ * |
+ * {@code enabled}
+ * | All
+ * | The {@code isEnabled} method
+ * |
+ * |
+ * {@code toolTipText}
+ * | All
+ * | {@code SHORT_DESCRIPTION}
+ * |
+ * |
+ * {@code actionCommand}
+ * | All
+ * | {@code ACTION_COMMAND_KEY}
+ * |
+ * |
+ * {@code mnemonic}
+ * | All buttons
+ * | {@code MNEMONIC_KEY}
+ * | A {@code null} value or {@code Action} results in the button's
+ * {@code mnemonic} property being set to {@code '\0'}.
+ * |
+ * {@code text}
+ * | All buttons
+ * | {@code NAME}
+ * | If you do not want the text of the button to mirror that of the
+ * {@code Action}, set the property {@code hideActionText} to {@code true}.
+ * If {@code hideActionText} is {@code true}, setting the {@code Action}
+ * changes the text of the button to {@code null} and any changes to
+ * {@code NAME} are ignored. {@code hideActionText} is useful for tool bar
+ * buttons that typically only show an {@code Icon}.
+ * {@code JToolBar.add(Action)} sets the property to {@code true} if the
+ * {@code Action} has a non-{@code null} value for {@code LARGE_ICON_KEY} or
+ * {@code SMALL_ICON}.
+ * |
+ * {@code displayedMnemonicIndex}
+ * | All buttons
+ * | {@code DISPLAYED_MNEMONIC_INDEX_KEY}
+ * | If the value of {@code DISPLAYED_MNEMONIC_INDEX_KEY} is beyond the
+ * bounds of the text, it is ignored. When {@code setAction} is called, if
+ * the value from the {@code Action} is {@code null}, the displayed mnemonic
+ * index is not updated. In any subsequent changes to
+ * {@code DISPLAYED_MNEMONIC_INDEX_KEY}, {@code null} is treated as -1.
+ * |
+ * {@code icon}
+ * | All buttons except of {@code JCheckBox}, {@code JToggleButton} and
+ * {@code JRadioButton}.
+ * | either {@code LARGE_ICON_KEY} or {@code SMALL_ICON}
+ * | The {@code JMenuItem} subclasses only use {@code SMALL_ICON}. All
+ * other buttons will use {@code LARGE_ICON_KEY}; if the value is
+ * {@code null} they use {@code SMALL_ICON}.
+ * |
+ * {@code accelerator}
+ * | All {@code JMenuItem} subclasses, with the exception of {@code JMenu}.
+ * | {@code ACCELERATOR_KEY}
+ * |
+ * |
+ * {@code selected}
+ * | {@code JToggleButton}, {@code JCheckBox}, {@code JRadioButton},
+ * {@code JCheckBoxMenuItem} and {@code JRadioButtonMenuItem}
+ * | {@code SELECTED_KEY}
+ * | Components that honor this property only use the value if it is
+ * {@code non-null}. For example, if you set an {@code Action} that has a
+ * {@code null} value for {@code SELECTED_KEY} on a {@code JToggleButton},
+ * the {@code JToggleButton} will not update it's selected state in any way.
+ * Similarly, any time the {@code JToggleButton}'s selected state changes it
+ * will only set the value back on the {@code Action} if the {@code Action}
+ * has a {@code non-null} value for {@code SELECTED_KEY}.
+ *
+ * Components that honor this property keep their selected state in sync with
+ * this property. When the same {@code Action} is used with multiple
+ * components, all the components keep their selected state in sync with this
+ * property. Mutually exclusive buttons, such as {@code JToggleButton}s in a
+ * {@code ButtonGroup}, force only one of the buttons to be selected. As
+ * such, do not use the same {@code Action} that defines a value for the
+ * {@code SELECTED_KEY} property with multiple mutually exclusive buttons.
* |
*
*
--- old/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java 2017-09-03 00:46:59.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java 2017-09-03 00:46:58.000000000 -0700
@@ -59,27 +59,32 @@
*
Possible JFormattedTextField configurations and their descriptions
*
*
- * Value |
- * Description |
+ *
+ * Value
+ * | Description
* |
*
- * JFormattedTextField.REVERT
- * | Revert the display to match that of getValue ,
- * possibly losing the current edit.
- * |
JFormattedTextField.COMMIT
- * | Commits the current value. If the value being edited
- * isn't considered a legal value by the
- * AbstractFormatter that is, a
- * ParseException is thrown, then the value
- * will not change, and then edited value will persist.
- * |
JFormattedTextField.COMMIT_OR_REVERT
- * | Similar to COMMIT , but if the value isn't
- * legal, behave like REVERT .
- * |
JFormattedTextField.PERSIST
- * | Do nothing, don't obtain a new
- * AbstractFormatter , and don't update the value.
+ * |
+ * JFormattedTextField.REVERT
+ * | Revert the display to match that of {@code getValue}, possibly losing
+ * the current edit.
+ * |
+ * JFormattedTextField.COMMIT
+ * | Commits the current value. If the value being edited isn't considered
+ * a legal value by the {@code AbstractFormatter} that is, a
+ * {@code ParseException} is thrown, then the value will not change, and
+ * then edited value will persist.
+ * |
+ * JFormattedTextField.COMMIT_OR_REVERT
+ * | Similar to {@code COMMIT}, but if the value isn't legal, behave like
+ * {@code REVERT}.
+ * |
+ * JFormattedTextField.PERSIST
+ * | Do nothing, don't obtain a new {@code AbstractFormatter}, and don't
+ * update the value.
* |
*
+ *
* The default is JFormattedTextField.COMMIT_OR_REVERT
,
* refer to {@link #setFocusLostBehavior} for more information on this.
*
--- old/src/java.desktop/share/classes/javax/swing/JList.java 2017-09-03 00:46:59.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/JList.java 2017-09-03 00:46:59.000000000 -0700
@@ -966,25 +966,30 @@
*
Describes layouts VERTICAL,HORIZONTAL_WRAP, and VERTICAL_WRAP
*
*
- * Value | Description |
+ *
+ * Value
+ * | Description
* |
*
- * VERTICAL
- * | Cells are layed out vertically in a single column.
- * |
HORIZONTAL_WRAP
- * | Cells are layed out horizontally, wrapping to a new row as
- * necessary. If the {@code visibleRowCount} property is less than
- * or equal to zero, wrapping is determined by the width of the
- * list; otherwise wrapping is done in such a way as to ensure
- * {@code visibleRowCount} rows in the list.
- * |
VERTICAL_WRAP
- * | Cells are layed out vertically, wrapping to a new column as
- * necessary. If the {@code visibleRowCount} property is less than
- * or equal to zero, wrapping is determined by the height of the
- * list; otherwise wrapping is done at {@code visibleRowCount} rows.
+ * |
+ * {@code VERTICAL}
+ * | Cells are layed out vertically in a single column.
+ * |
+ * {@code HORIZONTAL_WRAP}
+ * | Cells are layed out horizontally, wrapping to a new row as
+ * necessary. If the {@code visibleRowCount} property is less than or
+ * equal to zero, wrapping is determined by the width of the list;
+ * otherwise wrapping is done in such a way as to ensure
+ * {@code visibleRowCount} rows in the list.
+ * |
+ * {@code VERTICAL_WRAP}
+ * | Cells are layed out vertically, wrapping to a new column as
+ * necessary. If the {@code visibleRowCount} property is less than or
+ * equal to zero, wrapping is determined by the height of the list;
+ * otherwise wrapping is done at {@code visibleRowCount} rows.
* |
*
- *
+ *
* The default value of this property is VERTICAL
.
*
* @param layoutOrientation the new layout orientation, one of:
--- old/src/java.desktop/share/classes/javax/swing/JOptionPane.java 2017-09-03 00:47:00.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/JOptionPane.java 2017-09-03 00:47:00.000000000 -0700
@@ -71,37 +71,30 @@
* class may appear complex because of the large number of methods, almost
* all uses of this class are one-line calls to one of the static
* showXxxDialog
methods shown below:
- *
*
*
* Common JOptionPane method names and their descriptions
*
- *
- * Method Name |
- * Description |
- *
+ *
+ * Method Name
+ * | Description
* |
*
- *
- * showConfirmDialog |
- * Asks a confirming question, like yes/no/cancel. |
- *
- *
- * showInputDialog |
- * Prompt for some input. |
- *
- *
- * showMessageDialog |
- * Tell the user about something that has happened. |
- *
- *
- * showOptionDialog |
- * The Grand Unification of the above three. |
- *
+ *
+ * showConfirmDialog
+ * | Asks a confirming question, like yes/no/cancel. |
+ *
+ * showInputDialog
+ * | Prompt for some input.
+ * |
+ * showMessageDialog
+ * | Tell the user about something that has happened.
+ * |
+ * showOptionDialog
+ * | The Grand Unification of the above three.
* |
*
*
- *
* Each of these methods also comes in a showInternalXXX
* flavor, which uses an internal frame to hold the dialog box (see
* {@link JInternalFrame}).
--- old/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java 2017-09-03 00:47:01.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicListUI.java 2017-09-03 00:47:01.000000000 -0700
@@ -588,52 +588,53 @@
* Describes the preferred size for each layout orientation
*
*
- * Layout Orientation | Preferred Size |
+ *
+ * Layout Orientation
+ * | Preferred Size
* |
*
- *
- * JList.VERTICAL
- * | The preferredSize of the list is total height of the rows
- * and the maximum width of the cells. If JList.fixedCellHeight
- * is specified then the total height of the rows is just
- * (cellVerticalMargins + fixedCellHeight) * model.getSize() where
- * rowVerticalMargins is the space we allocate for drawing
- * the yellow focus outline. Similarly if fixedCellWidth is
- * specified then we just use that.
- * |
- *
- * JList.VERTICAL_WRAP
- * | If the visible row count is greater than zero, the preferredHeight
- * is the maximum cell height * visibleRowCount. If the visible row
- * count is <= 0, the preferred height is either the current height
- * of the list, or the maximum cell height, whichever is
- * bigger. The preferred width is than the maximum cell width *
- * number of columns needed. Where the number of columns needs is
- * list.height / max cell height. Max cell height is either the fixed
- * cell height, or is determined by iterating through all the cells
- * to find the maximum height from the ListCellRenderer.
- * |
- * JList.HORIZONTAL_WRAP
- * | If the visible row count is greater than zero, the preferredHeight
- * is the maximum cell height * adjustedRowCount. Where
- * visibleRowCount is used to determine the number of columns.
- * Because this lays out horizontally the number of rows is
- * then determined from the column count. For example, lets say
- * you have a model with 10 items and the visible row count is 8.
- * The number of columns needed to display this is 2, but you no
- * longer need 8 rows to display this, you only need 5, thus
- * the adjustedRowCount is 5.
- * If the visible row
- * count is <= 0, the preferred height is dictated by the
- * number of columns, which will be as many as can fit in the width
- * of the JList (width / max cell width), with at
- * least one column. The preferred height then becomes the
- * model size / number of columns * maximum cell height.
- * Max cell height is either the fixed
- * cell height, or is determined by iterating through all the cells
- * to find the maximum height from the ListCellRenderer.
+ * |
+ * JList.VERTICAL
+ * | The preferredSize of the list is total height of the rows
+ * and the maximum width of the cells. If JList.fixedCellHeight
+ * is specified then the total height of the rows is just
+ * (cellVerticalMargins + fixedCellHeight) * model.getSize() where
+ * rowVerticalMargins is the space we allocate for drawing
+ * the yellow focus outline. Similarly if fixedCellWidth is
+ * specified then we just use that.
+ * |
+ * JList.VERTICAL_WRAP
+ * | If the visible row count is greater than zero, the preferredHeight
+ * is the maximum cell height * visibleRowCount. If the visible row
+ * count is <= 0, the preferred height is either the current height
+ * of the list, or the maximum cell height, whichever is
+ * bigger. The preferred width is than the maximum cell width *
+ * number of columns needed. Where the number of columns needs is
+ * list.height / max cell height. Max cell height is either the fixed
+ * cell height, or is determined by iterating through all the cells
+ * to find the maximum height from the ListCellRenderer.
+ * |
+ * JList.HORIZONTAL_WRAP
+ * | If the visible row count is greater than zero, the preferredHeight
+ * is the maximum cell height * adjustedRowCount. Where
+ * visibleRowCount is used to determine the number of columns.
+ * Because this lays out horizontally the number of rows is
+ * then determined from the column count. For example, lets say
+ * you have a model with 10 items and the visible row count is 8.
+ * The number of columns needed to display this is 2, but you no
+ * longer need 8 rows to display this, you only need 5, thus
+ * the adjustedRowCount is 5.
+ *
+ * If the visible row count is <= 0, the preferred height is dictated
+ * by the number of columns, which will be as many as can fit in the
+ * width of the {@code JList} (width / max cell width), with at least
+ * one column. The preferred height then becomes the model size / number
+ * of columns * maximum cell height. Max cell height is either the fixed
+ * cell height, or is determined by iterating through all the cells to
+ * find the maximum height from the ListCellRenderer.
* |
*
+ *
* The above specifies the raw preferred width and height. The resulting
* preferred width is the above width + insets.left + insets.right and
* the resulting preferred height is the above height + insets.top +
--- old/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java 2017-09-03 00:47:02.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java 2017-09-03 00:47:02.000000000 -0700
@@ -295,87 +295,87 @@
* Metal's system color mapping
*
*
- * Key
- * | Value
+ * | Key
+ * | Value
* |
*
- *
- * "desktop"
+ * |
+ * "desktop"
* | {@code theme.getDesktopColor()}
- * |
- * "activeCaption"
+ * |
+ * "activeCaption"
* | {@code theme.getWindowTitleBackground()}
- * |
- * "activeCaptionText"
+ * |
+ * "activeCaptionText"
* | {@code theme.getWindowTitleForeground()}
- * |
- * "activeCaptionBorder"
+ * |
+ * "activeCaptionBorder"
* | {@code theme.getPrimaryControlShadow()}
- * |
- * "inactiveCaption"
+ * |
+ * "inactiveCaption"
* | {@code theme.getWindowTitleInactiveBackground()}
- * |
- * "inactiveCaptionText"
+ * |
+ * "inactiveCaptionText"
* | {@code theme.getWindowTitleInactiveForeground()}
- * |
- * "inactiveCaptionBorder"
+ * |
+ * "inactiveCaptionBorder"
* | {@code theme.getControlShadow()}
- * |
- * "window"
+ * |
+ * "window"
* | {@code theme.getWindowBackground()}
- * |
- * "windowBorder"
+ * |
+ * "windowBorder"
* | {@code theme.getControl()}
- * |
- * "windowText"
+ * |
+ * "windowText"
* | {@code theme.getUserTextColor()}
- * |
- * "menu"
+ * |
+ * "menu"
* | {@code theme.getMenuBackground()}
- * |
- * "menuText"
+ * |
+ * "menuText"
* | {@code theme.getMenuForeground()}
- * |
- * "text"
+ * |
+ * "text"
* | {@code theme.getWindowBackground()}
- * |
- * "textText"
+ * |
+ * "textText"
* | {@code theme.getUserTextColor()}
- * |
- * "textHighlight"
+ * |
+ * "textHighlight"
* | {@code theme.getTextHighlightColor()}
- * |
- * "textHighlightText"
+ * |
+ * "textHighlightText"
* | {@code theme.getHighlightedTextColor()}
- * |
- * "textInactiveText"
+ * |
+ * "textInactiveText"
* | {@code theme.getInactiveSystemTextColor()}
- * |
- * "control"
+ * |
+ * "control"
* | {@code theme.getControl()}
- * |
- * "controlText"
+ * |
+ * "controlText"
* | {@code theme.getControlTextColor()}
- * |
- * "controlHighlight"
+ * |
+ * "controlHighlight"
* | {@code theme.getControlHighlight()}
- * |
- * "controlLtHighlight"
+ * |
+ * "controlLtHighlight"
* | {@code theme.getControlHighlight()}
- * |
- * "controlShadow"
+ * |
+ * "controlShadow"
* | {@code theme.getControlShadow()}
- * |
- * "controlDkShadow"
+ * |
+ * "controlDkShadow"
* | {@code theme.getControlDarkShadow()}
- * |
- * "scrollbar"
+ * |
+ * "scrollbar"
* | {@code theme.getControl()}
- * |
- * "info"
+ * |
+ * "info"
* | {@code theme.getPrimaryControl()}
- * |
- * "infoText"
+ * |
+ * "infoText"
* | {@code theme.getPrimaryControlInfo()}
* |
*
--- old/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTreeUI.java 2017-09-03 00:47:03.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalTreeUI.java 2017-09-03 00:47:03.000000000 -0700
@@ -47,24 +47,18 @@
*
* Descriptions of supported hints: Angled, Horizontal, and None
*
- *
- * Angled |
- * A line is drawn connecting the child to the parent. For handling
- * of the root node refer to
- * {@link javax.swing.JTree#setRootVisible} and
- * {@link javax.swing.JTree#setShowsRootHandles}.
- * |
- *
- *
- * Horizontal |
- * A horizontal line is drawn dividing the children of the root node. |
- *
- *
- * None |
- * Do not draw any visual indication between nodes. |
- *
+ *
+ * Angled
+ * | A line is drawn connecting the child to the parent. For handling of
+ * the root node refer to {@link JTree#setRootVisible} and
+ * {@link JTree#setShowsRootHandles}.
+ * |
+ * Horizontal
+ * | A horizontal line is drawn dividing the children of the root node.
+ * |
+ * None
+ * | Do not draw any visual indication between nodes.
* |
- *
*
* As it is typically impractical to obtain the TreeUI
from
* the JTree
and cast to an instance of MetalTreeUI
--- old/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java 2017-09-03 00:47:04.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java 2017-09-03 00:47:04.000000000 -0700
@@ -160,31 +160,37 @@
*
* Stages of keyboard and input method event handling
*
- *
- * Stage |
- * KeyEvent |
- * InputMethodEvent |
+ *
+ * Stage
+ * | KeyEvent
+ * | InputMethodEvent
* |
*
- * 1. |
- * input methods |
- * (generated here) |
- * 2. |
- * focus manager |
- * |
- *
- *
- * 3. |
- * registered key listeners |
- * registered input method listeners |
- *
- * 4. |
- * |
- * input method handling in JTextComponent |
- *
- * 5. | keymap handling using the current keymap |
- * 6. | keyboard handling in JComponent (e.g. accelerators, component navigation, etc.) |
- * |
+ *
+ * 1.
+ * | input methods
+ * | (generated here)
+ * |
+ * 2.
+ * | focus manager
+ * |
+ * |
+ *
+ * 3.
+ * | registered key listeners
+ * | registered input method listeners
+ * |
+ * 4.
+ * |
+ * | input method handling in JTextComponent
+ * |
+ * 5.
+ * | keymap handling using the current keymap
+ * |
+ * 6.
+ * | keyboard handling in JComponent (e.g. accelerators,
+ * component navigation, etc.)
+ * |
* |
*
*
--- old/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java 2017-09-03 00:47:05.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/text/MaskFormatter.java 2017-09-03 00:47:05.000000000 -0700
@@ -40,36 +40,39 @@
*
* Valid characters and their descriptions
*
- *
- * Character |
- * Description |
- *
+ *
+ * Character
+ * | Description
* |
*
- *
- * # |
- * Any valid number, uses Character.isDigit . |
- *
- *
- * ' |
- * Escape character, used to escape any of the
- * special formatting characters. |
- *
- *
- * U | Any character (Character.isLetter ). All
- * lowercase letters are mapped to upper case. |
- *
- * L | Any character (Character.isLetter ). All
- * upper case letters are mapped to lower case. |
- *
- * A | Any character or number (Character.isLetter
- * or Character.isDigit ) |
- *
- * ? | Any character
- * (Character.isLetter ). |
- *
- * * | Anything. |
- * H | Any hex character (0-9, a-f or A-F). |
+ *
+ * #
+ * | Any valid number, uses {@code Character.isDigit}.
+ * |
+ * '
+ * | Escape character, used to escape any of the special formatting
+ * characters.
+ * |
+ * U
+ * | Any character ({@code Character.isLetter}). All lowercase letters are
+ * mapped to upper case.
+ * |
+ * L
+ * | Any character ({@code Character.isLetter}). All upper case letters
+ * are mapped to lower case.
+ * |
+ * A
+ * | Any character or number ({@code Character.isLetter} or
+ * {@code Character.isDigit}).
+ * |
+ * ?
+ * | Any character ({@code Character.isLetter}).
+ * |
+ * *
+ * | Anything.
+ * |
+ * H
+ * | Any hex character (0-9, a-f or A-F).
* |
*
*
--- old/src/java.desktop/share/classes/javax/swing/text/html/FormView.java 2017-09-03 00:47:06.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/text/html/FormView.java 2017-09-03 00:47:06.000000000 -0700
@@ -50,60 +50,47 @@
*
* Shows what components get built by this view
*
- *
- * Element Type |
- * Component built |
- *
+ *
+ * Element Type
+ * | Component built
* |
*
- *
- * input, type button |
- * JButton |
- *
- *
- * input, type checkbox |
- * JCheckBox |
- *
- *
- * input, type image |
- * JButton |
- *
- *
- * input, type password |
- * JPasswordField |
- *
- *
- * input, type radio |
- * JRadioButton |
- *
- *
- * input, type reset |
- * JButton |
- *
- *
- * input, type submit |
- * JButton |
- *
- *
- * input, type text |
- * JTextField |
- *
- *
- * select, size > 1 or multiple attribute defined |
- * JList in a JScrollPane |
- *
- *
- * select, size unspecified or 1 |
- * JComboBox |
- *
- *
- * textarea |
- * JTextArea in a JScrollPane |
- *
- *
- * input, type file |
- * JTextField |
- *
+ *
+ * input, type button
+ * | JButton
+ * |
+ * input, type checkbox
+ * | JCheckBox
+ * |
+ * input, type image
+ * | JButton
+ * |
+ * input, type password
+ * | JPasswordField
+ * |
+ * input, type radio
+ * | JRadioButton
+ * |
+ * input, type reset
+ * | JButton
+ * |
+ * input, type submit
+ * | JButton
+ * |
+ * input, type text
+ * | JTextField
+ * |
+ * select, size > 1 or multiple attribute defined
+ * | JList in a JScrollPane
+ * |
+ * select, size unspecified or 1
+ * | JComboBox
+ * |
+ * textarea
+ * | JTextArea in a JScrollPane
+ * |
+ * input, type file
+ * | JTextField
* |
*
*
--- old/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java 2017-09-03 00:47:07.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java 2017-09-03 00:47:06.000000000 -0700
@@ -2134,81 +2134,227 @@
*
* HTML tags and assigned actions
*
- * Tag | Action |
+ *
+ * Tag
+ * | Action
* |
*
- * HTML.Tag.A | CharacterAction
- * |
HTML.Tag.ADDRESS | CharacterAction
- * |
HTML.Tag.APPLET | HiddenAction
- * |
HTML.Tag.AREA | AreaAction
- * |
HTML.Tag.B | CharacterAction
- * |
HTML.Tag.BASE | BaseAction
- * |
HTML.Tag.BASEFONT | CharacterAction
- * |
HTML.Tag.BIG | CharacterAction
- * |
HTML.Tag.BLOCKQUOTE | BlockAction
- * |
HTML.Tag.BODY | BlockAction
- * |
HTML.Tag.BR | SpecialAction
- * |
HTML.Tag.CAPTION | BlockAction
- * |
HTML.Tag.CENTER | BlockAction
- * |
HTML.Tag.CITE | CharacterAction
- * |
HTML.Tag.CODE | CharacterAction
- * |
HTML.Tag.DD | BlockAction
- * |
HTML.Tag.DFN | CharacterAction
- * |
HTML.Tag.DIR | BlockAction
- * |
HTML.Tag.DIV | BlockAction
- * |
HTML.Tag.DL | BlockAction
- * |
HTML.Tag.DT | ParagraphAction
- * |
HTML.Tag.EM | CharacterAction
- * |
HTML.Tag.FONT | CharacterAction
- * |
HTML.Tag.FORM | As of 1.4 a BlockAction
- * |
HTML.Tag.FRAME | SpecialAction
- * |
HTML.Tag.FRAMESET | BlockAction
- * |
HTML.Tag.H1 | ParagraphAction
- * |
HTML.Tag.H2 | ParagraphAction
- * |
HTML.Tag.H3 | ParagraphAction
- * |
HTML.Tag.H4 | ParagraphAction
- * |
HTML.Tag.H5 | ParagraphAction
- * |
HTML.Tag.H6 | ParagraphAction
- * |
HTML.Tag.HEAD | HeadAction
- * |
HTML.Tag.HR | SpecialAction
- * |
HTML.Tag.HTML | BlockAction
- * |
HTML.Tag.I | CharacterAction
- * |
HTML.Tag.IMG | SpecialAction
- * |
HTML.Tag.INPUT | FormAction
- * |
HTML.Tag.ISINDEX | IsndexAction
- * |
HTML.Tag.KBD | CharacterAction
- * |
HTML.Tag.LI | BlockAction
- * |
HTML.Tag.LINK | LinkAction
- * |
HTML.Tag.MAP | MapAction
- * |
HTML.Tag.MENU | BlockAction
- * |
HTML.Tag.META | MetaAction
- * |
HTML.Tag.NOFRAMES | BlockAction
- * |
HTML.Tag.OBJECT | SpecialAction
- * |
HTML.Tag.OL | BlockAction
- * |
HTML.Tag.OPTION | FormAction
- * |
HTML.Tag.P | ParagraphAction
- * |
HTML.Tag.PARAM | HiddenAction
- * |
HTML.Tag.PRE | PreAction
- * |
HTML.Tag.SAMP | CharacterAction
- * |
HTML.Tag.SCRIPT | HiddenAction
- * |
HTML.Tag.SELECT | FormAction
- * |
HTML.Tag.SMALL | CharacterAction
- * |
HTML.Tag.STRIKE | CharacterAction
- * |
HTML.Tag.S | CharacterAction
- * |
HTML.Tag.STRONG | CharacterAction
- * |
HTML.Tag.STYLE | StyleAction
- * |
HTML.Tag.SUB | CharacterAction
- * |
HTML.Tag.SUP | CharacterAction
- * |
HTML.Tag.TABLE | BlockAction
- * |
HTML.Tag.TD | BlockAction
- * |
HTML.Tag.TEXTAREA | FormAction
- * |
HTML.Tag.TH | BlockAction
- * |
HTML.Tag.TITLE | TitleAction
- * |
HTML.Tag.TR | BlockAction
- * |
HTML.Tag.TT | CharacterAction
- * |
HTML.Tag.U | CharacterAction
- * |
HTML.Tag.UL | BlockAction
- * |
HTML.Tag.VAR | CharacterAction
+ * |
+ * {@code HTML.Tag.A}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.ADDRESS}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.APPLET}
+ * | HiddenAction
+ * |
+ * {@code HTML.Tag.AREA}
+ * | AreaAction
+ * |
+ * {@code HTML.Tag.B}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.BASE}
+ * | BaseAction
+ * |
+ * {@code HTML.Tag.BASEFONT}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.BIG}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.BLOCKQUOTE}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.BODY}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.BR}
+ * | SpecialAction
+ * |
+ * {@code HTML.Tag.CAPTION}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.CENTER}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.CITE}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.CODE}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.DD}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.DFN}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.DIR}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.DIV}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.DL}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.DT}
+ * | ParagraphAction
+ * |
+ * {@code HTML.Tag.EM}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.FONT}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.FORM}
+ * | As of 1.4 a BlockAction
+ * |
+ * {@code HTML.Tag.FRAME}
+ * | SpecialAction
+ * |
+ * {@code HTML.Tag.FRAMESET}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.H1}
+ * | ParagraphAction
+ * |
+ * {@code HTML.Tag.H2}
+ * | ParagraphAction
+ * |
+ * {@code HTML.Tag.H3}
+ * | ParagraphAction
+ * |
+ * {@code HTML.Tag.H4}
+ * | ParagraphAction
+ * |
+ * {@code HTML.Tag.H5}
+ * | ParagraphAction
+ * |
+ * {@code HTML.Tag.H6}
+ * | ParagraphAction
+ * |
+ * {@code HTML.Tag.HEAD}
+ * | HeadAction
+ * |
+ * {@code HTML.Tag.HR}
+ * | SpecialAction
+ * |
+ * {@code HTML.Tag.HTML}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.I}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.IMG}
+ * | SpecialAction
+ * |
+ * {@code HTML.Tag.INPUT}
+ * | FormAction
+ * |
+ * {@code HTML.Tag.ISINDEX}
+ * | IsndexAction
+ * |
+ * {@code HTML.Tag.KBD}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.LI}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.LINK}
+ * | LinkAction
+ * |
+ * {@code HTML.Tag.MAP}
+ * | MapAction
+ * |
+ * {@code HTML.Tag.MENU}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.META}
+ * | MetaAction
+ * |
+ * {@code HTML.Tag.NOFRAMES}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.OBJECT}
+ * | SpecialAction
+ * |
+ * {@code HTML.Tag.OL}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.OPTION}
+ * | FormAction
+ * |
+ * {@code HTML.Tag.P}
+ * | ParagraphAction
+ * |
+ * {@code HTML.Tag.PARAM}
+ * | HiddenAction
+ * |
+ * {@code HTML.Tag.PRE}
+ * | PreAction
+ * |
+ * {@code HTML.Tag.SAMP}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.SCRIPT}
+ * | HiddenAction
+ * |
+ * {@code HTML.Tag.SELECT}
+ * | FormAction
+ * |
+ * {@code HTML.Tag.SMALL}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.STRIKE}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.S}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.STRONG}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.STYLE}
+ * | StyleAction
+ * |
+ * {@code HTML.Tag.SUB}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.SUP}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.TABLE}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.TD}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.TEXTAREA}
+ * | FormAction
+ * |
+ * {@code HTML.Tag.TH}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.TITLE}
+ * | TitleAction
+ * |
+ * {@code HTML.Tag.TR}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.TT}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.U}
+ * | CharacterAction
+ * |
+ * {@code HTML.Tag.UL}
+ * | BlockAction
+ * |
+ * {@code HTML.Tag.VAR}
+ * | CharacterAction
* |
*
*
@@ -3397,45 +3543,44 @@
*
Model assignments for the various types of form elements
*
*
- *
- * Element Type
- * | Model Type
- * |
+ *
+ * Element Type
+ * | Model Type
* |
*
- *
- * input, type button
- * | {@link DefaultButtonModel}
- * |
- * input, type checkbox
- * | {@link javax.swing.JToggleButton.ToggleButtonModel}
- * |
- * input, type image
- * | {@link DefaultButtonModel}
- * |
- * input, type password
- * | {@link PlainDocument}
- * |
- * input, type radio
- * | {@link javax.swing.JToggleButton.ToggleButtonModel}
- * |
- * input, type reset
- * | {@link DefaultButtonModel}
- * |
- * input, type submit
- * | {@link DefaultButtonModel}
- * |
- * input, type text or type is null.
- * | {@link PlainDocument}
- * |
- * select
- * | {@link DefaultComboBoxModel} or an {@link DefaultListModel}, with an item type of Option
- * |
- * textarea
- * | {@link PlainDocument}
+ * |
+ * input, type button
+ * | {@link DefaultButtonModel}
+ * |
+ * input, type checkbox
+ * | {@link JToggleButton.ToggleButtonModel}
+ * |
+ * input, type image
+ * | {@link DefaultButtonModel}
+ * |
+ * input, type password
+ * | {@link PlainDocument}
+ * |
+ * input, type radio
+ * | {@link JToggleButton.ToggleButtonModel}
+ * |
+ * input, type reset
+ * | {@link DefaultButtonModel}
+ * |
+ * input, type submit
+ * | {@link DefaultButtonModel}
+ * |
+ * input, type text or type is null.
+ * | {@link PlainDocument}
+ * |
+ * select
+ * | {@link DefaultComboBoxModel} or an {@link DefaultListModel},
+ * with an item type of Option
+ * |
+ * textarea
+ * | {@link PlainDocument}
* |
*
- *
*/
public class FormAction extends SpecialAction {
--- old/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java 2017-09-03 00:47:08.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java 2017-09-03 00:47:07.000000000 -0700
@@ -1122,83 +1122,116 @@
* Describes the tag and view created by this factory by default
*
*
- *
- * Tag
- * | View created
- * |
+ *
+ * Tag
+ * | View created
* |
*
- *
- * HTML.Tag.CONTENT | InlineView
- * |
- * HTML.Tag.IMPLIED | javax.swing.text.html.ParagraphView
- * |
- * HTML.Tag.P | javax.swing.text.html.ParagraphView
- * |
- * HTML.Tag.H1 | javax.swing.text.html.ParagraphView
- * |
- * HTML.Tag.H2 | javax.swing.text.html.ParagraphView
- * |
- * HTML.Tag.H3 | javax.swing.text.html.ParagraphView
- * |
- * HTML.Tag.H4 | javax.swing.text.html.ParagraphView
- * |
- * HTML.Tag.H5 | javax.swing.text.html.ParagraphView
- * |
- * HTML.Tag.H6 | javax.swing.text.html.ParagraphView
- * |
- * HTML.Tag.DT | javax.swing.text.html.ParagraphView
- * |
- * HTML.Tag.MENU | ListView
- * |
- * HTML.Tag.DIR | ListView
- * |
- * HTML.Tag.UL | ListView
- * |
- * HTML.Tag.OL | ListView
- * |
- * HTML.Tag.LI | BlockView
- * |
- * HTML.Tag.DL | BlockView
- * |
- * HTML.Tag.DD | BlockView
- * |
- * HTML.Tag.BODY | BlockView
- * |
- * HTML.Tag.HTML | BlockView
- * |
- * HTML.Tag.CENTER | BlockView
- * |
- * HTML.Tag.DIV | BlockView
- * |
- * HTML.Tag.BLOCKQUOTE | BlockView
- * |
- * HTML.Tag.PRE | BlockView
- * |
- * HTML.Tag.BLOCKQUOTE | BlockView
- * |
- * HTML.Tag.PRE | BlockView
- * |
- * HTML.Tag.IMG | ImageView
- * |
- * HTML.Tag.HR | HRuleView
- * |
- * HTML.Tag.BR | BRView
- * |
- * HTML.Tag.TABLE | javax.swing.text.html.TableView
- * |
- * HTML.Tag.INPUT | FormView
- * |
- * HTML.Tag.SELECT | FormView
- * |
- * HTML.Tag.TEXTAREA | FormView
- * |
- * HTML.Tag.OBJECT | ObjectView
- * |
- * HTML.Tag.FRAMESET | FrameSetView
- * |
- * HTML.Tag.FRAME | FrameView
- * |
+ *
+ * HTML.Tag.CONTENT
+ * | InlineView
+ * |
+ * HTML.Tag.IMPLIED
+ * | javax.swing.text.html.ParagraphView
+ * |
+ * HTML.Tag.P
+ * | javax.swing.text.html.ParagraphView
+ * |
+ * HTML.Tag.H1
+ * | javax.swing.text.html.ParagraphView
+ * |
+ * HTML.Tag.H2
+ * | javax.swing.text.html.ParagraphView
+ * |
+ * HTML.Tag.H3
+ * | javax.swing.text.html.ParagraphView
+ * |
+ * HTML.Tag.H4
+ * | javax.swing.text.html.ParagraphView
+ * |
+ * HTML.Tag.H5
+ * | javax.swing.text.html.ParagraphView
+ * |
+ * HTML.Tag.H6
+ * | javax.swing.text.html.ParagraphView
+ * |
+ * HTML.Tag.DT
+ * | javax.swing.text.html.ParagraphView
+ * |
+ * HTML.Tag.MENU
+ * | ListView
+ * |
+ * HTML.Tag.DIR
+ * | ListView
+ * |
+ * HTML.Tag.UL
+ * | ListView
+ * |
+ * HTML.Tag.OL
+ * | ListView
+ * |
+ * HTML.Tag.LI
+ * | BlockView
+ * |
+ * HTML.Tag.DL
+ * | BlockView
+ * |
+ * HTML.Tag.DD
+ * | BlockView
+ * |
+ * HTML.Tag.BODY
+ * | BlockView
+ * |
+ * HTML.Tag.HTML
+ * | BlockView
+ * |
+ * HTML.Tag.CENTER
+ * | BlockView
+ * |
+ * HTML.Tag.DIV
+ * | BlockView
+ * |
+ * HTML.Tag.BLOCKQUOTE
+ * | BlockView
+ * |
+ * HTML.Tag.PRE
+ * | BlockView
+ * |
+ * HTML.Tag.BLOCKQUOTE
+ * | BlockView
+ * |
+ * HTML.Tag.PRE
+ * | BlockView
+ * |
+ * HTML.Tag.IMG
+ * | ImageView
+ * |
+ * HTML.Tag.HR
+ * | HRuleView
+ * |
+ * HTML.Tag.BR
+ * | BRView
+ * |
+ * HTML.Tag.TABLE
+ * | javax.swing.text.html.TableView
+ * |
+ * HTML.Tag.INPUT
+ * | FormView
+ * |
+ * HTML.Tag.SELECT
+ * | FormView
+ * |
+ * HTML.Tag.TEXTAREA
+ * | FormView
+ * |
+ * HTML.Tag.OBJECT
+ * | ObjectView
+ * |
+ * HTML.Tag.FRAMESET
+ * | FrameSetView
+ * |
+ * HTML.Tag.FRAME
+ * | FrameView
* |
*
*/
--- old/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java 2017-09-03 00:47:08.000000000 -0700
+++ new/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java 2017-09-03 00:47:08.000000000 -0700
@@ -65,19 +65,35 @@
* Properties
*
*
- * Property:
- * | Key:
+ * | Property
+ * | Key
* |
*
*
- * "leafIcon" | "Tree.leafIcon"
- * |
"closedIcon" | "Tree.closedIcon"
- * |
"openIcon" | "Tree.openIcon"
- * |
"textSelectionColor" | "Tree.selectionForeground"
- * |
"textNonSelectionColor" | "Tree.textForeground"
- * |
"backgroundSelectionColor" | "Tree.selectionBackground"
- * |
"backgroundNonSelectionColor" | "Tree.textBackground"
- * |
"borderSelectionColor" | "Tree.selectionBorderColor"
+ * |
+ * "leafIcon"
+ * | "Tree.leafIcon"
+ * |
+ * "closedIcon"
+ * | "Tree.closedIcon"
+ * |
+ * "openIcon"
+ * | "Tree.openIcon"
+ * |
+ * "textSelectionColor"
+ * | "Tree.selectionForeground"
+ * |
+ * "textNonSelectionColor"
+ * | "Tree.textForeground"
+ * |
+ * "backgroundSelectionColor"
+ * | "Tree.selectionBackground"
+ * |
+ * "backgroundNonSelectionColor"
+ * | "Tree.textBackground"
+ * |
+ * "borderSelectionColor"
+ * | "Tree.selectionBorderColor"
* |
*
*