Toolkit.getImage(String) fails for URL null

hansonr · hansonr · commit f0ecb327f550 · 2021-04-26T15:23:43.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/sun/awt/image/FileImageSource.java b/sources/net.sf.j2s.java.core/src/sun/awt/image/FileImageSource.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1995, 1996, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.awt.image;
+
+import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.BufferedInputStream;
+import java.io.FileNotFoundException;
+
+public class FileImageSource extends InputStreamImageSource {
+    String imagefile;
+
+    public FileImageSource(String filename) {
+        SecurityManager security = System.getSecurityManager();
+        if (security != null) {
+            security.checkRead(filename);
+        }
+        imagefile = filename;
+    }
+
+    final boolean checkSecurity(Object context, boolean quiet) {
+        // File based images only ever need to be checked statically
+        // when the image is retrieved from the cache.
+        return true;
+    }
+
+    protected ImageDecoder getDecoder() {
+        if (imagefile == null) {
+            return null;
+        }
+
+        InputStream is;
+        try {
+            is = new BufferedInputStream(new FileInputStream(imagefile));
+        } catch (FileNotFoundException e) {
+            return null;
+        }
+        // Don't believe the file suffix - many users don't know what
+        // kind of image they have and guess wrong...
+        /*
+        int suffixpos = imagefile.lastIndexOf('.');
+        if (suffixpos >= 0) {
+            String suffix = imagefile.substring(suffixpos+1).toLowerCase();
+            if (suffix.equals("gif")) {
+                return new GifImageDecoder(this, is);
+            } else if (suffix.equals("jpeg") || suffix.equals("jpg") ||
+                       suffix.equals("jpe") || suffix.equals("jfif")) {
+                return new JPEGImageDecoder(this, is);
+            } else if (suffix.equals("xbm")) {
+                return new XbmImageDecoder(this, is);
+            }
+        }
+        */
+        return getDecoder(is);
+    }
+}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -68,6 +68,8 @@
 import javajs.util.PT;
 import sun.awt.AppContext;
 import sun.awt.SunToolkit;
+import sun.awt.image.FileImageSource;
+import sun.awt.image.ToolkitImage;
 import swingjs.api.Interface;
 import swingjs.api.JSFileHandler;
 import swingjs.api.js.HTML5Applet;
@@ -597,7 +599,15 @@ private JSImagekit getImagekit() {
 	public Image getImage(String filename) {
 		if (filename.indexOf("/") != 0)
 			filename = "../" + filename;
-		return createImage(JSToolkit.class.getResource(filename));
+		Image img = null;
+		try {
+			img = createImage(JSToolkit.class.getResource(filename));
+		} catch (Exception e) {
+		}
+		if (img == null)
+			img = new ToolkitImage(new FileImageSource(filename));
+		return img;
+		
 	}
 
 
