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

Issue #2832 fix watches and warnings in collaboration displays

Browse source 
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f

Former-commit-id: bb84ca01bb74bc93710ba92fcbdb13b30dc2454e
This commit is contained in:
Nate Jensen 2014-03-04 12:46:08 -06:00
parent 4547cbcfea
commit 3c3e483d18
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 * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Sep 1, 2010 jsanchez Initial creation * 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. * May 3, 2012 DR 14741 porricel Stop setting end time of orig.
* warning to start time of update. * warning to start time of update.
* Jun 04, 2012 DR14992 mgamazaychikov Fix the problem with plotting expiration time for * 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 * Jul 24, 2013 DR16350 mgamazaychikov Fix the problem with plotting EXP warning
* Sep 5, 2013 2176 jsanchez Disposed the emergency font. * Sep 5, 2013 2176 jsanchez Disposed the emergency font.
* Feb 19, 2014 2819 randerso Removed unnecessary .clone() call * 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> * </pre>
* *
* @author jsanchez * @author jsanchez
@ -139,15 +141,22 @@ public class WarningsResource extends AbstractWWAResource {
if (entry.wireframeShape != null) { if (entry.wireframeShape != null) {
entry.wireframeShape.dispose(); 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) { if (warningsFont != null) {
warningsFont.dispose(); warningsFont.dispose();
warningsFont = null;
} }
if (emergencyFont != null) { if (emergencyFont != null) {
emergencyFont.dispose(); 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 * Nov 8, 2013 16758 mgamazaychikov Changed access modifier of mergeWatches to protected
* so a child class can override the implementation. * so a child class can override the implementation.
* Feb 19, 2014 2819 randerso Removed unnecessary .clone() call * Feb 19, 2014 2819 randerso Removed unnecessary .clone() call
* Mar 04, 2014 2832 njensen Set fonts to null in disposeInternal() so recycle works
* </pre> * </pre>
* *
* @author jsanchez * @author jsanchez
@ -143,10 +144,12 @@ public class WatchesResource extends AbstractWWAResource {
entryMap.clear(); entryMap.clear();
if (warningsFont != null) { if (warningsFont != null) {
warningsFont.dispose(); warningsFont.dispose();
warningsFont = null;
} }
if (emergencyFont != null) { if (emergencyFont != null) {
emergencyFont.dispose(); emergencyFont.dispose();
emergencyFont = null;
} }
} }