Author: chatellier Date: 2011-02-04 10:05:16 +0000 (Fri, 04 Feb 2011) New Revision: 663 Log: Fix classloader in java web start Modified: trunk/changelog.txt trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-02-04 09:42:47 UTC (rev 662) +++ trunk/changelog.txt 2011-02-04 10:05:16 UTC (rev 663) @@ -4,6 +4,7 @@ 1.0.0-beta4 ----------- + * Fix coser classloader in javawebstart context * Website locale action stay on same page * Add website cumputed indices pdf files * Add coser logo in main view Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2011-02-04 09:42:47 UTC (rev 662) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/Coser.java 2011-02-04 10:05:16 UTC (rev 663) @@ -66,11 +66,6 @@ */ public static void main(String... args) { - // declare new classloader - ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader(); - CoserClassLoader coserClassLoader = new CoserClassLoader(currentClassLoader); - Thread.currentThread().setContextClassLoader(coserClassLoader); - // init config final CoserConfig coserConfig = new CoserConfig(); try { @@ -81,9 +76,6 @@ } } - // set coser xwork validation file directory in classloader - coserClassLoader.setValidatorsDirectory(coserConfig.getValidatorsDirectory()); - // catch wall application exception launch(coserConfig); @@ -112,6 +104,15 @@ SwingUtilities.invokeLater(new Runnable() { @Override public void run() { + + // ne to be done in Swing EDT (otherwize, don't work on javawebstart) + // declare new classloader + ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader(); + CoserClassLoader coserClassLoader = new CoserClassLoader(currentClassLoader); + Thread.currentThread().setContextClassLoader(coserClassLoader); + // set coser xwork validation file directory in classloader + coserClassLoader.setValidatorsDirectory(coserConfig.getValidatorsDirectory()); + // init LAF (from configuration) try { String lafClassName = coserConfig.getLookAndFeel();