diff options
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); } |