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

Merge "Issue #1904 - FFMPConfig no longer able to be reset." into development

Browse source 
Former-commit-id: 8e6df2e9d3 [formerly 966085d878] [formerly c5c885b28b] [formerly 8e6df2e9d3 [formerly 966085d878] [formerly c5c885b28b] [formerly 770f473bf7 [formerly c5c885b28b [formerly 72178a388b7114f92146ba7fbb1eb062cbeb7aa4]]]]
Former-commit-id: 770f473bf7
Former-commit-id: e3cbfade68 [formerly 42aefd0d77] [formerly 5f29c43af6ad720000ce8d1a56c8387e3b877f46 [formerly 668a5133f6]]
Former-commit-id: fa5006089d4ea7509db536bbacb7cf61a6246369 [formerly e1c360ca37]
Former-commit-id: 71870d782c
This commit is contained in:
Lee Venable 2013-04-15 13:11:34 -05:00 • committed by Gerrit Code Review
commit a0b531c77c
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
View file

@ -55,6 +55,7 @@ import com.raytheon.uf.viz.monitor.ffmp.xml.FFMPTableColumnXML;
* ------------ ---------- ----------- --------------------------
* Aug 01, 2012 14168 mpduff Add convenience methods for
* getting ColorCell and ReverseFilter
* Apr 15, 2013 1904 mpduff Don't allow this class to be nulled out
*
* </pre>
*
@ -123,27 +124,9 @@ public class FFMPConfig {
}
public static synchronized FFMPConfig getInstance() {
if (classInstance == null) {
classInstance = new FFMPConfig();
}
return classInstance;
}
public void disposeResources() {
upperColor.dispose();
midColor.dispose();
lowerColor.dispose();
belowLowerColor.dispose();
defaultColor.dispose();
forcedFFGColor.dispose();
vgbColor.dispose();
}
public static void unloadConfig() {
classInstance = null;
}
private void init() {
threshMgrMap = new HashMap<ThreshColNames, ThresholdManager>();

3
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
View file

@ -118,6 +118,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Mar 01, 2013 13228 gzhang Adding field rowName for VGB in County
* Mar 24, 2013 1818 mpduff Fixed Attributes dialog on multiple opens, needed an isDisposed check.
* Mar 29, 2013 1790 rferrel Bug fix for non-blocking dialogs.
* Apr 15, 2013 1904 mpduff Remove calls to reset FFMPConfig.
* </pre>
*
* @author lvenable
@ -320,8 +321,6 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
dataLoadFont.dispose();
timeDurFont.dispose();
FFMPConfig.getInstance().disposeResources();
FFMPConfig.unloadConfig();
if (refreshColor != null) {
refreshColor.dispose();