From 2305247ac1c87fb78ad61be5a352e3c4ab077dbf Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Tue, 17 Jun 2003 21:24:48 +0000 Subject: [PATCH] old resource loading was buggy? --- src/java/org/lwjgl/test/openal/WaveData.java | 2 +- src/java/org/lwjgl/test/opengl/Grass.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/java/org/lwjgl/test/openal/WaveData.java b/src/java/org/lwjgl/test/openal/WaveData.java index 34148c20..1a37fac7 100644 --- a/src/java/org/lwjgl/test/openal/WaveData.java +++ b/src/java/org/lwjgl/test/openal/WaveData.java @@ -91,7 +91,7 @@ public class WaveData { try { return create( AudioSystem.getAudioInputStream( - new BufferedInputStream(ClassLoader.getSystemClassLoader().getResourceAsStream(filepath)))); + new BufferedInputStream(WaveData.class.getClassLoader().getResourceAsStream(filepath)))); } catch (Exception e) { e.printStackTrace(); return null; diff --git a/src/java/org/lwjgl/test/opengl/Grass.java b/src/java/org/lwjgl/test/opengl/Grass.java index 23e8ce71..42aeb657 100644 --- a/src/java/org/lwjgl/test/opengl/Grass.java +++ b/src/java/org/lwjgl/test/opengl/Grass.java @@ -45,7 +45,6 @@ import org.lwjgl.input.*; import org.lwjgl.opengl.*; import org.lwjgl.*; -import java.net.*; import java.io.*; import java.nio.*; import java.util.*; @@ -115,9 +114,8 @@ public class Grass { int next; java.util.Vector bytes = new java.util.Vector(); try { - ClassLoader loader = ClassLoader.getSystemClassLoader(); - URL url = loader.getResource(file); - InputStream stream = new BufferedInputStream(url.openStream()); + ClassLoader loader = Grass.class.getClassLoader(); + InputStream stream = new BufferedInputStream(loader.getResourceAsStream(file)); while ((next = (stream.read())) != -1) bytes.add(new Byte((byte) next)); stream.close();