1. remove and selection index boogs solved!

soheil_h_y · soheil_h_y · commit a033bd0e5027 · 2006-11-06T09:13:31.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
@@ -1956,7 +1956,7 @@ public int getSelectionIndex () {
 	if(selection.length == 0){
 		return -1;
 	}
-	return selection[0].index;
+	return indexOf(selection[0]);
 }
 
 /**
@@ -1987,7 +1987,7 @@ public int getSelectionIndex () {
 	*/
 	int [] result = new int [selection.length];
 	for (int i = 0; i < selection.length; i++) {
-		result[i] = selection[i].index;
+		result[i] = indexOf(selection[i]);
 	}
 	return result;
 }
diff --git a/tests/net.sf.j2s.test.swt/src/net/sf/j2s/test/swt/widgets/TestTable.java b/tests/net.sf.j2s.test.swt/src/net/sf/j2s/test/swt/widgets/TestTable.java
@@ -14,6 +14,8 @@
 package net.sf.j2s.test.swt.widgets;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -80,7 +82,23 @@ public static void main(String[] args) {
 		final TableItem tableItem52 = new TableItem(table5, SWT.NONE); 
 		tableItem52.setText(new String[] {"Width", "Very long long string"});
 		table5.setHeaderVisible(true);
-		
+		final Table table6 = new Table(shell, SWT.NONE);
+		new TableColumn(table5, SWT.NONE).setText("I'm A Column");
+		table6.setHeaderVisible(true);
+		final TableItem doNotDeleteMe = new TableItem(table6, SWT.NONE);
+		doNotDeleteMe.setText("Do not click on me first! I will be deleted");
+		final TableItem deleteMeFirst = new TableItem(table6, SWT.NONE);
+		deleteMeFirst.setText("Click on me first! I will be deleted");
+		final TableItem deleteMeAfter = new TableItem(table6, SWT.NONE);
+		deleteMeAfter.setText("Click on me after! I will be deleted");
+		table6.addSelectionListener(new SelectionAdapter(){
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+//				table6.remove(table6.indexOf((TableItem) e.item));
+				table6.remove(table6.getSelectionIndex());
+			}
+			
+		});
 		shell.pack();
 		shell.open ();
 		while (!shell.isDisposed ()) {

Original file line number	Diff line number	Diff line change
`@@ -1956,7 +1956,7 @@ public int getSelectionIndex () {`
`1956`	`1956`	`if(selection.length == 0){`
`1957`	`1957`	`return -1;`
`1958`	`1958`	`}`
`1959`		`- return selection[0].index;`
	`1959`	`+ return indexOf(selection[0]);`
`1960`	`1960`	`}`
`1961`	`1961`
`1962`	`1962`	`/**`
`@@ -1987,7 +1987,7 @@ public int getSelectionIndex () {`
`1987`	`1987`	`*/`
`1988`	`1988`	`int [] result = new int [selection.length];`
`1989`	`1989`	`for (int i = 0; i < selection.length; i++) {`
`1990`		`- result[i] = selection[i].index;`
	`1990`	`+ result[i] = indexOf(selection[i]);`
`1991`	`1991`	`}`
`1992`	`1992`	`return result;`
`1993`	`1993`	`}`