X-Git-Url: http://source.jalview.org/gitweb/?p=jalviewjs.git;a=blobdiff_plain;f=site%2Fj2s%2Fcore%2Fpackage.js;fp=site%2Fj2s%2Fcore%2Fpackage.js;h=549c740747fb3609ab3c7324fe6f4e8aa8c41a1d;hp=5e32d72810d802adeb436d7ad0f772671fbd4521;hb=36d803e4a1f98728e91e80de5fa0b95e0cadb0d4;hpb=5b669b6c1a4f1f29b178283a46bc22fcd66aabad

diff --git a/site/j2s/core/package.js b/site/j2s/core/package.js
index 5e32d72..549c740 100644
--- a/site/j2s/core/package.js
+++ b/site/j2s/core/package.js
@@ -1,3 +1,4 @@
+
 // package.js from Jmol project -- template only here for Swingjs
 
 // NOTE: Any changes here must also be reflected in build xml
@@ -22,12 +23,12 @@ ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "java/awt/geom/Point2D.j
   "java.awt.geom.Point2D.Float"  
 	]);
 
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "jssun/awt/SunHints.js", [
-  "jssun.awt.SunHints", 
-  "jssun.awt.SunHints.Value", 
-  "jssun.awt.SunHints.Key", 
-  "jssun.awt.SunHints.LCDContrastKey",
-  "jssun.awt.SunHints.SunKey" 
+ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "sun/awt/SunHints.js", [
+  "sun.awt.SunHints", 
+  "sun.awt.SunHints.Value", 
+  "sun.awt.SunHints.Key", 
+  "sun.awt.SunHints.LCDContrastKey",
+  "sun.awt.SunHints.SunKey" 
 	]);
 
 ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/text/AbstractDocument.js", [
@@ -53,9 +54,9 @@ ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/JComponent.
   "javax.swing.JComponent.IntVector" 
 	]);
 
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "jssun/util/resources/LocaleData.js", [
-  "jssun.util.resources.LocaleData", 
-  "jssun.util.resources.LocaleDataResourceBundleControl"
+ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "sun/util/resources/LocaleData.js", [
+  "sun.util.resources.LocaleData", 
+  "sun.util.resources.LocaleDataResourceBundleControl"
 	]);
 
 ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "java/text/DateFormat.js", [
@@ -67,28 +68,11 @@ ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "java/text/DateFormat.js
     return;
 
 	var	base = ClazzLoader.getJ2SLibBase() + "core/";
-
 // note - we don't need to list ALL the classes -- only the ones that are entry points.
-// several more classe are in each of these files -- see build_03_tojs.xml
-
-/*
-	ClazzLoader.jarClasspath (base + "coretext.z.js",	[    
-	"JM.Object2d",
-	"$.Text",
-	"J.shape.Object2dShape",
-	"$.TextShape",
-	"$.Labels",
-	"$.Measures",
-	"$.Echo",
-	"$.Hover",
-	"J.render.TextRenderer",
-	"$.LabelsRenderer",
-	"$.MeasuresRenderer",
-	"$.EchoRenderer",
-	"$.HoverRenderer"	
+
+	ClazzLoader.jarClasspath (base + "corejalview.z.js",	[
+  "jalview.javascript.JalviewLiteJsApi"
 	]);
-   ...
-*/
 
 }) (Clazz._Loader);
 window["java.registered"] = true;