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

Issue #2111: Prevent possible NullPointerException in GridCanvas's mouse

Browse source 
handler when attempting to display context menu.

Change-Id: I87fd5e790364028986e1a7872f4adf747b78bfee

Former-commit-id: 6b696c9e6a [formerly be9d6ed2d6c2a87afb5365abba0c9f09983550ec]
Former-commit-id: 4f6c293a7e
This commit is contained in:
David Gillingham 2013-06-20 16:18:43 -05:00
parent eaa3e47877
commit 8b7a998bbf
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/gridmanager/GridCanvas.java
View file

@ -113,6 +113,8 @@ import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
* 01/22/2013 #1518 randerso Removed use of Map with Parms as keys * 01/22/2013 #1518 randerso Removed use of Map with Parms as keys
* 03/28/2013 #1838 randerso Fixed selected time range when Select Grids When * 03/28/2013 #1838 randerso Fixed selected time range when Select Grids When
* Stepping is enabled. Cleaned up deprecated warnings. * Stepping is enabled. Cleaned up deprecated warnings.
* 06/20/2013 #2111 dgilling Prevent NullPointerException in mouse handler's
* displayContextMenu() method.
* *
* </pre> * </pre>
* *
@ -475,6 +477,11 @@ public class GridCanvas extends Canvas implements IMessageClient {
@Override @Override
public void displayContextMenu(MouseEvent e) public void displayContextMenu(MouseEvent e)
throws GFEServerException { throws GFEServerException {
if (menuMgr != null) {
menuMgr.dispose();
menuMgr = null;
}
super.displayContextMenu(e); super.displayContextMenu(e);
GridBar gridBar = findClickedBar(e.x, e.y); GridBar gridBar = findClickedBar(e.x, e.y);
@ -495,9 +502,6 @@ public class GridCanvas extends Canvas implements IMessageClient {
.getTimeConstraints().constraintTime(clickTime) .getTimeConstraints().constraintTime(clickTime)
.isValid(); .isValid();
if (menuMgr != null) {
menuMgr.dispose();
}
menuMgr = new MenuManager("#PopupMenu"); menuMgr = new MenuManager("#PopupMenu");
if (!isEmpty) { if (!isEmpty) {
@ -608,11 +612,11 @@ public class GridCanvas extends Canvas implements IMessageClient {
menuMgr.add(action); menuMgr.add(action);
} }
} }
}
Menu menu = menuMgr.createContextMenu(GridCanvas.this); Menu menu = menuMgr.createContextMenu(GridCanvas.this);
menu.setVisible(true); menu.setVisible(true);
setMenu(menu); setMenu(menu);
}
} }
}; };