fix for JSFrameUI.getEmbedded

hansonr · hansonr · commit 1438e7c34b98 · 2019-10-06T12:46:26.000+02:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/DOMNode.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/DOMNode.java
@@ -2,6 +2,7 @@
 
 import java.applet.AudioClip;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.Image;
 import java.awt.JSComponent;
 import java.awt.Rectangle;
@@ -329,4 +330,18 @@ public static Component getComponentFor(DOMNode node) {
 		return (ui == null ? null : ui.jc);
 	}
 
+	public static Object getEmbedded(String name, String type) {
+		DOMNode node = DOMNode.getElement(name + "-div");
+		if (node == null)
+			return null;
+		switch (type) {
+		case "node":
+			return node;
+		case "dim":
+			return new Dimension(DOMNode.getWidth(node), DOMNode.getHeight(node));
+		default:
+			return DOMNode.getAttr(node, type);
+		}
+	}
+
 }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java
@@ -178,20 +178,13 @@ public DOMNode updateDOMNode() {
 	 * @return
 	 */
 	@Override
-	@SuppressWarnings("unused")
 	public Object getEmbedded(String type) {
 		String name = frame.getName();
-		DOMNode node = DOMNode.getElement(name + "-div");
-		if (node == null)
-			return null;
 		switch (type) {
 		case "name":
 			return name;
-		case "node":
-			return node;
-		case "dim":
-			return new Dimension(DOMNode.getWidth(node), DOMNode.getHeight(node));
 		case "init":
+			DOMNode node = (DOMNode) getEmbedded("node");
 			if (node == null)
 				return null;
 			Dimension dim = (Dimension) getEmbedded("dim");
@@ -205,8 +198,9 @@ public Object getEmbedded(String type) {
 				DOMNode.setStyles(node, "position", "relative", "overflow", "hidden");
 			}
 			return node;
+		default:
+			return DOMNode.getEmbedded(name, type);
 		}
-		return null;
 	}
 
 	@Override
