Index: trunk/src/tmcsim/paramicscommunicator/gui/ParamicsCommunicatorGUI.java =================================================================== --- trunk/src/tmcsim/paramicscommunicator/gui/ParamicsCommunicatorGUI.java (revision 2) +++ trunk/src/tmcsim/paramicscommunicator/gui/ParamicsCommunicatorGUI.java (revision 6) @@ -11,90 +11,104 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; - import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JFrame; +import javax.swing.JMenuBar; +import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.JTextArea; - +import tmcsim.common.RevisionNumber; import tmcsim.paramicscommunicator.FileIOUpdate; import tmcsim.paramicscommunicator.FileRegUpdate; /** - * ParamicsCommunicatorGUI is the view class for the ParamicsCommunicator. - * The user interface shows a tab for each I/O reader or writer that has - * been registered with the ParamicsCommunicator. The tab shows the - * history of I/O reads and writes, and the unique information for the - * target file and I/O interval. - * + * ParamicsCommunicatorGUI is the view class for the ParamicsCommunicator. The + * user interface shows a tab for each I/O reader or writer that has been + * registered with the ParamicsCommunicator. The tab shows the history of I/O + * reads and writes, and the unique information for the target file and I/O + * interval. + * * @author Matthew Cechini * @version */ @SuppressWarnings("serial") -public class ParamicsCommunicatorGUI extends JFrame implements Observer { - - /** - * Logging handler that writes all received log records to the - * error text area. +public class ParamicsCommunicatorGUI extends JFrame implements Observer +{ + + /** + * Logging handler that writes all received log records to the error text + * area. + * * @author Matthew Cechini */ - protected class ParamicsLoggerHandler extends Handler { + protected class ParamicsLoggerHandler extends Handler + { DateFormat timeFormat = DateFormat.getTimeInstance(); - - public void close() throws SecurityException { - } - - public void flush() { - } - - public void publish(LogRecord record) { + + public void close() throws SecurityException + { + } + + public void flush() + { + } + + public void publish(LogRecord record) + { StringBuffer errorBuf = new StringBuffer(); - + errorBuf.append(timeFormat.format(new Date(record.getMillis()))); - errorBuf.append(" - " + record.getMessage() + "\n"); - - errorTA.setText(errorTA.getText() + errorBuf.toString()); - } - } - - /** Map of FileIOTableModel objects for each reader id. */ + errorBuf.append(" - " + record.getMessage() + "\n"); + + errorTA.setText(errorTA.getText() + errorBuf.toString()); + } + } + /** + * Map of FileIOTableModel objects for each reader id. + */ protected TreeMap readerTables; - - /** Map of FileIOTableModel objects for each writer id. */ + /** + * Map of FileIOTableModel objects for each writer id. + */ protected TreeMap writerTables; - - /** - * Constructor. Initialize local lists, set up the logging handler and + + /** + * Constructor. Initialize local lists, set up the logging handler and * initialize the GUI. */ - public ParamicsCommunicatorGUI() { + public ParamicsCommunicatorGUI() + { super("Paramics Communicator"); - + readerTables = new TreeMap(); writerTables = new TreeMap(); - + Logger.getLogger("tmcsim.paramicscommunicator").addHandler(new ParamicsLoggerHandler()); - + initializeGUI(); - } - - /** - * Observer update method. If the update object is a FileIOUpdate object, - * update the TableModel corresponding to the unique I/O id. If the - * update object is a FileRegUpdate object, add a new tab if the - * registration type is REGISTER, or update an existing tab if the - * registration type is UNREGISTER. - */ - public void update(Observable o, Object arg) { - - if(arg instanceof FileIOUpdate) { - - try { - FileIOUpdate update = (FileIOUpdate)arg; - - switch(update.ioType) { + } + + /** + * Observer update method. If the update object is a FileIOUpdate object, + * update the TableModel corresponding to the unique I/O id. If the update + * object is a FileRegUpdate object, add a new tab if the registration type + * is REGISTER, or update an existing tab if the registration type is + * UNREGISTER. + */ + public void update(Observable o, Object arg) + { + + if (arg instanceof FileIOUpdate) + { + + try + { + FileIOUpdate update = (FileIOUpdate) arg; + + switch (update.ioType) + { case READ: readerTables.get(update.ioID).addIOUpdate(update); @@ -104,22 +118,25 @@ break; } - } - catch (Exception e) { + } catch (Exception e) + { Logger.getLogger("tmcsim.paramicscommunicator.gui").logp( - Level.SEVERE, "ParamicsCommunicatorGUI", "update", + Level.SEVERE, "ParamicsCommunicatorGUI", "update", "Exception in receiving FileIOUpdate object.", e); } - } - else if(arg instanceof FileRegUpdate) { - try { - FileRegUpdate update = (FileRegUpdate)arg; - - switch(update.ioType) { + } else if (arg instanceof FileRegUpdate) + { + try + { + FileRegUpdate update = (FileRegUpdate) arg; + + switch (update.ioType) + { case READ: - switch(update.regType) { + switch (update.regType) + { case REGISTER: FileIOTableModel model = new FileIOTableModel(); readerTables.put(update.ioID, model); - + addTab(update, model); break; @@ -130,9 +147,10 @@ break; case WRITE: - switch(update.regType) { + switch (update.regType) + { case REGISTER: FileIOTableModel model = new FileIOTableModel(); writerTables.put(update.ioID, model); - + addTab(update, model); break; @@ -140,37 +158,53 @@ //unregister break; - } + } break; } - } - catch (Exception e) { + } catch (Exception e) + { Logger.getLogger("tmcsim.paramicscommunicator.gui").logp( - Level.SEVERE, "ParamicsCommunicatorGUI", "update", + Level.SEVERE, "ParamicsCommunicatorGUI", "update", "Exception in receiving FileRegUpdate object.", e); } - } - } - - private void initializeGUI() { - - /* Added by Nathaniel Lehrer */ - this.setJMenuBar(new javax.swing.JMenuBar() { - { - javax.swing.JMenu fileMenu = new javax.swing.JMenu("File"); - javax.swing.JMenuItem logItem = new javax.swing.JMenuItem("Show Log"); - - logItem.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - tmcsim.paramicslog.gui.ParamicsLogGUI.getInstance().display(); - } - }); - - fileMenu.add(logItem); - this.add(fileMenu); + } + } + + private void initializeGUI() + { + + JMenuBar menuBar = new JMenuBar(); + + javax.swing.JMenu fileMenu = new javax.swing.JMenu("File"); + javax.swing.JMenuItem logItem = new javax.swing.JMenuItem("Show Log"); + + logItem.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { + tmcsim.paramicslog.gui.ParamicsLogGUI.getInstance().display(); } }); - /* End Add by Nathaniel Lehrer */ - + + fileMenu.add(logItem); + menuBar.add(fileMenu); + + javax.swing.JMenu helpMenu = new javax.swing.JMenu("Help"); + javax.swing.JMenuItem aboutItem = new javax.swing.JMenuItem("About"); + + aboutItem.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { + String ver = RevisionNumber.getString(); + JOptionPane.showMessageDialog(rootPane, "Version: " + ver, "About", JOptionPane.INFORMATION_MESSAGE); + } + }); + + helpMenu.add(aboutItem); + menuBar.add(helpMenu); + + this.setJMenuBar(menuBar); + fileIOTabs = new JTabbedPane(); fileIOTabs.setAlignmentX(Box.CENTER_ALIGNMENT); @@ -180,10 +214,10 @@ fileIOTabs.setBorder(BorderFactory.createCompoundBorder( BorderFactory.createTitledBorder( - BorderFactory.createRaisedBevelBorder(), "Registered I/O"), - BorderFactory.createEmptyBorder(5,5,5,5))); - + BorderFactory.createRaisedBevelBorder(), "Registered I/O"), + BorderFactory.createEmptyBorder(5, 5, 5, 5))); + errorTA = new JTextArea(); errorTA.setLineWrap(true); - + errorPane = new JScrollPane(); errorPane.setViewportView(errorTA); @@ -191,15 +225,15 @@ errorPane.setBorder(BorderFactory.createCompoundBorder( BorderFactory.createTitledBorder( - BorderFactory.createRaisedBevelBorder(), "Errors"), - BorderFactory.createEmptyBorder(5,5,5,5))); - - + BorderFactory.createRaisedBevelBorder(), "Errors"), + BorderFactory.createEmptyBorder(5, 5, 5, 5))); + + Box guiBox = new Box(BoxLayout.Y_AXIS); guiBox.add(fileIOTabs); guiBox.add(Box.createVerticalStrut(10)); guiBox.add(errorPane); - + add(guiBox); - + setMinimumSize(new Dimension(420, 680)); setPreferredSize(new Dimension(420, 680)); @@ -208,16 +242,20 @@ setVisible(true); } - - /** - * Method creates a new tab for the new I/O object. The tab is labeled + + /** + * Method creates a new tab for the new I/O object. The tab is labeled * "Reader #" or "Writer #", where '#' is the I/O object's ID. + * * @param update Initial update object. - * @param model TableModel for reader/writer that will display I/O operations. - */ - private void addTab(FileRegUpdate update, FileIOTableModel model) { - + * @param model TableModel for reader/writer that will display I/O + * operations. + */ + private void addTab(FileRegUpdate update, FileIOTableModel model) + { + String tabName = null; - - switch(update.ioType) { + + switch (update.ioType) + { case READ: tabName = "Reader " + update.ioID; @@ -227,13 +265,9 @@ break; } - + fileIOTabs.add(tabName, new ParamicsIOInfoPanel(update, model)); } - private JTabbedPane fileIOTabs; - private JScrollPane errorPane; - private JTextArea errorTA; - }