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

Merge "Issue #2832 fix watches and warnings in collaboration displays" into development

Browse source 
Former-commit-id: 6b4d16b750 [formerly 8ebe236ce9] [formerly 67fa21cfd9] [formerly 6b4d16b750 [formerly 8ebe236ce9] [formerly 67fa21cfd9] [formerly faf3dbb670 [formerly 67fa21cfd9 [formerly 27ce4812affb11b506a21b5cf54c4b74b8c49031]]]]
Former-commit-id: faf3dbb670
Former-commit-id: 12f218292c [formerly 0b827a343b] [formerly b1b15434c34d3a515d2e371f1abe646a64b39293 [formerly ddf96ad45b]]
Former-commit-id: d8ea0cb6bbb64296de147485da1e59278c68db60 [formerly c427ff8471]
Former-commit-id: 6d836f5d82
This commit is contained in:
Nate Jensen 2014-03-04 13:59:01 -06:00 • committed by Gerrit Code Review
commit 2a3734d8f1
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
View file

@ -52,7 +52,7 @@ import com.vividsolutions.jts.geom.Geometry;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 1, 2010 jsanchez Initial creation
* Aug 22, 2011 10631 njensen Major refactor
* Aug 22, 2011 10631 njensen Major refactor
* May 3, 2012 DR 14741 porricel Stop setting end time of orig.
* warning to start time of update.
* Jun 04, 2012 DR14992 mgamazaychikov Fix the problem with plotting expiration time for
@ -63,6 +63,8 @@ import com.vividsolutions.jts.geom.Geometry;
* Jul 24, 2013 DR16350 mgamazaychikov Fix the problem with plotting EXP warning
* Sep 5, 2013 2176 jsanchez Disposed the emergency font.
* Feb 19, 2014 2819 randerso Removed unnecessary .clone() call
* Mar 04, 2014 2832 njensen Set fonts to null in disposeInternal() so recycle works
* Set entry.project to true for recycle
* </pre>
*
* @author jsanchez
@ -139,15 +141,22 @@ public class WarningsResource extends AbstractWWAResource {
if (entry.wireframeShape != null) {
entry.wireframeShape.dispose();
}
/*
* we set this to true and keep the entries around solely in case
* this resource is being recycled
*/
entry.project = true;
}
entryMap.clear();
if (warningsFont != null) {
warningsFont.dispose();
warningsFont = null;
}
if (emergencyFont != null) {
emergencyFont.dispose();
emergencyFont = null;
}
}

3
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WatchesResource.java
View file

@ -53,6 +53,7 @@ import com.vividsolutions.jts.geom.GeometryFactory;
* Nov 8, 2013 16758 mgamazaychikov Changed access modifier of mergeWatches to protected
* so a child class can override the implementation.
* Feb 19, 2014 2819 randerso Removed unnecessary .clone() call
* Mar 04, 2014 2832 njensen Set fonts to null in disposeInternal() so recycle works
* </pre>
*
* @author jsanchez
@ -143,10 +144,12 @@ public class WatchesResource extends AbstractWWAResource {
entryMap.clear();
if (warningsFont != null) {
warningsFont.dispose();
warningsFont = null;
}
if (emergencyFont != null) {
emergencyFont.dispose();
emergencyFont = null;
}
}