diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f3e60f22a9f7..dabede449fe6 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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
diff --git a/libjava/javax/swing/AbstractCellEditor.java b/libjava/javax/swing/AbstractCellEditor.java
index bc4652388dc8..3463c97547c9 100644
--- a/libjava/javax/swing/AbstractCellEditor.java
+++ b/libjava/javax/swing/AbstractCellEditor.java
@@ -104,12 +104,6 @@ public abstract class AbstractCellEditor
 		// TODO
 	} // cancelCellEditing()
 
-	/**
-	 * getCellEditorValue
-	 * @returns Object
-	 */
-	public abstract Object getCellEditorValue();
-
   /**
    * addCellEditorListener
    *
diff --git a/libjava/javax/swing/Box.java b/libjava/javax/swing/Box.java
index eee96b1cdc89..d2faeac557ee 100644
--- a/libjava/javax/swing/Box.java
+++ b/libjava/javax/swing/Box.java
@@ -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));	
+  }
 }
diff --git a/libjava/javax/swing/ButtonGroup.java b/libjava/javax/swing/ButtonGroup.java
index c872ab76a404..b59d5659434e 100644
--- a/libjava/javax/swing/ButtonGroup.java
+++ b/libjava/javax/swing/ButtonGroup.java
@@ -129,11 +129,3 @@ public class ButtonGroup implements Serializable
 
 }
 
-
-
-
-
-
-
-
-
diff --git a/libjava/javax/swing/CellEditor.java b/libjava/javax/swing/CellEditor.java
index 007ea234ec8a..831cde0e7f9d 100644
--- a/libjava/javax/swing/CellEditor.java
+++ b/libjava/javax/swing/CellEditor.java
@@ -45,54 +45,49 @@ import javax.swing.event.CellEditorListener;
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public interface CellEditor {
+public interface CellEditor
+{
+  /**
+   * getCellEditorValue
+   * @returns Object
+   */
+  Object getCellEditorValue();
 
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
+  /**
+   * isCellEditable
+   * @param event TODO
+   * @returns boolean
+   */
+  boolean isCellEditable(EventObject event);
 
-	/**
-	 * getCellEditorValue
-	 * @returns Object
-	 */
-	Object getCellEditorValue();
+  /**
+   * shouldSelectCell
+   * @param event TODO
+   * @returns boolean
+   */
+  boolean shouldSelectCell(EventObject event);
 
-	/**
-	 * isCellEditable
-	 * @param event TODO
-	 * @returns boolean
-	 */
-	boolean isCellEditable(EventObject event);
+  /**
+   * stopCellEditing
+   * @returns boolean
+   */
+  boolean stopCellEditing();
 
-	/**
-	 * shouldSelectCell
-	 * @param event TODO
-	 * @returns boolean
-	 */
-	boolean shouldSelectCell(EventObject event);
+  /**
+   * cancelCellEditing
+   */
+  void cancelCellEditing();
 
-	/**
-	 * stopCellEditing
-	 * @returns boolean
-	 */
-	boolean stopCellEditing();
-
-	/**
-	 * cancelCellEditing
-	 */
-	void cancelCellEditing();
-
-	/**
-	 * addCellEditorListener
-	 * @param value0 TODO
-	 */
-	void addCellEditorListener(CellEditorListener listener);
-
-	/**
-	 * removeCellEditorListener
-	 * @param listener TODO
-	 */
-	void removeCellEditorListener(CellEditorListener listener);
+  /**
+   * addCellEditorListener
+   * @param value0 TODO
+   */
+  void addCellEditorListener(CellEditorListener listener);
 
+  /**
+   * removeCellEditorListener
+   * @param listener TODO
+   */
+  void removeCellEditorListener(CellEditorListener listener);
 
 } // CellEditor
diff --git a/libjava/javax/swing/CellRendererPane.java b/libjava/javax/swing/CellRendererPane.java
index e93e46446ef3..6e2ba210a642 100644
--- a/libjava/javax/swing/CellRendererPane.java
+++ b/libjava/javax/swing/CellRendererPane.java
@@ -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 ---------------------------------------------
 		//-------------------------------------------------------------
diff --git a/libjava/javax/swing/DefaultListModel.java b/libjava/javax/swing/DefaultListModel.java
index 43846a5cdbe9..3ba13cdaf5d8 100644
--- a/libjava/javax/swing/DefaultListModel.java
+++ b/libjava/javax/swing/DefaultListModel.java
@@ -50,6 +50,7 @@ import java.util.Vector;
  */
 public class DefaultListModel extends AbstractListModel
 {
+  private static final long serialVersionUID = 2315945659722172272L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
diff --git a/libjava/javax/swing/JEditorPane.java b/libjava/javax/swing/JEditorPane.java
index ecc4eb0e24e9..273ed899ea35 100644
--- a/libjava/javax/swing/JEditorPane.java
+++ b/libjava/javax/swing/JEditorPane.java
@@ -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
diff --git a/libjava/javax/swing/JFileChooser.java b/libjava/javax/swing/JFileChooser.java
index 988e75b7743a..47b086180d1c 100644
--- a/libjava/javax/swing/JFileChooser.java
+++ b/libjava/javax/swing/JFileChooser.java
@@ -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
diff --git a/libjava/javax/swing/JFormattedTextField.java b/libjava/javax/swing/JFormattedTextField.java
index f26af99e60ed..801ffac47be1 100644
--- a/libjava/javax/swing/JFormattedTextField.java
+++ b/libjava/javax/swing/JFormattedTextField.java
@@ -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");
   }
diff --git a/libjava/javax/swing/JLabel.java b/libjava/javax/swing/JLabel.java
index c49615c46388..227fe644edb4 100644
--- a/libjava/javax/swing/JLabel.java
+++ b/libjava/javax/swing/JLabel.java
@@ -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;
diff --git a/libjava/javax/swing/JList.java b/libjava/javax/swing/JList.java
index 22d35a5a2c04..792a0f2b66f5 100644
--- a/libjava/javax/swing/JList.java
+++ b/libjava/javax/swing/JList.java
@@ -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);   }
diff --git a/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java b/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java
index c39801dc10a5..3fa0ad1945f6 100644
--- a/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java
+++ b/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java
@@ -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
diff --git a/libjava/javax/swing/table/AbstractTableModel.java b/libjava/javax/swing/table/AbstractTableModel.java
index 38e36e1744c5..dd8eb69382cb 100644
--- a/libjava/javax/swing/table/AbstractTableModel.java
+++ b/libjava/javax/swing/table/AbstractTableModel.java
@@ -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
+}