[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3223] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

[<ka...@us...>]

Revision: 3223
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3223&view=rev
Author:   kappa1
Date:     2009-06-15 13:08:52 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
Fix: allow logo's outside the appletloader.jar to be used.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-06-11 21:07:34 UTC (rev 3222)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2009-06-15 13:08:52 UTC (rev 3223)
@@ -38,7 +38,6 @@
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Image;
-import java.awt.Toolkit;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -71,6 +70,8 @@
 import java.util.jar.JarOutputStream;
 import java.util.jar.Pack200;
 
+import javax.imageio.ImageIO;
+
 import sun.security.util.SecurityConstants;
 
 /**
@@ -259,8 +260,8 @@
 		errorColor 		= getColor("al_errorcolor", Color.red);		
 
 		// load logos
-		logo 			= getImage("/" + getParameter("al_logo"));
-		progressbar 	= getImage("/" + getParameter("al_progressbar"));
+		logo 			= getImage(getParameter("al_logo"));
+		progressbar 	= getImage(getParameter("al_progressbar"));
 		
 		//sanity check
 		if(logo == null || progressbar == null) {
@@ -1112,11 +1113,14 @@
 	 */
 	protected Image getImage(String s) {
 		try {
-			DataInputStream datainputstream = new DataInputStream(getClass().getResourceAsStream(s));
-			byte abyte0[] = new byte[datainputstream.available()];
-			datainputstream.readFully(abyte0);
-			datainputstream.close();
-			return Toolkit.getDefaultToolkit().createImage(abyte0);
+			URL url = AppletLoader.class.getResource("/"+s);
+			
+			// if logo not found in jar, look at URL
+			if (url == null) {
+				url = new URL(getCodeBase(), s);
+			}
+			
+			return ImageIO.read(url);
 		} catch (Exception e) {
 			/* */
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.