diff options
author | Francis Kung <fkung@redhat.com> | 2007-02-12 21:39:20 +0000 |
---|---|---|
committer | Francis Kung <fkung@redhat.com> | 2007-02-12 21:39:20 +0000 |
commit | 9b132bf73abd2d8870ecc03782a254df7ca98a25 (patch) | |
tree | 24ac5891e3015f92fadc92766404b2a808e4834b /java | |
parent | 898d45fed828c53f3e6c10b1db9978d541788f70 (diff) | |
download | classpath-9b132bf73abd2d8870ecc03782a254df7ca98a25.tar.gz |
2007-02-12 Francis Kung <fkung@redhat.com>
* gnu/java/awt/ClasspathToolkit.java:
* gnu/java/awt/peer/gtk/AsyncImage.java,
* gnu/java/awt/peer/gtk/BufferedImageGraphics.java,
* gnu/java/awt/peer/gtk/CairoGraphics2D.java,
* gnu/java/awt/peer/gtk/CairoSurface.java,
* gnu/java/awt/peer/gtk/ComponentGraphics.java,
* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,
* gnu/java/awt/peer/gtk/GdkFontPeer.java,
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
* gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
* gnu/java/awt/peer/gtk/GtkChoicePeer.java,
* gnu/java/awt/peer/gtk/GtkClipboard.java,
* gnu/java/awt/peer/gtk/GtkClipboardNotifier.java,
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
* gnu/java/awt/peer/gtk/GtkFramePeer.java,
* gnu/java/awt/peer/gtk/GtkImage.java,
* gnu/java/awt/peer/gtk/GtkImageConsumer.java,
* gnu/java/awt/peer/gtk/GtkLabelPeer.java,
* gnu/java/awt/peer/gtk/GtkListPeer.java,
* gnu/java/awt/peer/gtk/GtkMainThread.java,
* gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
* gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
* gnu/java/awt/peer/gtk/GtkMenuPeer.java,
* gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java,
* gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
* gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
* gnu/java/awt/peer/gtk/GtkSelection.java,
* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
* gnu/java/awt/peer/gtk/GtkToolkit.java,
* gnu/java/awt/peer/gtk/GtkWindowPeer.java,
* gnu/java/awt/peer/gtk/VolatileImageGraphics.java,
* java/awt/RenderingHints.java,
* java/awt/image/BufferedImage.java: Reformatted and added generics.
Diffstat (limited to 'java')
-rw-r--r-- | java/awt/RenderingHints.java | 10 | ||||
-rw-r--r-- | java/awt/image/BufferedImage.java | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/java/awt/RenderingHints.java b/java/awt/RenderingHints.java index ce327e369..e98a00c5b 100644 --- a/java/awt/RenderingHints.java +++ b/java/awt/RenderingHints.java @@ -158,7 +158,7 @@ public class RenderingHints } } // class KeyImpl - private HashMap hintMap = new HashMap(); + private HashMap<Object,Object> hintMap = new HashMap<Object,Object>(); /** * A key for the 'antialiasing' hint. Permitted values are: @@ -711,9 +711,9 @@ public class RenderingHints Iterator iterator = m.keySet().iterator(); while (iterator.hasNext()) { - Key key = (Key) iterator.next(); - if (!key.isCompatibleValue(m.get(key))) - throw new IllegalArgumentException(); + Key key = (Key) iterator.next(); + if (!key.isCompatibleValue(m.get(key))) + throw new IllegalArgumentException(); } // map is OK, update hintMap.putAll(m); @@ -783,7 +783,7 @@ public class RenderingHints try { RenderingHints copy = (RenderingHints) super.clone(); - copy.hintMap = (HashMap) hintMap.clone(); + copy.hintMap = new HashMap<Object,Object>(hintMap); return copy; } catch (CloneNotSupportedException e) diff --git a/java/awt/image/BufferedImage.java b/java/awt/image/BufferedImage.java index 526f12c99..98e1b4ad6 100644 --- a/java/awt/image/BufferedImage.java +++ b/java/awt/image/BufferedImage.java @@ -83,7 +83,7 @@ public class BufferedImage extends Image /** * Vector of TileObservers (or null) */ - Vector tileObservers; + Vector<TileObserver> tileObservers; /** * The image's WritableRaster @@ -572,7 +572,7 @@ public class BufferedImage extends Image { return new ImageProducer() { - Vector consumers = new Vector(); + Vector<ImageConsumer> consumers = new Vector<ImageConsumer>(); public void addConsumer(ImageConsumer ic) { @@ -608,9 +608,9 @@ public class BufferedImage extends Image consumers.add(ic); - for(int i=0;i<consumers.size();i++) + for(int i = 0; i < consumers.size(); i++) { - ImageConsumer c = (ImageConsumer) consumers.elementAt(i); + ImageConsumer c = consumers.elementAt(i); c.setHints(ImageConsumer.SINGLEPASS); c.setDimensions(getWidth(), getHeight()); c.setPixels(x, y, width, height, model, pixels, offset, stride); @@ -794,7 +794,7 @@ public class BufferedImage extends Image public void addTileObserver (TileObserver to) { if (tileObservers == null) - tileObservers = new Vector (); + tileObservers = new Vector<TileObserver>(); tileObservers.add (to); } |