Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/welcome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/welcome
Modified Files:
WelcomeTopComponent.java
Log Message:
Merging EMS into head for the 2.0 release work
Index: WelcomeTopComponent.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/welcome/WelcomeTopComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WelcomeTopComponent.java 14 Oct 2004 14:55:04 -0000 1.2
--- WelcomeTopComponent.java 12 Apr 2006 19:14:10 -0000 1.3
***************
*** 181,187 ****
// c = Class.forName(classname);
// } catch (ClassNotFoundException e) {
! ClassLoader loader = getClassLoader();
try {
! c = Class.forName(classname, true, loader);
} catch (ClassNotFoundException e1) { }
// }
--- 181,187 ----
// c = Class.forName(classname);
// } catch (ClassNotFoundException e) {
! // ClassLoader loader = getClassLoader();
try {
! c = Class.forName(classname);
} catch (ClassNotFoundException e1) { }
// }
***************
*** 213,217 ****
File extrasFile =
InstalledFileLocator.getDefault().locate("mc4jlib/mc4j_common.jar","org.mc4j.console",false);
! if (!extrasFile.exists()) {
ErrorManager.getDefault().notify(
new RuntimeException("Unable to locate mc4j_common.jar in the mc4jlib folder")
--- 213,217 ----
File extrasFile =
InstalledFileLocator.getDefault().locate("mc4jlib/mc4j_common.jar","org.mc4j.console",false);
! if (extrasFile != null && !extrasFile.exists()) {
ErrorManager.getDefault().notify(
new RuntimeException("Unable to locate mc4j_common.jar in the mc4jlib folder")
|
