Load ShellManager as the default class.

zhourenjian · zhourenjian · commit 1adf21bcc9b0 · 2007-02-26T14:53:24.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/package.js b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/package.js
@@ -346,6 +346,7 @@ if (!isDebugging) {
 		"$.Composite",
 		"$.Canvas",
 		"$.Decorations",
+		"$.ShellManager",
 		"$.Shell"
 	]);
 	var w = "$wt.widgets.";
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
@@ -1727,6 +1727,7 @@ public void setMaximized (boolean maximized) {
 			 * };
 			 */ { }
 		}
+		boolean toUpdateMax = false;
 		if (contentHandle != null) {
 			if (oldBounds == null) {
 				oldBounds = getBounds();
@@ -1750,12 +1751,19 @@ public void setMaximized (boolean maximized) {
 				setBounds(computeTrim(0, 0, width, height - titleHeight));
 			} else {
 				setBounds(computeTrim(0, -titleHeight, width, height));
+				toUpdateMax = true;
 			}
 		}
 		ResizeSystem.register(this, SWT.MAX);
 		if (titleBar != null) {
 			OS.addCSSClass(titleBar, key);
 		}
+		if (toUpdateMax)
+		/**
+		 * @j2sNative
+		 * ShellManager.topbarContainerEl.style.display = "block";
+		 * ShellManager.updateTopMaximized ();
+		 */ {}
 	} else {
 		setBounds(oldBounds);
 		if (titleBar != null) {
@@ -1910,6 +1918,8 @@ public void setMinimized (boolean minimized) {
 	 * @j2sNative
 	 * if (window["ShellManager"] != null && this.parent == null && minimized) {
 	 * 	this.handle.style.display = "none";
+	 * 	ShellManager.sidebarEl.style.display = "block";
+	 * 	ShellManager.updateItems ();
 	 * 	return;
 	 * }
 	 */ {}
@@ -2099,11 +2109,12 @@ public void run() {
 		titleBar.appendChild(shellMax);
 		shellMax.onclick = new RunnableCompatibility() {
 			public void run() {
-				setMaximized(!getMaximized());
+				boolean cur = !getMaximized();
+				setMaximized(cur);
 				Decorations shell = Decorations.this;
 				/**
 				 * @j2sNative
-				 * if (window["ShellManager"] != null) {
+				 * if (window["ShellManager"] != null && !cur) {
 				 * 	ShellManager.returnTopMaximized (shell);
 				 * }
 				 */ { shell.bringToTop(); }
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
@@ -102,6 +102,7 @@
  * @see Decorations
  * @see SWT
  * 
+ * @j2sRequireImport org.eclipse.swt.widgets.ShellManager
  * @j2sPrefix
  * $WTC$$.registerCSS ("$wt.widgets.Shell");
  * @j2sSuffix
@@ -280,9 +281,7 @@ public Shell (Display display, int style) {
  * @param style
  * @param handle
  *
- * @j-2-s-Ignore-Super-Constructor
- * The above ignore super constructor will bring a bug that Display object
- * is not a Widget instance!
+ * @j2sIgnoreSuperConstructor
  */
 Shell (Display display, Shell parent, int style, int handle) {
 	super ();
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ShellManager.js b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ShellManager.js
@@ -33,8 +33,10 @@ ClazzLoader.loadClass ("org.eclipse.swt.widgets.ShellManager", function () {
 	});
 });
 </script>
+ * 
+ * Update: Above example is out of date. -- Feb 26, 2007
  */
-$_L(["$wt.widgets.Shell"], "$wt.widgets.ShellManager", null, function(){
+$_L(null, "$wt.widgets.ShellManager", null, function(){
 $WTC$$.registerCSS ("$wt.widgets.ShellManager");
 //ShellManager = new Object ();
 ShellManager = $_T($wt.widgets, "ShellManager");
