From 00b3600ad6079f339acdd230a9cb3723e2178fe9 Mon Sep 17 00:00:00 2001
From: Mike Duff <michael.duff@raytheon.com>
Date: Mon, 15 Apr 2013 13:02:58 -0500
Subject: [PATCH] Issue #1904 - FFMPConfig no longer able to be reset.

Change-Id: I9e7a7628ca1cd77964574fbc84c2cd2f78364872

Former-commit-id: 2323505f913dd69755542f44ab1dcae804e3930f [formerly 18e5561dd2347f1b7b84d28232116add8f7c8a45] [formerly 2323505f913dd69755542f44ab1dcae804e3930f [formerly 18e5561dd2347f1b7b84d28232116add8f7c8a45] [formerly f9c0de442feaf42cf3193a829e360f31d372c205 [formerly 5775e40e5f939ca847527ae562cba71dc3984a60]]]
Former-commit-id: f9c0de442feaf42cf3193a829e360f31d372c205
Former-commit-id: b8477335668bb8948be850c44239820e2a7b59e9 [formerly c0f6fe51999529f4790594c765a1725fb7582ec3]
Former-commit-id: 5253e6e5351c4d2ad684ed2a2258745d73e5f084
---
 .../monitor/ffmp/ui/dialogs/FFMPConfig.java   | 19 +------------------
 .../ffmp/ui/dialogs/FfmpBasinTableDlg.java    |  3 +--
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
index 04d9846250..7b81d1857a 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
@@ -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>();
 
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
index c2d61c978a..b653e85eb4 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
@@ -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();