2004-10-04 Michael Koch <konqueror@gmx.de>

	* javax/imageio/spi/ImageInputStreamSpi.java,
	javax/imageio/spi/ImageOutputStreamSpi.java:
	Reworked import startments.
	* javax/imageio/spi/ServiceRegistry.java:
	Reworked import startments. Fixed XHTML in javadocs.
	(ServiceRegistry): Added @param tag to javadoc.
	* javax/imageio/stream/ImageInputStream.java
	(mark): Doesn't throws IOException;

4 files changed, 19 insertions, 8 deletions

diff --git a/javax/imageio/spi/ImageInputStreamSpi.java b/javax/imageio/spi/ImageInputStreamSpi.java
index b8d58547d..6e33d1d39 100644
--- a/javax/imageio/spi/ImageInputStreamSpi.java
+++ b/javax/imageio/spi/ImageInputStreamSpi.java
@@ -40,8 +40,8 @@ package javax.imageio.spi;
 
 import java.io.File;
 import java.io.IOException;
-import javax.imageio.stream.ImageInputStream;
 
+import javax.imageio.stream.ImageInputStream;
 
 /**
  * An abstract superclass for service providers that create
diff --git a/javax/imageio/spi/ImageOutputStreamSpi.java b/javax/imageio/spi/ImageOutputStreamSpi.java
index aa287c313..935aa7c67 100644
--- a/javax/imageio/spi/ImageOutputStreamSpi.java
+++ b/javax/imageio/spi/ImageOutputStreamSpi.java
@@ -40,8 +40,8 @@ package javax.imageio.spi;
 
 import java.io.File;
 import java.io.IOException;
-import javax.imageio.stream.ImageOutputStream;
 
+import javax.imageio.stream.ImageOutputStream;
 
 /**
  * An abstract superclass for service providers that create
diff --git a/javax/imageio/spi/ServiceRegistry.java b/javax/imageio/spi/ServiceRegistry.java
index c41e1b5a7..566d50f73 100644
--- a/javax/imageio/spi/ServiceRegistry.java
+++ b/javax/imageio/spi/ServiceRegistry.java
@@ -38,9 +38,19 @@ exception statement from your version. */
 
 package javax.imageio.spi;
 
-import java.util.*;
 import gnu.classpath.ServiceFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
 
 /**
  * A registry for service providers.
@@ -100,6 +110,8 @@ public class ServiceRegistry
   /**
    * Constructs a <code>ServiceRegistry</code> for the specified
    * service categories.
+   * 
+   * @param categories the categories to support
    *
    * @throws IllegalArgumentException if <code>categories</code> is
    * <code>null</code>, or if its {@link Iterator#next()} method
@@ -141,7 +153,7 @@ public class ServiceRegistry
    * might make sense to install only the frequently needed service
    * providers on the local machine. More exotic providers can be put
    * onto a server; the server will only be contacted when no suitable
-   * service could be found locally.
+   * service could be found locally.</p>
    *
    * <p><b>Security considerations:</b> Any loaded service providers
    * are loaded through the specified ClassLoader, or the system
@@ -150,7 +162,7 @@ public class ServiceRegistry
    * the current {@link java.security.AccessControlContext} gets
    * recorded. This captured security context will determine the
    * permissions when services get loaded via the <code>next()</code>
-   * method of the returned <code>Iterator</code>.
+   * method of the returned <code>Iterator</code>.</p>
    *
    * @param spi the service provider interface which must be
    * implemented by any loaded service providers.
@@ -474,7 +486,7 @@ public class ServiceRegistry
    * invoked in order to inform the provider about the removal from
    * this registry. If <code>provider</code> implements several
    * service categories, <code>onDeregistration</code> gets called
-   * multiple times.
+   * multiple times.</p>
    *
    * @param provider the service provider to be de-registered.
    *
diff --git a/javax/imageio/stream/ImageInputStream.java b/javax/imageio/stream/ImageInputStream.java
index d37231dd7..39296a711 100644
--- a/javax/imageio/stream/ImageInputStream.java
+++ b/javax/imageio/stream/ImageInputStream.java
@@ -626,8 +626,7 @@ public interface ImageInputStream
   void seek(long pos)
     throws IOException;
 
-  void mark()
-    throws IOException;
+  void mark();
 
   void reset()
     throws IOException;