Merge "Issue #3060 safety checks for SWT widgets being disposed" into development

Former-commit-id: 1067e4b09c [formerly 0f33d8dfe65574db7cfbf37f7fc34393707538d3]
Former-commit-id: c193eac6e8
This commit is contained in:
Nate Jensen 2014-04-23 14:24:33 -05:00 committed by Gerrit Code Review
commit 547bcafdb6

View file

@ -51,7 +51,8 @@ import com.raytheon.viz.ui.panes.VizDisplayPane;
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Jun 7, 2012 mschenke Initial creation * Jun 07, 2012 mschenke Initial creation
* Apr 23, 2014 3060 njensen Safety checks for SWT widgets disposed
* *
* </pre> * </pre>
* *
@ -179,11 +180,14 @@ public class CollaborationPaneManager extends PaneManager {
setExclude(activeData, true); setExclude(activeData, true);
activeData = null; activeData = null;
} }
if (!noDisplayLabel.isDisposed() && !composite.isDisposed()) {
noDisplayLabel.setVisible(true); noDisplayLabel.setVisible(true);
((GridData) noDisplayLabel.getLayoutData()).exclude = false; ((GridData) noDisplayLabel.getLayoutData()).exclude = false;
composite.layout(); composite.layout();
} }
}
@Override
protected void adjustPaneLayout(int paneCount) { protected void adjustPaneLayout(int paneCount) {
;// don't do anything, we always want one pane displayed. ;// don't do anything, we always want one pane displayed.
} }