isWindowOrJSApplet()

hansonr · hansonr · commit 7ea6ee923cd4 · 2019-02-28T15:56:07.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTableUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSTableUI.java
@@ -249,7 +249,7 @@ private JSComponent getCellComponent(TableCellRenderer renderer, int row, int co
 			JSComponentUI ui = ((JSComponentUI) c.getUI());
 			boolean wasDisabled = ui.isUIDisabled;
 			ui.setRenderer(c, w, h);
-			ui.targetParent = table;
+			ui.setTargetParent(table);
 			if (fullPaint && wasDisabled || cNoPrep != null) {
 				// repeat, now that the UI is enabled
 				if (wasDisabled)
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSToolBarUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSToolBarUI.java
@@ -542,9 +542,9 @@ protected DragWindow createDragWindow(JToolBar toolbar) {
 		Window frame = null;
 		if (toolBar != null) {
 			Container p;
-			for (p = toolBar.getParent(); p != null && !(p instanceof Window); p = p.getParent())
+			for (p = toolBar.getParent(); p != null && !p.isWindowOrJSApplet(); p = p.getParent())
 				;
-			if (p != null && p instanceof Window)
+			if (p != null && p.isWindowOrJSApplet())
 				frame = (Window) p;
 		}
 		if (floatingToolBar == null) {

Original file line number	Diff line number	Diff line change
`@@ -542,9 +542,9 @@ protected DragWindow createDragWindow(JToolBar toolbar) {`
`542`	`542`	`Window frame = null;`
`543`	`543`	`if (toolBar != null) {`
`544`	`544`	`Container p;`
`545`		`- for (p = toolBar.getParent(); p != null && !(p instanceof Window); p = p.getParent())`
	`545`	`+ for (p = toolBar.getParent(); p != null && !p.isWindowOrJSApplet(); p = p.getParent())`
`546`	`546`	`;`
`547`		`- if (p != null && p instanceof Window)`
	`547`	`+ if (p != null && p.isWindowOrJSApplet())`
`548`	`548`	`frame = (Window) p;`
`549`	`549`	`}`
`550`	`550`	`if (floatingToolBar == null) {`