src/share/classes/javax/swing/JSlider.java

Print this page

        

@@ -136,11 +136,11 @@
 
 
     /**
      * {@code Dictionary} of what labels to draw at which values
      */
-    private Dictionary<Integer, JComponent> labelTable;
+    private Dictionary<Integer, ? extends JComponent> labelTable;
 
 
     /**
      * The changeListener (no suffix) is the listener we add to the
      * slider's model.  This listener is initialized to the

@@ -771,11 +771,11 @@
         if (!isShowing()) {
             return false;
         }
 
         // Check that there is a label with such image
-        Enumeration<JComponent> elements = labelTable.elements();
+        Enumeration<? extends JComponent> elements = labelTable.elements();
 
         while (elements.hasMoreElements()) {
             JComponent component = elements.nextElement();
 
             if (component instanceof JLabel) {

@@ -795,11 +795,11 @@
      * Returns the dictionary of what labels to draw at which values.
      *
      * @return the <code>Dictionary</code> containing labels and
      *    where to draw them
      */
-    public Dictionary<Integer, JComponent> getLabelTable() {
+    public Dictionary<Integer, ? extends JComponent> getLabelTable() {
 /*
         if ( labelTable == null && getMajorTickSpacing() > 0 ) {
             setLabelTable( createStandardLabels( getMajorTickSpacing() ) );
         }
 */

@@ -828,12 +828,12 @@
      *       hidden: true
      *        bound: true
      *    attribute: visualUpdate true
      *  description: Specifies what labels will be drawn for any given value.
      */
-    public void setLabelTable( Dictionary<Integer, JComponent> labels ) {
-        Dictionary<Integer, JComponent> oldTable = labelTable;
+    public void setLabelTable( Dictionary<Integer, ? extends JComponent> labels ) {
+        Dictionary<Integer, ? extends JComponent> oldTable = labelTable;
         labelTable = labels;
         updateLabelUIs();
         firePropertyChange("labelTable", oldTable, labelTable );
         if (labels != oldTable) {
             revalidate();

@@ -850,11 +850,11 @@
      *
      * @see #setLabelTable
      * @see JComponent#updateUI
      */
     protected void updateLabelUIs() {
-        Dictionary<Integer, JComponent> labelTable = getLabelTable();
+        Dictionary<Integer, ? extends JComponent> labelTable = getLabelTable();
 
         if (labelTable == null) {
             return;
         }
         Enumeration<Integer> labels = labelTable.keys();

@@ -864,13 +864,13 @@
             component.setSize(component.getPreferredSize());
         }
     }
 
     private void updateLabelSizes() {
-        Dictionary<Integer, JComponent> labelTable = getLabelTable();
+        Dictionary<Integer, ? extends JComponent> labelTable = getLabelTable();
         if (labelTable != null) {
-            Enumeration<JComponent> labels = labelTable.elements();
+            Enumeration<? extends JComponent> labels = labelTable.elements();
             while (labels.hasMoreElements()) {
                 JComponent component = labels.nextElement();
                 component.setSize(component.getPreferredSize());
             }
         }

@@ -1015,11 +1015,11 @@
             }
         }
 
         SmartHashtable table = new SmartHashtable( increment, start );
 
-        Dictionary<Integer, JComponent> labelTable = getLabelTable();
+        Dictionary<Integer, ? extends JComponent> labelTable = getLabelTable();
 
         if (labelTable != null && (labelTable instanceof PropertyChangeListener)) {
             removePropertyChangeListener((PropertyChangeListener) labelTable);
         }