From b1963e4a10035b0f52b3a4def8fbd8c9a10e65b9 Mon Sep 17 00:00:00 2001 From: chegar Date: Sun, 1 Jan 2012 09:24:00 +0000 Subject: [PATCH] 7125055: ContentHandler.getContent API changed in error Reviewed-by: alanb --- src/share/classes/java/net/ContentHandler.java | 2 +- .../classes/sun/net/www/content/image/gif.java | 17 +++++++++-------- .../classes/sun/net/www/content/image/jpeg.java | 17 +++++++++-------- .../classes/sun/net/www/content/image/png.java | 17 +++++++++-------- .../sun/net/www/content/image/x_xbitmap.java | 17 +++++++++-------- .../sun/net/www/content/image/x_xpixmap.java | 17 +++++++++-------- 6 files changed, 46 insertions(+), 41 deletions(-) diff --git a/src/share/classes/java/net/ContentHandler.java b/src/share/classes/java/net/ContentHandler.java index 319e6199b..87d578b0c 100644 --- a/src/share/classes/java/net/ContentHandler.java +++ b/src/share/classes/java/net/ContentHandler.java @@ -96,7 +96,7 @@ abstract public class ContentHandler { * @exception IOException if an I/O error occurs while reading the object. * @since 1.3 */ - public Object getContent(URLConnection urlc, Class[] classes) throws IOException { + public Object getContent(URLConnection urlc, Class[] classes) throws IOException { Object obj = getContent(urlc); for (int i = 0; i < classes.length; i++) { diff --git a/src/share/classes/sun/net/www/content/image/gif.java b/src/share/classes/sun/net/www/content/image/gif.java index adba0c16d..a1c9a44b7 100644 --- a/src/share/classes/sun/net/www/content/image/gif.java +++ b/src/share/classes/sun/net/www/content/image/gif.java @@ -37,15 +37,16 @@ public class gif extends ContentHandler { return new URLImageSource(urlc); } - public Object getContent(URLConnection urlc, Class[] classes) throws IOException { - for (int i = 0; i < classes.length; i++) { - if (classes[i].isAssignableFrom(URLImageSource.class)) { + public Object getContent(URLConnection urlc, Class[] classes) throws IOException { + Class[] cls = classes; + for (int i = 0; i < cls.length; i++) { + if (cls[i].isAssignableFrom(URLImageSource.class)) { return new URLImageSource(urlc); - } - if (classes[i].isAssignableFrom(Image.class)) { - Toolkit tk = Toolkit.getDefaultToolkit(); - return tk.createImage(new URLImageSource(urlc)); - } + } + if (cls[i].isAssignableFrom(Image.class)) { + Toolkit tk = Toolkit.getDefaultToolkit(); + return tk.createImage(new URLImageSource(urlc)); + } } return null; } diff --git a/src/share/classes/sun/net/www/content/image/jpeg.java b/src/share/classes/sun/net/www/content/image/jpeg.java index 8076954ca..c884c0578 100644 --- a/src/share/classes/sun/net/www/content/image/jpeg.java +++ b/src/share/classes/sun/net/www/content/image/jpeg.java @@ -36,15 +36,16 @@ public class jpeg extends ContentHandler { return new URLImageSource(urlc); } - public Object getContent(URLConnection urlc, Class[] classes) throws IOException { - for (int i = 0; i < classes.length; i++) { - if (classes[i].isAssignableFrom(URLImageSource.class)) { + public Object getContent(URLConnection urlc, Class[] classes) throws IOException { + Class[] cls = classes; + for (int i = 0; i < cls.length; i++) { + if (cls[i].isAssignableFrom(URLImageSource.class)) { return new URLImageSource(urlc); - } - if (classes[i].isAssignableFrom(Image.class)) { - Toolkit tk = Toolkit.getDefaultToolkit(); - return tk.createImage(new URLImageSource(urlc)); - } + } + if (cls[i].isAssignableFrom(Image.class)) { + Toolkit tk = Toolkit.getDefaultToolkit(); + return tk.createImage(new URLImageSource(urlc)); + } } return null; } diff --git a/src/share/classes/sun/net/www/content/image/png.java b/src/share/classes/sun/net/www/content/image/png.java index 88026de1e..790d9e60d 100644 --- a/src/share/classes/sun/net/www/content/image/png.java +++ b/src/share/classes/sun/net/www/content/image/png.java @@ -36,15 +36,16 @@ public class png extends ContentHandler { return new URLImageSource(urlc); } - public Object getContent(URLConnection urlc, Class[] classes) throws IOException { - for (int i = 0; i < classes.length; i++) { - if (classes[i].isAssignableFrom(URLImageSource.class)) { + public Object getContent(URLConnection urlc, Class[] classes) throws IOException { + Class[] cls = classes; + for (int i = 0; i < cls.length; i++) { + if (cls[i].isAssignableFrom(URLImageSource.class)) { return new URLImageSource(urlc); - } - if (classes[i].isAssignableFrom(Image.class)) { - Toolkit tk = Toolkit.getDefaultToolkit(); - return tk.createImage(new URLImageSource(urlc)); - } + } + if (cls[i].isAssignableFrom(Image.class)) { + Toolkit tk = Toolkit.getDefaultToolkit(); + return tk.createImage(new URLImageSource(urlc)); + } } return null; } diff --git a/src/share/classes/sun/net/www/content/image/x_xbitmap.java b/src/share/classes/sun/net/www/content/image/x_xbitmap.java index 10e724622..b82637514 100644 --- a/src/share/classes/sun/net/www/content/image/x_xbitmap.java +++ b/src/share/classes/sun/net/www/content/image/x_xbitmap.java @@ -35,15 +35,16 @@ public class x_xbitmap extends ContentHandler { return new URLImageSource(urlc); } - public Object getContent(URLConnection urlc, Class[] classes) throws java.io.IOException { - for (int i = 0; i < classes.length; i++) { - if (classes[i].isAssignableFrom(URLImageSource.class)) { + public Object getContent(URLConnection urlc, Class[] classes) throws java.io.IOException { + Class[] cls = classes; + for (int i = 0; i < cls.length; i++) { + if (cls[i].isAssignableFrom(URLImageSource.class)) { return new URLImageSource(urlc); - } - if (classes[i].isAssignableFrom(Image.class)) { - Toolkit tk = Toolkit.getDefaultToolkit(); - return tk.createImage(new URLImageSource(urlc)); - } + } + if (cls[i].isAssignableFrom(Image.class)) { + Toolkit tk = Toolkit.getDefaultToolkit(); + return tk.createImage(new URLImageSource(urlc)); + } } return null; } diff --git a/src/share/classes/sun/net/www/content/image/x_xpixmap.java b/src/share/classes/sun/net/www/content/image/x_xpixmap.java index 3b3ed4006..e67206ec8 100644 --- a/src/share/classes/sun/net/www/content/image/x_xpixmap.java +++ b/src/share/classes/sun/net/www/content/image/x_xpixmap.java @@ -35,15 +35,16 @@ public class x_xpixmap extends ContentHandler { return new URLImageSource(urlc); } - public Object getContent(URLConnection urlc, Class[] classes) throws java.io.IOException { - for (int i = 0; i < classes.length; i++) { - if (classes[i].isAssignableFrom(URLImageSource.class)) { + public Object getContent(URLConnection urlc, Class[] classes) throws java.io.IOException { + Class[] cls = classes; + for (int i = 0; i < cls.length; i++) { + if (cls[i].isAssignableFrom(URLImageSource.class)) { return new URLImageSource(urlc); - } - if (classes[i].isAssignableFrom(Image.class)) { - Toolkit tk = Toolkit.getDefaultToolkit(); - return tk.createImage(new URLImageSource(urlc)); - } + } + if (cls[i].isAssignableFrom(Image.class)) { + Toolkit tk = Toolkit.getDefaultToolkit(); + return tk.createImage(new URLImageSource(urlc)); + } } return null; } -- GitLab