Index: trunk/src/tmcsim/cadsimulator/viewer/TrafficModelViewPanel.java =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/TrafficModelViewPanel.java (revision 210) +++ trunk/src/tmcsim/cadsimulator/viewer/TrafficModelViewPanel.java (revision 230) @@ -89,5 +89,5 @@ btnClear = new javax.swing.JButton(); - lstEvents.setFont(new java.awt.Font("Noto Mono", 0, 12)); // NOI18N + lstEvents.setFont(new java.awt.Font("FreeMono", 0, 12)); // NOI18N lstEvents.setModel(new javax.swing.AbstractListModel() { @@ -136,5 +136,5 @@ ); - lstIncidents.setFont(new java.awt.Font("Noto Mono", 0, 15)); // NOI18N + lstIncidents.setFont(new java.awt.Font("FreeMono", 0, 15)); // NOI18N lstIncidents.setModel(new javax.swing.AbstractListModel() { Index: trunk/src/tmcsim/cadsimulator/viewer/TrafficModelViewPanel.form =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/TrafficModelViewPanel.form (revision 210) +++ trunk/src/tmcsim/cadsimulator/viewer/TrafficModelViewPanel.form (revision 230) @@ -85,5 +85,5 @@ - + @@ -155,5 +155,5 @@ - + Index: trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java (revision 210) +++ trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java (revision 230) @@ -52,5 +52,5 @@ * Panel to display configuration files. */ - private ConfigStatusPanel configPanel; + private ConfigStatusTab configPanel; /* * Panel to display Traffic Model Event Queue @@ -137,9 +137,7 @@ private void initComponents() { - - simulationPanel = new SimulationStatusPanel(); mediaPanel = new MediaStatusPanel(); - configPanel = new ConfigStatusPanel(); + configPanel = new ConfigStatusTab(); trafficPanel = new TrafficModelViewPanel(); Index: trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.java =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.java (revision 230) +++ trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.java (revision 230) @@ -0,0 +1,142 @@ + +package tmcsim.cadsimulator.viewer; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.nio.file.FileSystems; +import java.nio.file.Path; +import java.util.Scanner; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JPanel; + +/** + * ConfigStatusPanel displays the content of configuration files. + * + * @author Drew Miller + * @author jdalbey + */ +public class ConfigStatusTab extends javax.swing.JPanel +{ + /** Root config directory name */ + private String configDir; + + /** + * Creates new form + */ + public ConfigStatusTab() + { + initComponents(); + if (System.getProperty("CONFIG_DIR") == null) + { + System.setProperty("CONFIG_DIR", "config"); + } + configDir = System.getProperty("CONFIG_DIR"); + setupComboBox(); + setupTextView(); + } + + private String getFileContent(Path pathToFile) + { + FileInputStream fis = null; + try + { + //Read a file into a single string. + fis = new FileInputStream(pathToFile.toString()); + Scanner s = new Scanner(fis).useDelimiter("\\A"); + return s.next(); + } + catch (FileNotFoundException ex) + { + 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 */ + private void updateDisplay(Path pathToFileName) + { + view.setText(getFileContent(pathToFileName)); + view.setCaretPosition(view.getDocument().getLength()); + } + + /** Combo Box with names of config files for user to select */ + private void setupComboBox() + { + selectMenu.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + JComboBox src = (JComboBox) e.getSource(); + Path p = getPathToFile(src.getSelectedItem().toString()); + updateDisplay(p); + } + + }); + } + + private void setupTextView() + { + view.setEditable(false); + view.setLineWrap(true); + view.setWrapStyleWord(true); + // Initialize with first config file in list + Path path = getPathToFile(selectMenu.getItemAt(0)); + view.setText(getFileContent(path)); + } + + /** + * Local main for unit testing. + * + * @param args not used + */ + public static void main(String[] args) + { + JFrame frame = new JFrame("Config Status Panel Test"); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setSize(1050, 450); + ConfigStatusTab pnl = new ConfigStatusTab(); + frame.add(pnl); + frame.setVisible(true); + } + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() + { + + selectMenu = new javax.swing.JComboBox<>(); + jScrollPane1 = new javax.swing.JScrollPane(); + view = new javax.swing.JTextArea(); + + 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); + + view.setColumns(20); + view.setFont(new java.awt.Font("FreeMono", 0, 15)); // NOI18N + view.setRows(5); + jScrollPane1.setViewportView(view); + + add(jScrollPane1, java.awt.BorderLayout.CENTER); + }// //GEN-END:initComponents + + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JComboBox selectMenu; + private javax.swing.JTextArea view; + // End of variables declaration//GEN-END:variables +} Index: trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.form =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.form (revision 230) +++ trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusTab.form (revision 230) @@ -0,0 +1,64 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusPanel.java =================================================================== --- trunk/src/tmcsim/cadsimulator/viewer/ConfigStatusPanel.java (revision 36) +++ (revision ) @@ -1,101 +1,0 @@ -package tmcsim.cadsimulator.viewer; - -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.*; -import java.nio.file.FileSystems; -import java.nio.file.Path; - -import javax.swing.*; - - -/** - * ConfigStatusPanel is a GUI object used for displaying the current configuration files. - * - * @author Drew Miller - * @version - */ -@SuppressWarnings("serial") -public class ConfigStatusPanel extends JPanel { - - private String[] configFileNames = { - "cad_simulator_config.properties", - "cad_simulator_media_config.properties", - "cad_simulator_paramics_config.properties", - "cad_simulator_smoketest_config.properties" - }; - private JTextArea view; - /** - * Constructor. Initialize data and GUI components. - */ - public ConfigStatusPanel() { - initComponents(); - } - - private String getFileContent(Path pathToFile) throws IOException { - BufferedReader br = new BufferedReader(new FileReader(pathToFile.toString())); - String content = null; - String line = null; - while((line = br.readLine()) != null) { - content += line + "\n"; - } - return content; - } - - private Path getPathToFile(String fileName) { - Path p = FileSystems.getDefault().getPath("config", fileName); - return p; - } - - private void changeView(Path pathToFileName) { - try { - view.setText(getFileContent(pathToFileName)); - view.setCaretPosition(view.getDocument().getLength()); - } catch (IOException e) { - System.out.println("Error in setting text."); - } - } - private void setupComboBox(JPanel container) { - JComboBox selectMenu = new JComboBox(configFileNames); - selectMenu.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - JComboBox b = (JComboBox)e.getSource(); - System.out.println(b.getSelectedItem()); - Path p = getPathToFile(b.getSelectedItem().toString()); - changeView(p); - } - - }); - container.add(selectMenu); - } - - private void setupTextView(JPanel container) { - view = new JTextArea(15, 30); - view.setEditable(false); - view.setLineWrap(true); - view.setWrapStyleWord(true); - Path p = FileSystems.getDefault().getPath("config", configFileNames[0]); - try { - view.setText(getFileContent(p)); - } catch (IOException e) { - System.out.println("Error in setting text."); - } - container.add(view); - } - /** - * Initialize GUI components. - */ - private void initComponents() { - configTab = new JPanel(new FlowLayout(FlowLayout.CENTER)); - configTab.setPreferredSize(new Dimension(400, 400)); - setupComboBox(configTab); - setupTextView(configTab); - - add(configTab); - } - - - private JPanel configTab; - -}