2004-02-05 Michael Koch <konqueror@gmx.de>
authorMichael Koch <konqueror@gmx.de>
Thu, 5 Feb 2004 18:48:54 +0000 (18:48 +0000)
committerMichael Koch <mkoch@gcc.gnu.org>
Thu, 5 Feb 2004 18:48:54 +0000 (18:48 +0000)
* javax/swing/AbstractCellEditor.java
(getCellEditorValue): Removed.
* javax/swing/Box.java: Reformated.
(serialVersionUID): New field.
* javax/swing/ButtonGroup.java:
Removed some weird whitespace.
* javax/swing/CellEditor.java: Reformated.
* javax/swing/CellRendererPane.java
(serialVersionUID): New field.
(AccessibleCellRendererPaneserialVersionUID): New field.
* javax/swing/DefaultListModel.java
(serialVersionUID): New field.
* javax/swing/JEditorPane.java
(serialVersionUID): New field.
(setPage): Throws IOException.
(addHyperlinkListener): Implemented.
(removeHyperlinkListener): Implemented.
(getHyperlinkListener): New method.
* javax/swing/JFileChooser.java
(serialVersionUID): New field.
(AccessibleJFileChooser.serialVersionUID): New field.
(addActionListener): Implemented.
(removeActionListener): Implemented.
(getActionListeners): New method.
* javax/swing/JFormattedTextField.java
(serialVersionUID): New field.
(AbstractFormatter.serialVersionUID): New field.
(clone): Throws CloneNotSupportedException
(setEditValid): Add missing argument.
(stringToValue): Throws ParseExcpetion.
(valueToString): Throws ParseException.
(commitEdit): Throws ParseException.
* javax/swing/JLabel.java
(serialVersionUID): New field.
* javax/swing/JList.java
(serialVersionUID): New field.
(addListSelectionListener): Reformated.
(removeListSelectionListener): Reformated.
(getListSelectionListeners): New method.
* javax/swing/colorchooser/AbstractColorChooserPanel.java:
Reformated.
(serialVersionUID): New field.
* javax/swing/table/AbstractTableModel.java
(getValueAt): Removed.
(getColumnCount): Removed.
(getRowCount): Removed.

From-SVN: r77329

14 files changed:
libjava/ChangeLog
libjava/javax/swing/AbstractCellEditor.java
libjava/javax/swing/Box.java
libjava/javax/swing/ButtonGroup.java
libjava/javax/swing/CellEditor.java
libjava/javax/swing/CellRendererPane.java
libjava/javax/swing/DefaultListModel.java
libjava/javax/swing/JEditorPane.java
libjava/javax/swing/JFileChooser.java
libjava/javax/swing/JFormattedTextField.java
libjava/javax/swing/JLabel.java
libjava/javax/swing/JList.java
libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java
libjava/javax/swing/table/AbstractTableModel.java

index f3e60f22a9f75710f62e6dcd4732d4e3466dfa0c..dabede449fe6cbb4843d4cc53bac0e8fd4023ec6 100644 (file)
@@ -1,3 +1,52 @@
+2004-02-05  Michael Koch  <konqueror@gmx.de>
+
+       * javax/swing/AbstractCellEditor.java
+       (getCellEditorValue): Removed.
+       * javax/swing/Box.java: Reformated.
+       (serialVersionUID): New field.
+       * javax/swing/ButtonGroup.java:
+       Removed some weird whitespace.
+       * javax/swing/CellEditor.java: Reformated.
+       * javax/swing/CellRendererPane.java
+       (serialVersionUID): New field.
+       (AccessibleCellRendererPaneserialVersionUID): New field.
+       * javax/swing/DefaultListModel.java
+       (serialVersionUID): New field.
+       * javax/swing/JEditorPane.java
+       (serialVersionUID): New field.
+       (setPage): Throws IOException.
+       (addHyperlinkListener): Implemented.
+       (removeHyperlinkListener): Implemented.
+       (getHyperlinkListener): New method.
+       * javax/swing/JFileChooser.java
+       (serialVersionUID): New field.
+       (AccessibleJFileChooser.serialVersionUID): New field.
+       (addActionListener): Implemented.
+       (removeActionListener): Implemented.
+       (getActionListeners): New method.
+       * javax/swing/JFormattedTextField.java
+       (serialVersionUID): New field.
+       (AbstractFormatter.serialVersionUID): New field.
+       (clone): Throws CloneNotSupportedException
+       (setEditValid): Add missing argument.
+       (stringToValue): Throws ParseExcpetion.
+       (valueToString): Throws ParseException.
+       (commitEdit): Throws ParseException.
+       * javax/swing/JLabel.java
+       (serialVersionUID): New field.
+       * javax/swing/JList.java
+       (serialVersionUID): New field.
+       (addListSelectionListener): Reformated.
+       (removeListSelectionListener): Reformated.
+       (getListSelectionListeners): New method.
+       * javax/swing/colorchooser/AbstractColorChooserPanel.java:
+       Reformated.
+       (serialVersionUID): New field.
+       * javax/swing/table/AbstractTableModel.java
+       (getValueAt): Removed.
+       (getColumnCount): Removed.
+       (getRowCount): Removed.
+
 2004-02-05  Michael Koch  <konqueror@gmx.de>
 
        * java/awt/datatransfer/DataFlavor.java
index bc4652388dc88381abba82a8e08a2c64ff6e487a..3463c97547c9b52adcc2d6d3129bf6665a20eea9 100644 (file)
@@ -104,12 +104,6 @@ public abstract class AbstractCellEditor
                // TODO
        } // cancelCellEditing()
 
-       /**
-        * getCellEditorValue
-        * @returns Object
-        */
-       public abstract Object getCellEditorValue();
-
   /**
    * addCellEditorListener
    *
index eee96b1cdc89f3a562c3b318300adb09128657ff..d2faeac557eec1994056f0704d836c86177a696d 100644 (file)
@@ -47,9 +47,10 @@ import javax.accessibility.Accessible;
  */
 public class Box extends JComponent implements Accessible
 {
-    Box(int a)
-    {
-        setLayout(new BoxLayout(this, 
-                               a));    
-    }
+  private static final long serialVersionUID = 1525417495883046342L;
+  
+  public Box(int a)
+  {
+    setLayout(new BoxLayout(this, a)); 
+  }
 }
index c872ab76a4045285e229af5ec1d205f9de348e09..b59d5659434eb1533b1857f685cd1e3326eed271 100644 (file)
@@ -129,11 +129,3 @@ public class ButtonGroup implements Serializable
 
 }
 
-
-
-
-
-
-
-
-
index 007ea234ec8abd26add3c493aea6a62e6e6fd891..831cde0e7f9da520e9354c72068e7d6f5cc525d4 100644 (file)
@@ -45,54 +45,49 @@ import javax.swing.event.CellEditorListener;
  * @author     Andrew Selkirk
  * @version    1.0
  */
-public interface CellEditor {
-
-       //-------------------------------------------------------------
-       // Methods ----------------------------------------------------
-       //-------------------------------------------------------------
-
-       /**
-        * getCellEditorValue
-        * @returns Object
-        */
-       Object getCellEditorValue();
-
-       /**
-        * isCellEditable
-        * @param event TODO
-        * @returns boolean
-        */
-       boolean isCellEditable(EventObject event);
-
-       /**
-        * shouldSelectCell
-        * @param event TODO
-        * @returns boolean
-        */
-       boolean shouldSelectCell(EventObject event);
-
-       /**
-        * stopCellEditing
-        * @returns boolean
-        */
-       boolean stopCellEditing();
-
-       /**
-        * cancelCellEditing
-        */
-       void cancelCellEditing();
-
-       /**
-        * addCellEditorListener
-        * @param value0 TODO
-        */
-       void addCellEditorListener(CellEditorListener listener);
-
-       /**
-        * removeCellEditorListener
-        * @param listener TODO
-        */
-       void removeCellEditorListener(CellEditorListener listener);
-
+public interface CellEditor
+{
+  /**
+   * getCellEditorValue
+   * @returns Object
+   */
+  Object getCellEditorValue();
+
+  /**
+   * isCellEditable
+   * @param event TODO
+   * @returns boolean
+   */
+  boolean isCellEditable(EventObject event);
+
+  /**
+   * shouldSelectCell
+   * @param event TODO
+   * @returns boolean
+   */
+  boolean shouldSelectCell(EventObject event);
+
+  /**
+   * stopCellEditing
+   * @returns boolean
+   */
+  boolean stopCellEditing();
+
+  /**
+   * cancelCellEditing
+   */
+  void cancelCellEditing();
+
+  /**
+   * addCellEditorListener
+   * @param value0 TODO
+   */
+  void addCellEditorListener(CellEditorListener listener);
+
+  /**
+   * removeCellEditorListener
+   * @param listener TODO
+   */
+  void removeCellEditorListener(CellEditorListener listener);
 
 } // CellEditor
index e93e46446ef341b1a69cfd0ef2ae5e062a23fd4a..6e2ba210a642ac2940b72850bde1ec988ed48c10 100644 (file)
@@ -52,7 +52,9 @@ import javax.accessibility.AccessibleRole;
  * @author     Andrew Selkirk
  * @version    1.0
  */
-public class CellRendererPane extends Container implements Accessible {
+public class CellRendererPane extends Container implements Accessible
+{
+  private static final long serialVersionUID = -7642183829532984273L;
 
        //-------------------------------------------------------------
        // Classes ----------------------------------------------------
@@ -63,6 +65,8 @@ public class CellRendererPane extends Container implements Accessible {
         */
        protected class AccessibleCellRendererPane extends AccessibleAWTContainer {
 
+          private static final long serialVersionUID = 7300340301783504481L;
+
                //-------------------------------------------------------------
                // Initialization ---------------------------------------------
                //-------------------------------------------------------------
index 43846a5cdbe9e942c32236ddd870a4053da91aae..3ba13cdaf5d881051631c92341e563fcb365210b 100644 (file)
@@ -50,6 +50,7 @@ import java.util.Vector;
  */
 public class DefaultListModel extends AbstractListModel
 {
+  private static final long serialVersionUID = 2315945659722172272L;
 
        //-------------------------------------------------------------
        // Variables --------------------------------------------------
index ecc4eb0e24e9861c12a67046ac500c6abfe60785..273ed899ea35b54caf8e77d99c38eaa4dbccdefb 100644 (file)
@@ -52,6 +52,8 @@ import javax.swing.event.HyperlinkListener;
 
 public class JEditorPane extends JTextComponent
 {
+  private static final long serialVersionUID = 3140472492599046285L;
+
     URL page_url;
     EditorKit kit;
     String ctype = "text/plain";
@@ -82,9 +84,6 @@ public class JEditorPane extends JTextComponent
        setPage(url);
     }
 
-    void addHyperlinkListener(HyperlinkListener listener)
-    {  }
-    
     protected  EditorKit createDefaultEditorKit()
     {  return new PlainEditorKit();    }
     
@@ -174,11 +173,6 @@ public class JEditorPane extends JTextComponent
        //Establishes the default bindings of type to classname.  
     }
     
-    void removeHyperlinkListener(HyperlinkListener listener)
-    {
-       //Removes a hyperlink listener.  
-    }
-    
     void replaceSelection(String content)
     {
        //Replaces the currently selected content with new content represented by the given string. 
@@ -210,11 +204,13 @@ public class JEditorPane extends JTextComponent
     }
   
   void setPage(String url)
+    throws IOException
     {
        //  Sets the current URL being displayed.  
     }
     
     void setPage(URL page)
+    throws IOException
     {
        //    Sets the current URL being displayed.  
     }
@@ -223,4 +219,23 @@ public class JEditorPane extends JTextComponent
     {  
        super.setText(t);
     }
+
+  public void addHyperlinkListener(HyperlinkListener listener)
+  {
+    listenerList.add (HyperlinkListener.class, listener);
+  }
+    
+  public void removeHyperlinkListener (HyperlinkListener listener)
+  {
+    listenerList.remove (HyperlinkListener.class, listener);
+  }
+
+  /**
+   * @since 1.4
+   */
+  public HyperlinkListener[] getHyperlinkListeners()
+  {
+    return (HyperlinkListener[]) getListeners (HyperlinkListener.class);
+  }
+    
 } // class JEditorPane
index 988e75b7743aaa1b3cdd198a700c19167753cfb7..47b086180d1c8821b80bc7b17fc6536a21beecb2 100644 (file)
@@ -59,6 +59,8 @@ import javax.swing.plaf.FileChooserUI;
  */
 public class JFileChooser extends JComponent implements Accessible {
 
+  private static final long serialVersionUID = 3162921138695327837L;
+
        //-------------------------------------------------------------
        // Classes ----------------------------------------------------
        //-------------------------------------------------------------
@@ -68,6 +70,8 @@ public class JFileChooser extends JComponent implements Accessible {
         */
        protected class AccessibleJFileChooser extends AccessibleJComponent {
 
+          private static final long serialVersionUID = 3318922050345221200L;
+
                //-------------------------------------------------------------
                // Variables --------------------------------------------------
                //-------------------------------------------------------------
@@ -906,17 +910,24 @@ public class JFileChooser extends JComponent implements Accessible {
         * addActionListener
         * @param listener TODO
         */
-       public void addActionListener(ActionListener listener) {
-               // TODO
-       } // addActionListener()
+       public void addActionListener(ActionListener listener)
+       {
+               listenerList.add (ActionListener.class, listener);
+       }
 
        /**
         * removeActionListener
         * @param listener TODO
         */
-       public void removeActionListener(ActionListener listener) {
-               // TODO
-       } // removeActionListener()
+       public void removeActionListener(ActionListener listener)
+       {
+               listenerList.remove (ActionListener.class, listener);
+       }
+
+       public ActionListener[] getActionListeners()
+       {
+               return (ActionListener[]) listenerList.getListeners (ActionListener.class);
+       }
 
        /**
         * fireActionPerformed
index f26af99e60edbacb165f5f631d74f6dfe8ff39ab..801ffac47be1a76f4bb6f167eb8dd570e3d290a2 100644 (file)
@@ -52,14 +52,19 @@ import javax.swing.text.NavigationFilter;
  */
 public class JFormattedTextField extends JTextField
 {
+  private static final long serialVersionUID = 2889768923115424035L;
+
   public abstract static class AbstractFormatter implements Serializable
   {
+    private static final long serialVersionUID = -5193212041738979680L;
+    
     public AbstractFormatter ()
     {
       //Do nothing here.
     }
 
     protected Object clone ()
+      throws CloneNotSupportedException
     {
       throw new InternalError ("not implemented");
     }
@@ -99,14 +104,16 @@ public class JFormattedTextField extends JTextField
       throw new InternalError ("not implemented");
     }
 
-    protected void setEditValid ()
+    protected void setEditValid (boolean valid)
     {
       throw new InternalError ("not implemented");
     }
 
-    public abstract Object stringToValue (String text);
+    public abstract Object stringToValue (String text)
+      throws ParseException;
 
-    public abstract String valueToString (Object value);
+    public abstract String valueToString (Object value)
+      throws ParseException;
   }
   
   public abstract static class AbstractFormatterFactory
@@ -155,6 +162,7 @@ public class JFormattedTextField extends JTextField
   }
 
   public void commitEdit ()
+    throws ParseException
   {
     throw new InternalError ("not implemented");
   }
index c49615c463888c9c54b6cfabbb63ef222dd8fb67..227fe644edb4dcebf3666f5fec6b7645ecf4811f 100644 (file)
@@ -46,6 +46,8 @@ import javax.swing.plaf.LabelUI;
 
 public class JLabel extends JComponent implements Accessible, SwingConstants
 {
+  private static final long serialVersionUID = 5496508283662221534L;
+  
     String text;
     Icon icon;
     int gap;
index 22d35a5a2c04800e9548e2547e6abd6c6c024202..792a0f2b66f53ffafe5bc611d55efdd0aa6398c2 100644 (file)
@@ -51,6 +51,8 @@ import javax.swing.plaf.ListUI;
 
 public class JList extends JComponent implements Accessible, Scrollable
 {
+  private static final long serialVersionUID = 4406629526391098046L;
+
     Color select_back, select_fore;
     ListCellRenderer render;
     int visibles = 8;
@@ -105,10 +107,23 @@ public class JList extends JComponent implements Accessible, Scrollable
        repaint();
     }
 
-    void addListSelectionListener(ListSelectionListener listener)
-    { sel_model.addListSelectionListener(listener);    }
-    void removeListSelectionListener(ListSelectionListener listener)
-    { sel_model.removeListSelectionListener(listener);    }
+  public void addListSelectionListener (ListSelectionListener listener)
+  {
+    sel_model.addListSelectionListener (listener);
+  }
+  
+  public void removeListSelectionListener (ListSelectionListener listener)
+  {
+    sel_model.removeListSelectionListener (listener);
+  }
+
+  /**
+   * @since 1.4
+   */
+  public ListSelectionListener[] getListSelectionListeners()
+  {
+    throw new Error ("not implemented");
+  }
 
     void setSelectionMode(int a)
     {  sel_model.setSelectionMode(a);   }
index c39801dc10a51146d1f9eade369bab56468cb88f..3fa0ad1945f6f96668458a50bc39b1ed8a630b2b 100644 (file)
@@ -49,22 +49,15 @@ import javax.swing.JPanel;
  * @author     Andrew Selkirk
  * @version    1.0
  */
-public abstract class AbstractColorChooserPanel extends JPanel {
-
-       //-------------------------------------------------------------
-       // Variables --------------------------------------------------
-       //-------------------------------------------------------------
+public abstract class AbstractColorChooserPanel extends JPanel
+{
+  private static final long serialVersionUID = -977469671210173863L;
 
        /**
         * chooser
         */
        private JColorChooser chooser;
 
-
-       //-------------------------------------------------------------
-       // Initialization ---------------------------------------------
-       //-------------------------------------------------------------
-
        /**
         * Constructor AbstractColorChooserPanel
         */
@@ -72,11 +65,6 @@ public abstract class AbstractColorChooserPanel extends JPanel {
                // TODO
        } // AbstractColorChooserPanel()
 
-
-       //-------------------------------------------------------------
-       // Methods ----------------------------------------------------
-       //-------------------------------------------------------------
-
        /**
         * getDisplayName
         * @returns String
@@ -144,6 +132,4 @@ public abstract class AbstractColorChooserPanel extends JPanel {
        public void paint(Graphics graphics) {
                // TODO
        } // paint()
-
-
 } // AbstractColorChooserPanel
index 38e36e1744c5484a3aafaf2e4baeed22487d416b..dd8eb69382cb41f03e0da65e5c396cfb2f203c6f 100644 (file)
@@ -35,7 +35,6 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package javax.swing.table;
 
 import java.io.Serializable;
@@ -271,25 +270,4 @@ public abstract class AbstractTableModel implements TableModel, Serializable
   {
     return listenerList.getListeners (listenerType);
   }
-
-  /**
-   * getValueAt
-   * @param value0 TODO
-   * @param value1 TODO
-   * @return Object
-   */
-  public abstract Object getValueAt (int row, int column);
-
-  /**
-   * getColumnCount
-   * @return int
-   */
-  public abstract int getColumnCount();
-
-  /**
-   * getRowCount
-   * @return int
-   */
-  public abstract int getRowCount();
-
-} // AbstractTableModel
+}