Changeset 455 in tmcsimulator

Timestamp:

07/18/2019 08:20:12 AM (7 years ago)

Author:

jdalbey

Message:

ConfigStatusTab? updated to fix @169.

Location:

trunk

Files:

• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/cadsimulator/CADServer.java (modified) (2 diffs)
• src/tmcsim/cadsimulator/viewer/CADConsoleViewer.java (modified) (1 diff)
• src/tmcsim/cadsimulator/viewer/CADServerViewer.java (modified) (2 diffs)
• src/tmcsim/cadsimulator/viewer/ConfigStatusTab.form (modified) (1 diff)
• src/tmcsim/cadsimulator/viewer/ConfigStatusTab.java (modified) (10 diffs)
• test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java (modified) (1 diff)
• test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java (modified) (4 diffs)
• test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java (modified) (2 diffs)
• test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java (modified) (1 diff)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Tue, 16 Jul 2019 08:06:49 -0700
+#Thu, 18 Jul 2019 09:49:25 -0700
 
-Application.revision=447
+Application.revision=453
 
-Application.buildnumber=160
+Application.buildnumber=165

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -3 +3 @@
 import java.io.File;
 import java.io.FileInputStream;
+import java.lang.reflect.Constructor;
 import java.rmi.Naming;
 import java.rmi.RemoteException;
@@ -239 +240 @@
             {
                 Class uiClass = Class.forName(userInterfaceName);
-                theViewer = (CADViewer) uiClass.newInstance();
+                Constructor<?> cons = uiClass.getConstructor(String.class);
+                theViewer = (CADViewer) cons.newInstance(propertiesFile);
             } catch (Exception exc)
             {

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

@@ -36 +36 @@
      * Constructor.
      */
-    public CADConsoleViewer()
+    public CADConsoleViewer(String propertiesFile)
     {
         display = new PrintWriter(System.out, true);

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

@@ -58 +58 @@
     */
     private TrafficModelViewPanel trafficPanel;
+    /*
+     * Name of propertes file for this run of CAD Server.
+    */
+    private String propertiesFile;
     
     /**
      * Constructor.
      */
-    public CADServerViewer()
+    public CADServerViewer(String propertiesFile)
     {
         super();
+        this.propertiesFile = propertiesFile;
         setTitle("CAD Server " + RevisionNumber.getAppVersion());
 
@@ -111 +116 @@
         simulationPanel = new SimulationStatusPanel();
         mediaPanel = new MediaStatusPanel();
-        configPanel = new ConfigStatusTab();
+        configPanel = new ConfigStatusTab(propertiesFile);
         trafficPanel = new TrafficModelViewPanel();
 

trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.form

@@ -18 +18 @@
   <SubComponents>
     <Component class="javax.swing.JComboBox" name="selectMenu">
-      <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="5">
-            <StringItem index="0" value="cad_simulator_config.properties"/>
-            <StringItem index="1" value="cad_simulator_media_config.properties"/>
-            <StringItem index="2" value="cad_simulator_paramics_config.properties"/>
-            <StringItem index="3" value="cad_simulator_smoketest_config.properties"/>
-            <StringItem index="4" value="traffic_model_config.properties"/>
-          </StringArray>
-        </Property>
-      </Properties>
       <AuxValues>
         <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>

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

@@ -7 +7 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
+import java.util.Properties;
 import java.util.Scanner;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.JComboBox;
 import javax.swing.JFrame;
@@ -16 +20 @@
 /**
  * ConfigStatusPanel displays the content of configuration files.
+ * A ComboBox allows the user to select from a list of current properties files.
  *
  * @author Drew Miller
@@ -22 +27 @@
 public class ConfigStatusTab extends javax.swing.JPanel
 {
-    /** Root config directory name */
-    private String configDir;
-    
+    /**
+     * Properties file for the CAD Server.
+     */
+    private Properties cadServerProperties;
+
     /**
      * Creates new form 
      */
-    public ConfigStatusTab()
+    public ConfigStatusTab(String propertiesFile)
     {
         initComponents();
-        if (System.getProperty("CONFIG_DIR") == null)
-        {
-            System.setProperty("CONFIG_DIR", "config");
-        }
-        configDir = System.getProperty("CONFIG_DIR");
-        setupComboBox();
+        createMenu(propertiesFile);
+        addMenuListener();
         setupTextView();
     }
+    /** Add the properties filenames to the combobox menu */
+    private void createMenu(String propertiesFile)
+    {
+        selectMenu.addItem(propertiesFile);
+        try {
+            cadServerProperties = new Properties();
+            cadServerProperties.load(new FileInputStream(propertiesFile));
+            // Add each item that's a properties file to the menu
+            for (String propname: cadServerProperties.stringPropertyNames())
+            {
+                String currVal = (String) cadServerProperties.get(propname);
+                if (currVal.endsWith(".properties"))
+                {
+                    selectMenu.addItem(currVal);
+                }
+            }
+        } catch (FileNotFoundException ex) {
+            Logger.getLogger(ConfigStatusTab.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (IOException ex) {
+            Logger.getLogger(ConfigStatusTab.class.getName()).log(Level.SEVERE, null, ex);
+        }        
+    }
 
+    /** Determine complete path to file, given the filename */
+    private Path getPathToFile(String fileName)
+    {
+        return FileSystems.getDefault().getPath(fileName);
+    }
+    /** Return the text from the given file */
     private String getFileContent(Path pathToFile) 
     {
@@ -54 +85 @@
             return "Error: config file not found.";
         }
-        
     }
-
-    private Path getPathToFile(String fileName)
-    {
-        Path p = FileSystems.getDefault().getPath(configDir, fileName);
-        return p;
-    }
-    /** Refresh the display using the given config file */
+    /** Refresh the display using the given properties file path */
     private void updateDisplay(Path pathToFileName)
     {
@@ -69 +93 @@
     }
 
-    /** Combo Box with names of config files for user to select */
-    private void setupComboBox()
+    /** Add menu listener to the Combo Box */
+    private void addMenuListener()
     {
         selectMenu.addActionListener(new ActionListener()
@@ -76 +100 @@
             public void actionPerformed(ActionEvent e)
             {
+                // Find which menu item was clicked
                 JComboBox src = (JComboBox) e.getSource();
-                Path p = getPathToFile(src.getSelectedItem().toString());
+                // Get the menu item string 
+                String menuItem = src.getSelectedItem().toString();
+                // Get the path to that file
+                Path p = getPathToFile(menuItem);
+                // Display the contents of that file
                 updateDisplay(p);
             }
-
         });
     }
@@ -89 +117 @@
         view.setLineWrap(true);
         view.setWrapStyleWord(true);
-        // Initialize with first config file in list
+        // Initially display the first config file in list
         Path path = getPathToFile(selectMenu.getItemAt(0));
         view.setText(getFileContent(path));
@@ -104 +132 @@
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setSize(1050, 450);
-        ConfigStatusTab pnl = new ConfigStatusTab();
+        ConfigStatusTab pnl = new ConfigStatusTab("config/cad_simulator_config.properties");
         frame.add(pnl);
         frame.setVisible(true);
@@ -115 +143 @@
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents()
-    {
+    private void initComponents() {
 
         selectMenu = new javax.swing.JComboBox<>();
@@ -123 +150 @@
 
         setLayout(new java.awt.BorderLayout());
-
-        selectMenu.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "cad_simulator_config.properties", "cad_simulator_media_config.properties", "cad_simulator_paramics_config.properties", "cad_simulator_smoketest_config.properties", "traffic_model_config.properties" }));
         add(selectMenu, java.awt.BorderLayout.PAGE_START);
 

trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java

@@ -83 +83 @@
         CADSimulatorFixture.pause(500);
 
-        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Something bad happened.");
+        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Sample error message.");
 
         // Load a script file

trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

@@ -189 +189 @@
                 + ". = Console Info Message.\n"
                 + "-- Error Messages --\n"
-                + "Someclass.Somemethod = Something bad happened.\n";
+                + "Someclass.Somemethod = Sample error message.\n";
         System.out.println("Error msg");
         cadSimLogger = Logger.getLogger("tmcsim.cadsimulator");
-        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Something bad happened.");
+        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Sample error message.");
         verify("Error message output incorrect: ", expected7);
         String expected6 =
@@ -205 +205 @@
                 + ". = Console Info Message.\n"
                 + "-- Error Messages --\n"
-                + "Someclass.Somemethod = Something bad happened.\n";
+                + "Someclass.Somemethod = Sample error message.\n";
         System.out.println("Paramics connect");
         app.theCoordinator.setParamicsStatus(CADEnums.PARAMICS_STATUS.CONNECTED);
@@ -222 +222 @@
                 + ". = Console Info Message.\n"
                 + "-- Error Messages --\n"
-                + "Someclass.Somemethod = Something bad happened.\n";
+                + "Someclass.Somemethod = Sample error message.\n";
         String expected9 =
                 "--- CAD Simulator ---\n"
@@ -234 +234 @@
                 + ". = Console Info Message.\n"
                 + "-- Error Messages --\n"
-                + "Someclass.Somemethod = Something bad happened.\n";
+                + "Someclass.Somemethod = Sample error message.\n";
         System.out.println("Sim status");
         // Load a script file - to put status at Ready

trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java

@@ -28 +28 @@
     {
         super.setUp();
-        console = new CADConsoleViewer();
+        console = new CADConsoleViewer("config/cad_simulator_config.properties");
         cadmodel = new CADSimulatorState();
         cadmodel.addObserver(console);
@@ -175 +175 @@
                 + "-- Info Messages --\n\n"
                 + "-- Error Messages --\n"
-                + "Someclass.Somemethod = Something bad happened.\n";
+                + "Someclass.Somemethod = Sample error message.\n";
         Logger cadSimLogger = Logger.getLogger("tmcsim.cadsimulator");
-        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Something bad happened.");
+        cadSimLogger.logp(Level.SEVERE, "Someclass", "Somemethod", "Sample error message.");
         verify("Error message output incorrect: ", expected7);
     }

trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java

@@ -30 +30 @@
     {
         super.setUp();
-        viewer = new CADServerViewer();
+        viewer = new CADServerViewer("config/cad_simulator_config.properties");
         cadwindow = new Window(viewer);
         model = new CADSimulatorState();