* javax/swing/text/StyleContext.java (getStaticAttribute): Mark as

	stub.
	(getStaticAttributeKey): Likewise.
	(readAttributeSet): Likewise.
	(writeAttributeSet): Likewise.
	(readAttributes): Likewise.
	(writeAttributes): Likewise.
	* javax/swing/text/html/HTMLEditorKit.java (insertAtBoundary): Mark
	as stub.
	* javax/swing/text/html/HTMLDocument.java (setParagraphAttributes):
	Mark as stub.
	(fireChangedUpdate): Likewise.
	(start): Likewise.
	(end): Likewise.
	(handleEndOfLineString): Likewise.
	(textAreaContent): Likewise.
	(preContent): Likewise.
	(addSpecialElement): Likewise.
	(setInnerHTML): Likewise.
	(setOuterHTML): Likewise.
	(insertBeforeStart): Likewise.
	(insertBeforeEnd): Likewise.
	(insertAfterEnd): Likewise.
	(insertAfterStart): Likewise.
	* javax/swing/table/JTableHeader.java (AccessibleJTableHeaderEntry):
	Mark all methods as stub.s
	* javax/swing/plaf/metal/MetalTreeUI.java (decodeLineStyle): Mark
	as stub.
	(paintHorizontalSeparators): Likewise.
	* javax/swing/plaf/basic/BasicLookAndFeel.java (loadSystemColors):
	Mark as stub.
	* javax/swing/MenuSelectionManager.java (processKeyEvent): Mark as
	stub.
	* java/beans/beancontext/BeanContextSupport.java: Mark most methods
	as stubs.
	* java/beans/beancontext/BeanContextServicesSupport.java: Mark most
	methods as stubs.

10 files changed, 246 insertions, 36 deletions

diff --git a/ChangeLog b/ChangeLog
index ca75d1bcb..6c190f2f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+2006-03-22  Tom Tromey  <tromey@redhat.com>
+
+	* javax/swing/text/StyleContext.java (getStaticAttribute): Mark as
+	stub.
+	(getStaticAttributeKey): Likewise.
+	(readAttributeSet): Likewise.
+	(writeAttributeSet): Likewise.
+	(readAttributes): Likewise.
+	(writeAttributes): Likewise.
+	* javax/swing/text/html/HTMLEditorKit.java (insertAtBoundary): Mark
+	as stub.
+	* javax/swing/text/html/HTMLDocument.java (setParagraphAttributes):
+	Mark as stub.
+	(fireChangedUpdate): Likewise.
+	(start): Likewise.
+	(end): Likewise.
+	(handleEndOfLineString): Likewise.
+	(textAreaContent): Likewise.
+	(preContent): Likewise.
+	(addSpecialElement): Likewise.
+	(setInnerHTML): Likewise.
+	(setOuterHTML): Likewise.
+	(insertBeforeStart): Likewise.
+	(insertBeforeEnd): Likewise.
+	(insertAfterEnd): Likewise.
+	(insertAfterStart): Likewise.
+	* javax/swing/table/JTableHeader.java (AccessibleJTableHeaderEntry):
+	Mark all methods as stub.s
+	* javax/swing/plaf/metal/MetalTreeUI.java (decodeLineStyle): Mark
+	as stub.
+	(paintHorizontalSeparators): Likewise.
+	* javax/swing/plaf/basic/BasicLookAndFeel.java (loadSystemColors):
+	Mark as stub.
+	* javax/swing/MenuSelectionManager.java (processKeyEvent): Mark as
+	stub.
+	* java/beans/beancontext/BeanContextSupport.java: Mark most methods
+	as stubs.
+	* java/beans/beancontext/BeanContextServicesSupport.java: Mark most
+	methods as stubs.
+
 2006-03-22  Mark Wielaard  <mark@klomp.org>
 
 	* gnu/java/awt/peer/gtk/GtkCursor.java: New class.
diff --git a/java/beans/beancontext/BeanContextServicesSupport.java b/java/beans/beancontext/BeanContextServicesSupport.java
index 0cffbc596..679464478 100644
--- a/java/beans/beancontext/BeanContextServicesSupport.java
+++ b/java/beans/beancontext/BeanContextServicesSupport.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.beans.beancontext;
 
+import gnu.classpath.NotImplementedException;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -80,6 +82,7 @@ public class BeanContextServicesSupport
 
     public Iterator getCurrentServiceSelectors (BeanContextServices bcs,
                                                 Class serviceClass)
+      throws NotImplementedException
     {
       throw new Error ("Not implemented");
     }
@@ -88,6 +91,7 @@ public class BeanContextServicesSupport
                               Object requestor,
                               Class serviceClass,
                               Object serviceSelector)
+      throws NotImplementedException
     {
       throw new Error ("Not implemented");
     }
@@ -95,11 +99,13 @@ public class BeanContextServicesSupport
     public void releaseService (BeanContextServices bcs,
                                 Object requestor,
                                 Object service)
+      throws NotImplementedException
     {
       throw new Error ("Not implemented");
     }
 
     public void serviceRevoked (BeanContextServiceRevokedEvent bcsre)
+      throws NotImplementedException
     {
       throw new Error ("Not implemented");
     }
@@ -165,6 +171,7 @@ public class BeanContextServicesSupport
   }
 
   public boolean addService (Class serviceClass, BeanContextServiceProvider bcsp)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -172,78 +179,90 @@ public class BeanContextServicesSupport
   protected boolean addService (Class serviceClass,
                                 BeanContextServiceProvider bcsp,
                                 boolean fireEvent)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
   
   protected void bcsPreDeserializationHook (ObjectInputStream ois)
-    throws ClassNotFoundException, IOException
+    throws ClassNotFoundException, IOException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected void bcsPreSerializationHook (ObjectOutputStream oos) 
-    throws IOException
+    throws IOException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
   
   protected void childJustRemovedHook (Object child,
                                        BeanContextSupport.BCSChild bcsc)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected BeanContextSupport.BCSChild createBCSChild (Object targetChild,
-                                                        Object peer) 
+                                                        Object peer)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected BeanContextServicesSupport.BCSSServiceProvider
   createBCSSServiceProvider (Class sc, BeanContextServiceProvider bcsp)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected final void fireServiceAdded (BeanContextServiceAvailableEvent bcssae)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
-  protected final void fireServiceAdded (Class serviceClass) 
+  protected final void fireServiceAdded (Class serviceClass)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected final void fireServiceRevoked(BeanContextServiceRevokedEvent event)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected final void fireServiceRevoked (Class serviceClass,
                                            boolean revokeNow)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public BeanContextServices getBeanContextServicesPeer ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected static final BeanContextServicesListener
-  getChildBeanContextServicesListener (Object child) 
+  getChildBeanContextServicesListener (Object child)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
-  public Iterator getCurrentServiceClasses () 
+  public Iterator getCurrentServiceClasses ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
-  public Iterator getCurrentServiceSelectors (Class serviceClass) 
+  public Iterator getCurrentServiceSelectors (Class serviceClass)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -251,12 +270,13 @@ public class BeanContextServicesSupport
   public Object getService (BeanContextChild child, Object requestor,
                             Class serviceClass, Object serviceSelector,
                             BeanContextServiceRevokedListener bcsrl)
-    throws TooManyListenersException
+    throws TooManyListenersException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public boolean hasService (Class serviceClass)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -269,18 +289,21 @@ public class BeanContextServicesSupport
     services = new HashMap();
   }
 
-  protected  void initializeBeanContextResources () 
+  protected  void initializeBeanContextResources ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
-  protected  void releaseBeanContextResources () 
+  protected  void releaseBeanContextResources ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public void releaseService (BeanContextChild child, Object requestor,
                               Object service)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -295,17 +318,20 @@ public class BeanContextServicesSupport
   }
 
   public void revokeService (Class serviceClass, BeanContextServiceProvider bcsp,
-                             boolean revokeCurrentServicesNow) 
+                             boolean revokeCurrentServicesNow)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
-  public void serviceAvailable (BeanContextServiceAvailableEvent bcssae) 
+  public void serviceAvailable (BeanContextServiceAvailableEvent bcssae)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
-  public void serviceRevoked (BeanContextServiceRevokedEvent bcssre) 
+  public void serviceRevoked (BeanContextServiceRevokedEvent bcssre)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
diff --git a/java/beans/beancontext/BeanContextSupport.java b/java/beans/beancontext/BeanContextSupport.java
index fe11aab87..5770c4fb0 100644
--- a/java/beans/beancontext/BeanContextSupport.java
+++ b/java/beans/beancontext/BeanContextSupport.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package java.beans.beancontext;
 
+import gnu.classpath.NotImplementedException;
+
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyVetoException;
@@ -64,15 +66,19 @@ public class BeanContextSupport extends BeanContextChildSupport
   VetoableChangeListener
 {
   private static final long serialVersionUID = -4879613978649577204L;
-  
+
+  // This won't show up in japi, but we mark it as a stub anyway,
+  // so that searches for NotImplementedException will find it.
   private void readObject (ObjectInputStream s)
-    throws ClassNotFoundException, IOException
+    throws ClassNotFoundException, IOException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
+  // This won't show up in japi, but we mark it as a stub anyway,
+  // so that searches for NotImplementedException will find it.
   private void writeObject (ObjectOutputStream s)
-    throws ClassNotFoundException, IOException
+    throws ClassNotFoundException, IOException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -93,11 +99,13 @@ public class BeanContextSupport extends BeanContextChildSupport
     }
 
     public boolean hasNext ()
+      throws NotImplementedException
     {
       throw new Error ("Not implemented");
     }
 
     public Object next ()
+      throws NotImplementedException
     {
       throw new Error ("Not implemented");
     }
@@ -189,129 +197,152 @@ public class BeanContextSupport extends BeanContextChildSupport
   }
 
   public boolean avoidingGui ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected Iterator bcsChildren ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected void bcsPreDeserializationHook (ObjectInputStream ois)
-    throws ClassNotFoundException, IOException 
+    throws ClassNotFoundException, IOException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected void bcsPreSerializationHook (ObjectOutputStream oos)
-    throws IOException
+    throws IOException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected void childDeserializedHook (Object child, BeanContextSupport.BCSChild bcsc)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected void childJustAddedHook (Object child, BeanContextSupport.BCSChild bcsc)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected void childJustRemovedHook (Object child, BeanContextSupport.BCSChild bcsc)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected static final boolean classEquals (Class first, Class second)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public void clear ()
   {
+    // This is probably the right thing to do.
+    // The JDK docs are really bad here.
     throw new UnsupportedOperationException();
   }
 
   public boolean contains (Object o)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public boolean containsAll (Collection c)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public boolean containsKey (Object o)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected final Object[] copyChildren ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected BeanContextSupport.BCSChild createBCSChild (Object targetChild, Object peer)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected final void deserialize (ObjectInputStream ois, Collection coll)
-    throws ClassNotFoundException, IOException
+    throws ClassNotFoundException, IOException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public void dontUseGui ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected final void fireChildrenAdded (BeanContextMembershipEvent bcme)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected final void fireChildrenRemoved (BeanContextMembershipEvent bcme)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public BeanContext getBeanContextPeer ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected static final BeanContextChild getChildBeanContextChild (Object child)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected static final BeanContextMembershipListener getChildBeanContextMembershipListener (Object child)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected static final PropertyChangeListener getChildPropertyChangeListener (Object child)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected static final Serializable getChildSerializable (Object child)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected static final VetoableChangeListener getChildVetoableChangeListener (Object child)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected static final Visibility getChildVisibility (Object child)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -322,11 +353,13 @@ public class BeanContextSupport extends BeanContextChildSupport
   }
 
   public URL getResource (String name, BeanContextChild bcc)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public InputStream getResourceAsStream (String name, BeanContextChild bcc)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -338,22 +371,25 @@ public class BeanContextSupport extends BeanContextChildSupport
   }
 
   public Object instantiateChild (String beanName)
-    throws IOException, ClassNotFoundException
+    throws IOException, ClassNotFoundException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public boolean isDesignTime ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public boolean isEmpty ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public boolean isSerializing ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -364,22 +400,25 @@ public class BeanContextSupport extends BeanContextChildSupport
   }
 
   public boolean needsGui ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public void okToUseGui ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public void propertyChange (PropertyChangeEvent pce)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public final void readChildren (ObjectInputStream ois)
-    throws IOException, ClassNotFoundException
+    throws IOException, ClassNotFoundException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -390,6 +429,7 @@ public class BeanContextSupport extends BeanContextChildSupport
   }
 
   protected boolean remove (Object targetChild, boolean callChildSetBC)
+    throws NotImplementedException
   {
     if (targetChild == null)
       throw new IllegalArgumentException();
@@ -403,6 +443,7 @@ public class BeanContextSupport extends BeanContextChildSupport
   }
 
   public void removeBeanContextMembershipListener (BeanContextMembershipListener bcml)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -413,23 +454,25 @@ public class BeanContextSupport extends BeanContextChildSupport
   }
 
   protected final void serialize (ObjectOutputStream oos, Collection coll)
-    throws IOException
+    throws IOException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public void setDesignTime (boolean dtime)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public void setLocale (Locale newLocale)
-    throws PropertyVetoException
+    throws PropertyVetoException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public int size ()
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
@@ -445,23 +488,25 @@ public class BeanContextSupport extends BeanContextChildSupport
   }
 
   protected boolean validatePendingAdd (Object targetChild)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   protected boolean validatePendingRemove (Object targetChild)
+    throws NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public void vetoableChange (PropertyChangeEvent pce)
-    throws PropertyVetoException
+    throws PropertyVetoException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
 
   public final void writeChildren (ObjectOutputStream oos)
-    throws IOException
+    throws IOException, NotImplementedException
   {
     throw new Error ("Not implemented");
   }
diff --git a/javax/swing/MenuSelectionManager.java b/javax/swing/MenuSelectionManager.java
index 4f9986d50..4ba0dbda7 100644
--- a/javax/swing/MenuSelectionManager.java
+++ b/javax/swing/MenuSelectionManager.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing;
 
+import gnu.classpath.NotImplementedException;
+
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Point;
@@ -252,6 +254,7 @@ public class MenuSelectionManager
    * @param e DOCUMENT ME!
    */
   public void processKeyEvent(KeyEvent e)
+    throws NotImplementedException
   {
     throw new UnsupportedOperationException("not implemented");
   }
diff --git a/javax/swing/plaf/basic/BasicLookAndFeel.java b/javax/swing/plaf/basic/BasicLookAndFeel.java
index 6b9bebcc3..b6c8b902b 100644
--- a/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/javax/swing/plaf/basic/BasicLookAndFeel.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.plaf.basic;
 
+import gnu.classpath.NotImplementedException;
+
 import java.awt.AWTEvent;
 import java.awt.Color;
 import java.awt.Component;
@@ -340,6 +342,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
    */
   protected void loadSystemColors(UIDefaults defaults, String[] systemColors,
                                   boolean useNative)
+    throws NotImplementedException
   {
     // TODO
   }
diff --git a/javax/swing/plaf/metal/MetalTreeUI.java b/javax/swing/plaf/metal/MetalTreeUI.java
index 24432a2b5..3ea37c82f 100644
--- a/javax/swing/plaf/metal/MetalTreeUI.java
+++ b/javax/swing/plaf/metal/MetalTreeUI.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.plaf.metal;
 
+import gnu.classpath.NotImplementedException;
+
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.Rectangle;
@@ -133,6 +135,7 @@ public class MetalTreeUI extends BasicTreeUI
    * @param lineStyleFlag - String representation
    */     
   protected void decodeLineStyle(Object lineStyleFlag)
+    throws NotImplementedException
   {
     // FIXME: not implemented
   }
@@ -176,6 +179,7 @@ public class MetalTreeUI extends BasicTreeUI
    * @param c - the current component to draw
    */
   protected void paintHorizontalSeparators(Graphics g, JComponent c)
+    throws NotImplementedException
   {
     // FIXME: not implemented
   }
diff --git a/javax/swing/table/JTableHeader.java b/javax/swing/table/JTableHeader.java
index 4e8dcd7b7..f7c1e1cd5 100644
--- a/javax/swing/table/JTableHeader.java
+++ b/javax/swing/table/JTableHeader.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.table;
 
+import gnu.classpath.NotImplementedException;
+
 import java.awt.Color;
 import java.awt.Cursor;
 import java.awt.Dimension;
@@ -80,232 +82,278 @@ public class JTableHeader extends JComponent
     protected class AccessibleJTableHeaderEntry extends AccessibleContext
       implements Accessible, AccessibleComponent
     {
-      public AccessibleJTableHeaderEntry(int c, JTableHeader p, JTable t) 
+      public AccessibleJTableHeaderEntry(int c, JTableHeader p, JTable t)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void addFocusListener(FocusListener l)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void addPropertyChangeListener(PropertyChangeListener l)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public boolean contains(Point p)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public AccessibleAction getAccessibleAction()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Accessible getAccessibleAt(Point p)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Accessible getAccessibleChild(int i)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public int getAccessibleChildrenCount()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public AccessibleComponent getAccessibleComponent()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public AccessibleContext getAccessibleContext()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public String getAccessibleDescription()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public int getAccessibleIndexInParent()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public String getAccessibleName()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public AccessibleRole getAccessibleRole()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public AccessibleSelection getAccessibleSelection()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public AccessibleStateSet getAccessibleStateSet()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public AccessibleText getAccessibleText()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public AccessibleValue getAccessibleValue()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Color getBackground()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Rectangle getBounds()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Cursor getCursor()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Font getFont()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public FontMetrics getFontMetrics(Font f)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Color getForeground()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Locale getLocale()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Point getLocation()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Point getLocationOnScreen()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public Dimension getSize()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public boolean isEnabled()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public boolean isFocusTraversable()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public boolean isShowing()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public boolean isVisible()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void removeFocusListener(FocusListener l)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void removePropertyChangeListener(PropertyChangeListener l)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void requestFocus()
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setAccessibleDescription(String s)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setAccessibleName(String s)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setBackground(Color c)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setBounds(Rectangle r)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setCursor(Cursor c)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setEnabled(boolean b)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setFont(Font f)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setForeground(Color c)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setLocation(Point p)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setSize(Dimension d)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
       
       public void setVisible(boolean b)
+        throws NotImplementedException
       {
         throw new Error("not implemented");
       }
diff --git a/javax/swing/text/StyleContext.java b/javax/swing/text/StyleContext.java
index e2643a2aa..8ef34400d 100644
--- a/javax/swing/text/StyleContext.java
+++ b/javax/swing/text/StyleContext.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.text;
 
+import gnu.classpath.NotImplementedException;
+
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -711,35 +713,37 @@ public class StyleContext
   // have left incomplete; I'm not sure I understand the intent properly.
 
   public static Object getStaticAttribute(Object key)
+    throws NotImplementedException
   {
     throw new InternalError("not implemented");
   }
   
   public static Object getStaticAttributeKey(Object key)
+    throws NotImplementedException
   {
     throw new InternalError("not implemented");
   }
 
   public static void readAttributeSet(ObjectInputStream in, MutableAttributeSet a)
-    throws ClassNotFoundException, IOException
+    throws ClassNotFoundException, IOException, NotImplementedException
   {
     throw new InternalError("not implemented");
   }
   
   public static void writeAttributeSet(ObjectOutputStream out, AttributeSet a)
-    throws IOException
+    throws IOException, NotImplementedException
   {
     throw new InternalError("not implemented");
   }
 
   public void readAttributes(ObjectInputStream in, MutableAttributeSet a)
-    throws ClassNotFoundException, IOException 
+    throws ClassNotFoundException, IOException, NotImplementedException 
   {
     throw new InternalError("not implemented");
   }
 
   public void writeAttributes(ObjectOutputStream out, AttributeSet a)
-    throws IOException
+    throws IOException, NotImplementedException
   {
     throw new InternalError("not implemented");
   }
diff --git a/javax/swing/text/html/HTMLDocument.java b/javax/swing/text/html/HTMLDocument.java
index 2a96953ee..fba6cad12 100644
--- a/javax/swing/text/html/HTMLDocument.java
+++ b/javax/swing/text/html/HTMLDocument.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package javax.swing.text.html;
 
+import gnu.classpath.NotImplementedException;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.HashMap;
@@ -667,6 +669,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("FormAction.start not implemented");
@@ -677,6 +680,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("FormAction.end not implemented");
@@ -690,6 +694,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("HiddenAction.start not implemented");
@@ -700,6 +705,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("HiddenAction.end not implemented");
@@ -713,6 +719,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("IsindexAction.start not implemented");
@@ -723,6 +730,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("IsindexAction.end not implemented");
@@ -759,6 +767,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("PreAction.start not implemented");
@@ -769,6 +778,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("PreAction.end not implemented");
@@ -782,6 +792,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("SpecialAction.start not implemented");
@@ -792,6 +803,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("SpecialAction.end not implemented");
@@ -805,6 +817,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("AreaAction.start not implemented");
@@ -815,6 +828,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("AreaAction.end not implemented");
@@ -828,6 +842,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("BaseAction.start not implemented");
@@ -838,6 +853,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("BaseAction.end not implemented");
@@ -851,6 +867,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("HeadAction.start not implemented: "+t);
@@ -862,6 +879,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("HeadAction.end not implemented: "+t);
@@ -876,6 +894,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("LinkAction.start not implemented");
@@ -886,6 +905,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("LinkAction.end not implemented");
@@ -899,6 +919,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("MapAction.start not implemented");
@@ -909,6 +930,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("MapAction.end not implemented");
@@ -922,6 +944,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("MetaAction.start not implemented");
@@ -932,6 +955,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("MetaAction.end not implemented");
@@ -945,6 +969,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("StyleAction.start not implemented");
@@ -955,6 +980,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("StyleAction.end not implemented");
@@ -968,6 +994,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * of tags associated with this Action.
        */
       public void start(HTML.Tag t, MutableAttributeSet a)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("TitleAction.start not implemented");
@@ -978,6 +1005,7 @@ public class HTMLDocument extends DefaultStyledDocument
        * with this Action.
        */
       public void end(HTML.Tag t)
+        throws NotImplementedException
       {
         // FIXME: Implement.
         print ("TitleAction.end not implemented");
@@ -1253,6 +1281,7 @@ public class HTMLDocument extends DefaultStyledDocument
      * @since 1.3
      */
     public void handleEndOfLineString(String eol)
+      throws NotImplementedException
     {
       // FIXME: Implement.
       print ("HTMLReader.handleEndOfLineString not implemented yet");
@@ -1265,6 +1294,7 @@ public class HTMLDocument extends DefaultStyledDocument
      * @param data the text to add to the textarea
      */
     protected void textAreaContent(char[] data)
+      throws NotImplementedException
     {
       // FIXME: Implement.
       print ("HTMLReader.textAreaContent not implemented yet");
@@ -1276,6 +1306,7 @@ public class HTMLDocument extends DefaultStyledDocument
      * @param data the text
      */
     protected void preContent(char[] data)
+      throws NotImplementedException
     {
       // FIXME: Implement
       print ("HTMLReader.preContent not implemented yet");
@@ -1447,6 +1478,7 @@ public class HTMLDocument extends DefaultStyledDocument
      * @param a the attribute set specifying the special content
      */
     protected void addSpecialElement(HTML.Tag t, MutableAttributeSet a)
+      throws NotImplementedException
     {
       // FIXME: Implement
       print ("HTMLReader.addSpecialElement not implemented yet");
@@ -1550,7 +1582,7 @@ public class HTMLDocument extends DefaultStyledDocument
    * @throws IllegalStateException - if an HTMLEditorKit.Parser has not been set
    */
   public void setInnerHTML(Element elem, String htmlText) 
-    throws BadLocationException, IOException
+    throws BadLocationException, IOException, NotImplementedException
   {
     if (elem.isLeaf())
       throw new IllegalArgumentException("Element is a leaf");
@@ -1574,7 +1606,7 @@ public class HTMLDocument extends DefaultStyledDocument
    * @throws IllegalStateException - if parser is not set
    */
   public void setOuterHTML(Element elem, String htmlText) 
-    throws BadLocationException, IOException
+    throws BadLocationException, IOException, NotImplementedException
     {
       if (parser == null)
         throw new IllegalStateException("Parser has not been set");
@@ -1593,7 +1625,7 @@ public class HTMLDocument extends DefaultStyledDocument
    * @throws IllegalStateException - if parser has not been set
    */
   public void insertBeforeStart(Element elem, String htmlText)
-      throws BadLocationException, IOException
+      throws BadLocationException, IOException, NotImplementedException
   {
     if (parser == null)
       throw new IllegalStateException("Parser has not been set");
@@ -1613,7 +1645,7 @@ public class HTMLDocument extends DefaultStyledDocument
    * @throws IllegalStateException - if parser is not set
    */
   public void insertBeforeEnd(Element elem, String htmlText)
-      throws BadLocationException, IOException
+      throws BadLocationException, IOException, NotImplementedException
   {
     if (parser == null)
       throw new IllegalStateException("Parser has not been set");
@@ -1632,7 +1664,7 @@ public class HTMLDocument extends DefaultStyledDocument
    * @throws IllegalStateException - if parser is not set
    */
   public void insertAfterEnd(Element elem, String htmlText)
-      throws BadLocationException, IOException
+      throws BadLocationException, IOException, NotImplementedException
   {
     if (parser == null)
       throw new IllegalStateException("Parser has not been set");
@@ -1651,7 +1683,7 @@ public class HTMLDocument extends DefaultStyledDocument
    * @throws IllegalStateException - if parser is not set
    */
   public void insertAfterStart(Element elem, String htmlText)
-      throws BadLocationException, IOException
+      throws BadLocationException, IOException, NotImplementedException
   {
     if (parser == null)
       throw new IllegalStateException("Parser has not been set");
@@ -1676,6 +1708,7 @@ public class HTMLDocument extends DefaultStyledDocument
    */
   public void setParagraphAttributes(int offset, int length, AttributeSet s,
                                      boolean replace)
+    throws NotImplementedException
   {
     //  FIXME: Not implemented.
     System.out.println("setParagraphAttributes not implemented");
@@ -1688,6 +1721,7 @@ public class HTMLDocument extends DefaultStyledDocument
    *  @param e - the Document event
    */
   protected void fireChangedUpdate(DocumentEvent e)
+    throws NotImplementedException
   {
     //  FIXME: Not implemented.
     System.out.println("fireChangedUpdate not implemented");
diff --git a/javax/swing/text/html/HTMLEditorKit.java b/javax/swing/text/html/HTMLEditorKit.java
index 2d5d1eb79..92d9de938 100644
--- a/javax/swing/text/html/HTMLEditorKit.java
+++ b/javax/swing/text/html/HTMLEditorKit.java
@@ -39,6 +39,8 @@ exception statement from your version. */
 package javax.swing.text.html;
 
 
+import gnu.classpath.NotImplementedException;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -298,6 +300,7 @@ public class HTMLEditorKit
                                       Element insertElement,
                                       String html, HTML.Tag parentTag,
                                       HTML.Tag addTag)
+        throws NotImplementedException
       {
         /*
         As its name implies, this protected method is used when HTML is inserted at a