archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6709530: There are unnecessary code in slider classes, such as in JSlider and SliderUIs

Browse source 
Removed unnecessary code like unused variables, castings, imports etc

Reviewed-by: peterz
This commit is contained in:
Pavel Porvatov 2008-06-02 19:08:13 +04:00
parent 44b0d9abbe
commit 2ae586bafc
3 changed files with 39 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

37
jdk/src/share/classes/javax/swing/JSlider.java
View file

@ -25,14 +25,12 @@
package javax.swing; package javax.swing;
import javax.swing.border.*;
import javax.swing.event.*; import javax.swing.event.*;
import javax.swing.plaf.*; import javax.swing.plaf.*;
import javax.accessibility.*; import javax.accessibility.*;
import java.io.Serializable; import java.io.Serializable;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.io.ObjectInputStream;
import java.io.IOException; import java.io.IOException;
import java.awt.Color; import java.awt.Color;
@ -409,8 +407,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible {
* @since 1.4 * @since 1.4
*/ */
public ChangeListener[] getChangeListeners() { public ChangeListener[] getChangeListeners() {
return (ChangeListener[])listenerList.getListeners( return listenerList.getListeners(ChangeListener.class);
ChangeListener.class);
} }
@ -826,33 +823,29 @@ public class JSlider extends JComponent implements SwingConstants, Accessible {
* @see JComponent#updateUI * @see JComponent#updateUI
*/ */
protected void updateLabelUIs() { protected void updateLabelUIs() {
if ( getLabelTable() == null ) { Dictionary labelTable = getLabelTable();
if (labelTable == null) {
return; return;
} }
Enumeration labels = getLabelTable().keys(); Enumeration labels = labelTable.keys();
while ( labels.hasMoreElements() ) { while ( labels.hasMoreElements() ) {
Object value = getLabelTable().get( labels.nextElement() ); JComponent component = (JComponent) labelTable.get(labels.nextElement());
if ( value instanceof JComponent ) {
JComponent component = (JComponent)value;
component.updateUI(); component.updateUI();
component.setSize(component.getPreferredSize()); component.setSize(component.getPreferredSize());
} }
} }
}
private void updateLabelSizes() { private void updateLabelSizes() {
Dictionary labelTable = getLabelTable(); Dictionary labelTable = getLabelTable();
if (labelTable != null) { if (labelTable != null) {
Enumeration labels = labelTable.elements(); Enumeration labels = labelTable.elements();
while (labels.hasMoreElements()) { while (labels.hasMoreElements()) {
Object value = labels.nextElement(); JComponent component = (JComponent) labels.nextElement();
if (value instanceof JComponent) {
JComponent component = (JComponent)value;
component.setSize(component.getPreferredSize()); component.setSize(component.getPreferredSize());
} }
} }
} }
}
/** /**
@ -960,14 +953,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible {
if ( e.getPropertyName().equals( "minimum" ) || if ( e.getPropertyName().equals( "minimum" ) ||
e.getPropertyName().equals( "maximum" ) ) { e.getPropertyName().equals( "maximum" ) ) {
Enumeration keys = getLabelTable().keys(); Dictionary labelTable = getLabelTable();
Object key = null; Enumeration keys = labelTable.keys();
Hashtable hashtable = new Hashtable(); Hashtable hashtable = new Hashtable();
// Save the labels that were added by the developer // Save the labels that were added by the developer
while ( keys.hasMoreElements() ) { while ( keys.hasMoreElements() ) {
key = keys.nextElement(); Object key = keys.nextElement();
Object value = getLabelTable().get( key ); Object value = labelTable.get(key);
if ( !(value instanceof LabelUIResource) ) { if ( !(value instanceof LabelUIResource) ) {
hashtable.put( key, value ); hashtable.put( key, value );
} }
@ -979,7 +972,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible {
// Add the saved labels // Add the saved labels
keys = hashtable.keys(); keys = hashtable.keys();
while ( keys.hasMoreElements() ) { while ( keys.hasMoreElements() ) {
key = keys.nextElement(); Object key = keys.nextElement();
put( key, hashtable.get( key ) ); put( key, hashtable.get( key ) );
} }
@ -996,8 +989,10 @@ public class JSlider extends JComponent implements SwingConstants, Accessible {
SmartHashtable table = new SmartHashtable( increment, start ); SmartHashtable table = new SmartHashtable( increment, start );
if ( getLabelTable() != null && (getLabelTable() instanceof PropertyChangeListener) ) { Dictionary labelTable = getLabelTable();
removePropertyChangeListener( (PropertyChangeListener)getLabelTable() );
if (labelTable != null && (labelTable instanceof PropertyChangeListener)) {
removePropertyChangeListener((PropertyChangeListener) labelTable);
} }
addPropertyChangeListener( table ); addPropertyChangeListener( table );

40
jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
View file

@ -26,14 +26,11 @@
package javax.swing.plaf.basic; package javax.swing.plaf.basic;
import java.awt.Component; import java.awt.Component;
import java.awt.Container;
import java.awt.Adjustable;
import java.awt.event.*; import java.awt.event.*;
import java.awt.FontMetrics; import java.awt.FontMetrics;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.Point;
import java.awt.Insets; import java.awt.Insets;
import java.awt.Color; import java.awt.Color;
import java.awt.IllegalComponentStateException; import java.awt.IllegalComponentStateException;
@ -42,8 +39,6 @@ import java.beans.*;
import java.util.Dictionary; import java.util.Dictionary;
import java.util.Enumeration; import java.util.Enumeration;
import javax.swing.border.AbstractBorder;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.*; import javax.swing.event.*;
import javax.swing.plaf.*; import javax.swing.plaf.*;
@ -409,7 +404,7 @@ public class BasicSliderUI extends SliderUI{
Enumeration elements = dictionary.elements(); Enumeration elements = dictionary.elements();
int baseline = -1; int baseline = -1;
while (elements.hasMoreElements()) { while (elements.hasMoreElements()) {
Component label = (Component)elements.nextElement(); JComponent label = (JComponent) elements.nextElement();
Dimension pref = label.getPreferredSize(); Dimension pref = label.getPreferredSize();
int labelBaseline = label.getBaseline(pref.width, int labelBaseline = label.getBaseline(pref.width,
pref.height); pref.height);
@ -634,7 +629,7 @@ public class BasicSliderUI extends SliderUI{
protected void calculateTrackRect() { protected void calculateTrackRect() {
int centerSpacing = 0; // used to center sliders added using BorderLayout.CENTER (bug 4275631) int centerSpacing; // used to center sliders added using BorderLayout.CENTER (bug 4275631)
if ( slider.getOrientation() == JSlider.HORIZONTAL ) { if ( slider.getOrientation() == JSlider.HORIZONTAL ) {
centerSpacing = thumbRect.height; centerSpacing = thumbRect.height;
if ( slider.getPaintTicks() ) centerSpacing += getTickLength(); if ( slider.getPaintTicks() ) centerSpacing += getTickLength();
@ -764,7 +759,7 @@ public class BasicSliderUI extends SliderUI{
if ( dictionary != null ) { if ( dictionary != null ) {
Enumeration keys = dictionary.keys(); Enumeration keys = dictionary.keys();
while ( keys.hasMoreElements() ) { while ( keys.hasMoreElements() ) {
Component label = (Component)dictionary.get( keys.nextElement() ); JComponent label = (JComponent) dictionary.get(keys.nextElement());
widest = Math.max( label.getPreferredSize().width, widest ); widest = Math.max( label.getPreferredSize().width, widest );
} }
} }
@ -777,7 +772,7 @@ public class BasicSliderUI extends SliderUI{
if ( dictionary != null ) { if ( dictionary != null ) {
Enumeration keys = dictionary.keys(); Enumeration keys = dictionary.keys();
while ( keys.hasMoreElements() ) { while ( keys.hasMoreElements() ) {
Component label = (Component)dictionary.get( keys.nextElement() ); JComponent label = (JComponent) dictionary.get(keys.nextElement());
tallest = Math.max( label.getPreferredSize().height, tallest ); tallest = Math.max( label.getPreferredSize().height, tallest );
} }
} }
@ -1001,22 +996,14 @@ public class BasicSliderUI extends SliderUI{
public void paintTicks(Graphics g) { public void paintTicks(Graphics g) {
Rectangle tickBounds = tickRect; Rectangle tickBounds = tickRect;
int i;
int maj, min, max;
int w = tickBounds.width;
int h = tickBounds.height;
int centerEffect, tickHeight;
g.setColor(DefaultLookup.getColor(slider, this, "Slider.tickColor", Color.black)); g.setColor(DefaultLookup.getColor(slider, this, "Slider.tickColor", Color.black));
maj = slider.getMajorTickSpacing();
min = slider.getMinorTickSpacing();
if ( slider.getOrientation() == JSlider.HORIZONTAL ) { if ( slider.getOrientation() == JSlider.HORIZONTAL ) {
g.translate( 0, tickBounds.y); g.translate( 0, tickBounds.y);
int value = slider.getMinimum(); int value = slider.getMinimum();
int xPos = 0; int xPos;
if ( slider.getMinorTickSpacing() > 0 ) { if ( slider.getMinorTickSpacing() > 0 ) {
while ( value <= slider.getMaximum() ) { while ( value <= slider.getMaximum() ) {
@ -1042,7 +1029,7 @@ public class BasicSliderUI extends SliderUI{
g.translate(tickBounds.x, 0); g.translate(tickBounds.x, 0);
int value = slider.getMinimum(); int value = slider.getMinimum();
int yPos = 0; int yPos;
if ( slider.getMinorTickSpacing() > 0 ) { if ( slider.getMinorTickSpacing() > 0 ) {
int offset = 0; int offset = 0;
@ -1111,10 +1098,9 @@ public class BasicSliderUI extends SliderUI{
Integer key = (Integer)keys.nextElement(); Integer key = (Integer)keys.nextElement();
int value = key.intValue(); int value = key.intValue();
if (value >= minValue && value <= maxValue) { if (value >= minValue && value <= maxValue) {
Component label = (Component)dictionary.get( key ); JComponent label = (JComponent) dictionary.get(key);
if (label instanceof JComponent) { label.setEnabled(enabled);
((JComponent)label).setEnabled(enabled);
}
if ( slider.getOrientation() == JSlider.HORIZONTAL ) { if ( slider.getOrientation() == JSlider.HORIZONTAL ) {
g.translate( 0, labelBounds.y ); g.translate( 0, labelBounds.y );
paintHorizontalLabel( g, value, label ); paintHorizontalLabel( g, value, label );
@ -1364,7 +1350,7 @@ public class BasicSliderUI extends SliderUI{
int min = slider.getMinimum(); int min = slider.getMinimum();
int max = slider.getMaximum(); int max = slider.getMaximum();
double valueRange = (double)max - (double)min; double valueRange = (double)max - (double)min;
double pixelsPerValue = (double)trackHeight / (double)valueRange; double pixelsPerValue = (double)trackHeight / valueRange;
int trackBottom = trackY + (trackHeight - 1); int trackBottom = trackY + (trackHeight - 1);
int yPosition; int yPosition;
@ -1715,7 +1701,7 @@ public class BasicSliderUI extends SliderUI{
* of the thumb relative to the origin of the track. * of the thumb relative to the origin of the track.
*/ */
public void mouseDragged(MouseEvent e) { public void mouseDragged(MouseEvent e) {
int thumbMiddle = 0; int thumbMiddle;
if (!slider.isEnabled()) { if (!slider.isEnabled()) {
return; return;
@ -1841,7 +1827,7 @@ public class BasicSliderUI extends SliderUI{
public void componentResized(ComponentEvent e) { public void componentResized(ComponentEvent e) {
getHandler().componentResized(e); getHandler().componentResized(e);
} }
}; }
/** /**
* Focus-change listener. * Focus-change listener.
@ -1903,7 +1889,7 @@ public class BasicSliderUI extends SliderUI{
return b; return b;
} }
}; }
/** /**

30
jdk/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java
View file

@ -25,26 +25,17 @@
package javax.swing.plaf.synth; package javax.swing.plaf.synth;
import java.awt.Component;
import java.awt.Container;
import java.awt.Adjustable;
import java.awt.event.*; import java.awt.event.*;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics; import java.awt.FontMetrics;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.Point; import java.awt.Point;
import java.awt.Insets; import java.awt.Insets;
import java.awt.Color;
import java.awt.IllegalComponentStateException;
import java.awt.Polygon;
import java.beans.*; import java.beans.*;
import java.util.Dictionary; import java.util.Dictionary;
import java.util.Enumeration; import java.util.Enumeration;
import javax.swing.border.AbstractBorder;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.*;
import javax.swing.plaf.*; import javax.swing.plaf.*;
import javax.swing.plaf.basic.BasicSliderUI; import javax.swing.plaf.basic.BasicSliderUI;
import sun.swing.plaf.synth.SynthUI; import sun.swing.plaf.synth.SynthUI;
@ -203,8 +194,7 @@ class SynthSliderUI extends BasicSliderUI implements PropertyChangeListener,
centerY += valueHeight + 2; centerY += valueHeight + 2;
centerY += trackHeight + trackInsets.top + trackInsets.bottom; centerY += trackHeight + trackInsets.top + trackInsets.bottom;
centerY += tickHeight + 2; centerY += tickHeight + 2;
Component label = (Component)slider.getLabelTable(). JComponent label = (JComponent) slider.getLabelTable().elements().nextElement();
elements().nextElement();
Dimension pref = label.getPreferredSize(); Dimension pref = label.getPreferredSize();
return centerY + label.getBaseline(pref.width, pref.height); return centerY + label.getBaseline(pref.width, pref.height);
} }
@ -226,8 +216,7 @@ class SynthSliderUI extends BasicSliderUI implements PropertyChangeListener,
int trackHeight = contentHeight - valueHeight; int trackHeight = contentHeight - valueHeight;
int yPosition = yPositionForValue(value.intValue(), trackY, int yPosition = yPositionForValue(value.intValue(), trackY,
trackHeight); trackHeight);
Component label = (Component)slider.getLabelTable(). JComponent label = (JComponent) slider.getLabelTable().get(value);
get(value);
Dimension pref = label.getPreferredSize(); Dimension pref = label.getPreferredSize();
return yPosition - pref.height / 2 + return yPosition - pref.height / 2 +
label.getBaseline(pref.width, pref.height); label.getBaseline(pref.width, pref.height);
@ -434,16 +423,14 @@ class SynthSliderUI extends BasicSliderUI implements PropertyChangeListener,
/** /**
* Calculates the pad for the label at the specified index. * Calculates the pad for the label at the specified index.
* *
* @param index index of the label to calculate pad for. * @param i index of the label to calculate pad for.
* @return padding required to keep label visible. * @return padding required to keep label visible.
*/ */
private int getPadForLabel(int i) { private int getPadForLabel(int i) {
Dictionary dictionary = slider.getLabelTable();
int pad = 0; int pad = 0;
Object o = dictionary.get(i); JComponent c = (JComponent) slider.getLabelTable().get(i);
if (o != null) { if (c != null) {
Component c = (Component)o;
int centerX = xPositionForValue(i); int centerX = xPositionForValue(i);
int cHalfWidth = c.getPreferredSize().width / 2; int cHalfWidth = c.getPreferredSize().width / 2;
if (centerX - cHalfWidth < insetCache.left) { if (centerX - cHalfWidth < insetCache.left) {
@ -500,8 +487,6 @@ class SynthSliderUI extends BasicSliderUI implements PropertyChangeListener,
} }
} }
private static Rectangle unionRect = new Rectangle();
public void setThumbLocation(int x, int y) { public void setThumbLocation(int x, int y) {
super.setThumbLocation(x, y); super.setThumbLocation(x, y);
// Value rect is tied to the thumb location. We need to repaint when // Value rect is tied to the thumb location. We need to repaint when
@ -544,7 +529,7 @@ class SynthSliderUI extends BasicSliderUI implements PropertyChangeListener,
trackBorder; trackBorder;
int trackLength = trackBottom - trackTop; int trackLength = trackBottom - trackTop;
double valueRange = (double)max - (double)min; double valueRange = (double)max - (double)min;
double pixelsPerValue = (double)trackLength / (double)valueRange; double pixelsPerValue = (double)trackLength / valueRange;
int yPosition; int yPosition;
if (!drawInverted()) { if (!drawInverted()) {
@ -802,8 +787,7 @@ class SynthSliderUI extends BasicSliderUI implements PropertyChangeListener,
} }
public void mouseDragged(MouseEvent e) { public void mouseDragged(MouseEvent e) {
SynthScrollBarUI ui; int thumbMiddle;
int thumbMiddle = 0;
if (!slider.isEnabled()) { if (!slider.isEnabled()) {
return; return;