Merge branch 'master_14.3.1' (14.3.1-42) into omaha_14.3.1

Former-commit-id: 084a13971d [formerly a3bbb0ec69] [formerly a8de59017f [formerly 089467110734e982ec8c7916a48159828e03e75e]]
Former-commit-id: a8de59017f
Former-commit-id: 9bf5fc1570

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/DisplayFieldData.java

@@ -11,7 +11,7 @@ package com.raytheon.viz.mpe.ui;
  * ------------ ---------- ----------- --------------------------
  * Jun 9, 2011            rgeorge     Initial creation
  * Jun 30, 2014  17457    snaples     Updated getCv_use to return name
- * 
+ * Jan 7, 2015  16954      cgobs      Fix for cv_use issue - using getFieldName() in certain parts.
  * </pre>
  * 
  * @author rgeorge
@@ -56,7 +56,7 @@ public enum DisplayFieldData {
     mlqmosaic("mpe_mlqmosaic_dir", "Q2 MultiSensor Mosaic", 3600, "PRECIP_ACCUM"),
     
     //best estimate QPE
-    Xmrg("rfcwide_xmrg_dir", "Best Estimate QPE (in)"), //
+    Xmrg("rfcwide_xmrg_dir", "Best Estimate QPE (in)", 3600, "PRECIP_ACCUM" ), //
 
     p3lMosaic("rfcwide_p3lmosaic_dir",
             "P3 Local Bias Corrected Radar-Derived Precip (in)", 3600, "PRECIP_ACCUM"), //
@@ -146,11 +146,18 @@ public enum DisplayFieldData {
     	}
     }
     
+    public String getFieldName() {
+        return name().toUpperCase();
+    }
+    
+    
     /**
      * @return the cv_use
      */
     public String getCv_use() {
-        cv_use = name().toUpperCase();
+        if (cv_use == null) {
+            cv_use = getFieldName();
+        }
         return cv_use;
     }
 

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveBestEstimate.java

@@ -16,6 +16,14 @@
  * 
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jan 7, 2015  16954      cgobs      Fix for cv_use issue - using getFieldName() in certain parts.
+ * </pre>
  **/
 package com.raytheon.viz.mpe.ui.actions;
 
@@ -116,7 +124,7 @@ public class SaveBestEstimate {
 
         String rfc = MPEDataManager.getInstance().getRFC();
 
-        update_rwr_save(rfc, editDate, bestEstField.getCv_use());
+        update_rwr_save(rfc, editDate, bestEstField.getFieldName());
 
         XmrgFile xmrgFile = MPEDisplayManager.getXmrgFile(bestEstField,
                 editDate);

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java

@@ -56,7 +56,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  *                                     Polygon values will now be
  *                                     displayed for polygons with
  *                                     the "sub" action.
- * 
+ * Jan 7, 2015  16954      cgobs       Fix for cv_use issue - using getFieldName() in certain parts.
  * </pre>
  * 
  * @author mpduff
@@ -286,8 +286,8 @@ public class DeletePolygonDlg extends CaveSWTDialog {
 
         polygonListBox.removeAll();
 
-        String type = displayManager.getDisplayFieldType().getCv_use()
-                .toUpperCase();
+        String type = displayManager.getDisplayFieldType().getFieldName();
+        
         productTF.setText(type);
         polygonList = PolygonEditManager.getPolygonEdits(fieldData, editDate);
         recreatePolygonListBox();
@@ -314,7 +314,7 @@ public class DeletePolygonDlg extends CaveSWTDialog {
 
             PolygonEditAction action = data.getEditAction();
             if (action == PolygonEditAction.SUB) {
-                String value = data.getSubDrawSource().getCv_use();
+                String value = data.getSubDrawSource().getFieldName();
                 polygonListBox.add(String.format(format2, number, displayed,
                         persist, action.toPrettyName(), value));
             } else {

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/PolygonEditManager.java

@@ -16,6 +16,14 @@
  * 
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jan 7, 2015  16954      cgobs      Fix for cv_use issue - using getFieldName() in certain parts.
+ * </pre>
  **/
 package com.raytheon.viz.mpe.ui.dialogs.polygon;
 
@@ -233,7 +241,7 @@ public class PolygonEditManager {
 
                 String polyEditStr = editAction.toPrettyName()
                         + " "
-                        + (subDrawSource != null ? subDrawSource.getCv_use()
+                        + (subDrawSource != null ? subDrawSource.getFieldName()
                                 : String.format("%6.2f", precipValue)) + " "
                         + editPoints.length + " " + (visible ? "1" : "0");
                 toUse.append(idx + " " + polyEditStr + "\n");
@@ -288,7 +296,7 @@ public class PolygonEditManager {
     }
 
     private static File getHourlyEditFile(DisplayFieldData fieldData, Date date) {
-        String fieldname = fieldData.getCv_use();
+        String fieldname = fieldData.getFieldName();
         String polygonDir = MPEDisplayManager.getPolygonEditDir();
 
         /* Build the polygon filename. */
@@ -299,7 +307,7 @@ public class PolygonEditManager {
 
     private static File getPersistentEditFile(DisplayFieldData fieldData,
             Date date) {
-        String fieldname = fieldData.getCv_use();
+        String fieldname = fieldData.getFieldName();
         String polygonDir = MPEDisplayManager.getPolygonEditDir();
         /* Build the persistent polygon filename. */
         String persistentFilename = String.format("%s/DrawPoly%s", polygonDir,
@@ -345,7 +353,7 @@ public class PolygonEditManager {
                         DisplayFieldData subData = null;
                         for (DisplayFieldData fieldData : DisplayFieldData
                                 .values()) {
-                            if (fieldData.getCv_use()
+                            if (fieldData.getFieldName()
                                     .equalsIgnoreCase(subCvUse)) {
                                 subData = fieldData;
                                 break;

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/DisplayMeanArealPrecipResource.java

@@ -16,6 +16,14 @@
  * 
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jan 7, 2015  16954      cgobs      Fix for cv_use issue - using getFieldName() in certain parts.
+ * </pre>
  **/
 package com.raytheon.viz.mpe.ui.rsc;
 
@@ -580,7 +588,7 @@ public class DisplayMeanArealPrecipResource extends
         // this will accumulate all hours requested and display it
         // this holds current xmrg values
         short[] tempdata = null;
-        String cv_use = displayMgr.getDisplayFieldType().getCv_use();
+        String cv_use = displayMgr.getDisplayFieldType().getFieldName();
         String dirname = appsDefaults.getToken(displayMgr.getDisplayFieldType()
                 .getDirToken());
         String fname = "";