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

Merge "Issue #2956 more safety checks" into omaha_14.3.1

Browse source 
Former-commit-id: f233d104d7 [formerly e9b3041170] [formerly f233d104d7 [formerly e9b3041170] [formerly d6518bede1 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]
Former-commit-id: d6518bede1
Former-commit-id: e8e971d434 [formerly 8ee8937daf]
Former-commit-id: e8b7cec960
This commit is contained in:
Nate Jensen 2014-05-05 09:45:11 -05:00 • committed by Gerrit Code Review
commit 3eaaf56f8e
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationPaneManager.java
View file

@ -53,6 +53,7 @@ import com.raytheon.viz.ui.panes.VizDisplayPane;
* ------------ ---------- ----------- --------------------------
* Jun 07, 2012 mschenke Initial creation
* Apr 23, 2014 3060 njensen Safety checks for SWT widgets disposed
* May 01, 2014 2956 njensen More safety checks for SWT widgets disposed
*
* </pre>
*
@ -242,7 +243,9 @@ public class CollaborationPaneManager extends PaneManager {
public void setCanvasSize(IRenderableDisplay display, Rectangle bounds) {
DisplayData data = displayMap.get(display);
if (data == null) {
if (data == null || data.canvasComp.isDisposed()
|| data.scrollable.isDisposed()
|| data.wrapperComp.isDisposed()) {
return;
}
data.canvasBounds = bounds;
@ -273,9 +276,11 @@ public class CollaborationPaneManager extends PaneManager {
}
private void setExclude(DisplayData data, boolean exclude) {
GridData gd = (GridData) data.scrollable.getLayoutData();
data.scrollable.setVisible(!exclude);
gd.exclude = exclude;
if (!data.scrollable.isDisposed()) {
GridData gd = (GridData) data.scrollable.getLayoutData();
data.scrollable.setVisible(!exclude);
gd.exclude = exclude;
}
}
}