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

Issue #2691 - Fixed null pointer exception when closing MPE perspective.

Browse source 
Former-commit-id: b435fd3050 [formerly 8405e235e6 [formerly fa5315a2874b91acaac4f5eb58142804a6a09ef8]]
Former-commit-id: 8405e235e6
Former-commit-id: 24a4cafd0c
This commit is contained in:
Lee Venable 2014-01-16 10:35:12 -06:00
parent 1d1f4175d0
commit 7369e58fad
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/MPEColorScaleMgrAction.java
View file

@ -42,9 +42,12 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 5, 2008 mschenke Initial creation
* Apr 18, 2013 1920 mpduff Set new ColorMap.
* Jul 02, 2013 2088 rferrel Changes for non-blocking ColorScaleMgrDlg.
* Dec 5, 2008 mschenke Initial creation
* Apr 18, 2013 #1920 mpduff Set new ColorMap.
* Jul 02, 2013 #2088 rferrel Changes for non-blocking ColorScaleMgrDlg.
* Jan 16, 2014 #2691 lvenable Fixed null pointer exception that occurs when closing
* the MPE perspective while the ColorScaleMgrDlg is
* visible.
* </pre>
*
* @author mschenke
@ -74,8 +77,16 @@ public class MPEColorScaleMgrAction extends AbstractHandler {
public void dialogClosed(Object returnValue) {
colorScaleDlg = null;
MPEFieldResource displayedFieldResource = MPEDisplayManager
.getCurrent().getDisplayedFieldResource();
MPEDisplayManager mdm = MPEDisplayManager.getCurrent();
// If the MPE Display Manager is null then return as no
// action is needed.
if (mdm == null) {
return;
}
MPEFieldResource displayedFieldResource = mdm
.getDisplayedFieldResource();
if (displayedFieldResource != null) {
MPEFieldResourceData resourceData = displayedFieldResource