Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (rmi_java_source_files): Added RMIClassLoaderSpi.
	* java/awt/AlphaComposite.java, java/awt/BasicStroke.java,
	java/awt/BufferCapabilities.java, java/awt/Button.java,
	java/awt/CheckboxMenuItem.java, java/awt/Choice.java,
	java/awt/Container.java, java/awt/Cursor.java,
	java/awt/EventQueue.java, java/awt/FileDialog.java,
	java/awt/Graphics2D.java, java/awt/Label.java, java/awt/Menu.java,
	java/awt/MenuBar.java, java/awt/MenuComponent.java,
	java/awt/PopupMenu.java, java/awt/ScrollPane.java,
	java/awt/Scrollbar.java, java/awt/TextArea.java,
	java/awt/TextField.java, java/awt/color/CMMException.java,
	java/awt/color/ColorSpace.java, java/awt/color/ICC_Profile.java,
	java/awt/color/ProfileDataException.java,
	java/awt/datatransfer/Clipboard.java,
	java/awt/datatransfer/DataFlavor.java,
	java/awt/datatransfer/FlavorMap.java,
	java/awt/datatransfer/SystemFlavorMap.java,
	java/awt/dnd/DragGestureEvent.java,
	java/awt/dnd/DragGestureRecognizer.java,
	java/awt/dnd/DragSource.java, java/awt/dnd/DropTarget.java,
	java/awt/event/WindowEvent.java, java/awt/geom/PathIterator.java,
	java/awt/im/InputMethodHighlight.java,
	java/io/PipedOutputStream.java, java/io/PipedWriter.java,
	java/rmi/server/RMIClassLoader.java: Merged from Classpath.

	* gnu/awt/j2d/Graphics2DImpl.java (drawImage): Changed type of
	`op' to BufferedImageOp.

From-SVN: r60768

4 files changed, 165 insertions, 162 deletions

diff --git a/libjava/java/awt/datatransfer/Clipboard.java b/libjava/java/awt/datatransfer/Clipboard.java
index 6ef9e70..93bba7c 100644
--- a/libjava/java/awt/datatransfer/Clipboard.java
+++ b/libjava/java/awt/datatransfer/Clipboard.java
@@ -103,6 +103,8 @@ getName()
   * Returns the contents of the clipboard.
   *
   * @param requestor The object requesting the contents.
+  *
+  * @exception IllegalStateException If the clipboard is currently unavailable
   */
 public synchronized Transferable
 getContents(Object requestor)
@@ -120,6 +122,8 @@ getContents(Object requestor)
   *
   * @param contents The new clipboard contents.
   * @param owner The new clipboard owner
+  *
+  * @exception IllegalStateException If the clipboard is currently unavailable
   */
 public synchronized void
 setContents(Transferable contents, ClipboardOwner owner)
diff --git a/libjava/java/awt/datatransfer/DataFlavor.java b/libjava/java/awt/datatransfer/DataFlavor.java
index 85f6ae5..e1500a7 100644
--- a/libjava/java/awt/datatransfer/DataFlavor.java
+++ b/libjava/java/awt/datatransfer/DataFlavor.java
@@ -281,6 +281,7 @@ DataFlavor(Class representationClass, String humanPresentableName)
   *
   * @exception IllegalArgumentException If the representation class
   * specified cannot be loaded.
+  * @exception ClassNotFoundException If the class is not loaded.
   */
 public
 DataFlavor(String mimeType, String humanPresentableName, 
@@ -504,6 +505,8 @@ setHumanPresentableName(String humanPresentableName)
   *
   * @return <code>true</code> if the MIME type is equal to this object's
   * MIME type, <code>false</code> otherwise.
+  *
+  * @exception NullPointerException If mimeType is null.
   */
 public final boolean
 isMimeTypeEqual(String mimeType)
@@ -652,6 +655,10 @@ isFlavorJavaFileListType()
   * Returns a copy of this object.
   *
   * @return A copy of this object.
+  *
+  * @exception CloneNotSupportedException If the object's class does not support
+  * the Cloneable interface. Subclasses that override the clone method can also
+  * throw this exception to indicate that an instance cannot be cloned.
   */
 public Object
 clone()
@@ -813,6 +820,8 @@ normalizeMimeType(String type)
   * Serialize this class.
   *
   * @param stream The <code>ObjectOutput</code> stream to serialize to.
+  *
+  * @exception IOException If an error occurs.
   */
 public void
 writeExternal(ObjectOutput stream) throws IOException
@@ -826,6 +835,10 @@ writeExternal(ObjectOutput stream) throws IOException
   * De-serialize this class.
   *
   * @param stream The <code>ObjectInput</code> stream to deserialize from.
+  *
+  * @exception IOException If an error ocurs.
+  * @exception ClassNotFoundException If the class for an object being restored
+  * cannot be found.
   */
 public void
 readExternal(ObjectInput stream) throws IOException, ClassNotFoundException
@@ -950,6 +963,10 @@ selectBestTextFlavor(DataFlavor[] availableFlavors)
   *
   * @param transferable The <code>Transferable</code> for which a text
   *                     <code>Reader</code> is requested.
+  *
+  * @exception IllegalArgumentException If the representation class is not one
+  * of the seven listed above or the Transferable has null data.
+  * @exception NullPointerException If the Transferable is null.
   * @exception UnsupportedFlavorException when the transferable doesn't
   * support this <code>DataFlavor</code>. Or if the representable class
   * isn't a (subclass of) <code>Reader</code>, <code>String</code>,
diff --git a/libjava/java/awt/datatransfer/FlavorMap.java b/libjava/java/awt/datatransfer/FlavorMap.java
index 96b1608..a392615 100644
--- a/libjava/java/awt/datatransfer/FlavorMap.java
+++ b/libjava/java/awt/datatransfer/FlavorMap.java
@@ -41,42 +41,35 @@ package java.awt.datatransfer;
 import java.util.Map;
 
 /**
-  * This interface maps between native platform type names and DataFlavors.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
+ * This interface maps between native platform type names and DataFlavors.
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ */
 public interface FlavorMap
 {
+  /**
+   * Maps the specified <code>DataFlavor</code> objects to the native
+   * data type name.  The returned <code>Map</code> has keys that are
+   * the data flavors and values that are strings.  The returned map
+   * may be modified.  This can be useful for implementing nested mappings.
+   *
+   * @param flavors An array of data flavors to map
+   *                or null for all data flavors.
+   *
+   * @return A <code>Map</code> of native data types.
+   */
+  public abstract Map getNativesForFlavors (DataFlavor[] flavors);
 
-/**
-  * Maps the specified <code>DataFlavor</code> objects to the native
-  * data type name.  The returned <code>Map</code> has keys that are
-  * the data flavors and values that are strings.  The returned map
-  * may be modified.  This can be useful for implementing nested mappings.
-  *
-  * @param flavors An array of data flavors to map
-  *                or null for all data flavors.
-  *
-  * @return A <code>Map</code> of native data types.
-  */
-public abstract Map
-getNativesForFlavors(DataFlavor[] flavors);
-
-/*************************************************************************/
-
-/**
-  * Maps the specified native type names to <code>DataFlavor</code>'s.
-  * The returned <code>Map</code> has keys that are strings and values
-  * that are <code>DataFlavor</code>'s.  The returned map may be
-  * modified.  This can be useful for implementing nested mappings.
-  *
-  * @param natives An array of native types to map
-  *                or null for all native types.
-  *
-  * @return A <code>Map</code> of data flavors.
-  */
-public abstract Map
-getFlavorsForNatives(String[] natives);
-
-} // interface FlavorMap
-
+  /**
+   * Maps the specified native type names to <code>DataFlavor</code>'s.
+   * The returned <code>Map</code> has keys that are strings and values
+   * that are <code>DataFlavor</code>'s.  The returned map may be
+   * modified.  This can be useful for implementing nested mappings.
+   *
+   * @param natives An array of native types to map
+   *                or null for all native types.
+   *
+   * @return A <code>Map</code> of data flavors.
+   */
+  public abstract Map getFlavorsForNatives (String[] natives);
+}
diff --git a/libjava/java/awt/datatransfer/SystemFlavorMap.java b/libjava/java/awt/datatransfer/SystemFlavorMap.java
index 50064db..7d91412 100644
--- a/libjava/java/awt/datatransfer/SystemFlavorMap.java
+++ b/libjava/java/awt/datatransfer/SystemFlavorMap.java
@@ -40,6 +40,7 @@ package java.awt.datatransfer;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.List;
 
 /**
   * This class maps between native platform type names and DataFlavors.
@@ -47,134 +48,122 @@ import java.util.Map;
   * XXX - The current implementation does no mapping at all.
   *
   * @author Mark Wielaard (mark@klomp.org)
-  */
-public final class SystemFlavorMap implements FlavorMap
-{
-
-/**
-  * The default (instance) flavor map.
-  */
-private static FlavorMap defaultFlavorMap;
-
-/**
-  * Private constructor.
-  */
-private SystemFlavorMap()
-{
-}
-
-/*************************************************************************/
-
-/**
-  * Maps the specified <code>DataFlavor</code> objects to the native
-  * data type name.  The returned <code>Map</code> has keys that are
-  * the data flavors and values that are strings.  The returned map
-  * may be modified.  This can be useful for implementing nested mappings.
-  *
-  * @param flavors An array of data flavors to map
-  *                or null for all data flavors.
   *
-  * @return A <code>Map</code> of native data types to data flavors.
-  */
-public Map
-getNativesForFlavors(DataFlavor[] flavors)
-{
-  return(new HashMap());
-}
-
-/*************************************************************************/
-
-/**
-  * Maps the specified native type names to <code>DataFlavor</code>'s.
-  * The returned <code>Map</code> has keys that are strings and values
-  * that are <code>DataFlavor</code>'s.  The returned map may be
-  * modified.  This can be useful for implementing nested mappings.
-  *
-  * @param natives An array of native types to map
-  *                or null for all native types.
-  *
-  * @return A <code>Map</code> of data flavors to native type names.
-  */
-public Map
-getFlavorsForNatives(String[] natives)
-{
-  return(new HashMap());
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the default (instance) (System)FlavorMap.
-  */
-public static FlavorMap
-getDefaultFlavorMap()
-{
-  if (defaultFlavorMap == null)
-    defaultFlavorMap = new SystemFlavorMap();
-
-  return(defaultFlavorMap);
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the native type name for the given java mime type.
-  */
-public static String
-encodeJavaMIMEType(String mime)
-{
-  return null;
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the native type name for the given data flavor.
-  */
-public static String
-encodeDataFlavor(DataFlavor df)
-{
-  return null;
-}
-
-/*************************************************************************/
-
-/**
-  * Returns true if the native type name can be represented as
-  * a java mime type.
-  */
-public static boolean
-isJavaMIMEType(String name)
-{
-  return(false);
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the java mime type for the given the native type name.
+  * @since 1.2
   */
-public static String
-decodeJavaMIMEType(String name)
+public final class SystemFlavorMap implements FlavorMap, FlavorTable
 {
-  return null;
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the data flavor given the native type name
-  * or null when no such data flavor exists.
-  */
-public static DataFlavor
-decodeDataFlavor(String name) throws ClassNotFoundException
-{
-  String javaMIMEType = decodeJavaMIMEType(name);
-  if (javaMIMEType != null)
-    return(new DataFlavor(javaMIMEType));
-  else
-    return(null);
-}
+  /**
+   * The default (instance) flavor map.
+   */
+  private static FlavorMap defaultFlavorMap;
+
+  /**
+   * Private constructor.
+   */
+  private SystemFlavorMap ()
+  {
+  }
+
+  /**
+   * Maps the specified <code>DataFlavor</code> objects to the native
+   * data type name.  The returned <code>Map</code> has keys that are
+   * the data flavors and values that are strings.  The returned map
+   * may be modified.  This can be useful for implementing nested mappings.
+   *
+   * @param flavors An array of data flavors to map
+   *                or null for all data flavors.
+   *
+   * @return A <code>Map</code> of native data types to data flavors.
+   */
+  public Map getNativesForFlavors (DataFlavor[] flavors)
+  {
+    return new HashMap();
+  }
+
+  /**
+   * Maps the specified native type names to <code>DataFlavor</code>'s.
+   * The returned <code>Map</code> has keys that are strings and values
+   * that are <code>DataFlavor</code>'s.  The returned map may be
+   * modified.  This can be useful for implementing nested mappings.
+   *
+   * @param natives An array of native types to map
+   *                or null for all native types.
+   *
+   * @return A <code>Map</code> of data flavors to native type names.
+   */
+  public Map getFlavorsForNatives (String[] natives)
+  { 
+    return new HashMap();
+  }
+
+  /**
+   * Returns the default (instance) (System)FlavorMap.
+   */
+  public static FlavorMap getDefaultFlavorMap ()
+  {
+    if (defaultFlavorMap == null)
+      defaultFlavorMap = new SystemFlavorMap ();
+
+    return defaultFlavorMap;
+  }
+
+  /**
+   * Returns the native type name for the given java mime type.
+   */
+  public static String encodeJavaMIMEType (String mime)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the native type name for the given data flavor.
+   */
+  public static String encodeDataFlavor (DataFlavor df)
+  {
+    return null;
+  }
+
+  /**
+   * Returns true if the native type name can be represented as
+   * a java mime type.
+   */
+  public static boolean isJavaMIMEType (String name)
+  {
+    return false;
+  }
+
+  /**
+   * Returns the java mime type for the given the native type name.
+   */
+  public static String decodeJavaMIMEType (String name)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the data flavor given the native type name
+   * or null when no such data flavor exists.
+   */
+  public static DataFlavor decodeDataFlavor (String name)
+    throws ClassNotFoundException
+  {
+    String javaMIMEType = decodeJavaMIMEType (name);
+    
+    if (javaMIMEType != null)
+      return new DataFlavor (javaMIMEType);
+    else
+      return null;
+  }
+
+  public List getFlavorsForNative (String nat)
+  {
+    throw new Error ("Not implemented");
+  }
+
+  public List getNativesForFlavor (DataFlavor flav)
+  {
+    throw new Error ("Not implemented");
+  }
 
 } // class SystemFlavorMap
-