Fix bug that "new Shell((Display) null);" will throw exceptions.

zhourenjian · zhourenjian · commit 232ce4325e0b · 2009-02-12T15:11:05.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.jface/src/org/eclipse/jface/window/Window.java b/sources/net.sf.j2s.java.org.eclipse.jface/src/org/eclipse/jface/window/Window.java
@@ -478,7 +478,12 @@ protected final Shell createShell() {
 		}
 		
 		//Create the shell
-		Shell newShell = new Shell(newParent, getShellStyle());
+		Shell newShell = null;
+		if (newParent != null) {
+			newShell = new Shell(newParent, getShellStyle());
+		} else {
+			newShell = new Shell((Shell) null, getShellStyle());
+		}
 
 		resizeListener = new Listener() {
 			public void handleEvent(Event e) {
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Shell.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Shell.java
@@ -163,7 +163,8 @@ public class Shell extends Decorations {
  * </ul>
  */
 public Shell () {
-	this ((Display) null);
+	//this ((Display) null);
+	this (null, null, SWT.SHELL_TRIM, 0);
 }
 
 /**
@@ -202,7 +203,8 @@ public Shell () {
  * @see SWT#SYSTEM_MODAL
  */
 public Shell (int style) {
-	this ((Display) null, style);
+	//this ((Display) null, style);
+	this (null, null, style, 0);
 }
 
 /**
@@ -225,7 +227,8 @@ public Shell (int style) {
  * </ul>
  */
 public Shell (Display display) {
-	this (display, SWT.SHELL_TRIM);
+	//this (display, SWT.SHELL_TRIM);
+	this (display, null, SWT.SHELL_TRIM, 0);
 	//this (display, OS.IsWinCE ? SWT.NONE : SWT.SHELL_TRIM);
 }
 
@@ -328,7 +331,8 @@ public Shell (Display display, int style) {
  * </ul>
  */
 public Shell (Shell parent) {
-	this (parent, SWT.DIALOG_TRIM);
+	//this (parent, SWT.DIALOG_TRIM);
+	this (parent != null ? parent.display : null, parent, SWT.DIALOG_TRIM, 0);
 }
 
 /**
diff --git a/sources/net.sf.j2s.lib/j2slib.zip b/sources/net.sf.j2s.lib/j2slib.zip
diff --git a/sources/net.sf.j2s.lib/src/net/sf/j2s/lib/build/UTF8Concat.java b/sources/net.sf.j2s.lib/src/net/sf/j2s/lib/build/UTF8Concat.java
@@ -41,7 +41,7 @@ public static void main(String[] args) {
 		String j2sKeySig = "/* http://j2s.sf.net/ */";
 		buf.append(j2sKeySig);
 		System.out.println("To " + dest.getAbsolutePath());
-		boolean isAllFileEarlier = dest.exists();
+		boolean isAllFileEarlier = false; //dest.exists();
 		if (isAllFileEarlier) {
 			for (int i = 0; i < args.length - 1 - indexDelta; i++) {
 				File src = new File(args[indexDelta], args[i + 1 + indexDelta]);
@@ -77,7 +77,6 @@ public static void main(String[] args) {
 					buf.append(RegExCompress.regexCompress2(s));
 				}
 				//*/
-				buf.append(s);
 			} catch (FileNotFoundException e) {
 				e.printStackTrace();
 				return;
