From 7abedf8904ef0a5207a26dd671b48e0cf84e70ad Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Fri, 11 May 2012 13:57:50 -0500 Subject: [PATCH] Issue #590 fix issue when exiting GFE Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157 Former-commit-id: c92f9ee70553d72dc95e62432c8e6d7e5ec04690 [formerly 258fead57d05a908b32b0b74a2e34ab19be0947f] Former-commit-id: 75754040cbb150c35b78ad9f0103f15a98e5bb3b --- .../AbstractVizPerspectiveManager.java | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java index 8ef115b4f6..df47fffc17 100644 --- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java +++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java @@ -228,24 +228,27 @@ public abstract class AbstractVizPerspectiveManager implements protected abstract void open(); public void close() { - // Cleanup hidden editors - if (perspectiveEditors.size() > 0) { - page.closeEditors(perspectiveEditors - .toArray(new IEditorReference[perspectiveEditors.size()]), - false); - } + if (opened) { + // Cleanup hidden editors + if (perspectiveEditors.size() > 0) { + page.closeEditors( + perspectiveEditors + .toArray(new IEditorReference[perspectiveEditors + .size()]), false); + } - perspectiveEditors.clear(); - layoutMap.clear(); + perspectiveEditors.clear(); + layoutMap.clear(); - opened = false; + opened = false; - closeDialogs(); - deactivateContexts(); - removeFromStatusLine(); + closeDialogs(); + deactivateContexts(); + removeFromStatusLine(); - if (backgroundColor != null) { - backgroundColor.removeListener(BGColorMode.GLOBAL, this); + if (backgroundColor != null) { + backgroundColor.removeListener(BGColorMode.GLOBAL, this); + } } }