Ticket #2635: webstart.patch

SRC/org/openmicroscopy/shoola/env/log/LoggerFactory.java

@@ -132 +132 @@
         {
                 Properties config = new Properties();
                 try { 
-                        FileInputStream fis = new FileInputStream(file);
-                        config.load(fis);
+                        config.load(org.openmicroscopy.shoola.util.file.IOUtil.readConfigFile(file));
                 } catch (Exception e) {
                         return null;
                 }

SRC/org/openmicroscopy/shoola/env/cache/CacheServiceFactory.java

@@ -130 +130 @@
         {
                 InputStream stream;
                 try { 
-                        stream = new FileInputStream(file);
+                        stream = org.openmicroscopy.shoola.util.file.IOUtil.readConfigFile(file);
                 } catch (Exception e) {
                         return null;
                 }

SRC/org/openmicroscopy/shoola/env/config/Parser.java

@@ -154 +154 @@
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         try {
             DocumentBuilder builder = factory.newDocumentBuilder();
-            document = builder.parse(new File(configFile));
+            document = builder.parse(org.openmicroscopy.shoola.util.file.IOUtil.readConfigFile(configFile));
             if (validating) {
                 factory.setValidating(true);   
                 factory.setNamespaceAware(true);

SRC/org/openmicroscopy/shoola/env/data/DataServicesFactory.java

@@ -130 +130 @@
         private static Properties loadConfig(String file)
         {
                 Properties config = new Properties();
-                FileInputStream fis = null;
-                try { 
-                        fis = new FileInputStream(file);
+                java.io.InputStream fis = null;
+                try {
+                        fis = org.openmicroscopy.shoola.util.file.IOUtil.readConfigFile(file);
                         config.load(fis);
                 } catch (Exception e) {
                         return null;

SRC/org/openmicroscopy/shoola/env/ui/TaskBarManager.java

@@ -162 +162 @@
         {
                 String message;
                 try {
-                        FileInputStream fis = new FileInputStream(file);
+                        java.io.InputStream fis = org.openmicroscopy.shoola.util.file.IOUtil.readConfigFile(file);
                         BufferedReader in = new BufferedReader(new InputStreamReader(fis));
                         StringBuffer buffer = new StringBuffer();
                         int number = 0;

SRC/org/openmicroscopy/shoola/util/file/IOUtil.java

@@ -144 +144 @@
                 return readTextFile(new File(fileName));
         }
         
+        public static InputStream readConfigFile(String file) throws IOException {
+            try {
+                return System.getProperty("javawebstart.version", null) != null ? Class.forName("uk.ac.imperial.cisbic.Config").getClassLoader().getResourceAsStream(new java.io.File(file).getName()) : new FileInputStream(file);
+            } catch (ClassNotFoundException e) {
+                throw new RuntimeException(e);
+            }
+        }
 }