Fixing bug#2321790: Not setting icon for new Shell() results in JavaScript error.

zhourenjian · zhourenjian · commit a28f889ea0eb · 2008-12-01T17:12:34.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java
@@ -2101,7 +2101,7 @@ void setSystemMenu () {
 	}
 	 */ {}
 
-	if ((style & SWT.BORDER) == 0 || (style & SWT.RESIZE) != 0) {
+	if ((style & SWT.TOOL) == 0 && (style & (SWT.CLOSE | SWT.MIN | SWT.MAX)) != 0) {
 		shellIcon = document.createElement("DIV");
 		shellIcon.className = "shell-title-icon";
 		titleBar.appendChild(shellIcon);
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TaskBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TaskBar.java
@@ -326,7 +326,10 @@ public void updateItems() {
 						handleStyle.backgroundImage = "url(\"" + image.url + "\")";
 					}
 				} else {
-					String cssClazzName = item.shell.shellIcon.className;
+					String cssClazzName = null;
+					if (item.shell.shellIcon != null) {
+						cssClazzName = item.shell.shellIcon.className;
+					}
 					if (cssClazzName != null && cssClazzName.indexOf("shell-title-icon-console") != -1) {
 						OS.addCSSClass(item.iconHandle, "shell-item-icon-console");
 					}

Original file line number	Diff line number	Diff line change
`@@ -2101,7 +2101,7 @@ void setSystemMenu () {`
`2101`	`2101`	`}`
`2102`	`2102`	`*/ {}`
`2103`	`2103`
`2104`		`- if ((style & SWT.BORDER) == 0 \|\| (style & SWT.RESIZE) != 0) {`
	`2104`	`+ if ((style & SWT.TOOL) == 0 && (style & (SWT.CLOSE \| SWT.MIN \| SWT.MAX)) != 0) {`
`2105`	`2105`	`shellIcon = document.createElement("DIV");`
`2106`	`2106`	`shellIcon.className = "shell-title-icon";`
`2107`	`2107`	`titleBar.appendChild(shellIcon);`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,10 @@ public void updateItems() {`
`326`	`326`	`handleStyle.backgroundImage = "url(\"" + image.url + "\")";`
`327`	`327`	`}`
`328`	`328`	`} else {`
`329`		`- String cssClazzName = item.shell.shellIcon.className;`
	`329`	`+ String cssClazzName = null;`
	`330`	`+ if (item.shell.shellIcon != null) {`
	`331`	`+ cssClazzName = item.shell.shellIcon.className;`
	`332`	`+ }`
`330`	`333`	`if (cssClazzName != null && cssClazzName.indexOf("shell-title-icon-console") != -1) {`
`331`	`334`	`OS.addCSSClass(item.iconHandle, "shell-item-icon-console");`
`332`	`335`	`}`