Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java =================================================================== --- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java (revision 449) +++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java (revision 455) @@ -189,8 +189,8 @@ + ". = 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,5 +205,5 @@ + ". = 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,5 +222,5 @@ + ". = 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,5 +234,5 @@ + ". = 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 Index: trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java =================================================================== --- trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java (revision 123) +++ trunk/test/tmcsim/cadsimulator/viewer/CADConsoleViewerTest.java (revision 455) @@ -28,5 +28,5 @@ { super.setUp(); - console = new CADConsoleViewer(); + console = new CADConsoleViewer("config/cad_simulator_config.properties"); cadmodel = new CADSimulatorState(); cadmodel.addObserver(console); @@ -175,7 +175,7 @@ + "-- 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); } Index: trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java =================================================================== --- trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java (revision 228) +++ trunk/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java (revision 455) @@ -30,5 +30,5 @@ { super.setUp(); - viewer = new CADServerViewer(); + viewer = new CADServerViewer("config/cad_simulator_config.properties"); cadwindow = new Window(viewer); model = new CADSimulatorState(); Index: trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java =================================================================== --- trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java (revision 123) +++ trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java (revision 455) @@ -83,5 +83,5 @@ 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 Index: trunk/src/tmcsim/application.properties =================================================================== --- trunk/src/tmcsim/application.properties (revision 448) +++ trunk/src/tmcsim/application.properties (revision 455) @@ -1,5 +1,5 @@ -#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 Index: trunk/src/tmcsim/cadsimulator/CADServer.java =================================================================== --- trunk/src/tmcsim/cadsimulator/CADServer.java (revision 448) +++ trunk/src/tmcsim/cadsimulator/CADServer.java (revision 455) @@ -3,4 +3,5 @@ import java.io.File; import java.io.FileInputStream; +import java.lang.reflect.Constructor; import java.rmi.Naming; import java.rmi.RemoteException; @@ -239,5 +240,6 @@ { Class uiClass = Class.forName(userInterfaceName); - theViewer = (CADViewer) uiClass.newInstance(); + Constructor cons = uiClass.getConstructor(String.class); + theViewer = (CADViewer) cons.newInstance(propertiesFile); } catch (Exception exc) { Index: trunk/src/tmcsim/cadsimulator/viewer/CADConsoleViewer.java =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/CADConsoleViewer.java (revision 123) +++ trunk/src/tmcsim/cadsimulator/viewer/CADConsoleViewer.java (revision 455) @@ -36,5 +36,5 @@ * Constructor. */ - public CADConsoleViewer() + public CADConsoleViewer(String propertiesFile) { display = new PrintWriter(System.out, true); Index: trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java (revision 365) +++ trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java (revision 455) @@ -58,11 +58,16 @@ */ 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,5 +116,5 @@ simulationPanel = new SimulationStatusPanel(); mediaPanel = new MediaStatusPanel(); - configPanel = new ConfigStatusTab(); + configPanel = new ConfigStatusTab(propertiesFile); trafficPanel = new TrafficModelViewPanel(); Index: trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.java =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.java (revision 231) +++ trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.java (revision 455) @@ -7,7 +7,11 @@ 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,4 +20,5 @@ /** * 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,22 +27,48 @@ 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,13 +85,6 @@ 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,6 +93,6 @@ } - /** 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,9 +100,13 @@ 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,5 +117,5 @@ 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,5 +132,5 @@ 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,6 +143,5 @@ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents - private void initComponents() - { + private void initComponents() { selectMenu = new javax.swing.JComboBox<>(); @@ -123,6 +150,4 @@ 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); Index: trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.form =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.form (revision 231) +++ trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.form (revision 455) @@ -18,15 +18,4 @@ - - - - - - - - - - -