Add image cache for image size

zhourenjian · zhourenjian · commit 1bad5908f89e · 2009-04-26T15:06:30.000Z
Refactor Browser to avoid unexpected exceptions
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/browser/Browser.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/browser/Browser.java
@@ -14,7 +14,6 @@
 import org.eclipse.swt.SWTError;
 import org.eclipse.swt.SWTException;
 import org.eclipse.swt.internal.browser.OS;
-import org.eclipse.swt.internal.xhtml.ContentWindow;
 import org.eclipse.swt.internal.xhtml.Element;
 import org.eclipse.swt.internal.xhtml.document;
 import org.eclipse.swt.widgets.Composite;
@@ -984,12 +983,21 @@ public void refresh() {
 	checkWidget();
 //	int[] rgdispid = auto.getIDsOfNames(new String[] { "Refresh" }); //$NON-NLS-1$
 //	auto.invoke(rgdispid[0]);
-	if (browserHandle != null) {
-		if (browserHandle.contentWindow != null) {
-			browserHandle.contentWindow.reload();
-		} else { // Opera
-			browserHandle.src = url; //?
-		}
+	if (browserHandle != null)
+	/**
+	 * @j2sNative
+	 * try {
+	 * 	var win = this.browserHandle.contentWindow;
+	 * 	if (win != null) {
+	 * 		win.reload();
+	 * 	} else { // Opera ?
+	 * 		this.browserHandle.src = this.url;
+	 * 	}
+	 * } catch (e) {
+	 * 	this.browserHandle.src = this.url;
+	 * }
+	 */ {
+		browserHandle.src = url;
 	}
 }
 
@@ -1476,12 +1484,21 @@ public boolean setUrl(String url) {
 	*/
 	this.url = url;
 	
-	if (browserHandle != null) {
-		if (browserHandle.contentWindow != null) {
-			browserHandle.contentWindow.location = url;
-		} else { // Opera
-			browserHandle.src = url;
-		}
+	if (browserHandle != null)
+	/**
+	 * @j2sNative
+	 * try {
+	 * 	var win = this.browserHandle.contentWindow;
+	 * 	if (win != null) {
+	 * 		win.location = this.url;
+	 * 	} else {
+	 * 		this.browserHandle.src = this.url;
+	 * 	}
+	 * } catch (e) {
+	 * 	this.browserHandle.src = this.url;
+	 * }
+	 */ {
+		browserHandle.src = url;
 	}
 	back = true;
 	return true;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java
@@ -893,16 +893,29 @@ public static int getFixedBodyOffsetLeft() {
 	    return bcScrollLeft;
 	}
 	
+	private static Object imageCaches = new Object();
+
 	public static Point getImageSize(Image image) {
 		int w = 16, h = 16; // Default to 16x16 for common
 		if (image.width == 0 && image.height == 0) {
 			if (image.url != null && image.url.length() != 0) {
-				org.eclipse.swt.internal.xhtml.Image img = new org.eclipse.swt.internal.xhtml.Image ();
-				img.src = image.url;
+				org.eclipse.swt.internal.xhtml.Image img = null;
+				/**
+				 * @j2sNative
+				 * img = O$.imageCaches[image.url];
+				 */ {}
+				if (img == null) {
+					img = new org.eclipse.swt.internal.xhtml.Image ();
+					img.src = image.url;
+				}
 				image.width = img.width;
 				image.height = img.height;
 				w = img.width;
 				h = img.height;
+				/**
+				 * @j2sNative
+				 * O$.imageCaches[image.url] = img;
+				 */ {}
 				// TODO: The above method to find out width & height is unsafe!
 				// TODO: Maybe the image may fail to be loaded!
 			} // else default 16x16
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Button.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Button.java
@@ -999,14 +999,7 @@ public void setImage (Image image) {
 		
 		CSSStyle handleStyle = null;
 		handleStyle = btnText.style;
-		org.eclipse.swt.internal.xhtml.Image img = new org.eclipse.swt.internal.xhtml.Image ();
-		img.src = this.image.url;
-		if (image.width == 0) {
-			this.image.width = img.width;
-		}
-		if (image.height == 0) {
-			this.image.height = img.height;
-		}
+		OS.getImageSize(this.image);
 		if ((style & (SWT.RADIO | SWT.CHECK)) != 0) {
 ////			handleStyle.fontSize = this.image.height + "px";
 //			handleStyle.display = "block";
