Changeset 44 in tmcsimulator for trunk/src/tmcsim/cadsimulator/viewer/CADSimulatorViewer.java

Timestamp:

06/23/2016 06:30:20 PM (10 years ago)

Author:

jdalbey

Message:

MultiFile? commit: Add CADViewer Interface and change CADSimulator to Observer Pattern.

File:

• trunk/src/tmcsim/cadsimulator/viewer/CADSimulatorViewer.java (modified) (9 diffs)

trunk/src/tmcsim/cadsimulator/viewer/CADSimulatorViewer.java

@@ -6 +6 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowEvent;
+import java.io.IOException;
+import java.util.Observable;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.JFrame;
 import javax.swing.JMenu;
@@ -13 +18 @@
 import javax.swing.JTabbedPane;
 import javax.swing.KeyStroke;
-import tmcsim.cadsimulator.videocontrol.DVDStatusUpdate;
-import tmcsim.cadsimulator.videocontrol.DVDTitleUpdate;
 import tmcsim.cadsimulator.viewer.actions.ExitAction;
-import tmcsim.common.CADEnums.PARAMICS_STATUS;
-import tmcsim.common.CADEnums.SCRIPT_STATUS;
-import tmcsim.common.RevisionNumber;
+import tmcsim.cadsimulator.viewer.model.CADMediaStatus;
+import tmcsim.cadsimulator.viewer.model.CADSimulatorStatus;
+import tmcsim.interfaces.CADViewer;
 
 /**
@@ -30 +33 @@
  */
 @SuppressWarnings("serial")
-public class CADSimulatorViewer extends JFrame
+public class CADSimulatorViewer extends JFrame implements CADViewer
 {
 
@@ -45 +48 @@
      */
     private ConfigStatusPanel configPanel;
+
     /**
      * Constructor.
      */
-    
     public CADSimulatorViewer()
     {
-        super("CAD Simulator");
+        super();
+        setTitle("CAD Simulator " + getAppVersion());
 
         initComponents();
@@ -57 +61 @@
 
     /**
-     * @see SimulationStatusPanel
+     * Read the version number from the application properties. The file
+     * 'application.properties' is generated by build.xml.
+     *
+     * @return a version string obtained from application.properties file, or
+     * "Version: unknown" if an IOerror prevents us from reading the file.
      */
-    public void connectClient()
+    private String getAppVersion()
     {
-        simulationPanel.connectClient();
-    }
-
-    /**
-     * @see SimulationStatusPanel
-     */
-    public void disconnectClient()
-    {
-        simulationPanel.disconnectClient();
-    }
-
-    /**
-     * @see SimulationStatusPanel
-     */
-    public void setSimManagerStatus(boolean connection)
-    {
-        simulationPanel.setSimManagerStatus(connection);
-    }
-
-    /**
-     * @see SimulationStatusPanel
-     */
-    public void setTime(long seconds)
-    {
-        simulationPanel.setTime(seconds);
-    }
-
-    /**
-     * @see SimulationStatusPanel
-     */
-    public void setScriptStatus(SCRIPT_STATUS newStatus)
-    {
-        simulationPanel.setScriptStatus(newStatus);
-    }
-
-    /**
-     * @see SimulationStatusPanel
-     */
-    public void setParamicsStatus(PARAMICS_STATUS newStatus)
-    {
-        simulationPanel.setParamicsStatus(newStatus);
-    }
-
-    /**
-     * @see SimulationStatusPanel
-     */
-    public void setParamicsNetworkLoaded(String networkID)
-    {
-        simulationPanel.setParamicsNetworkLoaded(networkID);
-    }
-
-    /**
-     * @see MediaStatusPanel
-     */
-    public void updateDVDStatus(DVDStatusUpdate update)
-    {
-        mediaPanel.updateDVDStatus(update);
-    }
-
-    /**
-     * @see MediaStatusPanel
-     */
-    public void updateDVDTitle(DVDTitleUpdate update)
-    {
-        mediaPanel.updateDVDTitle(update);
+        String propfilename = "/tmcsim/application.properties";
+        String propKey = "Application.revision";
+        String version = "unknown";
+        try
+        {
+            Properties props = new Properties();
+            props.load(this.getClass().getResourceAsStream(propfilename));
+            version = (String) props.get(propKey);
+        } catch (IOException ex)
+        {
+            Logger.getLogger("tmcsim/cadsimulator").log(Level.SEVERE,
+                    "CADSimulatorView.getAppVersion()",
+                    "IOError reading " + propfilename);
+        }
+        return "revision: " + version;
     }
 
@@ -147 +105 @@
         if (evt.getID() == WindowEvent.WINDOW_CLOSING)
         {
-            int option = JOptionPane.showConfirmDialog(null,
-                    "Closing the CAD Simulator will stop the current "
-                    + "simulation.  Do you wish to continue exiting?",
-                    "Confirm Exit",
-                    JOptionPane.YES_NO_OPTION);
-
-            if (option != JOptionPane.NO_OPTION)
-            {
-                System.exit(0);
-            }
+//            int option = JOptionPane.showConfirmDialog(null,
+//                    "Closing the CAD Simulator will stop the current "
+//                    + "simulation.  Do you wish to continue exiting?",
+//                    "Confirm Exit",
+//                    JOptionPane.YES_NO_OPTION);
+//
+//            if (option != JOptionPane.NO_OPTION)
+//            {
+            System.exit(0);
+//            }
         }
     }
@@ -196 +154 @@
             public void actionPerformed(java.awt.event.ActionEvent evt)
             {
-                String ver = RevisionNumber.getString();
+                String ver = "";//RevisionNumber.getString();
                 JOptionPane.showMessageDialog(rootPane, "Version: " + ver, "About", JOptionPane.INFORMATION_MESSAGE);
             }
@@ -208 +166 @@
         pack();
         setResizable(true);
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
     }
     private JTabbedPane cadSimTabbedPane;
@@ -213 +172 @@
     private JMenu fileMenu;
     private JMenuItem exitMenuItem;
+
+    @Override
+    public void update(Observable obs, Object obj)
+    {
+        if (obs instanceof CADSimulatorStatus)
+        {
+            simulationPanel.refresh(obs);
+        }
+        if (obs instanceof CADMediaStatus)
+        {
+            mediaPanel.refresh(obs);
+        }
+    }
 }