From fa3207a140560e12b6896ed2af89238d02cb4cac Mon Sep 17 00:00:00 2001
From: Ben Steffensmeier <Ben.Steffensmeier@raytheon.com>
Date: Wed, 30 Jul 2014 16:38:51 -0500
Subject: [PATCH 1/7] Issue #3455 Fix gridless grib models.

Former-commit-id: 12f84a942775bc286412bebc8ccdd05cbbf96da6 [formerly 7341c62f40775fdaa7a6c5b4081fb549a76da06a [formerly 1228b73957fc4a407e9075292faffeff3a84bdb4]]
Former-commit-id: 7341c62f40775fdaa7a6c5b4081fb549a76da06a
Former-commit-id: 1005d4d4b19a6f4c0d274dca37e9113080b02ee8
---
 .../com/raytheon/edex/plugin/grib/util/GribModelLookup.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
index 9af2c1260e..1207ed3c65 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
@@ -56,6 +56,7 @@ import com.raytheon.uf.common.util.mapping.MultipleMappingException;
  * Apr 30, 2013  1961     bsteffen    Add ability to disable grib tables.
  * Oct 14, 2013  2473     bsteffen    Remove lookup of deprecated grib files.
  * Apr 25, 2014  2874     bsteffen    Add processType
+ * Jul 30, 2014  3455     bsteffen    Allow model matching with no grid defined.
  * 
  * 
  * </pre>
@@ -148,6 +149,9 @@ public class GribModelLookup {
                     return model;
                 }
             }
+        } else {
+            String key = toKey(center, subcenter, null, process, processType);
+            return models.get(key);
         }
         return null;
     }

From 0505983ab3b3154285e24eb51b249b992ba119a2 Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Mon, 11 Aug 2014 10:54:39 -0500
Subject: [PATCH 2/7] Issue #3480 added info logging when procedures are loaded
 or perspective changes

Change-Id: Ib342ace7c86cf71b0d548dafb7b57b6c9a421624

Former-commit-id: 3bb860eda5dd61d68a026067f8e18de072f9dc2c [formerly dd0d6097a5049f191660d7cf9653545d98a68e83 [formerly c3155a4633e8da5f852667a2af5982fb24438623]]
Former-commit-id: dd0d6097a5049f191660d7cf9653545d98a68e83
Former-commit-id: 372a2ba352b3e1b48a13a4c095aefe6d7a42b7b7
---
 .../uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java      | 10 +++++++++-
 .../uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java |  2 ++
 .../com/raytheon/viz/ui/actions/LoadSerializedXml.java |  3 +++
 .../viz/ui/perspectives/VizPerspectiveListener.java    |  7 +++++++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java
index 5d743cc132..1224f01e10 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java
@@ -28,6 +28,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.LocalizationUtil;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.viz.core.procedures.Procedure;
 import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.OpenProcedureListDlg;
 import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureDlg;
@@ -47,7 +49,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  *    Sep 13, 2007             chammack    Initial Creation.
  *    Oct 16, 2012 1229        rferrel     Change to use ProcedureDlg.displayDialog.
  *    Oct 16, 2012 1229        rferrel     Changes for non-blocking ProcedureListDlg.
- *    Jun 7, 2013  2074       mnash        Don't open the dialog if no procedures are deserialized
+ *    Jun 07, 2013 2074        mnash       Don't open the dialog if no procedures are deserialized
+ *    Aug 11, 2014 3480        bclement    added logging
  * </pre>
  * 
  * @author chammack
@@ -57,6 +60,9 @@ public class OpenAWIPSProcedure extends AbstractHandler {
 
     private OpenProcedureListDlg dialog;
 
+    private static final IUFStatusHandler log = UFStatus
+            .getHandler(OpenAWIPSProcedure.class);
+
     /*
      * (non-Javadoc)
      * 
@@ -78,6 +84,8 @@ public class OpenAWIPSProcedure extends AbstractHandler {
                         Procedure p = (Procedure) LoadSerializedXml
                                 .deserialize(f);
                         if (p != null) {
+                            log.info("Loading display file: "
+                                    + f.getAbsolutePath());
                             ProcedureDlg.displayDialog(LocalizationUtil
                                     .extractName(selectedFile.getName()), p,
                                     VizWorkbenchManager.getInstance()
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
index f50665e65d..eb58ca14ea 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
@@ -102,6 +102,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
  * Jan 16, 2013  DR 15367  D. Friedman Enable save button for Up/Down changes. 
  * Feb 25, 2013 1640       bsteffen    Dispose old display in BundleLoader
  * Jun 7, 2013  2074       mnash       Remove resource if doesn't instantiate correctly
+ * Aug 11, 2014 3480       bclement    added info logging when procedure is loaded
  * </pre>
  * 
  * @author unknown
@@ -863,6 +864,7 @@ public class ProcedureDlg extends CaveSWTDialog {
     }
 
     private void load(final Bundle b) {
+        statusHandler.info("Loading bundle: " + b.getName());
         String editorName = null;
         if (b.getDisplays().length > 0) {
             editorName = DescriptorMap.getEditorId(b.getDisplays()[0]
diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
index 1b9c067a5a..84bf68eaf7 100644
--- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
+++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
@@ -66,6 +66,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
  * Mar 21, 2013  1638     mschenke    Added method to load procedure to window
  * Oct 22, 2013  2491     bsteffen    Switch serialization to
  *                                    ProcedureXmlManager
+ * Aug 11, 2014  3480     bclement    added info logging to execute()
  * 
  * </pre>
  * 
@@ -95,6 +96,8 @@ public class LoadSerializedXml extends AbstractHandler {
         String fileName = fd.getFilterPath() + File.separator
                 + fd.getFileName();
 
+        statusHandler.info("Loading display file: " + fileName);
+
         Object obj = deserialize(new File(fileName));
         try {
             if (obj != null) {
diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
index 5e963ae00e..8f76550302 100644
--- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
+++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
@@ -41,6 +41,8 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPartReference;
 import org.eclipse.ui.IWorkbenchWindow;
 
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.viz.ui.VizWorkbenchManager;
 
 /**
@@ -55,6 +57,7 @@ import com.raytheon.viz.ui.VizWorkbenchManager;
  * ------------ ---------- ----------- --------------------------
  * Apr 21, 2010            mschenke    Initial creation
  * Mar 21, 2013       1638 mschenke    Added method to get managed perspectives
+ * Aug 11, 2014 3480       bclement    added log message in perspectiveOpened()
  * 
  * </pre>
  * 
@@ -64,6 +67,9 @@ import com.raytheon.viz.ui.VizWorkbenchManager;
 
 public class VizPerspectiveListener implements IPerspectiveListener4 {
 
+    private static final IUFStatusHandler log = UFStatus
+            .getHandler(VizPerspectiveListener.class);
+
     private static final String PERSPECTIVE_MANAGER_EXTENSION = "com.raytheon.viz.ui.perspectiveManager";
 
     private static final String PERSPECTIVE_ID = "perspectiveId";
@@ -257,6 +263,7 @@ public class VizPerspectiveListener implements IPerspectiveListener4 {
     @Override
     public void perspectiveOpened(IWorkbenchPage page,
             IPerspectiveDescriptor perspective) {
+        log.info("Opened perspective: " + perspective.getId());
     }
 
     @Override

From ea9abeb25e66889f5a7a3acfbf8e2137808cdf0a Mon Sep 17 00:00:00 2001
From: Roger Ferrel <Roger.L.Ferrel@raytheon.com>
Date: Wed, 13 Aug 2014 14:26:58 -0500
Subject: [PATCH 3/7] Issue #3439 Changes to add new GFS data to Product and
 Volume Browser.

Change-Id: I6314cb1a99aada35290a52e03810d4d51b224a9d

Former-commit-id: 518ec99c00077b4df265df9447fe8ddbef054c97 [formerly eef17da8cd1d53b51be8167aa1f026bf968e09aa [formerly 658976d6c9485a3abe4d8a5ba759897407ec1239]]
Former-commit-id: eef17da8cd1d53b51be8167aa1f026bf968e09aa
Former-commit-id: 2223d9500ed21215ccbc637c6edac5d8ce946873
---
 .../localization/volumebrowser/VbSources.xml             | 9 +++++++++
 .../base/grid/datasetInfo/gribDatasets_NCEP-7.xml        | 5 +++++
 .../edex_static/base/grib/models/gribModels_NCEP-7.xml   | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
index c1318f31f4..34202fab7c 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
@@ -16,11 +16,16 @@
 	<vbSource key="DGEX185" category="Volume" />
 	<vbSource key="ECMWF-HiRes" category="Volume" />
 	<vbSource key="ECMF-NorthernHemisphere" category="Volume" />
+    <vbSource key="GFS229" category="Volume" />
+    <!-- Old version being replaced by GFS229
 	<vbSource key="AVN203" category="Volume" />
+    -->
 	<vbSource key="GFS201" category="Volume" />
 	<vbSource key="GFS212" category="Volume" />
+    <!--Old version being replaced by GFS229
 	<vbSource key="AVN225" category="Volume" />
 	<vbSource key="GFS213" category="Volume" />
+    -->
 	<vbSource key="ENSEMBLE" category="Volume" views="PLANVIEW TIMESERIES"/>
 	<vbSource key="AVN-NorthernHemisphere" category="Volume" />
 	<vbSource key="HiResW-ARW-AK" category="Volume" />
@@ -34,7 +39,9 @@
 	<vbSource key="HiResW-NMM-SJU" category="Volume" />
 	<vbSource key="HiResW-NMM-West" category="Volume" />
 	<vbSource key="HRRR" category="Volume" />
+    <!-- Old version being replaced by GFS229
 	<vbSource key="MRF204" category="Volume" />
+    -->
 	<vbSource key="LAMPQPF" category="Volume" />
 	<vbSource key="LAPS" category="Volume" />
 	<vbSource key="ETA218" category="Volume" />
@@ -49,7 +56,9 @@
 	<vbSource key="RUC130" category="Volume" />
 	<vbSource key="RUC236" category="Volume" />
 	<vbSource key="GFS161" category="Volume" />
+    <!-- Old version being replaced by GFS229
 	<vbSource key="MRF205" category="Volume" />
+    -->
 	<vbSource key="SREF212" category="Volume" views="PLANVIEW TIMESERIES"/>
 	<vbSource key="UKMET-NorthernHemisphere" category="Volume" />
 	<vbSource key="radar" name="Radar" category="Volume" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
index 834500e458..4867cc5ddf 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
@@ -60,6 +60,11 @@
         <datasetId>GFS201</datasetId>
         <dt>6</dt>
     </info>
+    <info>
+        <title>GFS-N-Hem</title>
+        <datasetId>GFS229</datasetId>
+        <dt>3</dt>
+    </info>
     <info>
         <title>gfsLR</title>
         <datasetId>mrfNH</datasetId>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
index 3be44b3b4c..196f505517 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
@@ -1650,7 +1650,7 @@
 	</model>
 
 	<model>
-		<name>gfs</name>
+		<name>GFS229</name>
 		<center>7</center>
 		<subcenter>0</subcenter>
 		<grid>229</grid>

From b8bf30dc3281c316dbaf10bffec09ad1d6bca78a Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Fri, 15 Aug 2014 08:48:02 -0500
Subject: [PATCH 4/7] Issue #3510 added optimizations to GLDisposalManager

Change-Id: I07a443135d1f02beba7a2f9d097b9198f3484506

Former-commit-id: 05499720088f4a33a0e94876c1c5388bfede7a46 [formerly 5aa1830c3d36a76af27fbc3f36163db525fce41e [formerly 0dc59ef89147bd4eb2b40f6c99c5e3422555cf65]]
Former-commit-id: 5aa1830c3d36a76af27fbc3f36163db525fce41e
Former-commit-id: d8d80bea6d7ac1b68825655d8238c84c39bbccc3
---
 .../raytheon/viz/core/gl/GLDisposalManager.java  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
index aefaaceff8..6297f8612c 100644
--- a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
+++ b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
@@ -21,8 +21,8 @@ package com.raytheon.viz.core.gl;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.IdentityHashMap;
+import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
 
@@ -41,6 +41,8 @@ import javax.media.opengl.GL;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Feb 17, 2012            bsteffen     Initial creation
+ * Aug 13, 2014 3510       bclement     changed autoDisposers to map, 
+ *                                       remove auto if dispose called with disposer
  * 
  * </pre>
  * 
@@ -51,7 +53,7 @@ public class GLDisposalManager {
 
     private static ReferenceQueue<Object> refQueue = new ReferenceQueue<Object>();
 
-    private static List<GLAutoDisposer> autoDisposers = new LinkedList<GLAutoDisposer>();
+    private static Map<GLDisposer, GLAutoDisposer> autoDisposers = new IdentityHashMap<GLDisposer, GLAutoDisposer>();
 
     private static Queue<GLDisposer> disposeQueue = new LinkedBlockingQueue<GLDisposer>();
 
@@ -65,6 +67,7 @@ public class GLDisposalManager {
      */
     private static void dispose(GLDisposer disposer) {
         disposeQueue.add(disposer);
+        autoDisposers.remove(disposer);
     }
 
     /**
@@ -73,7 +76,8 @@ public class GLDisposalManager {
      * the disposer must have no references to object. Object should be the only
      * thing using these GL resources, this will not work for anything which
      * might be shared by multiple objects. This will also result in the dispose
-     * method of the disposer being called more than once so it should clear any
+     * method of the disposer being called more than once so it should be
+     * idempotent.
      * 
      * @param disposer
      *            - a disposer that will be called when object is garbage
@@ -82,7 +86,7 @@ public class GLDisposalManager {
      *            - an object which uses a gl resource.
      */
     public static void autoDispose(GLDisposer disposer, Object object) {
-        autoDisposers.add(new GLAutoDisposer(object, disposer));
+        autoDisposers.put(disposer, new GLAutoDisposer(object, disposer));
     }
 
     /**
@@ -99,7 +103,7 @@ public class GLDisposalManager {
         }
         GLAutoDisposer autoDisposer = (GLAutoDisposer) refQueue.poll();
         while (autoDisposer != null) {
-            autoDisposers.remove(autoDisposer);
+            autoDisposers.remove(autoDisposer.disposer);
             autoDisposer.disposer.dispose();
             autoDisposer = (GLAutoDisposer) refQueue.poll();
         }

From 7ac071e0f971514bb1516ec742d3b5a937534173 Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Tue, 19 Aug 2014 08:59:35 -0500
Subject: [PATCH 5/7] Issue #3542 fixed lightning count clipping issue

Change-Id: I40aa62558542d3da9b3abd8f82de9e5d8244870b

Former-commit-id: fc2e7f52b95b974d1c40b305f3fbaba2a0a78da2 [formerly 78796c3f6e3f7acac59fe615b2746897b9b7dfc1 [formerly 937c656ba2a9fc98bfa5655a5020d470f83b898f]]
Former-commit-id: 78796c3f6e3f7acac59fe615b2746897b9b7dfc1
Former-commit-id: 9e33cf1f5f841e7c11ee8f28d719c73fae190c92
---
 .../com/raytheon/viz/lightning/LightningResource.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java b/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
index 983a4bafe5..9e9ef292be 100644
--- a/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
+++ b/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
@@ -95,6 +95,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
  *    Feb 27, 2013 DCS 152     jgerth/elau Support for WWLLN and multiple sources
  *    Jan 21, 2014  2667       bclement    renamed record's lightSource field to source
  *    Jun 6, 2014  DR 17367    D. Friedman Fix cache object usage.
+ *    Aug 19, 2014  3542       bclement    fixed strike count clipping issue
  * 
  * </pre>
  * 
@@ -378,7 +379,13 @@ public class LightningResource extends
         
         if (magnification == 0.0) magnification=(float) 0.01;
         
-        IExtent extent = paintProps.getView().getExtent();
+        /*
+         * we only want strikes that are visible so we have to filter any
+         * strikes that aren't in both the clipping pane and the view
+         */
+        IExtent viewExtent = paintProps.getView().getExtent();
+        IExtent clipExtent = paintProps.getClippingPane();
+        IExtent extent = viewExtent.intersection(clipExtent);
 
         CacheObject<LightningFrameMetadata, LightningFrame> cacheObject = cacheObjectMap
                 .get(this.lastPaintedTime);

From c7cf1e92735385f2dc5266ddd4db479b0980804f Mon Sep 17 00:00:00 2001
From: Roger Ferrel <Roger.L.Ferrel@raytheon.com>
Date: Tue, 19 Aug 2014 16:41:06 -0500
Subject: [PATCH 6/7] Issue #3439 Name change per suggestions in email.

Former-commit-id: f110ca1f3d13060786c764df55455c39f7dae8af [formerly fb54b80ed50ce723cf022a1462076ec1091c9d7d [formerly 44c3b86c9dc0b978acc66c5f79255270ce0acb41]]
Former-commit-id: fb54b80ed50ce723cf022a1462076ec1091c9d7d
Former-commit-id: d76722987e364ef0a0b556e5bc570a99f56f0518
---
 .../common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
index 4867cc5ddf..4843b954ee 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
@@ -61,7 +61,7 @@
         <dt>6</dt>
     </info>
     <info>
-        <title>GFS-N-Hem</title>
+        <title>GFS1degGbl</title>
         <datasetId>GFS229</datasetId>
         <dt>3</dt>
     </info>

From ae3aa358e9b6a29192f59a517fdb66bfa1c343b6 Mon Sep 17 00:00:00 2001
From: Richard Peter <richard.peter@raytheon.com>
Date: Fri, 22 Aug 2014 10:44:28 -0500
Subject: [PATCH 7/7] Issue #3534 Update ThreadBasedAppender to extend
 UnsychronizedAppenderBase.

Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b

Former-commit-id: a9af2314d36f45392685826ef7e22dde2fb04ae8 [formerly ce238544d104745ec1e982ee53bdf7c088464adc [formerly 31e9cb1cfc15d79b204d4d16c1f7afa614bb9ca2]]
Former-commit-id: ce238544d104745ec1e982ee53bdf7c088464adc
Former-commit-id: 4cebb22560713cb1e6afc2c1021a67c91e711746
---
 .../uf/common/status/logback/ThreadBasedAppender.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java b/edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
index 40dca31de6..6667a8a550 100644
--- a/edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
+++ b/edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.Appender;
-import ch.qos.logback.core.AppenderBase;
+import ch.qos.logback.core.UnsynchronizedAppenderBase;
 import ch.qos.logback.core.spi.AppenderAttachable;
 
 /**
@@ -44,7 +44,7 @@ import ch.qos.logback.core.spi.AppenderAttachable;
  * ------------ ---------- ----------- --------------------------
  * Aug 25, 2010            rjpeter     Initial creation
  * Jun 24, 2013 2142       njensen     Changes for logback compatibility
- * 
+ * Aug 22, 2014 3534       rjpeter     Extend UnsynchronizedAppenderBase.
  * </pre>
  * 
  * @author rjpeter
@@ -52,7 +52,7 @@ import ch.qos.logback.core.spi.AppenderAttachable;
  */
 
 public class ThreadBasedAppender<E extends ILoggingEvent> extends
-        AppenderBase<E> implements AppenderAttachable<E> {
+        UnsynchronizedAppenderBase<E> implements AppenderAttachable<E> {
     private Map<String, Appender<E>> appenderMap = new HashMap<String, Appender<E>>();
 
     private Map<String, List<Pattern>> threadPatterns = new HashMap<String, List<Pattern>>();