Merge "ASM #235" into asm_14.2.2

Former-commit-id: 669c9447c8 [formerly ad1ff832d2] [formerly 08741ce6c4] [formerly 669c9447c8 [formerly ad1ff832d2] [formerly 08741ce6c4] [formerly 67942aacf7 [formerly 08741ce6c4 [formerly 46beee6bbda9af256daecd64b4c7abf52e021ad3]]]]
Former-commit-id: 67942aacf7
Former-commit-id: 266803a72a [formerly 4af4121b89] [formerly 5e48444fb3076ecdd713c0d16d41ab93b94819f4 [formerly 05eb5f8008]]
Former-commit-id: 6b77b557ab1895261f63c96227998f3e6e77fd4b [formerly 76dfd75140]
Former-commit-id: c3f994e9e3

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

@@ -102,7 +102,8 @@ import com.raytheon.viz.ui.editor.IMultiPaneEditor;
  * Mar 14, 2013   1457     mpduff       Reset the gages on the resource.
  * Apr 18, 2013   1920     mpduff       Added updateGages method to reload the gage data, 
  *                                      fix formatting of legend for Base field Height.
- * Jul 02, 2013   2160     mpduff       Initialize newly displayed resources.                                     
+ * Jul 02, 2013   2160     mpduff       Initialize newly displayed resources.  
+ * Feb 2, 2014  16201      snaples      Added saved data flag support
  * 
  * </pre>
  * 
@@ -207,6 +208,8 @@ public class MPEDisplayManager {
 
     private AbstractVizResource<?, ?> displayedResource;
 
+    private boolean savedData = true;
+
     public void setDisplayedResource(AbstractVizResource<?, ?> rsc) {
         displayedResource = rsc;
         if (displayedFieldResource != null
@@ -222,11 +225,11 @@ public class MPEDisplayManager {
      * @return the dataSaved
      */
     public boolean isDataSaved() {
-        // TODO: Does A1 MPE EVER have a time where you change edit dates and it
-        // doesn't prompt? If so, we need to check here if data is saved or not
-        // TODO: Also, any editing methods need to change displayed frame to
-        // stop looping so they can see what they are editing.
-        return false;
+        return savedData;
+    }
+
+    public void setSavedData(boolean saved) {
+        savedData = saved;
     }
 
     /**

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

@@ -56,6 +56,7 @@ import com.raytheon.viz.mpe.ui.MPEDisplayManager;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Dec 11, 2012            mschenke     Initial creation
+ * Feb 2, 2014  16201      snaples      Added saved data flag support
  * 
  * </pre>
  * 
@@ -263,6 +264,7 @@ public class SaveBestEstimate {
             // "%s\n", command_string ));
             // system ( command_string );
         }
+        MPEDisplayManager.getCurrent().setSavedData(true);
     }
 
     private static void mpegui_save_image(BufferedImage bi, String format,

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/AddPseudoGageDialog.java

@@ -61,6 +61,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jan 8, 2009             snaples     Initial creation
+ * Feb 2, 2014  16201      snaples      Added saved data flag support
  * 
  * </pre>
  * 
@@ -92,6 +93,8 @@ public class AddPseudoGageDialog extends CaveSWTDialog {
 
     private MPEGageResource resource;
 
+    private MPEDisplayManager mgr;
+
     private static final String psstr = "PSEUDO";
 
     /**
@@ -124,7 +127,8 @@ public class AddPseudoGageDialog extends CaveSWTDialog {
     @Override
     protected void initializeComponents(Shell shell) {
         font = new Font(shell.getDisplay(), "Courier", 10, SWT.NORMAL);
-        datetime = MPEDisplayManager.getCurrent().getCurrentEditDate();
+        mgr = MPEDisplayManager.getCurrent();
+        datetime = mgr.getCurrentEditDate();
         sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
 
@@ -219,6 +223,7 @@ public class AddPseudoGageDialog extends CaveSWTDialog {
             @Override
             public void widgetSelected(SelectionEvent e) {
                 writePGage();
+                mgr.setSavedData(false);
                 close();
             }
         });

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/Display7x7Dialog.java

@@ -74,6 +74,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Jun 05, 2013  15961     lbousaidi    added routines for set Bad/set not bad buttons
  *                                     to reflect the state of the gages.                                   
  * Jul 02, 2013   2160     mpduff      Changed to not call deprecated resource.getData() method.
+ * Feb 2, 2014  16201      snaples      Added saved data flag support
+ * 
  * </pre>
  * 
  * @author randerso
@@ -155,10 +157,12 @@ public class Display7x7Dialog extends CaveSWTDialog {
     private DisplayFieldData selectedFieldData;
 
     private static boolean oldManedit = false;
+    private MPEDisplayManager mgr;
 
     public Display7x7Dialog(Shell parentShell, MPEGageData data) {
         super(parentShell, SWT.DIALOG_TRIM, CAVE.DO_NOT_BLOCK);
         setText("Display 7 X 7 Gage Editing Utility");
+        mgr = MPEDisplayManager.getCurrent();
         selectedGage = data;
         gData = MPEDataManager.getInstance().getEditedGage(selectedGage);
         ArrayList<String> bg = MPEDataManager.getInstance().readBadGageList();
@@ -488,6 +492,7 @@ public class Display7x7Dialog extends CaveSWTDialog {
                 undoMissing.setEnabled(undoEn);
                 String wid = workingGage.getId();
                 editGage.put(wid, workingGage);
+                mgr.setSavedData(false);
 
                 if (!editGage.isEmpty()) {
                     Iterator<MPEGageData> x = editGage.values().iterator();
@@ -578,6 +583,7 @@ public class Display7x7Dialog extends CaveSWTDialog {
                         MPEGageData gd = x.next();
                         MPEDataManager.getInstance().addEditedGage(gd);
                     }
+                    mgr.setSavedData(false);
                 }
             }
         });
@@ -678,6 +684,7 @@ public class Display7x7Dialog extends CaveSWTDialog {
                 if ((!notBadGage.isEmpty() || !badGage.isEmpty())
                         && !editGage.isEmpty()) {
                     MPEDataManager.getInstance().writeBadGageList();
+                    
                 }
             }
         });
@@ -938,7 +945,6 @@ public class Display7x7Dialog extends CaveSWTDialog {
     }
 
     private void updateGridField(DisplayFieldData fieldType) {
-        MPEDisplayManager mgr = MPEDisplayManager.getCurrent();
         if (selectedFieldData != fieldType) {
             selectedFieldData = fieldType;
             mgr.displayFieldData(fieldType);

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java

@@ -69,6 +69,8 @@ import com.raytheon.viz.mpe.ui.radartable.ReadBiasTableParam;
  * Jul 14, 2009            snaples     Initial creation
  * Jun 18, 2013  16053     snaples     Removed reference to setRadarEditFlag
  * Aug 06, 2013  16243                 Changed the Gui to a ScrolledComposite.
+ * Feb 2, 2014  16201      snaples      Added saved data flag support
+ * 
  * </pre>
  * 
  * @author snaples
@@ -251,6 +253,8 @@ public class RadarBiasTableDialog extends Dialog {
             @Override
             public void widgetSelected(SelectionEvent e) {
                 applyBiasUpdate(dt);
+                MPEDisplayManager mgr = MPEDisplayManager.getCurrent();
+                mgr.setSavedData(false);
                 shell.dispose();
             }
         });

cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/GageTableDlg.java

@@ -104,6 +104,7 @@ import com.raytheon.viz.mpe.ui.dialogs.gagetable.xml.GageTableSortType;
  * May 28, 2009 2476       mpduff     Initial creation.
  * Mar 08, 2013 15725      snaples    Updated to fix resort issues when editing value.
  * Jan 28, 2014 16994      snaples    Updated populateGridCombo to get correct filename prefix for matching up selection.
+ * Feb 2, 2014  16201      snaples      Added saved data flag support
  * 
  * </pre>
  * 
@@ -526,6 +527,7 @@ public class GageTableDlg extends JFrame implements IEditTimeChangedListener {
             @Override
             public void actionPerformed(ActionEvent e) {
                 saveChanges();
+                displayManager.setSavedData(false);
             }
         });
 

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

@@ -59,6 +59,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  *                                     longer be divided by 100.
  * Sep 11, 2013 #2353      lvenable    Fixed cursor memory leak.
  * Jan 29, 2014 16561      snaples     Updated processDrawPrecipValue to remove polygon wireframe after setting value.
+ * Feb 2, 2014  16201      snaples      Added saved data flag support
  * 
  * 
  * </pre>
@@ -742,6 +743,7 @@ public class DrawPolygonDlg extends CaveSWTDialog {
             PolygonEditManager.writePolygonEdits(displayedField, editDate,
                     polygonEdits);
             resource.clearPolygons();
+            dispMgr.setSavedData(false);
         } finally {
             shell.setCursor(prevCursor);
         }