[Patch][gui] ClasspathToolkit

[Michael Koch]

Hi list,


I commited the attached patch to merge gnu.java.awt.ClasspathToolkit
with GNU classpath again. This patch reworks the import statements and
makes a imageCache field and real java.util.HashMap object.


Michael


2005-01-19  Michael Koch  <konqueror@gmx.de>

	* gnu/java/awt/ClasspathToolkit.java:
	Import statements reworked.
	(imageCache): Made it of type java.util.HashMap.

-------------- next part --------------
Index: gnu/java/awt/ClasspathToolkit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/ClasspathToolkit.java,v
retrieving revision 1.1.18.8
diff -u -r1.1.18.8 ClasspathToolkit.java
--- gnu/java/awt/ClasspathToolkit.java	18 Jan 2005 03:30:26 -0000	1.1.18.8
+++ gnu/java/awt/ClasspathToolkit.java	19 Jan 2005 16:49:29 -0000
@@ -42,18 +42,19 @@
 import gnu.java.awt.peer.ClasspathTextLayoutPeer;
 
 import java.awt.AWTException;
-import java.awt.Image;
 import java.awt.Dimension;
 import java.awt.DisplayMode;
 import java.awt.EventQueue;
 import java.awt.Font;
 import java.awt.FontMetrics;
-import java.awt.GraphicsEnvironment;
 import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.font.FontRenderContext;
 import java.awt.image.ColorModel;
 import java.awt.image.ImageProducer;
+import java.awt.peer.RobotPeer;
 import java.io.File;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -61,9 +62,8 @@
 import java.text.AttributedString;
 import java.util.HashMap;
 import java.util.Map;
-import java.awt.peer.RobotPeer;
-import javax.imageio.spi.IIORegistry;
 
+import javax.imageio.spi.IIORegistry;
 
 /**
  * An abstract superclass for Classpath toolkits.
@@ -94,7 +94,7 @@
    * #getImage(java.net.URL)}. For images that were loaded via a path
    * to an image file, the map contains a key with a file URL.
    */
-  private Map imageCache;
+  private HashMap imageCache;
 
 
   /**
@@ -173,7 +173,6 @@
    * this font peer should have, such as size, weight, family name, or
    * transformation.
    */
-
   public abstract ClasspathFontPeer getClasspathFontPeer (String name, Map attrs); 
 
   public abstract ClasspathTextLayoutPeer 
@@ -188,7 +187,6 @@
    * implement {@link java.awt.font.OpenType} or
    * {@link java.awt.font.MultipleMaster}.
    */
-
   public Font getFont (String name, Map attrs) 
   {
     return new Font (name, attrs);