Index: modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java =================================================================== --- modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java (revision 489577) +++ modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicSliderUI.java (working copy) @@ -14,18 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/** - * @author Sergey Burlak - * @version $Revision$ - */ - package javax.swing.plaf.basic; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.Graphics; +import java.awt.IllegalComponentStateException; import java.awt.Insets; import java.awt.Point; import java.awt.Rectangle; @@ -59,21 +54,29 @@ import org.apache.harmony.x.swing.StringConstants; import org.apache.harmony.x.swing.Utilities; - +/** + * Note: serialVersionUID fields are added as + * a performance optimization only but not as a guarantee of correct + * deserialization. + */ public class BasicSliderUI extends SliderUI { public class ActionScroller extends AbstractAction { + private static final long serialVersionUID = -3454576988589353120L; + public ActionScroller(final JSlider slider, final int dir, final boolean block) { } public void actionPerformed(final ActionEvent e) { } + @Override public boolean isEnabled() { return false; } } + public class ChangeHandler implements ChangeListener { public void stateChanged(final ChangeEvent e) { calculateThumbLocation(); @@ -88,7 +91,9 @@ } } + public class ComponentHandler extends ComponentAdapter { + @Override public void componentResized(final ComponentEvent e) { calculateGeometry(); slider.repaint(); @@ -175,6 +180,7 @@ }); } + @Override public void mouseReleased(final MouseEvent e) { if (trackTimer.isRunning()) { trackTimer.stop(); @@ -200,6 +206,7 @@ slider.repaint(); } + @Override public void mousePressed(final MouseEvent e) { if (!slider.isFocusOwner()) { slider.requestFocus(); @@ -239,6 +246,7 @@ return false; } + @Override public void mouseDragged(final MouseEvent e) { mousePoint = e.getPoint(); if (inThumb && SwingUtilities.isLeftMouseButton(e)) { @@ -272,6 +280,7 @@ } } + @Override public void mouseMoved(final MouseEvent e) { } @@ -378,8 +387,6 @@ private static final int UNIT_INCREMENT = 1; public BasicSliderUI(final JSlider slider) { - this.slider = slider; - focusRect = new Rectangle(); contentRect = new Rectangle(); labelRect = new Rectangle(); @@ -408,6 +415,7 @@ return new BasicSliderUI((JSlider)c); } + @Override public void installUI(final JComponent c) { slider = (JSlider)c; @@ -418,9 +426,12 @@ calculateGeometry(); } + @Override public void uninstallUI(final JComponent c) { - slider = (JSlider)c; - + if (c != slider) { + // TODO Perform i18n after HARMONY-1320 is applied + throw new IllegalComponentStateException(this + " was asked to deinstall() " + c + " when it only knows about " + slider); + } uninstallListeners(slider); uninstallKeyboardActions(slider); } @@ -558,6 +569,7 @@ return new Dimension(width, DEFAULT_SLIDER_MIN_SIZE); } + @Override public Dimension getPreferredSize(final JComponent c) { if (slider.getOrientation() == JSlider.HORIZONTAL) { return getPreferredHorizontalSize(); @@ -566,6 +578,7 @@ } } + @Override public Dimension getMinimumSize(final JComponent c) { if (slider.getOrientation() == JSlider.HORIZONTAL) { return getMinimumHorizontalSize(); @@ -574,6 +587,7 @@ } } + @Override public Dimension getMaximumSize(final JComponent c) { if (slider.getOrientation() == JSlider.HORIZONTAL) { return new Dimension(Short.MAX_VALUE, getPreferredHorizontalSize().height); @@ -811,6 +825,7 @@ return result; } + @Override public void paint(final Graphics g, final JComponent c) { Color oldColor = g.getColor(); @@ -1063,6 +1078,8 @@ private Action newMaxScrollAction() { return new AbstractAction() { + private static final long serialVersionUID = -3822301141065864044L; + public void actionPerformed(final ActionEvent e) { if (drawInverted()) { slider.setValue(slider.getMinimum()); @@ -1076,6 +1093,8 @@ private Action newMinScrollAction() { return new AbstractAction() { + private static final long serialVersionUID = 703565386507416752L; + public void actionPerformed(final ActionEvent e) { if (drawInverted()) { slider.setValue(slider.getMaximum()); @@ -1089,6 +1108,8 @@ private Action newNegativeBlockIncrementAction() { return new AbstractAction() { + private static final long serialVersionUID = 7818668169396841520L; + public void actionPerformed(final ActionEvent e) { scrollByBlock(NEGATIVE_SCROLL); } @@ -1097,6 +1118,8 @@ private Action newNegativeUnitIncrementAction() { return new AbstractAction() { + private static final long serialVersionUID = -4366059737366026435L; + public void actionPerformed(final ActionEvent e) { scrollByUnit(NEGATIVE_SCROLL); } @@ -1105,6 +1128,8 @@ private Action newPositiveBlockIncrementAction() { return new AbstractAction() { + private static final long serialVersionUID = -5999323396935662487L; + public void actionPerformed(final ActionEvent e) { scrollByBlock(POSITIVE_SCROLL); } @@ -1113,6 +1138,8 @@ private Action newPositiveUnitIncrementAction() { return new AbstractAction() { + private static final long serialVersionUID = 5166413389559469128L; + public void actionPerformed(final ActionEvent e) { scrollByUnit(POSITIVE_SCROLL); }