xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1215 Added runWithEvent override in PointToolAction. Reviewer comments implemented. Change-Id: I60fbf26f8721750a11ada9ceaffe65a2d3c9dabf" into development

Browse source 
Former-commit-id: 76da7495a8 [formerly 9d34ef7cba] [formerly 76da7495a8 [formerly 9d34ef7cba] [formerly 132202b658 [formerly 9254e7b764622b29a7d64edf0d5cea996a10fb18]]]
Former-commit-id: 132202b658
Former-commit-id: 57a01afcc0 [formerly d4f67bae30]
Former-commit-id: 7cf87f408d
This commit is contained in:
Nate Jensen 2012-09-26 11:55:10 -05:00 • committed by Gerrit Code Review
commit 4659b75a27
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/PointToolAction.java
View file

@ -27,7 +27,9 @@ import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.IMenuCreator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.ToolItem;
import com.raytheon.uf.viz.points.PointsDataManager;
import com.raytheon.uf.viz.points.data.IPointNode;
@ -44,6 +46,8 @@ import com.raytheon.viz.volumebrowser.xml.MenuContribution;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jul 29, 2012 rferrel Initial creation
* Sep 25, 2012 1215 rferrel Clicking anywhere on the Point button
* now opens the menu.
*
* </pre>
*
@ -58,16 +62,34 @@ public class PointToolAction extends Action implements IMenuCreator {
private IPointNode parentNode;
private PointsDataManager dataManager;
public PointToolAction(String text, String pointNames) {
super(text, SWT.DROP_DOWN);
this.pointNames = pointNames;
this.parentNode = null;
this(text, pointNames, null);
}
public PointToolAction(String text, String pointNames, IPointNode parentNode) {
super(text, SWT.DROP_DOWN);
this.pointNames = pointNames;
this.parentNode = parentNode;
this.dataManager = PointsDataManager.getInstance();
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.
* Event)
*/
@Override
public void runWithEvent(Event event) {
if (menu == null) {
ToolItem item = (ToolItem) event.widget;
getMenu(item.getParent());
}
menu.setVisible(true);
super.runWithEvent(event);
}
/*
@ -116,13 +138,12 @@ public class PointToolAction extends Action implements IMenuCreator {
}
private void fillMenu(final Menu menu) {
List<IPointNode> nodes = PointsDataManager.getInstance().getChildren(
parentNode);
List<IPointNode> nodes = dataManager.getChildren(parentNode);
// Create the menu items
for (IPointNode node : nodes) {
if (node.isGroup()) {
if (PointsDataManager.getInstance().getChildren(node).size() > 0) {
if (dataManager.getChildren(node).size() > 0) {
PointToolAction submenu = new PointToolAction(""
+ node.getName(), pointNames, node);
submenu.menu = new Menu(menu);