Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git
[jalviewjs.git] / site / j2s / core / package.js
index e6db614..5e32d72 100644 (file)
@@ -1,94 +1,94 @@
-// package.js from Jmol project -- template only here for Swingjs\r
-\r
-// NOTE: Any changes here must also be reflected in build xml\r
-// NOTE: this code does not allow for multiple J2S applications on a page\r
-\r
-if (!window["java.registered"])\r
- window["java.registered"] = false;\r
-\r
-(function (ClazzLoader) {\r
-\r
-       if (window["java.packaged"]) return;\r
-       window["java.packaged"] = true;\r
-\r
-       //if (!Jmol._isAsync) {\r
-               for (var i = 0; i < Jmol._coreFiles.length; i++)\r
-                 ClazzLoader.loadZJar(Jmol._coreFiles[i], ClazzLoader.runtimeKeyClass);\r
-       //}\r
-               \r
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "java/awt/geom/Point2D.js", [\r
-  "java.awt.geom.Point2D", \r
-  "java.awt.geom.Point2D.Double", \r
-  "java.awt.geom.Point2D.Float"  \r
-       ]);\r
-\r
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "jssun/awt/SunHints.js", [\r
-  "jssun.awt.SunHints", \r
-  "jssun.awt.SunHints.Value", \r
-  "jssun.awt.SunHints.Key", \r
-  "jssun.awt.SunHints.LCDContrastKey",\r
-  "jssun.awt.SunHints.SunKey" \r
-       ]);\r
-\r
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/text/AbstractDocument.js", [\r
-  "javax.swing.text.AbstractDocument", \r
-  "javax.swing.text.AbstractDocument.UndoRedoDocumentEvent" \r
-       ]);\r
-\r
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/Popup.js", [\r
-  "javax.swing.Popup", \r
-  "javax.swing.Popup.DefaultFrame",\r
-  "javax.swing.Popup.HeavyWeightWindow" \r
-       ]);\r
-\r
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/text/LayeredHighlighter.js", [\r
-  "javax.swing.text.LayeredHighlighter", \r
-  "javax.swing.text.LayeredHighlighter.LayerPainter" \r
-       ]);\r
-\r
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "javax/swing/JComponent.js", [\r
-  "javax.swing.JComponent", \r
-  "javax.swing.JComponent.KeyboardState", \r
-  "javax.swing.JComponent.ActionStandin", \r
-  "javax.swing.JComponent.IntVector" \r
-       ]);\r
-\r
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "jssun/util/resources/LocaleData.js", [\r
-  "jssun.util.resources.LocaleData", \r
-  "jssun.util.resources.LocaleDataResourceBundleControl"\r
-       ]);\r
-\r
-ClazzLoader.jarClasspath (ClazzLoader.getJ2SLibBase() + "java/text/DateFormat.js", [\r
-  "java.text.DateFormat", \r
-  "java.text.DateFormat.Field"\r
-       ]);\r
-\r
-  if (Jmol._debugCode)\r
-    return;\r
-\r
-       var     base = ClazzLoader.getJ2SLibBase() + "core/";\r
-\r
-// note - we don't need to list ALL the classes -- only the ones that are entry points.\r
-// several more classe are in each of these files -- see build_03_tojs.xml\r
-\r
-/*\r
-       ClazzLoader.jarClasspath (base + "coretext.z.js",       [    \r
-       "JM.Object2d",\r
-       "$.Text",\r
-       "J.shape.Object2dShape",\r
-       "$.TextShape",\r
-       "$.Labels",\r
-       "$.Measures",\r
-       "$.Echo",\r
-       "$.Hover",\r
-       "J.render.TextRenderer",\r
-       "$.LabelsRenderer",\r
-       "$.MeasuresRenderer",\r
-       "$.EchoRenderer",\r
-       "$.HoverRenderer"       \r
-       ]);\r
-   ...\r
-*/\r
-\r
-}) (Clazz._Loader);\r
-window["java.registered"] = true;\r
+// 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;