Fixed a bug that Snippet106 adding table column fails.

jossonsmith · jossonsmith · commit ed79326e80fd · 2006-08-20T03:54:25.000Z
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
@@ -1025,18 +1025,20 @@ void createItem (TableColumn column, int index) {
 		for (int i = 0; i < items.length; i++) {
 			Element dataTD = document.createElement("TD");
 			items[i].handle.insertBefore(dataTD, items[i].handle.childNodes[index]);
+			Element el = document.createElement("DIV");
+			dataTD.appendChild(el);
+			el.className = "table-item-cell-default";
+			Element text = document.createElement("DIV");
+			el.appendChild(text);
+			text.className = "table-item-cell-text-default";
 			for (int j = items[i].strings.length; j > index; j--) {
 				items[i].strings[j] = items[i].strings[j - 1];
 			}
 			items[i].strings[index] = "";
 		}
 	}
 	if (theadTD.childNodes != null) {
-		for (int i = 0; i < theadTD.childNodes.length; i++) {
-			if (theadTD.childNodes[i] != null) {
-				theadTD.removeChild(theadTD.childNodes[i]);
-			}
-		}
+		OS.clearChildren(theadTD);
 	}
 	theadTD.appendChild(document.createTextNode(column.getText()));
 	theadTD.style.margin = "0";
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
@@ -123,7 +123,7 @@ public TableItem (Table parent, int style, int index) {
 }
 
 private void configureItem() {
-	if((parent.style & SWT.CHECK) != 0){
+	if((parent.style & SWT.CHECK) != 0 && check != null){
 		check.onclick = new RunnableCompatibility() {
 			public void run() {
 				Event e = new Event();
@@ -770,7 +770,9 @@ public void setChecked (boolean checked) {
 
 void setChecked (boolean checked, boolean notify) {
 	this.checked = checked;
-	this.check.checked = this.checked;
+	if (this.check != null) {
+		this.check.checked = this.checked;
+	}
 	if (notify) {
 		Event event = new Event();
 		event.item = this;
@@ -1166,7 +1168,7 @@ public void setText (int index, String string) {
 	int elementIndex = ((parent.style & SWT.CHECK) != 0 && index == 0)? 1 : 0;
 	Element text = handle.childNodes[index].childNodes[0].childNodes[elementIndex];
 //	Element[] children = text.childNodes;
-	text.innerHTML = "<div class=\"table-item-cell-text-default\">" + string + "</div>";
+	text.innerHTML = string;
 	
 	int[] columnMaxWidth = parent.columnMaxWidth;
 	int width = OS.getContainerWidth(text.parentNode);
@@ -1334,7 +1336,9 @@ boolean isSelected(){
 
 public void enableWidget(boolean enabled) {
 	this.handle.disabled = !enabled;
-	this.check.disabled = !enabled;
+	if (this.check != null) {
+		this.check.disabled = !enabled;
+	}
 }
 
 }
