From 490ec9b49ed4c0744cda21d08ca3c5561f484791 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 8 Jun 2011 08:47:33 +0000 Subject: [PATCH] Replaced calls to system class loader with calls to parent class loader. Calls to system class loader git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3039 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/prism/SBML2Prism.java | 2 +- prism/src/simulator/networking/SimulatorNetworkHandler.java | 2 +- prism/src/userinterface/GUIPrism.java | 2 +- prism/src/userinterface/GUIPrismSplash.java | 2 +- prism/src/userinterface/graph/Graph.java | 3 +-- .../model/computation/LoadGraphicModelThread.java | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/prism/src/prism/SBML2Prism.java b/prism/src/prism/SBML2Prism.java index a02a4a4e..0dd3fb08 100644 --- a/prism/src/prism/SBML2Prism.java +++ b/prism/src/prism/SBML2Prism.java @@ -147,7 +147,7 @@ public class SBML2Prism implements EntityResolver if (systemId.endsWith("dtd")) { // get appropriate dtd from classpath - InputStream inputStream = ClassLoader.getSystemResourceAsStream("dtds/sbml.dtd"); + InputStream inputStream = this.getClass().getResourceAsStream("dtds/sbml.dtd"); if (inputStream != null) inputSource = new InputSource(inputStream); } diff --git a/prism/src/simulator/networking/SimulatorNetworkHandler.java b/prism/src/simulator/networking/SimulatorNetworkHandler.java index 7da9e512..fde65aeb 100644 --- a/prism/src/simulator/networking/SimulatorNetworkHandler.java +++ b/prism/src/simulator/networking/SimulatorNetworkHandler.java @@ -673,7 +673,7 @@ public class SimulatorNetworkHandler extends Observable implements EntityResolve if (systemId.endsWith("dtd")) { // get appropriate dtd from classpath - InputStream inputStream = ClassLoader.getSystemResourceAsStream("dtds/prismnetwork.dtd"); + InputStream inputStream = SimulatorNetworkHandler.class.getClassLoader().getResourceAsStream("dtds/prismnetwork.dtd"); if (inputStream != null) inputSource = new InputSource(inputStream); } diff --git a/prism/src/userinterface/GUIPrism.java b/prism/src/userinterface/GUIPrism.java index dd13031d..3efae0e5 100644 --- a/prism/src/userinterface/GUIPrism.java +++ b/prism/src/userinterface/GUIPrism.java @@ -470,7 +470,7 @@ public class GUIPrism extends JFrame */ public static ImageIcon getIconFromImage(String file) { - URL url = ClassLoader.getSystemResource("images/" + file); + URL url = GUIPrism.class.getClassLoader().getResource("images/" + file); if (url == null) { System.out.println("Warning: Failed to load icon file \"" + file + "\""); diff --git a/prism/src/userinterface/GUIPrismSplash.java b/prism/src/userinterface/GUIPrismSplash.java index 32550c51..a9af8f47 100644 --- a/prism/src/userinterface/GUIPrismSplash.java +++ b/prism/src/userinterface/GUIPrismSplash.java @@ -44,7 +44,7 @@ public class GUIPrismSplash extends Frame { mt = new MediaTracker(this); - URL imageURL = ClassLoader.getSystemResource(filename); + URL imageURL = GUIPrismSplash.class.getClassLoader().getResource(filename); if (imageURL == null) { System.out.println("Warning: Failed to load icon file \"" + filename + "\""); diff --git a/prism/src/userinterface/graph/Graph.java b/prism/src/userinterface/graph/Graph.java index 8b08ed4f..8e80ddbc 100644 --- a/prism/src/userinterface/graph/Graph.java +++ b/prism/src/userinterface/graph/Graph.java @@ -861,8 +861,7 @@ public class Graph extends ChartPanel implements SettingOwner, EntityResolver, O // override the resolve method for the dtd if (systemId.endsWith("dtd")) { // get appropriate dtd from classpath - InputStream inputStream = ClassLoader - .getSystemResourceAsStream("dtds/chartformat.dtd"); + InputStream inputStream = Graph.class.getClassLoader().getResourceAsStream("dtds/chartformat.dtd"); if (inputStream != null) inputSource = new InputSource(inputStream); } diff --git a/prism/src/userinterface/model/computation/LoadGraphicModelThread.java b/prism/src/userinterface/model/computation/LoadGraphicModelThread.java index a542c5f7..f1331473 100644 --- a/prism/src/userinterface/model/computation/LoadGraphicModelThread.java +++ b/prism/src/userinterface/model/computation/LoadGraphicModelThread.java @@ -658,7 +658,7 @@ public class LoadGraphicModelThread extends Thread implements EntityResolver // override the resolve method for the dtd if (systemId.endsWith("dtd")) { // get appropriate dtd from classpath - InputStream inputStream = ClassLoader.getSystemResourceAsStream("dtds/gmo.dtd"); + InputStream inputStream = LoadGraphicModelThread.class.getClassLoader().getResourceAsStream("dtds/gmo.dtd"); if (inputStream != null) inputSource = new InputSource(inputStream); }