Remove "System.out.println" expressions

zhourenjian · zhourenjian · commit 37521d426908 · 2008-09-15T08:39:15.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Button.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Button.java
@@ -644,7 +644,6 @@ public boolean getSelection () {
 	return (state & OS.BST_CHECKED) != 0;
 	*/
 	if ((style & SWT.TOGGLE) != 0) {
-		//System.out.println(btnHandle.className);
 		return OS.existedCSSClass(btnHandle, "button-selected");
 	} else if ((style & (SWT.RADIO | SWT.CHECK)) != 0) {
 		return btnHandle.checked;
@@ -864,11 +863,9 @@ void setDefault (boolean value) {
 	OS.SendMessage (handle, OS.BM_SETSTYLE, bits, 1);
 	*/
 	if (value) {
-		System.out.println("Set default.");
 		try {
 			handle.focus();
 		} catch (Error e) { }
-		System.out.println("Set default ok.");
 	}
 }
 
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Combo.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Combo.java
@@ -672,7 +672,6 @@ void createSelect() {
 void configureSelect() {
 	selectInput.onchange = new RunnableCompatibility() {
 		public void run() {
-//			System.out.println("select changed!" + selectInput.selectedIndex);
 			noSelection = false;
 			updateSelection();
 //			if(!isSimple)
@@ -1735,8 +1734,6 @@ void setBounds (int x, int y, int width, int height, int flags) {
 		
 	}
 	selectInput.style.width = width + "px";
-	
-//	System.out.println("combo left " + this.left + " " + this.top + " textInput " +dropDownButton.style.width + " " + dropDownButton.style.height);
 }
 
 /* (non-Javadoc)
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Composite.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Composite.java
@@ -247,8 +247,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 			changed |= (state & LAYOUT_CHANGED) != 0;
 			state &= ~LAYOUT_CHANGED;
 			size = layout.computeSize (this, wHint, hHint, changed);
-//			System.out.println(wHint + "," + hHint + "," + changed);
-//			System.out.println(size);
 		} else {
 			size = new Point (wHint, hHint);
 		}
@@ -259,9 +257,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 	if (size.y == 0) size.y = DEFAULT_HEIGHT;
 	if (wHint != SWT.DEFAULT) size.x = wHint;
 	if (hHint != SWT.DEFAULT) size.y = hHint;
-//	System.out.println("before trimming " + size);
 	Rectangle trim = computeTrim (0, 0, size.x, size.y);
-//	System.out.println("after trimming " + trim);
 	return new Point (trim.width, trim.height);
 }
 
@@ -604,7 +600,6 @@ public void layout (boolean changed, boolean all) {
  */
 public void layout (Control [] changed) {
 	checkWidget ();
-//	System.out.print("control");
 	if (changed == null) error (SWT.ERROR_INVALID_ARGUMENT);
 //	Date d = new Date();
 	int length = changed.length;
@@ -669,18 +664,13 @@ void markLayout (boolean changed, boolean all) {
 
 Point minimumSize (int wHint, int hHint, boolean changed) {
 	Control [] children = _getChildren ();
-	//System.out.println("minimumSize@Composite");
 	int width = 0, height = 0;
 	int length = children.length;
 	for (int i=0; i< length; i++) {
-		//System.out.println(i + "..." + children [i]);
 		Rectangle rect = children [i].getBounds ();
 		width = Math.max (width, rect.x + rect.width);
 		height = Math.max (height, rect.y + rect.height);
-		//System.out.println(children[i].getBounds);
-		//System.out.println(rect);
 	}
-	//System.out.println(new Point (width, height));
 	return new Point (width, height);
 }
 
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Control.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Control.java
@@ -1602,7 +1602,6 @@ public void pack () {
 public void pack (boolean changed) {
 	checkWidget ();
 	Point computeSize = computeSize (SWT.DEFAULT, SWT.DEFAULT, changed);
-//	System.out.println(computeSize);
 	setSize (computeSize);
 }
 
@@ -2710,7 +2709,6 @@ public void setSize (int width, int height) {
 public void setSize (Point size) {
 	checkWidget ();
 	if (size == null) error (SWT.ERROR_NULL_ARGUMENT);
-//	System.err.println(size);
 	setSize (size.x, size.y);
 }
 
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/CoolBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/CoolBar.java
@@ -181,7 +181,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 			rowWidth += rbBand.cxIdeal + getMargin (i) + separator;
 			*/
 			if (items[i].wrap) {
-				//System.out.println("wrap...");
 				width = Math.max(width, rowWidth - separator);
 				rowWidth = 0;
 				height += rowHeight;
@@ -688,7 +687,6 @@ boolean moveDelta(int index, int dx, int dy) {
 		setBounds (left, top, Math.max (0, width), Math.max (0, h), SWT.NONE);
 		sendEvent(SWT.Resize);
 	}
-	//System.out.println("Length:" + items.length);
 	return needLayout;
 }
 
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Group.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Group.java
@@ -313,7 +313,6 @@ public Rectangle getClientArea () {
 	int border = getBorderWidth();
 	int width = this.width - border * 2 - CLIENT_INSET * 2;
 	int height = this.height - border * 2 - y - CLIENT_INSET;
-	//System.out.println("-->" + new Rectangle (x, y, width, height));
 //	if (groupText == null || groupText.length() == 0) {
 //		return new Rectangle (x, y / 2, width, height);
 //	} else {
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Link.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Link.java
@@ -817,22 +817,6 @@ public void setText (String string) {
 	anchors = new Element[0];
 	OS.clearChildren(handle);
 	parse (string, handle);
-	/*
-	System.out.println(cachedText);
-//	OS.insertText(handle, cachedText);
-	System.out.println("ids==");
-	for (int i = 0; i < ids.length; i++) {
-		System.out.println(i + "/" + ids[i]);
-	}
-	System.out.println("mnemonics==");
-	for (int i = 0; i < mnemonics.length; i++) {
-		System.out.println(i + "/" + mnemonics[i]);
-	}
-	System.out.println("offsets==");
-	for (int i = 0; i < offsets.length; i++) {
-		System.out.println(i + "/" + offsets[i]);
-	}
-	*/
 	/*
 	if (OS.COMCTL32_MAJOR >= 6) {
 		TCHAR buffer = new TCHAR (getCodePage (), string, true);
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Menu.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Menu.java
@@ -439,10 +439,8 @@ void createHandle () {
 	btnFocus.onkeydown = new RunnableCompatibility() {
 		public void run() {
 			HTMLEvent evt = (HTMLEvent) getEvent();
-			//System.out.println(evt.keyCode);
 			MenuItem[] menuItems = items;
 			int index = currentIndex;
-			//System.out.println(evt.keyCode);
 			if (evt.keyCode == 13 || evt.keyCode == 10) {
 				if (index != -1) {
 					Element target = menuItems[index].handle;
@@ -541,7 +539,6 @@ public void run() {
 	};
 	btnFocus.onblur = new RunnableCompatibility() {
 		public void run() {
-			//System.out.println(Menu.this + "::" + "blur");
 			long time = new Date().getTime();
 			if (time - lastFocusdTime > 20) {
 				if ((style & SWT.BAR) == 0) {
@@ -1019,7 +1016,6 @@ void fixMenus (Decorations newParent) {
 					textWidth = width;
 				}
 			}
-			//System.out.println(textWidth + "//" + accelWidth);
 			w = 16 + textWidth + 16 + accelWidth + 16 + 8; // 8 for extra safe width
 			if (handle.className.indexOf("menu-enable-status") != -1 &&
 					handle.className.indexOf("menu-enable-image") != -1) {
@@ -1034,7 +1030,6 @@ void fixMenus (Decorations newParent) {
 				//w = OS.getContainerWidth(hdl2);
 				h = pt2.y - pt1.y + OS.getContainerHeight(hdl2);
 			}
-			//System.out.println(w + 4);
 			return new Rectangle(x - 2, y - 2, w + 4, h + 4);
 		}
 	}
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MenuItem.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MenuItem.java
@@ -1379,7 +1379,6 @@ void showSubMenu() {
 			new Rectangle(coordinate.x, coordinate.y, w, h),
 			bounds.width, bounds.height, 0);
 	menu.handle.style.width = rect.width + "px";
-	//System.out.println(rect);
 	//menu.setLocation (rect.x, rect.y);
 	menu.x = rect.x;
 	menu.y = rect.y;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Sash.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Sash.java
@@ -201,7 +201,6 @@ public boolean dragEnded(DragEvent e) {
 			event.height = height;
 			event.widget = Sash.this;
 			event.item = Sash.this;
-//			System.out.println("drop");
 			sendEvent (SWT.Selection, event);
 			if (event.doit) {
 				if ((style & SWT.SMOOTH) != 0) {
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Scale.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Scale.java
@@ -391,7 +391,6 @@ private void decorateScale() {
 		outerSize = getSize().y;
 	}
 	
-	//System.err.println(outerSize);
 	int pages = (maximum - minimum) / pageIncrement;
 	
 	for (int i = pages; i < lines.length; i++) {
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ScrollBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ScrollBar.java
@@ -1076,7 +1076,6 @@ public void setValues (int selection, int minimum, int maximum, int thumb, int i
  */
 public void setVisible (boolean visible) {
 	checkWidget();
-//	System.out.println("setvisible of scrollbar called : " + visible + " parent : " + parent);
 	boolean isVisible = (state & HIDDEN) == 0;
 	if (isVisible == visible) return;
 	if(visible) {
@@ -1094,14 +1093,12 @@ public void setVisible (boolean visible) {
 	}
 	String className = this.parent.handle.className;
 	int idx = this.parent.handle.className.indexOf(scrollClass);
-//	System.out.println("parent scroll class name is " + className + " " + idx + " " + visible);
 	if(!visible && idx != -1){
 		className = className.substring(0, idx) + className.substring(idx + scrollClass.length());
 	}
 	else if(visible && idx == -1){ 
 		className += " " + scrollClass;
 	}
-//	System.out.println("setting parent scrollable to " + className);
 	this.parent.handle.className = className;
 	/*
 	/*
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Scrollable.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Scrollable.java
@@ -202,7 +202,6 @@ public Rectangle getClientArea () {
 	if (h < 0) {
 		h = 64;
 	}
-	//System.out.println(new Rectangle (0, 0, w, h));
 	return new Rectangle (0, 0, w, h);
 }
 
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TabFolder.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TabFolder.java
@@ -206,7 +206,6 @@ protected void checkSubclass () {
 
 public Point computeSize (int wHint, int hHint, boolean changed) {
 	checkWidget ();
-//	System.out.println(wHint + "," + hHint + "," + changed);
 	Point size = super.computeSize (wHint, hHint, changed);
 	int width = -124; // this number is an experimental number from WinXP in classical style
 	if (items != null && items.length != 0) {
@@ -282,7 +281,6 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
 	y -= border;
 	width += border * 2;
 	height += border * 2;
-	//System.out.println("after t");
 	return new Rectangle(x, y, width, height);
 }
 
@@ -343,7 +341,6 @@ void createItem (TabItem item, final int index) {
 		width = 2;
 	}
 	tab.style.left = width + "px";
-	//System.out.println(index + "..." + item);
 	items[index] = item;
 	items[index].handle = tab;
 //	tab.onclick = new RunnableCompatibility() {
@@ -427,19 +424,16 @@ public void run() {
 				if (w > width) {
 					if (i < items.length - 1) {
 						offset++;
-//						System.out.println("Offset:" + offset);
 						setSelection(getSelectionIndex(), false);
 						return ;
 					}
 				}
 			}
 			if (ww > width) {
 				offset++;
-//				System.out.println("Offset:" + offset);
 				setSelection(getSelectionIndex(), false);
 				return ;
 			}
-//			System.err.println("false...");
 		}
 	};
 	el = (Element) createCSSElement(itemMore, "tab-item-button");
@@ -453,10 +447,8 @@ public void run() {
 	}
 	el.onclick = btnPrevTab.onclick = new RunnableCompatibility() {
 		public void run() {
-//			System.out.println("in Offset:" + offset);
 			if (offset <= 0) return ;
 			offset--;
-//			System.out.println("Offset:" + offset);
 			setSelection(getSelectionIndex(), false);
 		}
 	};
@@ -540,9 +532,7 @@ public void setBounds(int x, int y, int width, int height) {
 //		
 //		Control control = items[selectedIndex].control;
 //		if(control != null)
-//		System.out.println(" tab folder conrol for bounds 1 " + control + " " + getClientArea() + " " + control.isDisposed());
 //		if(control != null && control.isDisposed()){
-//			System.out.println("tab folder set bounds for " + control + " " + getClientArea());
 //			control.setBounds(getClientArea());
 //		}
 //	}
@@ -602,7 +592,6 @@ public Rectangle getClientArea () {
 	return new Rectangle (rect.left, rect.top, width, height);
 	*/
 //	return super.getClientArea();
-	//System.err.println(super.getClientArea());
 	int x = 4, y = 4;
 	int h = height - 8, w = width - 8;
 	if (items != null && items.length != 0) {
@@ -612,7 +601,6 @@ public Rectangle getClientArea () {
 			lineHeight -= 2; // padding-top:2px
 		}
 		h -= lineHeight;
-//		System.out.println("hi..." + height + "," + lineHeight + ":" + );
 		if ((style & SWT.BOTTOM) == 0) {
 			y += lineHeight;
 		} else {
@@ -736,7 +724,6 @@ public int getSelectionIndex () {
 			return i;
 		}
 	}
-//	System.out.println("The selection is not happend yet!");
 	/*
 	 * should return -1 instead of 0
 	 */
@@ -1001,7 +988,6 @@ void setSelection (int index, boolean notify) {
 	 * TODO: When a tab is selected programmly, should move
 	 * the tab into visible tab area.
 	 */
-//	System.out.println("set selection is called!");
 //	int oldIndex = OS.SendMessage (handle, OS.TCM_GETCURSEL, 0, 0);
 	int oldIndex = getSelectionIndex();
 	
@@ -1030,7 +1016,6 @@ void setSelection (int index, boolean notify) {
 			 * later layout should relayout the control.
 			 */
 			control.setBounds (getClientArea ());
-//			System.out.println("set selection bounds " + getClientArea());
 			control.setVisible (true);
 			//control.handle.style.display = "block";
 		}
@@ -1118,10 +1103,7 @@ void updateSelectionWithWidth(int index, int prefWidth) {
 			if ((style & SWT.BOTTOM) != 0) {
 				borderSW.style.width = (left - 2) + "px";
 				borderSE.style.width = y + "px";
-//				System.out.println("L:" + (left - 2) + ":R:" + y);
 			} else {
-//				System.out.println(this.width + "-" + left + "-" + w);
-//				System.out.println("L:" + (left - 2) + ":R:" + y);
 				borderNW.style.width = (left - 2) + "px";
 				borderNE.style.width = y + "px";
 			}
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Table.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Table.java
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TableColumn.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TableColumn.java
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TableItem.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TableItem.java
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ToolBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/ToolBar.java
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Tree.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Tree.java
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TreeItem.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TreeItem.java

Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,6 @@ void createSelect() {`
`672`	`672`	`void configureSelect() {`
`673`	`673`	`selectInput.onchange = new RunnableCompatibility() {`
`674`	`674`	`public void run() {`
`675`		`-// System.out.println("select changed!" + selectInput.selectedIndex);`
`676`	`675`	`noSelection = false;`
`677`	`676`	`updateSelection();`
`678`	`677`	`// if(!isSimple)`
`@@ -1735,8 +1734,6 @@ void setBounds (int x, int y, int width, int height, int flags) {`
`1735`	`1734`
`1736`	`1735`	`}`
`1737`	`1736`	`selectInput.style.width = width + "px";`
`1738`		`-`
`1739`		`-// System.out.println("combo left " + this.left + " " + this.top + " textInput " +dropDownButton.style.width + " " + dropDownButton.style.height);`
`1740`	`1737`	`}`
`1741`	`1738`
`1742`	`1739`	`/* (non-Javadoc)`
Original file line number	Diff line number	Diff line change
`@@ -1602,7 +1602,6 @@ public void pack () {`
`1602`	`1602`	`public void pack (boolean changed) {`
`1603`	`1603`	`checkWidget ();`
`1604`	`1604`	`Point computeSize = computeSize (SWT.DEFAULT, SWT.DEFAULT, changed);`
`1605`		`-// System.out.println(computeSize);`
`1606`	`1605`	`setSize (computeSize);`
`1607`	`1606`	`}`
`1608`	`1607`
`@@ -2710,7 +2709,6 @@ public void setSize (int width, int height) {`
`2710`	`2709`	`public void setSize (Point size) {`
`2711`	`2710`	`checkWidget ();`
`2712`	`2711`	`if (size == null) error (SWT.ERROR_NULL_ARGUMENT);`
`2713`		`-// System.err.println(size);`
`2714`	`2712`	`setSize (size.x, size.y);`
`2715`	`2713`	`}`
`2716`	`2714`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,6 @@ public Point computeSize (int wHint, int hHint, boolean changed) {`
`181`	`181`	`rowWidth += rbBand.cxIdeal + getMargin (i) + separator;`
`182`	`182`	`*/`
`183`	`183`	`if (items[i].wrap) {`
`184`		`- //System.out.println("wrap...");`
`185`	`184`	`width = Math.max(width, rowWidth - separator);`
`186`	`185`	`rowWidth = 0;`
`187`	`186`	`height += rowHeight;`
`@@ -688,7 +687,6 @@ boolean moveDelta(int index, int dx, int dy) {`
`688`	`687`	`setBounds (left, top, Math.max (0, width), Math.max (0, h), SWT.NONE);`
`689`	`688`	`sendEvent(SWT.Resize);`
`690`	`689`	`}`
`691`		`- //System.out.println("Length:" + items.length);`
`692`	`690`	`return needLayout;`
`693`	`691`	`}`
`694`	`692`