--- a/jdk/src/share/classes/java/net/ContentHandler.java Thu Dec 29 16:39:51 2011 -0800
+++ b/jdk/src/share/classes/java/net/ContentHandler.java Sun Jan 01 09:24:00 2012 +0000
@@ -96,7 +96,7 @@
* @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++) {
--- a/jdk/src/share/classes/sun/net/www/content/image/gif.java Thu Dec 29 16:39:51 2011 -0800
+++ b/jdk/src/share/classes/sun/net/www/content/image/gif.java Sun Jan 01 09:24:00 2012 +0000
@@ -37,15 +37,16 @@
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;
}
--- a/jdk/src/share/classes/sun/net/www/content/image/jpeg.java Thu Dec 29 16:39:51 2011 -0800
+++ b/jdk/src/share/classes/sun/net/www/content/image/jpeg.java Sun Jan 01 09:24:00 2012 +0000
@@ -36,15 +36,16 @@
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;
}
--- a/jdk/src/share/classes/sun/net/www/content/image/png.java Thu Dec 29 16:39:51 2011 -0800
+++ b/jdk/src/share/classes/sun/net/www/content/image/png.java Sun Jan 01 09:24:00 2012 +0000
@@ -36,15 +36,16 @@
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;
}
--- a/jdk/src/share/classes/sun/net/www/content/image/x_xbitmap.java Thu Dec 29 16:39:51 2011 -0800
+++ b/jdk/src/share/classes/sun/net/www/content/image/x_xbitmap.java Sun Jan 01 09:24:00 2012 +0000
@@ -35,15 +35,16 @@
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;
}
--- a/jdk/src/share/classes/sun/net/www/content/image/x_xpixmap.java Thu Dec 29 16:39:51 2011 -0800
+++ b/jdk/src/share/classes/sun/net/www/content/image/x_xpixmap.java Sun Jan 01 09:24:00 2012 +0000
@@ -35,15 +35,16 @@
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;
}