From 223d41331bbe12c52ad9f67bfe725f512bb50484 Mon Sep 17 00:00:00 2001
From: Michael James <Michael.James@noaa.gov>
Date: Wed, 7 Sep 2016 19:13:30 -0500
Subject: [PATCH] D2DNSHARP and UI updates

---
 .../com.raytheon.uf.viz.d2d.nsharp/plugin.xml |  2 +-
 ...DNsharpObservedSoundingDialogContents.java | 10 +++---
 .../display/map/D2DNsharpMapResourceData.java |  2 --
 cave/com.raytheon.uf.viz.d2d.ui/plugin.xml    | 32 +++++++++++++++++++
 .../uf/viz/d2d/ui/perspectives/D2D5Pane.java  |  2 +-
 5 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
index 565b572887..e587fc78a3 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
@@ -18,7 +18,7 @@
             restorable="false"
             class="com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow"
             id="com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow"
-            name="NSHARP(D2D)"/>
+            name="NSHARP"/>
    </extension> 
 
 <extension point="org.eclipse.ui.perspectiveExtensions">
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpObservedSoundingDialogContents.java b/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpObservedSoundingDialogContents.java
index c9970b0265..2736f098cc 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpObservedSoundingDialogContents.java
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpObservedSoundingDialogContents.java
@@ -30,11 +30,11 @@ import gov.noaa.nws.ncep.ui.nsharp.NsharpConstants;
 import gov.noaa.nws.ncep.ui.nsharp.NsharpStationInfo;
 import com.raytheon.uf.viz.d2d.nsharp.display.map.D2DNsharpMapResource;
 
-import java.sql.Timestamp;
 import java.text.DateFormatSymbols;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.TimeZone;
 
 import org.eclipse.swt.SWT;
@@ -99,10 +99,10 @@ public class D2DNsharpObservedSoundingDialogContents {
             Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
             ldDia.startWaitCursor();
             for (Object timeLine : timeLines.getTimeLines()) {
-                Timestamp synoptictime = (Timestamp) timeLine;
+                Date synoptictime = (Date) timeLine;
                 if (synoptictime != null) {
                     // need to format synoptictime to GMT time string.
-                    // Timestamp.toString produce a local time Not GMT time
+                    // Date.toString produce a local time Not GMT time
                     cal.setTimeInMillis(synoptictime.getTime());
                     String dayOfWeek = defaultDays[cal
                             .get(Calendar.DAY_OF_WEEK)];
@@ -148,14 +148,14 @@ public class D2DNsharpObservedSoundingDialogContents {
             // Note: A same station may have many reports
             for (int i = 0; i < stnInfoAry.length; i++) {
                 NcSoundingStnInfo stnInfo = stnInfoAry[i];
-                Timestamp synoptictime = null;
+                Date synoptictime = null;
                 stnInfoStr = stnInfo.getStnId();
                 if (stnInfoStr == null || stnInfoStr.length() < 1)
                     stnInfoStr = "*";
                 lat = stnInfo.getStationLatitude();
                 lon = stnInfo.getStationLongitude();
                 // elv = stnInfo.getStationElevation();
-                synoptictime = (Timestamp) stnInfo.getSynopTime();
+                synoptictime = (Date) stnInfo.getSynopTime();
 
                 // convert to Nsharp's own station info struct
                 NsharpStationInfo stn = new NsharpStationInfo();
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/map/D2DNsharpMapResourceData.java b/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/map/D2DNsharpMapResourceData.java
index 3ec9f85d88..c0c2f3273d 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/map/D2DNsharpMapResourceData.java
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/map/D2DNsharpMapResourceData.java
@@ -19,8 +19,6 @@
  */
 package com.raytheon.uf.viz.d2d.nsharp.display.map;
 
-import gov.noaa.nws.ncep.ui.nsharp.display.map.NsharpMapResource;
-import gov.noaa.nws.ncep.ui.nsharp.display.map.NsharpMapResourceData;
 import gov.noaa.nws.ncep.viz.common.ui.Markers.MarkerState;
 import gov.noaa.nws.ncep.viz.common.ui.Markers.MarkerTextSize;
 import gov.noaa.nws.ncep.viz.common.ui.Markers.MarkerType;
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index 636c5059bc..d5eb1207f5 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -621,7 +621,25 @@
                   </reference>
                </visibleWhen>
             </command>
+            <!--
+            <command
+                  commandId="com.raytheon.viz.radar.rsc.map.dialog"
+                  icon="icons/nsharp.png"
+                  id="com.raytheon.viz.radar.rsc.map.dialog"
+                  label="NEXRAD"
+                  mode="FORCE_TEXT"
+                  style="push"
+                  tooltip="NEXRAD">
+               <visibleWhen>
+                  <reference
+                        definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
+                  </reference>
+               </visibleWhen>
+            </command>
+            -->
 			<!--
+			com.raytheon.viz.radar.rsc.map.RadarMapResource
+			
             <command
                   commandId="gov.noaa.nws.ncep.ui.nsharp.palette"
                   icon="icons/nsharp.png"
@@ -810,12 +828,26 @@
                      value="10">
                </parameter>
             </command>
+            <command
+                  commandId="com.raytheon.viz.ui.actions.setframes">
+               <parameter
+                     name="frameCount"
+                     value="15">
+               </parameter>
+            </command>
             <command commandId="com.raytheon.viz.ui.actions.setframes">
                <parameter
                      name="frameCount"
                      value="20">
                </parameter>
             </command>
+            <command
+                  commandId="com.raytheon.viz.ui.actions.setframes">
+               <parameter
+                     name="frameCount"
+                     value="25">
+               </parameter>
+            </command>
             <command commandId="com.raytheon.viz.ui.actions.setframes">
                <parameter
                      name="frameCount"
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
index e89fe43a9d..8e45c7915d 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
@@ -81,7 +81,7 @@ public class D2D5Pane implements IPerspectiveFactory {
         // Get the editor area.
         String editorArea = layout.getEditorArea();
         layout.setFixed(false);
-        //layout.addPlaceholder("com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow", IPageLayout.RIGHT,0.85f, editorArea); 
+        layout.addPlaceholder("com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow", IPageLayout.RIGHT,0.85f, editorArea); 
         //layout.addPlaceholder("edu.ucar.unidata.viz.radar.radarBrowser", IPageLayout.RIGHT,0.65f, editorArea); 
         layout.addPlaceholder("gov.noaa.gsd.viz.ensemble.tool.viewer", IPageLayout.RIGHT,0.6f, editorArea);