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: 7369e58fad [formerly 24a4cafd0c] [formerly 8405e235e6] [formerly 7369e58fad [formerly 24a4cafd0c] [formerly 8405e235e6] [formerly b435fd3050 [formerly 8405e235e6 [formerly fa5315a2874b91acaac4f5eb58142804a6a09ef8]]]]
Former-commit-id: b435fd3050
Former-commit-id: 1f51e0e218 [formerly a859b50881] [formerly 3e9e28a9e6d59237117b55c63bbb1de8dbd573e0 [formerly bc07967e3b]]
Former-commit-id: d6d4a5788dfb930e7322e7cf669bc8d320076e4f [formerly a49baddf98]
Former-commit-id: 39c7b5dffb
This commit is contained in:
Lee Venable 2014-01-16 10:35:12 -06:00
parent fc8ba211a7
commit 592327f9bb
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 * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Dec 5, 2008 mschenke Initial creation * Dec 5, 2008 mschenke Initial creation
* Apr 18, 2013 1920 mpduff Set new ColorMap. * Apr 18, 2013 #1920 mpduff Set new ColorMap.
* Jul 02, 2013 2088 rferrel Changes for non-blocking ColorScaleMgrDlg. * 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> * </pre>
* *
* @author mschenke * @author mschenke
@ -74,8 +77,16 @@ public class MPEColorScaleMgrAction extends AbstractHandler {
public void dialogClosed(Object returnValue) { public void dialogClosed(Object returnValue) {
colorScaleDlg = null; colorScaleDlg = null;
MPEFieldResource displayedFieldResource = MPEDisplayManager MPEDisplayManager mdm = MPEDisplayManager.getCurrent();
.getCurrent().getDisplayedFieldResource();
// 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) { if (displayedFieldResource != null) {
MPEFieldResourceData resourceData = displayedFieldResource MPEFieldResourceData resourceData = displayedFieldResource