X-Git-Url: http://source.jalview.org/gitweb/?p=jalviewjs.git;a=blobdiff_plain;f=site%2Fj2s%2Fswingjs%2FJSToolkit.js;h=14b814cb9992d670a9b79ce74a09823544e7badd;hp=a41205bb5a2cbc4c793325171d1f4f1d6c5626ab;hb=7301a2415adab88038b291fc54caeeb3a5a47a44;hpb=6154cb57a6eac3bb1344b8342495f5bb701ee921

diff --git a/site/j2s/swingjs/JSToolkit.js b/site/j2s/swingjs/JSToolkit.js
index a41205b..14b814c 100644
--- a/site/j2s/swingjs/JSToolkit.js
+++ b/site/j2s/swingjs/JSToolkit.js
@@ -1,5 +1,5 @@
 Clazz.declarePackage ("swingjs");
-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 () {
+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 () {
 c$ = Clazz.decorateAsClass (function () {
 this.imageKit = null;
 Clazz.instantialize (this, arguments);
@@ -198,11 +198,11 @@ if (!window.jQuery) alert(
 ); jQuery.$ || (jQuery.$ = jQuery); return(jQuery);
 }});
 c$.getJavaResource = Clazz.defineMethod (c$, "getJavaResource", 
-function (resourceName) {
+function (resourceName, isJavaPath) {
 System.out.println ("JSToolkit getting Java resource " + resourceName);
 {
-return SwingJS.getJavaResource(resourceName);
-}}, "~S");
+return SwingJS.getJavaResource(resourceName, isJavaPath);
+}}, "~S,~B");
 c$.dispatchSystemEvent = Clazz.defineMethod (c$, "dispatchSystemEvent", 
 function (runnable) {
 var f = null;
@@ -369,7 +369,11 @@ throw e;
 }, "java.net.URL");
 Clazz.defineMethod (c$, "createImage", 
 function (data, imageoffset, imagelength) {
-return this.getImagekit ().createImageFromBytes (data, imageoffset, imagelength);
+if (data == null) {
+var width = imageoffset;
+var height = imagelength;
+return  new swingjs.JSImage (null, width, height);
+}return this.getImagekit ().createImageFromBytes (data, imageoffset, imagelength);
 }, "~A,~N,~N");
 Clazz.overrideMethod (c$, "checkImage", 
 function (image, width, height, observer) {