OpenJDK / jdk / jdk
changeset 4848:ffcc849b9351
6912118: Incosistency in several SynthUI classes between inherited specs ofupdate() and paint() methods
Reviewed-by: rupashka
line wrap: on
line diff
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -237,7 +237,16 @@ // ******************************** /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -250,7 +259,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -264,7 +279,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { AbstractButton b = (AbstractButton)context.getComponent();
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -137,7 +137,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -151,7 +160,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -166,7 +181,8 @@ * This implementation does not perform any actions. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { }
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -305,7 +305,16 @@ // begin ComponentUI Implementation /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -319,7 +328,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -333,7 +348,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { hasFocus = comboBox.hasFocus();
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -152,7 +152,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -166,7 +175,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -180,7 +195,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { }
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -439,7 +439,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -453,7 +462,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -467,7 +482,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { }
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -148,7 +148,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -164,7 +173,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { super.paint(g, getComponent());
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -194,7 +194,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -208,7 +217,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -222,7 +237,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { }
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthLabelUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -156,12 +156,16 @@ } /** - * Notifies this UI delegate that it's time to paint the specified - * component. This method is invoked by <code>JComponent</code> - * when the specified component is being painted. - */ - /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -175,7 +179,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -189,7 +199,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { JLabel label = (JLabel)context.getComponent();
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthListUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthListUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -57,7 +57,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint */ @Override public void update(Graphics g, JComponent c) {
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -125,7 +125,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -139,7 +148,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -153,7 +168,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { }
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -227,7 +227,16 @@ /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -240,7 +249,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -254,7 +269,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { SynthContext accContext = getContext(menuItem,
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -227,7 +227,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -241,7 +250,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -255,7 +270,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { SynthContext accContext = getContext(menuItem,
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -149,7 +149,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -163,7 +172,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -177,7 +192,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { }
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -136,7 +136,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -150,7 +159,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -164,7 +179,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { // do actual painting
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -132,7 +132,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -146,7 +155,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -160,7 +175,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { }
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -193,7 +193,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -208,7 +217,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -222,7 +237,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { JProgressBar pBar = (JProgressBar)context.getComponent();
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -102,7 +102,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -116,7 +125,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -130,7 +145,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { }
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -222,7 +222,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -237,7 +246,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -251,7 +266,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { SynthContext subcontext = getContext(scrollbar,
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -64,7 +64,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -78,7 +87,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -92,7 +107,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { Border vpBorder = scrollpane.getViewportBorder();
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -135,7 +135,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -151,7 +160,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -165,7 +180,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { JSeparator separator = (JSeparator)context.getComponent();
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -788,7 +788,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -802,7 +811,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -815,7 +830,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { recalculateIfInsetsChanged();
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthSpinnerUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -283,7 +283,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -298,7 +307,13 @@ /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -312,7 +327,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { }
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -269,7 +269,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -283,7 +292,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -297,7 +312,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { // This is done to update package private variables in
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -92,8 +92,8 @@ private SynthStyle tabAreaStyle; private SynthStyle tabContentStyle; - private Rectangle textRect; - private Rectangle iconRect; + private Rectangle textRect = new Rectangle(); + private Rectangle iconRect = new Rectangle(); private Rectangle tabAreaBounds = new Rectangle(); @@ -115,11 +115,6 @@ return new SynthTabbedPaneUI(); } - private SynthTabbedPaneUI() { - textRect = new Rectangle(); - iconRect = new Rectangle(); - } - private boolean scrollableTabLayoutEnabled() { return (tabPane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT); } @@ -362,7 +357,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -409,7 +413,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -423,7 +433,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { int selectedIndex = tabPane.getSelectedIndex();
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -123,7 +123,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -137,7 +146,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -151,7 +166,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { super.paint(g, context.getComponent());
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -256,7 +256,16 @@ // /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -279,7 +288,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -293,7 +308,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { Rectangle clip = g.getClipBounds();
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -123,7 +123,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -140,7 +149,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { super.paint(g, getComponent());
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -161,7 +161,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -182,7 +191,8 @@ * model to potentially be updated asynchronously. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { super.paint(g, getComponent());
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -198,7 +198,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -213,7 +222,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -258,7 +273,8 @@ * Paints the toolbar. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { if (handleIcon != null && toolBar.isFloatable()) {
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolTipUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -121,7 +121,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -144,7 +153,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -158,7 +173,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { JToolTip tip = (JToolTip)context.getComponent();
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -250,7 +250,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -273,7 +282,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -287,7 +302,8 @@ * Paints the specified component. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { paintContext = context;
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java Tue Jan 26 15:42:06 2010 +0900 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java Thu Jan 28 17:06:54 2010 +0300 @@ -150,7 +150,16 @@ } /** - * @inheritDoc + * Notifies this UI delegate to repaint the specified component. + * This method paints the component background, then calls + * the {@link #paint(SynthContext,Graphics)} method. + * + * <p>In general, this method does not need to be overridden by subclasses. + * All Look and Feel rendering code should reside in the {@code paint} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void update(Graphics g, JComponent c) { @@ -174,7 +183,13 @@ } /** - * @inheritDoc + * Paints the specified component according to the Look and Feel. + * <p>This method is not used by Synth Look and Feel. + * Painting is handled by the {@link #paint(SynthContext,Graphics)} method. + * + * @param g the {@code Graphics} object used for painting + * @param c the component being painted + * @see #paint(SynthContext,Graphics) */ @Override public void paint(Graphics g, JComponent c) { @@ -188,7 +203,8 @@ * Paints the specified component. This implementation does nothing. * * @param context context for the component being painted - * @param g {@code Graphics} object used for painting + * @param g the {@code Graphics} object used for painting + * @see #update(Graphics,JComponent) */ protected void paint(SynthContext context, Graphics g) { }