@@ -138,7 +138,7 @@ public static void launchingJ2SUnit(ILaunchConfiguration configuration, String m
138138
139139if (addonCompatiable ) {
140140generateFirefoxAddonPreJavaScript (buf ,j2sLibPath ,gj2sLibPath ,
141- grelativePath ,mainType ,workingDir ,configuration );
141+ grelativePath ,isJUnit , mainType ,workingDir ,configuration );
142142
143143buf .append ("\t \t ClazzLoader.loadClass (\" junit.textui.TestRunner\" , function () {\r \n " );
144144buf .append ("\t \t \t ClazzLoader.loadClass (\" " +mainType +"\" , function () {\r \n " );
@@ -293,7 +293,7 @@ public static void launchingJ2SApp(ILaunchConfiguration configuration, String mo
293293
294294if (addonCompatiable ) {
295295generateFirefoxAddonPreJavaScript (buf ,j2sLibPath ,gj2sLibPath ,
296- grelativePath ,mainType ,workingDir ,configuration );
296+ grelativePath ,isJUnit , mainType ,workingDir ,configuration );
297297
298298buf .append ("\t \t ClazzLoader.loadClass (\" " +mainType +"\" , function () {\r \n " );
299299String mainTypeName =new ASTTypeVisitor ().assureQualifiedName (mainType );
@@ -405,14 +405,14 @@ private static void generateFirefoxAddonPostJavaScript(StringBuffer buf,
405405
406406private static void generateFirefoxAddonPreJavaScript (StringBuffer buf ,
407407String j2sLibPath ,String gj2sLibPath ,String grelativePath ,
408- String mainType ,File workingDir ,ILaunchConfiguration configuration )
408+ boolean isJUnit , String mainType ,File workingDir ,ILaunchConfiguration configuration )
409409throws CoreException {
410410buf .append ("window[\" j2s.lib\" ] = {\r \n " );
411411File j2slibFolder =new File (workingDir .getAbsolutePath (),j2sLibPath );
412412File j2sRelease =new File (j2slibFolder ,".release" );
413413Properties release =new Properties ();
414414String alias ="1.0.0" ;
415- String version ="20071001 " ;
415+ String version ="20081203 " ;
416416release .put ("alias" ,alias );
417417release .put ("version" ,version );
418418if (j2sRelease .exists ()) {
@@ -449,10 +449,15 @@ private static void generateFirefoxAddonPreJavaScript(StringBuffer buf,
449449buf .append ("\t /*forward : true,*/\r \n " );
450450buf .append ("\t mode :\" dailybuild\" ,\r \n " );
451451buf .append ("\t onload : function () {\r \n " );
452- String j2xStr =J2SLaunchingUtil .generateClasspathJ2X (configuration ,"j2slibPath " ,workingDir );
452+ String j2xStr =J2SLaunchingUtil .generateClasspathJ2X (configuration ,"j2sBase " ,workingDir );
453453if (j2xStr !=null &&j2xStr .length () !=0 ) {
454- buf .append ("\t \t var o = window[\" j2s.lib\" ];\r \n " );
455- buf .append ("\t \t var j2slibPath = o.base + (o.alias ? o.alias : o.version) +\" /\" ;\r \n " );
454+ buf .append ("\t \t var j2sBase = window[\" j2s.lib\" ].j2sBase;\r \n " );
455+ if (j2xStr .indexOf ("\" java\" " ) == -1 ) {
456+ buf .append ("\t \t ClazzLoader.packageClasspath (\" java\" , j2sBase, true);\r \n " );
457+ }
458+ if (isJUnit &&j2xStr .indexOf ("\" junit\" " ) == -1 ) {
459+ buf .append ("\t \t ClazzLoader.packageClasspath (\" junit\" , j2sBase, true);\r \n " );
460+ }
456461buf .append ("\t \t " );
457462buf .append (j2xStr .replaceAll ("\r \n " ,"\r \n \t \t " ).trim ());
458463buf .append ("\r \n " );
@@ -750,6 +755,7 @@ static String generateClasspathJ2X(
750755String propStr ="j2s.output.path=" +relativePath +"\r \n j2s.resources.list=" +classpath ;
751756fModel .load (new ByteArrayInputStream (propStr .getBytes ()));
752757}
758+ J2SCyclicProjectUtils .emptyTracks ();
753759buf .append (fModel .toJ2XString ());
754760}
755761
