java2script
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/package.js‎
Lines changed: 3 additions & 1 deletion b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/package.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Label.java‎
Lines changed: 0 additions & 1 deletion b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Label.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Shell.java‎
Lines changed: 26 additions & 22 deletions b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Shell.java‎
Lines changed: 26 additions & 22 deletions
@@ -136,9 +136,11 @@ $WTC$$.globalChecking = function () {
 /* private */
 $WTC$$.getCSSRuleID = function (clazzName) {
 	var cssRuleID = null;
-	if (clazzName.indexOf ("org.eclipse.swt.") == 0 || clazzName.indexOf ("$wt.")) {
+	if (clazzName.indexOf ("org.eclipse.swt.") == 0 || clazzName.indexOf ("$wt.") == 0) {
 		var idx = clazzName.indexOf ("wt.") + 3;
 		cssRuleID = "swt." + clazzName.substring (idx);
+	} else {
+		cssRuleID = clazzName;
 	}
 	return cssRuleID.toLowerCase ().replace (/\./g, '-');
 };
 
@@ -523,7 +523,6 @@ public void setAlignment (int alignment) {
  */
 public void setImage (Image image) {
 	checkWidget ();
-	if (image == null) return ;
 	if ((style & SWT.SEPARATOR) != 0) return;
 	if (image != null && image.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
 	//_setImage (this.image = image);
 
@@ -493,36 +493,40 @@ int callWindowProc (int hwnd, int msg, int wParam, int lParam) {
  */
 public void close () {
 	checkWidget ();
-	if (parent == null && (this.getStyle() & SWT.TOOL) == 0 && display.taskBar != null) {
-		TaskBar taskBar = display.taskBar;
-		taskBar.removeShellItem(this);
-		taskBar.handleApproaching();
-		taskBar.updateLayout();
-		taskBar.setMinimized(false);
-		taskBar.updateLastModified();
-	}
 	Shell nextShell = null;
 	if (parent instanceof Shell) {
 		nextShell = (Shell) parent;
 		if (!nextShell.isVisible()) {
 			nextShell = null;
 		}
 	}
+	Display display = this.display;
 	closeWidget ();
-	if (nextShell == null || nextShell.isDisposed()) {
-		nextShell = Display.getTopShell();
-	}
-	if (nextShell != null && !nextShell.isDisposed()) {
-		nextShell.bringToTop();
-		nextShell.forceFocus();
-	} else 
-	/**
-	 * Return to default title
-	 * @j2sNative
-	 * if (window["document.title"] != null) {
-	 * 	document.title = window["document.title"];
-	 * }
-	 */ {}
+	if (isDisposed()) {
+		if (parent == null && (this.getStyle() & SWT.TOOL) == 0
+				&& display != null && display.taskBar != null) {
+			TaskBar taskBar = display.taskBar;
+			taskBar.removeShellItem(this);
+			taskBar.handleApproaching();
+			taskBar.updateLayout();
+			taskBar.setMinimized(false);
+			taskBar.updateLastModified();
+		}
+		if (nextShell == null || nextShell.isDisposed()) {
+			nextShell = Display.getTopShell();
+		}
+		if (nextShell != null && !nextShell.isDisposed()) {
+			nextShell.bringToTop();
+			nextShell.forceFocus();
+		} else 
+		/**
+		 * Return to default title
+		 * @j2sNative
+		 * if (window["document.title"] != null) {
+		 * 	document.title = window["document.title"];
+		 * }
+		 */ {}
+	}
 }
 
 protected void createHandle () {