Bug 422422 - [event spy] Add single cell selection to the capturedI20131124-2200

events tree - change in the selection behavior

Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>

1 files changed, 5 insertions, 10 deletions

diff --git a/bundles/org.eclipse.e4.tools.event.spy/src/org/eclipse/e4/tools/event/spy/internal/ui/CapturedEventTree.java b/bundles/org.eclipse.e4.tools.event.spy/src/org/eclipse/e4/tools/event/spy/internal/ui/CapturedEventTree.java
index 8ae238e8..6bc61288 100644
--- a/bundles/org.eclipse.e4.tools.event.spy/src/org/eclipse/e4/tools/event/spy/internal/ui/CapturedEventTree.java
+++ b/bundles/org.eclipse.e4.tools.event.spy/src/org/eclipse/e4/tools/event/spy/internal/ui/CapturedEventTree.java
@@ -220,12 +220,12 @@ public class CapturedEventTree extends TreeViewer {
 		getTree().addMouseListener(new MouseAdapter() {

 			@Override

 			public void mouseDown(MouseEvent e) {

+				TreeItem item = getTree().getItem(new Point(e.x, e.y));		

+				updateSelectedTreeItem(item, getSelectedColumnIndex(item, e.x, e.y));

+				

 				if (listener != null && (e.stateMask & SWT.CTRL) == SWT.CTRL && 

 						selectedClassNameTreeItem.getText() != null) {

 					listener.treeItemWithClassNameClicked(selectedClassNameTreeItem.getText());

-				} else {

-					TreeItem item = getTree().getItem(new Point(e.x, e.y));		

-					updateSelectedTreeItem(item, getSelectedColumnIndex(item, e.x, e.y));

 				}

 			}

 		});

@@ -282,13 +282,8 @@ public class CapturedEventTree extends TreeViewer {
 			public void widgetSelected(SelectionEvent e) {

 				if ((e.stateMask & SWT.BUTTON1) != SWT.BUTTON1) {

 					updateSelectedTreeItem((TreeItem) e.item, 

-						selectedTreeItem.getText() != null? 

-						selectedTreeItem.getColumnIndex(): 0);

-				} else if (e.item != selectedTreeItem.getTreeItem() && 

-						selectedTreeItem.getTreeItem() != null) {

-					//we don't change selected item when user has triggered ICapturedEventTreeListener.treeItemWithClassNameClicked 

-					getTree().setSelection(selectedTreeItem.getTreeItem());

-				}				

+						selectedTreeItem.getText() != null? selectedTreeItem.getColumnIndex(): 0);

+				}			

 			}

 		});