JAL-1807 includes ?j2sdebug flag and DebugJS._(msg)

[jalviewjs.git] / site / j2s / swingjs / JSToolkit.js

diff --git a/site/j2s/swingjs/JSToolkit.js b/site/j2s/swingjs/JSToolkit.js
index a41205b..14b814c 100644 (file)
--- a/site/j2s/swingjs/JSToolkit.js
+++ b/site/j2s/swingjs/JSToolkit.js
@@ -1,5 +1,5 @@
 Clazz.declarePackage ("swingjs");\r
-Clazz.load (["jssun.awt.SunToolkit"], "swingjs.JSToolkit", ["java.io.BufferedInputStream", "$.ByteArrayInputStream", "$.InputStream", "java.lang.Boolean", "$.Thread", "java.util.Hashtable", "JU.AU", "$.Rdr", "$.SB", "java.awt.Dimension", "java.awt.image.ColorModel", "javax.swing.UIManager", "jssun.awt.AppContext", "swingjs.JSComponentPeer", "swingjs.api.Interface"], function () {\r
+Clazz.load (["jssun.awt.SunToolkit"], "swingjs.JSToolkit", ["java.io.BufferedInputStream", "$.ByteArrayInputStream", "$.InputStream", "java.lang.Boolean", "$.Thread", "java.util.Hashtable", "JU.AU", "$.Rdr", "$.SB", "java.awt.Dimension", "java.awt.image.ColorModel", "javax.swing.UIManager", "jssun.awt.AppContext", "swingjs.JSComponentPeer", "$.JSImage", "swingjs.api.Interface"], function () {\r
 c$ = Clazz.decorateAsClass (function () {\r
 this.imageKit = null;\r
 Clazz.instantialize (this, arguments);\r
@@ -198,11 +198,11 @@ if (!window.jQuery) alert(
 ); jQuery.$ || (jQuery.$ = jQuery); return(jQuery);\r
 }});\r
 c$.getJavaResource = Clazz.defineMethod (c$, "getJavaResource", \r
-function (resourceName) {\r
+function (resourceName, isJavaPath) {\r
 System.out.println ("JSToolkit getting Java resource " + resourceName);\r
 {\r
-return SwingJS.getJavaResource(resourceName);\r
-}}, "~S");\r
+return SwingJS.getJavaResource(resourceName, isJavaPath);\r
+}}, "~S,~B");\r
 c$.dispatchSystemEvent = Clazz.defineMethod (c$, "dispatchSystemEvent", \r
 function (runnable) {\r
 var f = null;\r
@@ -369,7 +369,11 @@ throw e;
 }, "java.net.URL");\r
 Clazz.defineMethod (c$, "createImage", \r
 function (data, imageoffset, imagelength) {\r
-return this.getImagekit ().createImageFromBytes (data, imageoffset, imagelength);\r
+if (data == null) {\r
+var width = imageoffset;\r
+var height = imagelength;\r
+return  new swingjs.JSImage (null, width, height);\r
+}return this.getImagekit ().createImageFromBytes (data, imageoffset, imagelength);\r
 }, "~A,~N,~N");\r
 Clazz.overrideMethod (c$, "checkImage", \r
 function (image, width, height, observer) {\r