diff options
Diffstat (limited to 'libjava/classpath/java/awt/image/renderable')
3 files changed, 14 insertions, 14 deletions
diff --git a/libjava/classpath/java/awt/image/renderable/ParameterBlock.java b/libjava/classpath/java/awt/image/renderable/ParameterBlock.java index 879d3c4fb90..e484d6b8713 100644 --- a/libjava/classpath/java/awt/image/renderable/ParameterBlock.java +++ b/libjava/classpath/java/awt/image/renderable/ParameterBlock.java @@ -45,20 +45,20 @@ import java.util.Vector; public class ParameterBlock implements Cloneable, Serializable { private static final long serialVersionUID = -7577115551785240750L; - protected Vector sources; - protected Vector parameters; + protected Vector<Object> sources; + protected Vector<Object> parameters; public ParameterBlock() { - this(new Vector(), new Vector()); + this(new Vector<Object>(), new Vector<Object>()); } - public ParameterBlock(Vector sources) + public ParameterBlock(Vector<Object> sources) { - this(sources, new Vector()); + this(sources, new Vector<Object>()); } - public ParameterBlock(Vector sources, Vector parameters) + public ParameterBlock(Vector<Object> sources, Vector<Object> parameters) { this.sources = sources; this.parameters = parameters; @@ -80,9 +80,9 @@ public class ParameterBlock implements Cloneable, Serializable { ParameterBlock pb = (ParameterBlock) shallowClone(); if (sources != null) - pb.sources = (Vector) sources.clone(); + pb.sources = (Vector<Object>) sources.clone(); if (parameters != null) - pb.parameters = (Vector) parameters.clone(); + pb.parameters = (Vector<Object>) parameters.clone(); return pb; } @@ -119,12 +119,12 @@ public class ParameterBlock implements Cloneable, Serializable return sources.size(); } - public Vector getSources() + public Vector<Object> getSources() { return sources; } - public void setSources(Vector sources) + public void setSources(Vector<Object> sources) { this.sources = sources; } @@ -140,12 +140,12 @@ public class ParameterBlock implements Cloneable, Serializable return parameters.size(); } - public Vector getParameters() + public Vector<Object> getParameters() { return parameters; } - public void setParameters(Vector parameters) + public void setParameters(Vector<Object> parameters) { this.parameters = parameters; } diff --git a/libjava/classpath/java/awt/image/renderable/RenderableImage.java b/libjava/classpath/java/awt/image/renderable/RenderableImage.java index 45d2eb7ebf0..c2f6ad8b058 100644 --- a/libjava/classpath/java/awt/image/renderable/RenderableImage.java +++ b/libjava/classpath/java/awt/image/renderable/RenderableImage.java @@ -46,7 +46,7 @@ public interface RenderableImage { String HINTS_OBSERVED = "HINTS_OBSERVED"; - Vector getSources(); + Vector<RenderableImage> getSources(); Object getProperty(String name); String[] getPropertyNames(); boolean isDynamic(); diff --git a/libjava/classpath/java/awt/image/renderable/RenderableImageOp.java b/libjava/classpath/java/awt/image/renderable/RenderableImageOp.java index 5385a82a317..b9d0cd39e6e 100644 --- a/libjava/classpath/java/awt/image/renderable/RenderableImageOp.java +++ b/libjava/classpath/java/awt/image/renderable/RenderableImageOp.java @@ -55,7 +55,7 @@ public class RenderableImageOp implements RenderableImage this.block = (ParameterBlock) block.clone(); } - public Vector getSources() + public Vector<RenderableImage> getSources() { if (block.sources == null) return null; |
