From 484e86d746ed3339e3030f9247be94a1eb30857a Mon Sep 17 00:00:00 2001 From: Roger Ferrel Date: Tue, 2 Oct 2012 11:12:03 -0500 Subject: [PATCH] Issue #1233 Added check for null shell in PointEditAction. Change-Id: Ia96e6c1feb612b70e518c12722cd5e169bf142ac Former-commit-id: 65131152a3ce55689848c9630c26160cb381a604 [formerly 63c34663bd793fa3ee3bc8aceb138ed98ba42026] [formerly 241e41379fe2969e4d4da8a3ec37bd57ed8d8791] [formerly 65131152a3ce55689848c9630c26160cb381a604 [formerly 63c34663bd793fa3ee3bc8aceb138ed98ba42026] [formerly 241e41379fe2969e4d4da8a3ec37bd57ed8d8791] [formerly ac331563fa3abbaa6e9a7d0840f71f805b52da4e [formerly 241e41379fe2969e4d4da8a3ec37bd57ed8d8791 [formerly f6437fdb1bae6439481c01042cb74c885ba0768a]]]] Former-commit-id: ac331563fa3abbaa6e9a7d0840f71f805b52da4e Former-commit-id: 5c2ff072f1ddddb810f9f1da666262b90a38fa9c [formerly fb142e270bf9ef1fbbb971d5f1e335a85d78ed1f] [formerly 26ca7ce4a3417603fa5e185b0371d70241d22965 [formerly fa86d58ede0e7c1550e82e1c047ace2f5a003743]] Former-commit-id: 73d60d1e5a53ccf6ea51d95b812af23b7f5c48c8 [formerly 847489afd934b9a84944f834a679acc68beab705] Former-commit-id: 709846b8059ee1c334352b76ca4854ab3ba53937 --- cave/com.raytheon.uf.viz.points/build.properties | 3 ++- .../com/raytheon/uf/viz/points/ui/action/PointEditAction.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cave/com.raytheon.uf.viz.points/build.properties b/cave/com.raytheon.uf.viz.points/build.properties index 34d2e4d2da..c6baffa001 100644 --- a/cave/com.raytheon.uf.viz.points/build.properties +++ b/cave/com.raytheon.uf.viz.points/build.properties @@ -1,4 +1,5 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + icons/ diff --git a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/action/PointEditAction.java b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/action/PointEditAction.java index 0402ae3a70..039875cba8 100644 --- a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/action/PointEditAction.java +++ b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/action/PointEditAction.java @@ -62,7 +62,7 @@ public class PointEditAction extends AbstractRightClickAction { @Override public void run() { - if (dialog == null || dialog.isDisposed()) { + if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) { dialog = new PointsMgrDialog(Display.getCurrent().getShells()[0], (PointsToolLayer) getSelectedRsc()); dialog.setBlockOnOpen(false);