MouseEnter, FocusIn and Activate events should not set event.item
SWT TableItem and TreeItem do not set event.item for these events.
Change-Id: Iab4999f23948a6d0689c7060a04a805a32d36629
Signed-off-by: Aparna Argade <aprsac@yahoo.com>
diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItem.java
index ffd6a3a..fb7f663 100644
--- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItem.java
+++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTableItem.java
@@ -200,8 +200,8 @@
table.setSelection(widget);
}
});
- notifyTable(SWT.Activate);
- notifyTable(SWT.FocusIn);
+ notifyTable(SWT.Activate, super.createEvent());
+ notifyTable(SWT.FocusIn, super.createEvent());
notifyTable(SWT.MouseDown, createMouseEvent(1, SWT.NONE, 1));
notifyTable(SWT.Selection, createSelectionEvent(SWT.BUTTON1));
}
@@ -373,10 +373,9 @@
}
private void notifySelect() {
- notifyTable(SWT.MouseEnter);
- notifyTable(SWT.MouseMove);
- notifyTable(SWT.Activate);
- notifyTable(SWT.FocusIn);
+ notifyTable(SWT.MouseEnter, createMouseEvent(0, SWT.NONE, 0));
+ notifyTable(SWT.Activate, super.createEvent());
+ notifyTable(SWT.FocusIn, super.createEvent());
notifyTable(SWT.MouseDown, createMouseEvent(1, SWT.NONE, 1));
notifyTable(SWT.Selection, createSelectionEvent(SWT.BUTTON1));
notifyTable(SWT.MouseUp, createMouseEvent(1, SWT.BUTTON1, 1));
diff --git a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java
index 2d89ff3..78b5582 100644
--- a/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java
+++ b/org.eclipse.swtbot.swt.finder/src/org/eclipse/swtbot/swt/finder/widgets/SWTBotTreeItem.java
@@ -188,7 +188,7 @@
return this;
}
- preExpandNotify();
+ preExpandCollapseNotify();
syncExec(new VoidResult() {
@Override
public void run() {
@@ -196,7 +196,7 @@
widget.setExpanded(true);
}
});
- postExpandNotify();
+ postExpandCollapseNotify();
return this;
}
@@ -213,7 +213,7 @@
return this;
}
- preCollapseNotify();
+ preExpandCollapseNotify();
syncExec(new VoidResult() {
@Override
public void run() {
@@ -221,27 +221,17 @@
widget.setExpanded(false);
}
});
- postCollapseNotify();
+ postExpandCollapseNotify();
return this;
}
- private void preExpandNotify() {
- notifyTree(SWT.Activate);
- notifyTree(SWT.FocusIn);
+ private void preExpandCollapseNotify() {
+ notifyTree(SWT.Activate, super.createEvent());
+ notifyTree(SWT.FocusIn, super.createEvent());
notifyTree(SWT.MouseDown, createMouseEvent(1, SWT.NONE, 1));
}
- private void postExpandNotify() {
- notifyTree(SWT.MouseUp, createMouseEvent(1, SWT.BUTTON1, 1));
- }
-
- private void preCollapseNotify() {
- notifyTree(SWT.Activate);
- notifyTree(SWT.FocusIn);
- notifyTree(SWT.MouseDown, createMouseEvent(1, SWT.NONE, 1));
- }
-
- private void postCollapseNotify() {
+ private void postExpandCollapseNotify() {
notifyTree(SWT.MouseUp, createMouseEvent(1, SWT.BUTTON1, 1));
}
@@ -493,8 +483,8 @@
lastSelectionItem = widget;
}
});
- notifyTree(SWT.Activate);
- notifyTree(SWT.FocusIn);
+ notifyTree(SWT.Activate, super.createEvent());
+ notifyTree(SWT.FocusIn, super.createEvent());
notifyTree(SWT.MouseDown, createMouseEvent(1, SWT.NONE, 1));
notifyTree(SWT.Selection, createSelectionEvent(SWT.BUTTON1));
}
@@ -648,10 +638,9 @@
int stateMask1 = (ctrl) ? (SWT.NONE | SWT.CTRL) : SWT.NONE;
int stateMask2 = (ctrl) ? (SWT.BUTTON1 | SWT.CTRL) : SWT.BUTTON1;
SWTBotTreeItem item = new SWTBotTreeItem(lastSelectionItem);
- notifyTree(SWT.MouseEnter);
- notifyTree(SWT.MouseMove);
- notifyTree(SWT.Activate);
- notifyTree(SWT.FocusIn);
+ notifyTree(SWT.MouseEnter, item.createMouseEvent(0, SWT.NONE, 0));
+ notifyTree(SWT.Activate, super.createEvent());
+ notifyTree(SWT.FocusIn, super.createEvent());
notifyTree(SWT.MouseDown, item.createMouseEvent(1, stateMask1, 1));
notifyTree(SWT.Selection, item.createSelectionEvent(stateMask2));
notifyTree(SWT.MouseUp, item.createMouseEvent(1, stateMask2, 1));
