X-Git-Url: http://source.jalview.org/gitweb/?p=jalviewjs.git;a=blobdiff_plain;f=site%2Fj2s%2Fcore%2Fpackage.js;h=5e32d72810d802adeb436d7ad0f772671fbd4521;hp=e6db6143d736e03bf492aa130ad44a0ffa7c5c16;hb=b9b7a352eee79b7764c3b09c9d19663075061d8c;hpb=7301a2415adab88038b291fc54caeeb3a5a47a44

diff --git a/site/j2s/core/package.js b/site/j2s/core/package.js
index e6db614..5e32d72 100644
--- a/site/j2s/core/package.js
+++ b/site/j2s/core/package.js
@@ -1,94 +1,94 @@
-// package.js from Jmol project -- template only here for Swingjs
-
-// NOTE: Any changes here must also be reflected in build xml
-// NOTE: this code does not allow for multiple J2S applications on a page
-
-if (!window["java.registered"])
- window["java.registered"] = false;
-
-(function (ClazzLoader) {
-
-	if (window["java.packaged"]) return;
-	window["java.packaged"] = true;
-
-	//if (!Jmol._isAsync) {
-		for (var i = 0; i < Jmol._coreFiles.length; i++)
-		  ClazzLoader.loadZJar(Jmol._coreFiles[i], ClazzLoader.runtimeKeyClass);
-	//}
-		
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "java/awt/geom/Point2D.js", [
-  "java.awt.geom.Point2D", 
-  "java.awt.geom.Point2D.Double", 
-  "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() + "javax/swing/text/AbstractDocument.js", [
-  "javax.swing.text.AbstractDocument", 
-  "javax.swing.text.AbstractDocument.UndoRedoDocumentEvent" 
-	]);
-
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/Popup.js", [
-  "javax.swing.Popup", 
-  "javax.swing.Popup.DefaultFrame",
-  "javax.swing.Popup.HeavyWeightWindow" 
-	]);
-
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/text/LayeredHighlighter.js", [
-  "javax.swing.text.LayeredHighlighter", 
-  "javax.swing.text.LayeredHighlighter.LayerPainter" 
-	]);
-
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/JComponent.js", [
-  "javax.swing.JComponent", 
-  "javax.swing.JComponent.KeyboardState", 
-  "javax.swing.JComponent.ActionStandin", 
-  "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() + "java/text/DateFormat.js", [
-  "java.text.DateFormat", 
-  "java.text.DateFormat.Field"
-	]);
-
-  if (Jmol._debugCode)
-    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"	
-	]);
-   ...
-*/
-
-}) (Clazz._Loader);
-window["java.registered"] = true;
+// package.js from Jmol project -- template only here for Swingjs
+
+// NOTE: Any changes here must also be reflected in build xml
+// NOTE: this code does not allow for multiple J2S applications on a page
+
+if (!window["java.registered"])
+ window["java.registered"] = false;
+
+(function (ClazzLoader) {
+
+	if (window["java.packaged"]) return;
+	window["java.packaged"] = true;
+
+	//if (!Jmol._isAsync) {
+		for (var i = 0; i < Jmol._coreFiles.length; i++)
+		  ClazzLoader.loadZJar(Jmol._coreFiles[i], ClazzLoader.runtimeKeyClass);
+	//}
+		
+ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "java/awt/geom/Point2D.js", [
+  "java.awt.geom.Point2D", 
+  "java.awt.geom.Point2D.Double", 
+  "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() + "javax/swing/text/AbstractDocument.js", [
+  "javax.swing.text.AbstractDocument", 
+  "javax.swing.text.AbstractDocument.UndoRedoDocumentEvent" 
+	]);
+
+ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/Popup.js", [
+  "javax.swing.Popup", 
+  "javax.swing.Popup.DefaultFrame",
+  "javax.swing.Popup.HeavyWeightWindow" 
+	]);
+
+ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/text/LayeredHighlighter.js", [
+  "javax.swing.text.LayeredHighlighter", 
+  "javax.swing.text.LayeredHighlighter.LayerPainter" 
+	]);
+
+ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/JComponent.js", [
+  "javax.swing.JComponent", 
+  "javax.swing.JComponent.KeyboardState", 
+  "javax.swing.JComponent.ActionStandin", 
+  "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() + "java/text/DateFormat.js", [
+  "java.text.DateFormat", 
+  "java.text.DateFormat.Field"
+	]);
+
+  if (Jmol._debugCode)
+    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"	
+	]);
+   ...
+*/
+
+}) (Clazz._Loader);
+window["java.registered"] = true;