From 413899809a167876d82d6a0e8fa1a541cb44b491 Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Sat, 19 Apr 2008 18:42:02 +0000 Subject: [PATCH] fixed issue with filenames when cache is turned on --- .../org/lwjgl/util/applet/AppletLoader.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/java/org/lwjgl/util/applet/AppletLoader.java b/src/java/org/lwjgl/util/applet/AppletLoader.java index 71878c01..f001c0c5 100644 --- a/src/java/org/lwjgl/util/applet/AppletLoader.java +++ b/src/java/org/lwjgl/util/applet/AppletLoader.java @@ -658,6 +658,21 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { 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 @@ public class AppletLoader extends Applet implements Runnable, AppletStub { 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", "")); } } }