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

[<ma...@us...>]

Revision: 3025
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3025&view=rev
Author:   matzon
Date:     2008-04-19 11:42:02 -0700 (Sat, 19 Apr 2008)

Log Message:
-----------
fixed issue with filenames when cache is turned on

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	2008-04-18 22:41:05 UTC (rev 3024)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2008-04-19 18:42:02 UTC (rev 3025)
@@ -658,6 +658,21 @@
 		state = STATE_UPDATING_CLASSPATH;
 		
 		percentage = 95;
+		
+		// update filenames to match extracted files
+		for (int i = 0; i < urlList.length; i++) {
+			String filename = getFileName(urlList[i]);
+			
+			if (filename.endsWith(".pack.lzma")) {
+				urlList[i] = new URL("file://" + path + filename.replaceAll(".pack.lzma", ""));
+			} 
+			else if (filename.endsWith(".pack")) {
+				urlList[i] = new URL("file://" + path + filename.replaceAll(".pack", ""));
+			}
+			else if (filename.endsWith(".lzma")) {
+				urlList[i] = new URL("file://" + path + filename.replaceAll(".lzma", ""));
+			}
+		}		
 
 		Class[] parameters = new Class[] {URL.class};
 		
@@ -906,18 +921,12 @@
 			if (filename.endsWith(".pack.lzma")) {
 				extractLZMA(path + filename, path + filename.replaceAll(".lzma", ""));
 				extractPack(path + filename.replaceAll(".lzma", ""), path + filename.replaceAll(".pack.lzma", ""));
-				// update list to contain .jar file
-				urlList[i] = new URL("file://" + path + filename.replaceAll(".pack.lzma", ""));
 			} 
 			else if (filename.endsWith(".pack")) {
 				extractPack(path + filename, path + filename.replace(".pack", ""));
-				// update list to contain .jar file
-				urlList[i] = new URL("file://" + path + filename.replaceAll(".pack", ""));
 			}
 			else if (filename.endsWith(".lzma")) {
 				extractLZMA(path + filename, path + filename.replace(".lzma", ""));
-				// update list to contain .jar file
-				urlList[i] = new URL("file://" + path + filename.replaceAll(".lzma", ""));
 			}
 		}
 	}	


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