java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 50)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2851
          http://svn.sourceforge.net/java-game-lib/?rev=2851&view=rev
Author:   matzon
Date:     2007-06-11 11:10:19 -0700 (Mon, 11 Jun 2007)

Log Message:
-----------
applied kappaOne's Permision denied handling
made some minor cleanup

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	2007-06-10 20:31:41 UTC (rev 2850)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2007-06-11 18:10:19 UTC (rev 2851)
@@ -47,7 +47,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Method;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLConnection;
@@ -165,9 +164,6 @@
 	/** urls of the jars to download */
 	protected URL[]		urlList;
 	
-	/** list of jars to download */
-	protected String 	jarList;
-	
 	/** actual thread that does the loading */
 	protected Thread	loaderThread;
 	
@@ -197,6 +193,14 @@
 												"Plese contact support to resolve this issue.",
 												"<placeholder for error message>"};
 	
+	/** whether a certificate refused error occured */
+	protected boolean	certificateRefused;
+	
+	/** error message to display if user refuses to accept certicate*/
+	protected String[] 	certificateRefusedMessage = { "Permissions for Applet Refused.",
+												      "Please accept the permissions dialog to allow",
+												      "the applet to continue the loading process."};
+	
 	/*
 	 * @see java.applet.Applet#init()
 	 */
@@ -223,17 +227,10 @@
 		logo 			= getImage("/" + getParameter("al_logo"));
 		progressbar 	= getImage("/" + getParameter("al_progressbar"));
 		
-		// jars to load
-		jarList 		= getParameter("al_jars");
-		
 		//sanity check
 		if(logo == null || progressbar == null) {
 			fatalErrorOccured("Unable to load logo and progressbar images");
-			return;
 		}
-
-		// parse the urls for the jars into the url list
-		loadJarURLs();
 	}
 
 	/*
@@ -247,7 +244,7 @@
 			
 			animationThread = new Thread() {
 				public void run() {
-					while(state != STATE_DONE) {
+					while(loaderThread != null) {
 						repaint();
 						AppletLoader.this.sleep(100);
 					}
@@ -307,7 +304,7 @@
 	/*
 	 * @see java.awt.Container#paint(java.awt.Graphics)
 	 */
-	public final synchronized void paint(Graphics g) {
+	public synchronized void paint(Graphics g) {
 		
 		// paint applet if available
 		if(lwjglApplet != null && state == STATE_DONE) {
@@ -337,49 +334,18 @@
 		}
 
 		og.setColor(fgColor);
-		String message = null;
+		String message = getDescriptionForState();
 
-		switch (state) {
-			case STATE_INIT:
-				message = "Initializing loader";
-				break;
-			case STATE_DETERMINING_PACKAGES:
-				message = "Determining packages to load";
-				break;
-			case STATE_CHECKING_CACHE:
-				message = "Checking cache for existing files";
-				break;
-			case STATE_DOWNLOADING:
-				message = "Downloading packages";
-				break;
-			case STATE_EXTRACTING_PACKAGES:
-				message = "Extracting downloaded packages";
-				break;
-			case STATE_UPDATING_CLASSPATH:
-				message = "Updating classpath";
-				break;
-			case STATE_SWITCHING_APPLET:
-				message = "Switching applet";
-				break;
-			case STATE_INITIALIZE_REAL_APPLET:
-				message = "Initializing real applet";
-				break;
-			case STATE_START_REAL_APPLET:
-				message = "Starting real applet";
-				break;
-			case STATE_DONE:
-				message = "Done loading";
-				break;
-		}
-
+		// if we had a failure of some sort, notify the user
 		if (fatalError) {
-			genericErrorMessage[genericErrorMessage.length-1] = fatalErrorDescription;
-			for(int i=0; i<genericErrorMessage.length; i++) {
-				int messageX = (getWidth() - fm.stringWidth(genericErrorMessage[i])) / 2;
-				int messageY = (getHeight() - (fm.getHeight() * genericErrorMessage.length)) / 2;
+			String[] errorMessage = (certificateRefused) ? certificateRefusedMessage : genericErrorMessage;
+			
+			for(int i=0; i<errorMessage.length; i++) {
+				int messageX = (getWidth() - fm.stringWidth(errorMessage[i])) / 2;
+				int messageY = (getHeight() - (fm.getHeight() * errorMessage.length)) / 2;
 				
 				og.setColor(errorColor);
-				og.drawString(genericErrorMessage[i], messageX, messageY + i*fm.getHeight());
+				og.drawString(errorMessage[i], messageX, messageY + i*fm.getHeight());
 			}
 		} else {
 			og.setColor(fgColor);
@@ -411,49 +377,77 @@
 	}	
 
 	/**
+	 * @return string describing the state of the loader
+	 */
+	protected String getDescriptionForState() {
+		switch (state) {
+			case STATE_INIT:
+				return "Initializing loader";
+			case STATE_DETERMINING_PACKAGES:
+				return "Determining packages to load";
+			case STATE_CHECKING_CACHE:
+				return "Checking cache for existing files";
+			case STATE_DOWNLOADING:
+				return "Downloading packages";
+			case STATE_EXTRACTING_PACKAGES:
+				return "Extracting downloaded packages";
+			case STATE_UPDATING_CLASSPATH:
+				return "Updating classpath";
+			case STATE_SWITCHING_APPLET:
+				return "Switching applet";
+			case STATE_INITIALIZE_REAL_APPLET:
+				return "Initializing real applet";
+			case STATE_START_REAL_APPLET:
+				return "Starting real applet";
+			case STATE_DONE:
+				return "Done loading";
+			default:
+				return "unknown state";
+		}
+	}
+
+	/**
 	 * Reads list of jars to download and adds the urls to urlList
 	 * also finds out which OS you are on and adds appropriate native
 	 * jar to the urlList
 	 */
-	protected void loadJarURLs() {
+	protected void loadJarURLs() throws Exception {
 		state = STATE_DETERMINING_PACKAGES;
-
+		
+		// jars to load
+		String jarList = getParameter("al_jars");
+		
 		StringTokenizer jar = new StringTokenizer(jarList, ", ");
 
 		int jarCount = jar.countTokens() + 1;
 		
 		urlList = new URL[jarCount];
 
-		try {
-			URL path = getCodeBase();
+		URL path = getCodeBase();
 
-			// set jars urls
-			for (int i = 0; i < jarCount - 1; i++) {
-				urlList[i] = new URL(path, jar.nextToken());
-			}
+		// set jars urls
+		for (int i = 0; i < jarCount - 1; i++) {
+			urlList[i] = new URL(path, jar.nextToken());
+		}
 
-			// native jar url
-			String osName 		= System.getProperty("os.name");
-			String nativeJar 	= null;
+		// native jar url
+		String osName 		= System.getProperty("os.name");
+		String nativeJar 	= null;
+		
+		if (osName.startsWith("Win")) {
+			nativeJar = getParameter("al_windows");
+		} else if (osName.startsWith("Linux") || osName.startsWith("FreeBSD") || osName.startsWith("SunOS")) {
+			nativeJar = getParameter("al_linux");
+		} else if (osName.startsWith("Mac")) {
+			nativeJar = getParameter("al_mac");
+		} else {
+			fatalErrorOccured("OS (" + osName + ") not supported");
+		}
 
-			if (osName.startsWith("Win")) {
-				nativeJar = getParameter("al_windows");
-			} else if (osName.startsWith("Linux") || osName.startsWith("FreeBSD") || osName.startsWith("SunOS")) {
-				nativeJar = getParameter("al_linux");
-			} else if (osName.startsWith("Mac")) {
-				nativeJar = getParameter("al_mac");
-			} else {
-				fatalErrorOccured("OS (" + osName + ") not supported");
-			}
-
-			if (nativeJar == null) {
-				fatalErrorOccured("no lwjgl natives files found");
-			} else {
-				urlList[jarCount - 1] = new URL(path, nativeJar);
-			}
-
-		} catch (MalformedURLException e) {
-			fatalErrorOccured(e.getMessage());
+		if (nativeJar == null) {
+			fatalErrorOccured("no lwjgl natives files found");
+		} else {
+			urlList[jarCount - 1] = new URL(path, nativeJar);
 		}
 	}
 
@@ -478,6 +472,9 @@
 				sleep(2000);
 			}
 
+			// parse the urls for the jars into the url list
+			loadJarURLs();
+			
 			// get path where applet will be stored
 			String path = (String) AccessController.doPrivileged(new PrivilegedExceptionAction() {
 				public Object run() throws Exception {
@@ -542,10 +539,12 @@
 			state = STATE_DONE;		
 		} catch (AccessControlException ace) {
 			fatalErrorOccured(ace.getMessage());
+			certificateRefused = true;
 		} catch (Exception e) {
 			fatalErrorOccured(e.getMessage());
 		} finally {
 			loaderThread = null;
+			repaint();
 		}
 	}
 
@@ -797,6 +796,10 @@
 		subtaskMessage = "";
 
 		jarFile.close();
+		
+		// delete native jar as it is no longer needed
+		File f = new File(path + nativeJar);
+		f.delete();
 	}
 
 	/**


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




2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (134)	Sep (52)	Oct (13)	Nov (342)	Dec (163)
2003	Jan (44)	Feb (62)	Mar (158)	Apr (38)	May (70)	Jun (58)	Jul (104)	Aug (207)	Sep (83)	Oct (122)	Nov (23)	Dec (49)
2004	Jan (119)	Feb (132)	Mar (192)	Apr (140)	May (77)	Jun (74)	Jul (201)	Aug (63)	Sep (102)	Oct (70)	Nov (173)	Dec (78)
2005	Jan (174)	Feb (197)	Mar (105)	Apr (59)	May (77)	Jun (43)	Jul (21)	Aug (18)	Sep (47)	Oct (37)	Nov (74)	Dec (50)
2006	Jan (44)	Feb (19)	Mar (32)	Apr (24)	May (31)	Jun (55)	Jul (138)	Aug (28)	Sep (12)	Oct (41)	Nov (58)	Dec (24)
2007	Jan (28)	Feb (14)	Mar (10)	Apr (68)	May (30)	Jun (26)	Jul (18)	Aug (63)	Sep (19)	Oct (29)	Nov (20)	Dec (10)
2008	Jan (38)	Feb (7)	Mar (37)	Apr (120)	May (41)	Jun (36)	Jul (39)	Aug (24)	Sep (28)	Oct (30)	Nov (36)	Dec (75)
2009	Jan (46)	Feb (22)	Mar (50)	Apr (70)	May (134)	Jun (105)	Jul (75)	Aug (34)	Sep (38)	Oct (34)	Nov (19)	Dec (20)
2010	Jan (11)	Feb (20)	Mar (65)	Apr (83)	May (104)	Jun (73)	Jul (78)	Aug (57)	Sep (43)	Oct (35)	Nov (9)	Dec (4)
2011	Jan (21)	Feb (11)	Mar (18)	Apr (10)	May (18)	Jun (15)	Jul (48)	Aug (25)	Sep (17)	Oct (45)	Nov (15)	Dec (12)
2012	Jan (21)	Feb (9)	Mar (12)	Apr (9)	May (9)	Jun (5)	Jul (1)	Aug (10)	Sep (12)	Oct (1)	Nov (28)	Dec (5)
2013	Jan (4)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb (1)	Mar (1)	Apr	May (2)	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2015	Jan (1)	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (2)	Nov	Dec
2016	Jan (2)	Feb (1)	Mar (1)	Apr (1)	May (2)	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec

java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 50)

java-game-lib-cvs — Commits to the repository will be send to this list.