Index: trunk/src/spikes/StringRenderer.java =================================================================== --- trunk/src/spikes/StringRenderer.java (revision 59) +++ trunk/src/spikes/StringRenderer.java (revision 59) @@ -0,0 +1,46 @@ +package spikes; + +import java.awt.Component; +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellRenderer; + +public class StringRenderer extends JLabel + implements TableCellRenderer +{ + public StringRenderer() + { + } + + public Component getTableCellRendererComponent( + JTable table, Object message, + boolean isSelected, boolean hasFocus, + int row, int column) + { + String msgText = (String) message; + setText(msgText); + setToolTipText(msgText.toUpperCase()); + return this; + } +} + +/** + * This is an example of a CellRenderer that tailors the way the output is + * displayed. + */ +class SimpleWordRenderer extends DefaultTableCellRenderer +{ + protected void setValue(Object value) + { + String word = (String) value; + String name = word.toString().toUpperCase(); + // Long words get a star added to them + if (word.length() > 9) + { + name = name + "*"; + } + setToolTipText(name); + setText(name); + } +} Index: trunk/src/spikes/TableDialogEditDemo.java =================================================================== --- trunk/src/spikes/TableDialogEditDemo.java (revision 59) +++ trunk/src/spikes/TableDialogEditDemo.java (revision 59) @@ -0,0 +1,198 @@ +package spikes; + +/* + * TableDialogEditDemo.java requires these files: + * ColorRenderer.java + * ColorEditor.java + */ +import java.awt.Color; +import java.awt.Dimension; +import java.awt.GridLayout; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.table.AbstractTableModel; + +/** + * This is like TableDemo, except that it substitutes a Favorite Color column + * for the Last Name column and specifies a custom cell renderer and editor for + * the color data. + */ +public class TableDialogEditDemo extends JPanel +{ + private boolean DEBUG = false; + + public TableDialogEditDemo() + { + super(new GridLayout(1, 0)); + + JTable table = new JTable(new MyTableModel()); + table.setPreferredScrollableViewportSize(new Dimension(500, 70)); + table.setFillsViewportHeight(true); + + //Create the scroll pane and add the table to it. + JScrollPane scrollPane = new JScrollPane(table); + + //Set up renderer and editor for the Favorite Color column. + table.setDefaultRenderer(Color.class, + new ColorRenderer(true)); + table.setDefaultRenderer(String.class, + //new StringRenderer()); + new SimpleWordRenderer()); + + //Add the scroll pane to this panel. + add(scrollPane); + } + + class MyTableModel extends AbstractTableModel + { + private String[] columnNames = + { + "First Name", + "Favorite Color", + "Sport", + "# of Years", + "Vegetarian" + }; + private Object[][] data = + { + { + "Mary", new Color(153, 0, 153), + "Snowboarding", new Integer(5), new Boolean(false) + }, + { + "Alison", new Color(51, 51, 153), + "Rowing", new Integer(3), new Boolean(true) + }, + { + "Kathy", new Color(51, 102, 51), + "Knitting", new Integer(2), new Boolean(false) + }, + { + "Sharon", Color.red, + "Speed reading", new Integer(20), new Boolean(true) + }, + { + "Philip", Color.pink, + "Pool", new Integer(10), new Boolean(false) + } + }; + + public int getColumnCount() + { + return columnNames.length; + } + + public int getRowCount() + { + return data.length; + } + + public String getColumnName(int col) + { + return columnNames[col]; + } + + public Object getValueAt(int row, int col) + { + return data[row][col]; + } + + /* + * JTable uses this method to determine the default renderer/ + * editor for each cell. If we didn't implement this method, + * then the last column would contain text ("true"/"false"), + * rather than a check box. + */ + public Class getColumnClass(int c) + { + return getValueAt(0, c).getClass(); + } + + public boolean isCellEditable(int row, int col) + { + //Note that the data/cell address is constant, + //no matter where the cell appears onscreen. + if (col < 1) + { + return false; + } + else + { + return true; + } + } + + public void setValueAt(Object value, int row, int col) + { + if (DEBUG) + { + System.out.println("Setting value at " + row + "," + col + + " to " + value + + " (an instance of " + + value.getClass() + ")"); + } + + data[row][col] = value; + fireTableCellUpdated(row, col); + + if (DEBUG) + { + System.out.println("New value of data:"); + printDebugData(); + } + } + + private void printDebugData() + { + int numRows = getRowCount(); + int numCols = getColumnCount(); + + for (int i = 0; i < numRows; i++) + { + System.out.print(" row " + i + ":"); + for (int j = 0; j < numCols; j++) + { + System.out.print(" " + data[i][j]); + } + System.out.println(); + } + System.out.println("--------------------------"); + } + } + + /** + * Create the GUI and show it. For thread safety, this method should be + * invoked from the event-dispatching thread. + */ + private static void createAndShowGUI() + { + //Create and set up the window. + JFrame frame = new JFrame("TableDialogEditDemo"); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + + //Create and set up the content pane. + JComponent newContentPane = new TableDialogEditDemo(); + newContentPane.setOpaque(true); //content panes must be opaque + frame.setContentPane(newContentPane); + + //Display the window. + frame.pack(); + frame.setVisible(true); + } + + public static void main(String[] args) + { + //Schedule a job for the event-dispatching thread: + //creating and showing this application's GUI. + javax.swing.SwingUtilities.invokeLater(new Runnable() + { + public void run() + { + createAndShowGUI(); + } + }); + } +} Index: trunk/src/spikes/ColorRenderer.java =================================================================== --- trunk/src/spikes/ColorRenderer.java (revision 59) +++ trunk/src/spikes/ColorRenderer.java (revision 59) @@ -0,0 +1,62 @@ +package spikes; + +/* + * ColorRenderer.java (compiles with releases 1.2, 1.3, and 1.4) is used by + * TableDialogEditDemo.java. + */ +import java.awt.Color; +import java.awt.Component; +import javax.swing.BorderFactory; +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.border.Border; +import javax.swing.table.TableCellRenderer; + +public class ColorRenderer extends JLabel + implements TableCellRenderer +{ + Border unselectedBorder = null; + Border selectedBorder = null; + boolean isBordered = true; + + public ColorRenderer(boolean isBordered) + { + this.isBordered = isBordered; + setOpaque(true); //MUST do this for background to show up. + } + + public Component getTableCellRendererComponent( + JTable table, Object color, + boolean isSelected, boolean hasFocus, + int row, int column) + { + Color newColor = (Color) color; + setBackground(newColor); + if (isBordered) + { + if (isSelected) + { + if (selectedBorder == null) + { + selectedBorder = BorderFactory.createMatteBorder(2, 5, 2, 5, + table.getSelectionBackground()); + } + setBorder(selectedBorder); + } + else + { + if (unselectedBorder == null) + { + unselectedBorder = BorderFactory.createMatteBorder(2, 5, 2, 5, + table.getBackground()); + } + setBorder(unselectedBorder); + } + } + + setToolTipText("RGB value: " + newColor.getRed() + ", " + + newColor.getGreen() + ", " + + newColor.getBlue()); + return this; + } +} Index: trunk/src/spikes/StdOutDemo.java =================================================================== --- trunk/src/spikes/StdOutDemo.java (revision 59) +++ trunk/src/spikes/StdOutDemo.java (revision 59) @@ -0,0 +1,38 @@ +package spikes; + +import java.io.PrintWriter; +import java.io.Writer; + +/** + * + * @author jdalbey + */ +public class StdOutDemo +{ + + private PrintWriter display; + + /** + * Constructor. + */ + public StdOutDemo() + { + display = new PrintWriter(System.out, true); + } + + public void setWriter(Writer writer) + { + display = new PrintWriter(writer, true); + } + + public void setVisible(boolean state) + { + display.print("--- Hello World ---\n"); + display.println("Time to print to System.out."); + } + + public static void main(String[] args) + { + (new StdOutDemo()).setVisible(true); + } +} Index: trunk/src/tmcsim/application.properties =================================================================== --- trunk/src/tmcsim/application.properties (revision 57) +++ trunk/src/tmcsim/application.properties (revision 59) @@ -1,5 +1,5 @@ -#Tue, 14 Mar 2017 20:23:50 -0700 +#Wed, 15 Mar 2017 11:18:58 -0700 -Application.revision=56 +Application.revision=58 -Application.buildnumber=32 +Application.buildnumber=33 Index: trunk/src/tmcsim/client/cadclientgui/screens/IncidentEditor.java =================================================================== --- trunk/src/tmcsim/client/cadclientgui/screens/IncidentEditor.java (revision 3) +++ trunk/src/tmcsim/client/cadclientgui/screens/IncidentEditor.java (revision 59) @@ -1,6 +1,2 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package tmcsim.client.cadclientgui.screens; @@ -17,5 +13,4 @@ import java.util.Calendar; import java.util.Date; - import javax.swing.BorderFactory; import javax.swing.DefaultListModel; @@ -30,24 +25,28 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; - +import tmcsim.client.cadclientgui.enums.CADDataEnums.TABLE; import tmcsim.client.cadclientgui.enums.TableHeaders; -import tmcsim.client.cadclientgui.enums.CADDataEnums.TABLE; /** - * This class contains the view and controller for the IncidentEditor screen. The view is built using a GUI builder plug-in, and the controller - * uses listeners to control how the view and data act. + * This class contains the view and controller for the IncidentEditor screen. + * The view is built using a GUI builder plug-in, and the controller uses + * listeners to control how the view and data act. + * * @author Stuart */ -public class IncidentEditor extends javax.swing.JFrame { - - private final String[] monthNames = { "January", "February", - "March", "April", "May", "June", "July", "August", "September", - "October", "November", "December"}; - - private final String[] dayNames = { "Sun", "Mon", "Tue", "Wed", - "Thu", "Fri", "Sat"}; - +public class IncidentEditor extends javax.swing.JFrame +{ + private final String[] monthNames = + { + "January", "February", + "March", "April", "May", "June", "July", "August", "September", + "October", "November", "December" + }; + private final String[] dayNames = + { + "Sun", "Mon", "Tue", "Wed", + "Thu", "Fri", "Sat" + }; private DefaultTableModel blankTable; - private JTable calendarTable; private int todayRow; @@ -57,5 +56,6 @@ * Creates new form IncidentEditor */ - public IncidentEditor() { + public IncidentEditor() + { declareComponents(); initControllers(); @@ -71,5 +71,6 @@ // //GEN-BEGIN:initComponents - private void declareComponents() { + private void declareComponents() + { incidentLogScroll = new javax.swing.JScrollPane(); @@ -93,44 +94,58 @@ toCalendar = new javax.swing.JPanel(); } - - public MouseListener newMouseListener(){ - return new MouseListener() { - public void mouseClicked(MouseEvent e) { + + public MouseListener newMouseListener() + { + return new MouseListener() + { + public void mouseClicked(MouseEvent e) + { viewButton.setEnabled(true); } - public void mouseEntered(MouseEvent e) { - } - - public void mouseExited(MouseEvent e) { - } - - public void mousePressed(MouseEvent e) { - } - - public void mouseReleased(MouseEvent e) { - } - }; - } - - public ActionListener newSearchActionListener(){ - return new ActionListener() { - public void actionPerformed(ActionEvent e) { + public void mouseEntered(MouseEvent e) + { + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + } + + public void mouseReleased(MouseEvent e) + { + } + }; + } + + public ActionListener newSearchActionListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent e) + { ScreenManager.openSearch(); } - - }; - } - - public ActionListener newViewActionListener(){ - return new ActionListener() { - public void actionPerformed(ActionEvent e) { + }; + } + + public ActionListener newViewActionListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent e) + { String masterInc = (String) incidentLogTable.getValueAt( incidentLogTable.getSelectedRow(), 5); int incidentId = 0; - try { + try + { incidentId = ScreenManager.theCoordinator .getIncidentId(masterInc); - } catch (RemoteException e1) { + } catch (RemoteException e1) + { e1.printStackTrace(); } @@ -139,25 +154,32 @@ }; } - - public ActionListener newRefreshActionListener(){ - return new ActionListener() { - public void actionPerformed(ActionEvent e) { + + public ActionListener newRefreshActionListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent e) + { refreshInformation(); } }; } - - public ActionListener newExitActionListener(){ - return new ActionListener() { - public void actionPerformed(ActionEvent arg0) { + + public ActionListener newExitActionListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { close(); } }; } - - private void initControllers() { - + + private void initControllers() + { + incidentLogTable.addMouseListener(newMouseListener()); - + searchButton.addActionListener(newSearchActionListener()); viewButton.addActionListener(newViewActionListener()); @@ -165,6 +187,7 @@ exitButton.addActionListener(newExitActionListener()); } - - private void initLayout() { + + private void initLayout() + { blankTable = new DefaultTableModel(); blankTable.setColumnIdentifiers(TableHeaders.INCIDENT_EDITOR_HEADERS); @@ -195,5 +218,8 @@ currentDatabaseCombo.setModel(new javax.swing.DefaultComboBoxModel( - new String[] { "System" })); + new String[] + { + "System" + })); currentDatabaseCombo.setEnabled(false); @@ -202,5 +228,5 @@ fromCalendar = createCalendar(); toCalendar = createCalendar(); - + reopenButton.setText("ReOpen"); reopenButton.setEnabled(false); @@ -211,5 +237,5 @@ searchButton.setText("Search"); - + printButton.setText("Print"); printButton.setEnabled(false); @@ -217,95 +243,94 @@ viewButton.setText("View"); viewButton.setEnabled(false); - + refreshButton.setText("Refresh"); exitButton.setText("Exit"); - + fromLabel.setText("From..."); toLabel.setText("To..."); - + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(incidentLogScroll) - .addGroup(layout.createSequentialGroup() + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(incidentLogScroll) + .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(agencyTypeLabel) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 200, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createSequentialGroup() - .addGap(10, 10, 10) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(currentDatabaseLabel) - .addComponent(currentDatabaseCombo, javax.swing.GroupLayout.PREFERRED_SIZE, 150, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addComponent(searchLimitLabel)) + .addComponent(agencyTypeLabel) + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 200, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createSequentialGroup() + .addGap(10, 10, 10) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(currentDatabaseLabel) + .addComponent(currentDatabaseCombo, javax.swing.GroupLayout.PREFERRED_SIZE, 150, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(searchLimitLabel)) .addGap(32, 32, 32) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(fromLabel) - .addComponent(fromCalendar, 200, 200, 200)) + .addComponent(fromLabel) + .addComponent(fromCalendar, 200, 200, 200)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 45, Short.MAX_VALUE) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(toLabel) - .addComponent(toCalendar, 200, 200, 200)) + .addComponent(toLabel) + .addComponent(toCalendar, 200, 200, 200)) .addGap(25, 25, 25) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(reopenButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(duplicateCellButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(searchButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(printButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(viewButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(refreshButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(exitButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) - ); + .addComponent(reopenButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(duplicateCellButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(searchButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(printButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(viewButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(refreshButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(exitButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() .addComponent(incidentLogScroll, javax.swing.GroupLayout.PREFERRED_SIZE, 300, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(agencyTypeLabel) - .addComponent(reopenButton) - .addComponent(fromLabel) - .addComponent(toLabel)) + .addComponent(agencyTypeLabel) + .addComponent(reopenButton) + .addComponent(fromLabel) + .addComponent(toLabel)) .addGap(2, 2, 2) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(currentDatabaseLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(currentDatabaseCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(searchLimitLabel)) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(fromCalendar, 150, 150, 150) - .addComponent(toCalendar, 150, 150, 150))) - .addGroup(layout.createSequentialGroup() - .addComponent(duplicateCellButton) - .addGap(2, 2, 2) - .addComponent(searchButton) - .addGap(2, 2, 2) - .addComponent(printButton) - .addGap(2, 2, 2) - .addComponent(viewButton) - .addGap(2, 2, 2) - .addComponent(refreshButton) - .addGap(2, 2, 2) - .addComponent(exitButton))) - .addGap(0, 41, Short.MAX_VALUE)) - ); + .addGroup(layout.createSequentialGroup() + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 90, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(currentDatabaseLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(currentDatabaseCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(searchLimitLabel)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(fromCalendar, 150, 150, 150) + .addComponent(toCalendar, 150, 150, 150))) + .addGroup(layout.createSequentialGroup() + .addComponent(duplicateCellButton) + .addGap(2, 2, 2) + .addComponent(searchButton) + .addGap(2, 2, 2) + .addComponent(printButton) + .addGap(2, 2, 2) + .addComponent(viewButton) + .addGap(2, 2, 2) + .addComponent(refreshButton) + .addGap(2, 2, 2) + .addComponent(exitButton))) + .addGap(0, 41, Short.MAX_VALUE))); pack(); }// //GEN-END:initComponents - public JPanel createCalendar(){ - + public JPanel createCalendar() + { + JPanel calendarPanel = new JPanel(); Calendar now = Calendar.getInstance(); calendarPanel.setBorder(new LineBorder(new Color(0, 0, 0))); calendarPanel.setLayout(null); - + JLabel monthLabel = new JLabel("New label"); monthLabel.setBounds(0, 0, 140, 20); @@ -314,5 +339,5 @@ monthLabel.setText(monthNames[now.get(Calendar.MONTH)]); calendarPanel.add(monthLabel); - + JLabel yearLabel = new JLabel("New label"); yearLabel.setHorizontalAlignment(SwingConstants.CENTER); @@ -321,9 +346,9 @@ yearLabel.setText(Integer.toString(now.get(Calendar.YEAR))); calendarPanel.add(yearLabel); - + Date date = new Date(); DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy"); String dateString = dateFormat.format(date); - + JLabel dateLabel1 = new JLabel("New label"); dateLabel1.setBounds(0, 130, 60, 20); @@ -332,5 +357,5 @@ dateLabel1.setHorizontalAlignment(JLabel.CENTER); calendarPanel.add(dateLabel1); - + JLabel dateLabel2 = new JLabel("New label"); dateLabel2.setBounds(140, 130, 60, 20); @@ -339,5 +364,5 @@ dateLabel2.setHorizontalAlignment(JLabel.CENTER); calendarPanel.add(dateLabel2); - + JScrollBar scrollBar = new JScrollBar(); scrollBar.setOrientation(JScrollBar.HORIZONTAL); @@ -346,17 +371,21 @@ scrollBar.setEnabled(false); calendarPanel.add(scrollBar); - - calendarTable = new JTable(){ + + calendarTable = new JTable() + { /* * Custom renderer to set different background/foreground colors * @see javax.swing.JTable#prepareRenderer(javax.swing.table.TableCellRenderer, int, int) */ - public Component prepareRenderer(TableCellRenderer renderer, int row, int column){ + public Component prepareRenderer(TableCellRenderer renderer, int row, int column) + { Component comp = super.prepareRenderer(renderer, row, column); - if(todayRow == row && todayCol == column){ + if (todayRow == row && todayCol == column) + { comp.setBackground(Color.BLUE); comp.setForeground(Color.WHITE); } - else{ + else + { comp.setBackground(new Color(235, 235, 235)); comp.setForeground(Color.BLACK); @@ -368,5 +397,6 @@ DefaultTableCellRenderer centerRenderer = new DefaultTableCellRenderer(); centerRenderer.setHorizontalAlignment(JLabel.CENTER); - for(int i = 0; i < dayNames.length; i++){ + for (int i = 0; i < dayNames.length; i++) + { calendarTable.getColumnModel().getColumn(i).setCellRenderer(centerRenderer); } @@ -374,24 +404,47 @@ calendarTable.setBounds(0, 20, 200, 110); calendarPanel.add(calendarTable); - + return calendarPanel; } - - protected DefaultTableModel createDaysModel() { - - String[][] emptyModel = {{"", "", "", "", "", "", ""}, - {"", "", "", "", "", "", ""}, - {"", "", "", "", "", "", ""}, - {"", "", "", "", "", "", ""}, - {"", "", "", "", "", "", ""}, - {"", "", "", "", "", "", ""}, - {"", "", "", "", "", "", ""}, - {"", "", "", "", "", "", ""}}; - - String[] emptyHeader = {"", "", "", "", "", "", ""}; + + protected DefaultTableModel createDaysModel() + { + + String[][] emptyModel = + { + { + "", "", "", "", "", "", "" + }, + { + "", "", "", "", "", "", "" + }, + { + "", "", "", "", "", "", "" + }, + { + "", "", "", "", "", "", "" + }, + { + "", "", "", "", "", "", "" + }, + { + "", "", "", "", "", "", "" + }, + { + "", "", "", "", "", "", "" + }, + { + "", "", "", "", "", "", "" + } + }; + + String[] emptyHeader = + { + "", "", "", "", "", "", "" + }; DefaultTableModel calendarModel = new DefaultTableModel(emptyModel, emptyHeader); int row = 0; int col = 0; - + Calendar today = Calendar.getInstance(); int tMonth = today.get(Calendar.MONTH); @@ -411,5 +464,6 @@ maximum.add(Calendar.MONTH, +1); - for (int i = 0; i < dayNames.length; i++) { + for (int i = 0; i < dayNames.length; i++) + { calendarModel.setValueAt(dayNames[i], row, col); col++; @@ -418,20 +472,24 @@ row = 1; - while (iterator.getTimeInMillis() < maximum.getTimeInMillis()) { + while (iterator.getTimeInMillis() < maximum.getTimeInMillis()) + { int lMonth = iterator.get(Calendar.MONTH); int lYear = iterator.get(Calendar.YEAR); - if ((lMonth == tMonth) && (lYear == tYear)) { + if ((lMonth == tMonth) && (lYear == tYear)) + { int lDay = iterator.get(Calendar.DAY_OF_MONTH); calendarModel.setValueAt(Integer.toString(lDay), row, col); - if ((tMonth == lMonth) && (tYear == lYear) && (tDay == lDay)) { + if ((tMonth == lMonth) && (tYear == lYear) && (tDay == lDay)) + { todayRow = row; todayCol = col; } - } + } iterator.add(Calendar.DAY_OF_YEAR, +1); - + col++; - if(col >= calendarModel.getColumnCount()){ + if (col >= calendarModel.getColumnCount()) + { row++; col = 0; @@ -439,13 +497,16 @@ } - + return calendarModel; } - - public void refreshInformation() { - try { + + public void refreshInformation() + { + try + { incidentLogTable.setModel(ScreenManager.theCoordinator .getCadDataTable(TABLE.INCIDENT_EDITOR)); - } catch (RemoteException e) { + } catch (RemoteException e) + { e.printStackTrace(); } @@ -455,5 +516,6 @@ * Makes screen visible. */ - public void open() { + public void open() + { incidentLogTable.setModel(blankTable); viewButton.setEnabled(false); @@ -464,8 +526,8 @@ * Hides screen. */ - public void close() { + public void close() + { setVisible(false); } - // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JLabel agencyTypeLabel; Index: trunk/src/tmcsim/client/cadclientgui/screens/Login.java =================================================================== --- trunk/src/tmcsim/client/cadclientgui/screens/Login.java (revision 3) +++ trunk/src/tmcsim/client/cadclientgui/screens/Login.java (revision 59) @@ -2,9 +2,9 @@ import java.awt.Color; +import static java.awt.Component.LEFT_ALIGNMENT; import java.awt.Dimension; import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - import javax.swing.Box; import javax.swing.BoxLayout; @@ -16,27 +16,41 @@ import javax.swing.SwingConstants; - /** - * This class contains the view and controller for the Login screen. The view was not built using a GUI builder plug-in - * (but may want to consider doing so in the future), and the controller uses listeners to control how the view and data act. - * + * This class contains the view and controller for the Login screen. The view + * was not built using a GUI builder plug-in (but may want to consider doing so + * in the future), and the controller uses listeners to control how the view and + * data act. + * * @author Vincent */ - -public class Login extends JFrame { - +public class Login extends JFrame +{ private Box login; private JTextField userNameField; private JTextField passwordField; - - public Login() { + public static String kNamePrompt = "Enter your name"; + + public Login() + { initView(); } - - private ActionListener newEnterActionListener(){ - return new ActionListener() { - public void actionPerformed(ActionEvent e) { + + private ActionListener newEnterActionListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent e) + { setVisible(false); - ScreenManager.setUserName(userNameField.getText()); + // Check if user provided a username JD + String userEntry = userNameField.getText(); + if (userEntry.equals(kNamePrompt)) + { + ScreenManager.setUserName("Anonymous Trainee"); + } + else + { + ScreenManager.setUserName(userEntry); + } ScreenManager.openCADMenu(); ScreenManager.openAssignedIncidents(); @@ -44,5 +58,6 @@ ScreenManager.openPendingIncidents(); ScreenManager.openPowerlineUI(); - if (!passwordField.getText().equals("Dispatcher")) { + if (!passwordField.getText().equals("Dispatcher")) + { ScreenManager.setDispatcherAuthority(false); } @@ -50,14 +65,18 @@ }; } - - private ActionListener newExitActionListener(){ - return new ActionListener() { - public void actionPerformed(ActionEvent e) { + + private ActionListener newExitActionListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent e) + { System.exit(0); } }; } - - private void initView(){ + + private void initView() + { login = new Box(BoxLayout.Y_AXIS); login.setAlignmentX(LEFT_ALIGNMENT); @@ -78,5 +97,18 @@ JLabel title = new JLabel(); - title.setText("Inform CAD 5.3 Patch 5"); + // Check if we are running from a jar to put message from manifest into title + Package clientpkg = Login.class.getPackage(); + String builddate = clientpkg.getImplementationVersion(); + String version = ""; + if (builddate != null) + { + version = " (build " + builddate + ")"; + } + else // We're running from a dev environment + { + version = " 00-00-00 00:00"; + } + + title.setText("Inform CAD 5.3 Patch 5 "); title.setHorizontalAlignment(SwingConstants.CENTER); title.setFont(new Font("Arial", Font.PLAIN, 22)); @@ -87,4 +119,9 @@ blueBackground.add(title); + JLabel builddateLabel = new JLabel(version); + builddateLabel.setForeground(Color.WHITE); + builddateLabel.setHorizontalAlignment(SwingConstants.CENTER); + blueBackground.add(builddateLabel); + Box leftBox = new Box(BoxLayout.Y_AXIS); leftBox.setMaximumSize(new Dimension(350, 50)); @@ -95,5 +132,5 @@ JLabel userNameLabel = new JLabel("User name "); userNameLabel.setForeground(Color.WHITE); - userNameField = new JTextField("Enter your name"); + userNameField = new JTextField(kNamePrompt); Box userNameBox = new Box(BoxLayout.X_AXIS); userNameBox.setAlignmentX(LEFT_ALIGNMENT); @@ -105,5 +142,5 @@ JLabel passwordLabel = new JLabel("Password "); passwordLabel.setForeground(Color.WHITE); - passwordField = new JTextField("Does not matter"); + passwordField = new JTextField("Not required"); Box passwordBox = new Box(BoxLayout.X_AXIS); passwordBox.setAlignmentX(LEFT_ALIGNMENT); Index: trunk/src/tmcsim/client/cadclientgui/screens/ScreenManager.java =================================================================== --- trunk/src/tmcsim/client/cadclientgui/screens/ScreenManager.java (revision 3) +++ trunk/src/tmcsim/client/cadclientgui/screens/ScreenManager.java (revision 59) @@ -1,13 +1,3 @@ package tmcsim.client.cadclientgui.screens; - -import javax.swing.InputMap; -import javax.swing.JComponent; -import javax.swing.Timer; -import javax.swing.table.DefaultTableModel; - -import tmcsim.cadsimulator.Coordinator; -import tmcsim.client.cadclientgui.data.CADData; -import tmcsim.client.cadclientgui.data.Unit; -import tmcsim.interfaces.CoordinatorInterface; import java.awt.KeyEventDispatcher; @@ -19,18 +9,20 @@ import java.awt.event.WindowEvent; import java.awt.event.WindowListener; -import java.rmi.RemoteException; -import java.util.Vector; +import java.util.HashMap; +import javax.swing.Timer; +import tmcsim.interfaces.CoordinatorInterface; /** - * This class contains a reference to every single view-able component as well as a reference to the coordinator(which serves as the database). - * All commands to access data or manipulate a screen outside of the individual screen should be done through this ScreenManager. - * + * This class contains a reference to every single view-able component as well + * as a reference to the coordinator(which serves as the database). All commands + * to access data or manipulate a screen outside of the individual screen should + * be done through this ScreenManager. + * * @author Stuart */ - -public class ScreenManager { - +public class ScreenManager +{ private final static int ONE_SECOND = 1000; - + private final static int FIVE_SECONDS = 5000; private static ActivityLogViewer activityLogViewer; private static AssignedIncidents assignedIncidents; @@ -41,5 +33,5 @@ private static IncidentInfo incidentInfo; //private static IncidentSupplementPersonForm incidentSupplementPersonForm; - private static IncidentViewer incidentViewer; + private static HashMap incidentViewMap = new HashMap(); //JD private static Login login; private static PendingIncidents pendingIncidents; @@ -54,12 +46,14 @@ private static UnitStatus unitStatus; //private static VehicleInformationEntry vehicleInformationEntry; - //Reference to the Coordinator to use RMI methods protected static CoordinatorInterface theCoordinator; - - public ScreenManager(CoordinatorInterface theCoor){ + + private String username; // The login name entered by the trainee + + public ScreenManager(CoordinatorInterface theCoor) + { theCoordinator = theCoor; activityLogViewer = new ActivityLogViewer(); - + assignedIncidents = new AssignedIncidents(); assignedIncidents.addWindowListener(createWindowListener()); @@ -67,23 +61,22 @@ //boloEntry = new BOLOEntry(); //boloEntry.addWindowListener(createWindowListener()); - + cadMenu = new CADMenu(); cadMenu.addWindowListener(createWindowListener()); - + cardfile = new Cardfile(); cardfile.addWindowListener(createWindowListener()); - + incidentEditor = new IncidentEditor(); incidentEditor.addWindowListener(createWindowListener()); - + incidentInfo = new IncidentInfo(); incidentInfo.addWindowListener(createWindowListener()); - + //incidentSupplementPersonForm = new IncidentSupplementPersonForm(); //incidentSupplementPersonForm.addWindowListener(createWindowListener()); - - incidentViewer = new IncidentViewer(); - incidentViewer.addWindowListener(createWindowListener()); - + + incidentViewMap = new HashMap(); //JD + pendingIncidents = new PendingIncidents(); pendingIncidents.addWindowListener(createWindowListener()); @@ -91,59 +84,68 @@ powerlineUI1 = new PowerlineUI(false, 1); powerlineUI1.addWindowListener(createWindowListener()); - + powerlineUI2 = new PowerlineUI(false, 2); powerlineUI2.addWindowListener(createWindowListener()); - + powerlineUI3 = new PowerlineUI(false, 3); powerlineUI3.addWindowListener(createWindowListener()); - + powerlineUI4 = new PowerlineUI(false, 4); powerlineUI4.addWindowListener(createWindowListener()); - + powerlineUI5 = new PowerlineUI(false, 5); powerlineUI5.addWindowListener(createWindowListener()); - + //rotationServiceRequest = new RotationServiceRequest(); //rotationServiceRequest.addWindowListener(createWindowListener()); - + search = new Search(); search.addWindowListener(createWindowListener()); unitStatus = new UnitStatus(); unitStatus.addWindowListener(createWindowListener()); - + //vehicleInformationEntry = new VehicleInformationEntry(); //vehicleInformationEntry.addWindowListener(createWindowListener()); - + KeyboardFocusManager.getCurrentKeyboardFocusManager() - .addKeyEventDispatcher(new KeyEventDispatcher(){ - public boolean dispatchKeyEvent(KeyEvent e) { - if(e.getKeyCode() == KeyEvent.VK_F2 && e.getID() == KeyEvent.KEY_PRESSED - && e.getModifiers() == InputEvent.SHIFT_MASK){ + .addKeyEventDispatcher(new KeyEventDispatcher() + { + public boolean dispatchKeyEvent(KeyEvent e) + { + if (e.getKeyCode() == KeyEvent.VK_F2 && e.getID() == KeyEvent.KEY_PRESSED + && e.getModifiers() == InputEvent.SHIFT_MASK) + { openPendingIncidents(); return true; } - if(e.getKeyCode() == KeyEvent.VK_F3 && e.getID() == KeyEvent.KEY_PRESSED - && e.getModifiers() == InputEvent.SHIFT_MASK){ + if (e.getKeyCode() == KeyEvent.VK_F3 && e.getID() == KeyEvent.KEY_PRESSED + && e.getModifiers() == InputEvent.SHIFT_MASK) + { openAssignedIncidents(); return true; } - if(e.getKeyCode() == KeyEvent.VK_F4 && e.getID() == KeyEvent.KEY_PRESSED - && e.getModifiers() == InputEvent.SHIFT_MASK){ + if (e.getKeyCode() == KeyEvent.VK_F4 && e.getID() == KeyEvent.KEY_PRESSED + && e.getModifiers() == InputEvent.SHIFT_MASK) + { openUnitStatus(); return true; } - if(e.getKeyCode() == KeyEvent.VK_F4 && e.getID() == KeyEvent.KEY_PRESSED){ + if (e.getKeyCode() == KeyEvent.VK_F4 && e.getID() == KeyEvent.KEY_PRESSED) + { cyclePowerlineUI(); return true; } - if(e.getKeyCode() == KeyEvent.VK_F5 && e.getID() == KeyEvent.KEY_PRESSED){ + if (e.getKeyCode() == KeyEvent.VK_F5 && e.getID() == KeyEvent.KEY_PRESSED) + { openPowerlineUI(); return true; } - if(e.getKeyCode() == KeyEvent.VK_F9 && e.getID() == KeyEvent.KEY_PRESSED){ + if (e.getKeyCode() == KeyEvent.VK_F9 && e.getID() == KeyEvent.KEY_PRESSED) + { openCardfile(); return true; } - if(e.getKeyCode() == KeyEvent.VK_F10 && e.getID() == KeyEvent.KEY_PRESSED){ + if (e.getKeyCode() == KeyEvent.VK_F10 && e.getID() == KeyEvent.KEY_PRESSED) + { putRCARDinPL(); return true; @@ -152,75 +154,181 @@ } }); - - handleUpdateTimes(); - } - - public WindowListener createWindowListener(){ - return new WindowListener(){ - public void windowActivated(WindowEvent e) { + + launchUpdateTimers(); + } + + public WindowListener createWindowListener() + { + return new WindowListener() + { + public void windowActivated(WindowEvent e) + { closeDropDownMenus(); } - public void windowClosed(WindowEvent e) { + + public void windowClosed(WindowEvent e) + { closeDropDownMenus(); } - public void windowClosing(WindowEvent e) { + + public void windowClosing(WindowEvent e) + { closeDropDownMenus(); } - public void windowDeactivated(WindowEvent e) {} - public void windowDeiconified(WindowEvent e) {} - public void windowIconified(WindowEvent e) { + + public void windowDeactivated(WindowEvent e) + { + } + + public void windowDeiconified(WindowEvent e) + { + } + + public void windowIconified(WindowEvent e) + { closeDropDownMenus(); } - public void windowOpened(WindowEvent e) {} + + public void windowOpened(WindowEvent e) + { + } }; } - - public static void openActivityLogViewer(){ activityLogViewer.open(); } - public static void closeActivityLogViewer(){ activityLogViewer.close(); } - - public static void openAssignedIncidents(){ assignedIncidents.open(); } - public static void closeAssignedIncidents(){ assignedIncidents.close(); } - + + public static void openActivityLogViewer() + { + activityLogViewer.open(); + } + + public static void closeActivityLogViewer() + { + activityLogViewer.close(); + } + + public static void openAssignedIncidents() + { + assignedIncidents.open(); + } + + public static void closeAssignedIncidents() + { + assignedIncidents.close(); + } + //public static void openBOLOEntry(){ boloEntry.open(); } //public static void closeBOLOEntry(){ boloEntry.close(); } - - public static void openCADMenu(){ cadMenu.open(); } - public static void closeCADMenu(){ cadMenu.close(); } - - public static void openCardfile(){ cardfile.open(); } - public static void closeCardfile(){ cardfile.close(); } - - public static void openIncidentEditor(){ incidentEditor.open(); } - public static void closeIncidentEditor(){ incidentEditor.close(); } - public static void refreshIncidentEditor(){ incidentEditor.refreshInformation(); } - - public static void openIncidentInfo(int incidentId){ incidentInfo.open(incidentId); } - public static void closeIncidentInfo(){ incidentInfo.close(); } - + public static void openCADMenu() + { + cadMenu.open(); + } + + public static void closeCADMenu() + { + cadMenu.close(); + } + + public static void openCardfile() + { + cardfile.open(); + } + + public static void closeCardfile() + { + cardfile.close(); + } + + public static void openIncidentEditor() + { + incidentEditor.open(); + } + + public static void closeIncidentEditor() + { + incidentEditor.close(); + } + + public static void refreshIncidentEditor() + { + incidentEditor.refreshInformation(); + } + + public static void openIncidentInfo(int incidentId) + { + incidentInfo.open(incidentId); + } + + public static void closeIncidentInfo() + { + incidentInfo.close(); + } + //public static void openIncidentSupplementPersonForm(){ incidentSupplementPersonForm.open(); } //public static void closeIncidentSupplementPersonForm(){ incidentSupplementPersonForm.close(); } - - public static void openIncidentViewer(int incidentId){ incidentViewer.open(incidentId); } - public static void closeIncidentViewer(){ incidentViewer.close(); } - - public static void openPendingIncidents(){ pendingIncidents.open(); } - public static void closePendingIncidents(){ pendingIncidents.close(); } - - public static void openPowerlineUI(){ - if(!powerlineUI1.isVisible()){ +//JD public static void openIncidentViewer(int incidentId){ incidentViewer.open(incidentId); } + public static void openIncidentViewer(int incidentId) + { + if (incidentViewMap.containsKey(new Integer(incidentId))) + { + // if incident viewer already open for this incident ... + // make it visible + incidentViewMap.get(new Integer(incidentId)).setVisible(true); + } + else // there's no viewer open for this incident, so create it + { + // Just pass the incident ID to the constructor, not open() + IncidentViewer currIV = new IncidentViewer(incidentId); + currIV.open(); + // Don't put the item in the map until AFTER we've opened it, + // to avoid the possibility that the refresh timer happens to fire + // before we've opened the viewer. + incidentViewMap.put(new Integer(incidentId), currIV); + // Doesn't seem necessary, as this viewer has no drop down menus + // currIV.addWindowListener(createWindowListener()); + } + } + + // JD Seems obsolete, never used. +// public static void closeIncidentViewer() +// { +// incidentViewer.close(); +// } + public static void openPendingIncidents() + { + pendingIncidents.open(); + } + + public static void closePendingIncidents() + { + pendingIncidents.close(); + } + + public static void openPowerlineUI() + { + if (!powerlineUI1.isVisible()) + { powerlineUI1.open(); - }else if(!powerlineUI2.isVisible()){ + } + else if (!powerlineUI2.isVisible()) + { powerlineUI2.open(); - }else if(!powerlineUI3.isVisible()){ + } + else if (!powerlineUI3.isVisible()) + { powerlineUI3.open(); - }else if(!powerlineUI4.isVisible()){ + } + else if (!powerlineUI4.isVisible()) + { powerlineUI4.open(); - }else if(!powerlineUI5.isVisible()){ + } + else if (!powerlineUI5.isVisible()) + { powerlineUI5.open(); - } - } - - public static void cyclePowerlineUI(){ - if(currPowerlineFocus == 1){ + } + } + + public static void cyclePowerlineUI() + { + if (currPowerlineFocus == 1) + { currPowerlineFocus = 2; powerlineUI1.setVisible(true); @@ -228,5 +336,6 @@ powerlineUI1.clearText(); } - else if(currPowerlineFocus == 2){ + else if (currPowerlineFocus == 2) + { currPowerlineFocus = 3; powerlineUI2.setVisible(true); @@ -234,5 +343,6 @@ powerlineUI2.clearText(); } - else if(currPowerlineFocus == 3){ + else if (currPowerlineFocus == 3) + { currPowerlineFocus = 4; powerlineUI3.setVisible(true); @@ -240,5 +350,6 @@ powerlineUI3.clearText(); } - else if(currPowerlineFocus == 4){ + else if (currPowerlineFocus == 4) + { currPowerlineFocus = 5; powerlineUI4.setVisible(true); @@ -246,5 +357,6 @@ powerlineUI4.clearText(); } - else if(currPowerlineFocus == 5){ + else if (currPowerlineFocus == 5) + { currPowerlineFocus = 1; powerlineUI5.setVisible(true); @@ -253,41 +365,61 @@ } } - - public static void putRCARDinPL(){ - if(powerlineUI2.hasFocus()){ + + public static void putRCARDinPL() + { + if (powerlineUI2.hasFocus()) + { powerlineUI2.putRCARD(); } - else if(powerlineUI3.hasFocus()){ + else if (powerlineUI3.hasFocus()) + { powerlineUI3.putRCARD(); } - else if(powerlineUI4.hasFocus()){ + else if (powerlineUI4.hasFocus()) + { powerlineUI4.putRCARD(); } - else if(powerlineUI5.hasFocus()){ + else if (powerlineUI5.hasFocus()) + { powerlineUI5.putRCARD(); } - else{ + else + { powerlineUI1.setVisible(true); powerlineUI1.putRCARD(); } } - + //public static void openRotationServiceRequest(){ rotationServiceRequest.open(); } //public static void closeRotationServiceRequest(){ rotationServiceRequest.close(); } - - public static void openSearch(){ search.open(); } - public static void closeSearch(){ search.close(); } - - public static void openUnitStatus(){ unitStatus.open(); } - public static void closeUnitStatus(){ unitStatus.close(); } - + public static void openSearch() + { + search.open(); + } + + public static void closeSearch() + { + search.close(); + } + + public static void openUnitStatus() + { + unitStatus.open(); + } + + public static void closeUnitStatus() + { + unitStatus.close(); + } + //public static void openVehicleInformationEntry(){ vehicleInformationEntry.open(); } //public static void closeVehicleInformationEntry(){ vehicleInformationEntry.close(); } - - public static void createPowerlineSearch(String search){ + public static void createPowerlineSearch(String search) + { new PowerlineSearch(search); } - - public static void closeDropDownMenus(){ + + public static void closeDropDownMenus() + { cadMenu.closeMoreMenu(); cadMenu.closeToolMenu(); @@ -297,35 +429,68 @@ pendingIncidents.closeDropDownMenu(); } - - public static void refreshScreens(){ + + public static void refreshScreens() + { assignedIncidents.refreshTable(); unitStatus.refreshTable(); pendingIncidents.refreshTable(); } - - public static void setUserName(String username){ + + public static void setUserName(String username) + { cadMenu.setName(username); } - + public static String getUserName() + { + return cadMenu.getName(); + } + /** * This method calls CADMenu's and UnitStatus's update time method. */ - public static void handleUpdateTimes(){ - Timer timer = new Timer(ONE_SECOND, new ActionListener(){ - public void actionPerformed(ActionEvent e) { + public static void launchUpdateTimers() + { + Timer timer = new Timer(ONE_SECOND, new ActionListener() + { + public void actionPerformed(ActionEvent e) + { refreshScreens(); cadMenu.handleUpdateTime(); - unitStatus.handleUpdateTime(); + // Don't need this? Because refreshScreens already does it JD + //unitStatus.handleUpdateTime(); } }); timer.start(); - } - + + //JD refresh the info in all the incident viewers + Timer timer2 = new Timer(FIVE_SECONDS, new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + // for each incident viewer that we've created + for (Integer key : incidentViewMap.keySet()) + { + // Fetch the viewer + IncidentViewer viewer = incidentViewMap.get(key); + // is the viewer visible? + if (viewer.isVisible()) + { + // refresh the comments + viewer.refreshCommentsNotesTable(); + } + } + } + }); + timer2.start(); + } + /** - * Removes drag and drop/button clicking in unitStatus panel if bool is false. - * This method should only be called from Login.java + * Removes drag and drop/button clicking in unitStatus panel if bool is + * false. This method should only be called from Login.java */ - public static void setDispatcherAuthority(boolean bool){ - if (!bool){ + public static void setDispatcherAuthority(boolean bool) + { + if (!bool) + { unitStatus.removeDispatcherAuthority(); cadMenu.removeDispatcherStatus(); Index: trunk/src/tmcsim/client/cadclientgui/screens/CADMenu.java =================================================================== --- trunk/src/tmcsim/client/cadclientgui/screens/CADMenu.java (revision 40) +++ trunk/src/tmcsim/client/cadclientgui/screens/CADMenu.java (revision 59) @@ -13,5 +13,4 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -23,5 +22,4 @@ import java.util.logging.Logger; import javax.imageio.ImageIO; - import javax.swing.Box; import javax.swing.BoxLayout; @@ -30,5 +28,4 @@ import javax.swing.JFrame; import javax.swing.JLabel; -import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE; /** @@ -39,14 +36,12 @@ * "CADMenuLayout" can also be found in the same folder showing how this class's * looks were made. - * + * * @author Vincent - * + * */ -public class CADMenu extends JFrame { - +public class CADMenu extends JFrame +{ private final int ONE_SECOND = 1000; - private DateFormat dateFormat; - private Box mainPanel; private Box bottomRightIcons; @@ -56,5 +51,4 @@ private JLabel name; private JLabel userListName1; - private JButton button1; private JButton button2; @@ -65,14 +59,10 @@ private JButton buttonTool; private JButton buttonMore; - // the drop down menu when the "more button" is clicked. private JFrame moreMenu; - // the drop down menu when the "tool button" is clicked. private JFrame toolMenu; - private JButton buttonCheckmark; private JButton buttonMinus; - private JLabel position; @@ -80,35 +70,40 @@ * Constructor call. Creates the CADMenu. */ - public CADMenu() { + public CADMenu() + { initialize(); createTopPanel(); createBottomPanel(); createDropDownMenus(); - + initControllers(); - + getContentPane().add(mainPanel); - - setTitle("Inform CAD"); - URL url = null; - try - { - url = new URL("http://i1030.photobucket.com/albums/y362/sendeva66/antclipart2.jpg"); - } catch (MalformedURLException ex) - { - Logger.getLogger(CADMenu.class.getName()).log(Level.SEVERE, "can't access url", ex); + setTitle("Inform CAD "); + // Load an image for the task bar icon --JD + // First try to get the image from a local file + ImageIcon coolIcon = new ImageIcon("images/CADMenuImages/US_101_icon.png"); + if (coolIcon.getIconWidth() >= 0) + { + setIconImage(coolIcon.getImage()); } - Image image = null; - try - { - image = ImageIO.read(url); - setIconImage(image); - } catch (IOException ex) - { - Logger.getLogger(CADMenu.class.getName()).log(Level.SEVERE, null, ex); + else // if no local file found, try a URL + { + URL url; + Image img = null; + try + { + String iconURL = "http://www.chicagonow.com/running-with-a-book-cart/files/2012/02/crosswalk1.jpg"; + url = new URL(iconURL); + img = ImageIO.read(url); + setIconImage(img); + } catch (MalformedURLException ex) + { + Logger.getLogger(CADMenu.class.getName()).log(Level.SEVERE, null, ex); + } catch (IOException ex) + { + Logger.getLogger(CADMenu.class.getName()).log(Level.SEVERE, null, ex); + } } - // Doesn't work: file path problem? -// ImageIcon myIcon = new ImageIcon(getClass().getClassLoader().getResource("images/CADicon.png")); -// setIconImage(myIcon.getImage()); setPreferredSize(new Dimension(1195, 178)); setResizable(true); @@ -125,5 +120,6 @@ * Initializes variables and connects the CADMenu to the CADMenuListener. */ - public void initialize() { + public void initialize() + { mainPanel = new Box(BoxLayout.Y_AXIS); mainPanel.setAlignmentX(LEFT_ALIGNMENT); @@ -131,10 +127,14 @@ } - public void addListeners() { - addComponentListener(new ComponentListener() { - public void componentHidden(ComponentEvent e) { - } - - public void componentMoved(ComponentEvent e) { + public void addListeners() + { + addComponentListener(new ComponentListener() + { + public void componentHidden(ComponentEvent e) + { + } + + public void componentMoved(ComponentEvent e) + { closeToolMenu(); closeMoreMenu(); @@ -142,63 +142,85 @@ } - public void componentResized(ComponentEvent e) { - } - - public void componentShown(ComponentEvent e) { + public void componentResized(ComponentEvent e) + { + } + + public void componentShown(ComponentEvent e) + { } }); - addMouseListener(new MouseListener() { - public void mouseClicked(MouseEvent arg0) { + addMouseListener(new MouseListener() + { + public void mouseClicked(MouseEvent arg0) + { closeToolMenu(); closeMoreMenu(); } - public void mouseEntered(MouseEvent arg0) { - } - - public void mouseExited(MouseEvent arg0) { - } - - public void mousePressed(MouseEvent arg0) { - } - - public void mouseReleased(MouseEvent arg0) { + public void mouseEntered(MouseEvent arg0) + { + } + + public void mouseExited(MouseEvent arg0) + { + } + + public void mousePressed(MouseEvent arg0) + { + } + + public void mouseReleased(MouseEvent arg0) + { } }); } - - public void initToolMenuListeners(){ - toolMenu.addMouseMotionListener(new MouseMotionListener() { - public void mouseDragged(MouseEvent e) { - } - - public void mouseMoved(MouseEvent e) { + + public void initToolMenuListeners() + { + toolMenu.addMouseMotionListener(new MouseMotionListener() + { + public void mouseDragged(MouseEvent e) + { + } + + public void mouseMoved(MouseEvent e) + { } }); - toolMenu.addMouseListener(new MouseListener() { - public void mouseEntered(MouseEvent e) { - } - - public void mouseExited(MouseEvent e) { - } - - public void mousePressed(MouseEvent e) { - } - - public void mouseReleased(MouseEvent e) { - } - - public void mouseClicked(MouseEvent e) { + toolMenu.addMouseListener(new MouseListener() + { + public void mouseEntered(MouseEvent e) + { + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + } + + public void mouseReleased(MouseEvent e) + { + } + + public void mouseClicked(MouseEvent e) + { } }); } - - public void initMoreMenuListeners(){ - moreMenu.addMouseMotionListener(new MouseMotionListener() { - public void mouseDragged(MouseEvent e) { - } - - public void mouseMoved(MouseEvent e) { + + public void initMoreMenuListeners() + { + moreMenu.addMouseMotionListener(new MouseMotionListener() + { + public void mouseDragged(MouseEvent e) + { + } + + public void mouseMoved(MouseEvent e) + { ImageIcon image = new ImageIcon( "images/MoreMenuImages/moreMenu.png"); @@ -206,11 +228,14 @@ if (e.getLocationOnScreen().getY() >= moreMenu.getY() && e.getLocationOnScreen().getY() <= moreMenu.getY() - + moreMenu.getHeight() / 8) { + + moreMenu.getHeight() / 8) + { image = new ImageIcon( "images/MoreMenuImages/moreMenuHighlighted1.png"); - } else if (e.getLocationOnScreen().getY() >= moreMenu.getY() + } + else if (e.getLocationOnScreen().getY() >= moreMenu.getY() + moreMenu.getHeight() * 2 / 8 && e.getLocationOnScreen().getY() <= moreMenu.getY() - + moreMenu.getHeight() * 3 / 8) { + + moreMenu.getHeight() * 3 / 8) + { image = new ImageIcon( "images/MoreMenuImages/moreMenuHighlighted3.png"); @@ -223,27 +248,36 @@ }); - moreMenu.addMouseListener(new MouseListener() { - public void mouseEntered(MouseEvent e) { - } - - public void mouseExited(MouseEvent e) { - } - - public void mousePressed(MouseEvent e) { - } - - public void mouseReleased(MouseEvent e) { - } - - public void mouseClicked(MouseEvent e) { + moreMenu.addMouseListener(new MouseListener() + { + public void mouseEntered(MouseEvent e) + { + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + } + + public void mouseReleased(MouseEvent e) + { + } + + public void mouseClicked(MouseEvent e) + { if (e.getLocationOnScreen().getY() >= moreMenu.getY() && e.getLocationOnScreen().getY() <= moreMenu.getY() - + moreMenu.getHeight() / 8) { + + moreMenu.getHeight() / 8) + { ScreenManager.openIncidentEditor(); closeMoreMenu(); - } else if (e.getLocationOnScreen().getY() >= moreMenu.getY() + } + else if (e.getLocationOnScreen().getY() >= moreMenu.getY() + moreMenu.getHeight() * 2 / 8 && e.getLocationOnScreen().getY() <= moreMenu.getY() - + moreMenu.getHeight() * 3 / 8) { + + moreMenu.getHeight() * 3 / 8) + { ScreenManager.openCardfile(); closeMoreMenu(); @@ -252,24 +286,32 @@ }); } - - public void initControllers(){ + + public void initControllers() + { addListeners(); buttonTool.addActionListener(newToolActionListener()); buttonMore.addActionListener(newMoreActionListener()); - + initToolMenuListeners(); - initMoreMenuListeners(); - } - - public ActionListener newToolActionListener(){ - return new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - if (moreMenu.isVisible()) { + initMoreMenuListeners(); + } + + public ActionListener newToolActionListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { + if (moreMenu.isVisible()) + { closeMoreMenu(); } - if (toolMenu.isVisible()) { + if (toolMenu.isVisible()) + { closeToolMenu(); - } else { + } + else + { toolMenu.setLocation(new Point(getX() + getWidth() - toolMenu.getWidth(), getY() + 85)); @@ -279,14 +321,21 @@ }; } - - public ActionListener newMoreActionListener(){ - return new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - if (toolMenu.isVisible()) { + + public ActionListener newMoreActionListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { + if (toolMenu.isVisible()) + { closeToolMenu(); } - if (moreMenu.isVisible()) { + if (moreMenu.isVisible()) + { closeMoreMenu(); - } else { + } + else + { moreMenu.setLocation(new Point(getX() + getWidth() - moreMenu.getWidth(), getY() + 85)); @@ -296,9 +345,10 @@ }; } - + /* * Creates the topPanel for the CADMenu. */ - public void createTopPanel() { + public void createTopPanel() + { Box topPanel = new Box(BoxLayout.X_AXIS); @@ -390,5 +440,6 @@ * Creates the bottomPanel of the CADMenu. */ - public void createBottomPanel() { + public void createBottomPanel() + { Color grayBackground = new Color(100, 100, 100); @@ -477,5 +528,6 @@ * Creates the two bottom right buttons. */ - public void createBottomRightButtons() { + public void createBottomRightButtons() + { bottomRightButtonsGrayed = new Box(BoxLayout.X_AXIS); ImageIcon image = new ImageIcon( @@ -502,5 +554,6 @@ * buttons */ - public void createDropDownMenus() { + public void createDropDownMenus() + { ImageIcon image = new ImageIcon("images/ToolMenuImages/toolMenu.png"); @@ -524,19 +577,26 @@ * Takes in the name of the user and displays it. */ - public void setName(String username) { + public void setName(String username) + { name.setText(username); userListName1.setText(username); } - + /** + * Accessor to the user's name (for use in IncidentViewer comments + */ + public String getName() + { + return name.getText(); + } + /** * Factory method. Makes a JButton with an image and listener. - * - * @param image - * the image this button will display. - * @param listener - * the action listener for this button. + * + * @param image the image this button will display. + * @param listener the action listener for this button. * @return the JButton. */ - public JButton makeButton(ImageIcon image) { + public JButton makeButton(ImageIcon image) + { JButton button = new JButton(image); Dimension size = new Dimension(image.getImage().getWidth(null), image @@ -555,5 +615,6 @@ * highlighted rows). */ - public void closeToolMenu() { + public void closeToolMenu() + { ImageIcon image; JLabel menu; @@ -570,5 +631,6 @@ * highlighted rows). */ - public void closeMoreMenu() { + public void closeMoreMenu() + { ImageIcon image; JLabel menu; @@ -585,5 +647,6 @@ * time every second. */ - public void handleUpdateTime() { + public void handleUpdateTime() + { Date date = new Date(); String dateTime = dateFormat.format(date); @@ -594,5 +657,6 @@ * Makes screen visible. */ - public void open() { + public void open() + { setVisible(true); } @@ -601,5 +665,6 @@ * Hides screen. */ - public void close() { + public void close() + { setVisible(false); } @@ -608,5 +673,6 @@ * Currently not used. */ - public void setIncomingIncident() { + public void setIncomingIncident() + { bottomRightIcons.remove(bottomRightButtonsGrayed); bottomRightIcons.add(bottomRightButtonsColored); @@ -618,5 +684,6 @@ * Currently not used. */ - public void endIncomingIncident() { + public void endIncomingIncident() + { bottomRightIcons.remove(bottomRightButtonsColored); bottomRightIcons.add(bottomRightButtonsGrayed); @@ -628,7 +695,7 @@ * Sets position title to trainee. */ - public void removeDispatcherStatus() { + public void removeDispatcherStatus() + { position.setText("Trainee"); } - } Index: trunk/src/tmcsim/client/cadclientgui/screens/IncidentViewer.java =================================================================== --- trunk/src/tmcsim/client/cadclientgui/screens/IncidentViewer.java (revision 3) +++ trunk/src/tmcsim/client/cadclientgui/screens/IncidentViewer.java (revision 59) @@ -1,6 +1,2 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package tmcsim.client.cadclientgui.screens; @@ -14,27 +10,34 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.Stack; -import java.util.Date; - +import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JFrame; import javax.swing.ListSelectionModel; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.table.DefaultTableModel; - -import tmcsim.client.cadclientgui.data.CADData; -import tmcsim.client.cadclientgui.enums.CADDataEnums.*; +import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_ADD_INFO; +import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_CALLBACK; +import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_CALLER; +import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_GEN_INFO; +import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_INFO; +import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_LOC; +import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_TABLE; +import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_TIMES; +import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_VAL; import tmcsim.client.cadclientgui.enums.ComboBoxConstants; +import tmcsim.simulationmanager.model.LogEntryCellRenderer; /** - * This class contains the view and controller for the IncidentViewer screen. The view is built using a GUI builder plug-in, and the controller - * uses listeners to control how the view and data act. + * This class contains the view and controller for the IncidentViewer screen. + * The view is built using a GUI builder plug-in, and the controller uses + * listeners to control how the view and data act. + * * @author Stuart */ -public class IncidentViewer extends javax.swing.JFrame { - +public class IncidentViewer extends javax.swing.JFrame +{ Stack stack; SimpleDateFormat dateFormatDate; @@ -45,8 +48,10 @@ * Creates new form IncidentViewer */ - public IncidentViewer() { + public IncidentViewer(int incidentId) + { + this.incidentId = incidentId; declareComponents(); + initLayout(); initControllers(); - initLayout(); } @@ -58,5 +63,6 @@ @SuppressWarnings("unchecked") // - private void declareComponents() { + private void declareComponents() + { stack = new Stack(); @@ -189,5 +195,5 @@ commentsNotesNotifyButton = new javax.swing.JButton(); commentsNotesSaveButton = new javax.swing.JButton(); - commentsNotesField = new javax.swing.JTextField(); + commentsNotesField = new javax.swing.JTextArea(); // JD changed from TextField commentsNotesConfidentialCommentCheckBox = new javax.swing.JCheckBox(); editLogPane = new javax.swing.JPanel(); @@ -272,35 +278,55 @@ attachmentsSaveButton = new javax.swing.JButton(); } - - public void initWindowListener(){ - addWindowListener(new WindowAdapter() { - public void windowClosing(WindowEvent e) { + + public void initWindowListener() + { + addWindowListener(new WindowAdapter() + { + public void windowClosing(WindowEvent e) + { close(); } }); } - - public ActionListener newExitSendActionListener(){ - return new ActionListener(){ - public void actionPerformed(ActionEvent arg0) { + + public ActionListener newExitSendActionListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { close(); } }; } - - public DocumentListener newCommentsDocumentListener(){ - return new DocumentListener(){ - public void changedUpdate(DocumentEvent e) {} - public void insertUpdate(DocumentEvent e) { + + public DocumentListener newCommentsDocumentListener() + { + return new DocumentListener() + { + public void changedUpdate(DocumentEvent e) + { + } + + public void insertUpdate(DocumentEvent e) + { commentsNotesSaveButton.setEnabled(true); } - public void removeUpdate(DocumentEvent e) {} + + public void removeUpdate(DocumentEvent e) + { + } }; } - - public ActionListener newCommentsAddListener(){ - return new ActionListener(){ - public void actionPerformed(ActionEvent arg0) { + + public ActionListener newCommentsAddListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { commentsNotesField.setEditable(true); + commentsNotesField.setBackground(java.awt.Color.white); + commentsNotesField.requestFocus(); commentsNotesAddButton.setEnabled(false); @@ -309,10 +335,14 @@ }; } - - public ActionListener newCommentsCancelListener(){ - return new ActionListener(){ - public void actionPerformed(ActionEvent arg0) { + + public ActionListener newCommentsCancelListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { commentsNotesField.setText(""); commentsNotesField.setEditable(false); + commentsNotesField.setBackground(java.awt.Color.LIGHT_GRAY);//JD commentsNotesAddButton.setEnabled(true); commentsNotesCancelButton.setEnabled(false); @@ -321,46 +351,128 @@ }; } - - public ActionListener newCommentsSaveListener(){ - return new ActionListener(){ - public void actionPerformed(ActionEvent arg0) { + + public ActionListener newCommentsSaveListener() + { + return new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy"); - DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss"); - String[] fields = {dateFormat.format(new Date()), - timeFormat.format(new Date()), - "","",commentsNotesField.getText()}; - try { + DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss"); + String[] fields = + { + dateFormat.format(new Date()), + timeFormat.format(new Date()), + ScreenManager.getUserName(), // Put username in "Initials" column + "", // "Block" is left blank for now + commentsNotesField.getText().toUpperCase() // JD + }; + try + { ScreenManager.theCoordinator.addCadDataIncidentTable( - INC_TABLE.COMMENTS_NOTES, incidentId, fields); - ((DefaultTableModel)commentsNotesTable.getModel()).addRow(fields); - } catch (RemoteException e) { + INC_TABLE.COMMENTS_NOTES, incidentId, fields); + ((DefaultTableModel) commentsNotesTable.getModel()).insertRow(0, fields);//JD + //((DefaultTableModel) commentsNotesTable.getModel()).addRow(fields); + } catch (RemoteException e) + { e.printStackTrace(); } - + commentsNotesField.setText(""); commentsNotesField.setEditable(false); + commentsNotesField.setBackground(java.awt.Color.LIGHT_GRAY); commentsNotesAddButton.setEnabled(true); commentsNotesCancelButton.setEnabled(false); commentsNotesSaveButton.setEnabled(false); } - }; + }; } - - private void initControllers() { + + // JD Add a mouselistener to the comments table to display a single cell + // contents in a popup +// public MouseListener newCommentsTableCellListener() +// { +// return new MouseListener() +// { +// public void mousePressed(MouseEvent event) +// { +// } +// +// public void mouseReleased(MouseEvent event) +// { +// } +// +// public void mouseEntered(MouseEvent event) +// { +// } +// +// public void mouseExited(MouseEvent event) +// { +// } +// +// public void mouseClicked(MouseEvent event) +// { +// Point point = event.getPoint(); +// int row, column; +// row = commentsNotesTable.rowAtPoint(point); +// column = commentsNotesTable.columnAtPoint(point); +// // See if the click was in column 4 (the comment column) +// if (column == 4) +// { +// JOptionPane.showMessageDialog(null, getWrappedText((String) commentsNotesTable.getValueAt(row, column)), +// "Comment/Note Text", JOptionPane.INFORMATION_MESSAGE); +// } +// +// } +// }; +// } + private void initControllers() + { initWindowListener(); - + exitSendButton.addActionListener(newExitSendActionListener()); - + commentsNotesField.getDocument().addDocumentListener(newCommentsDocumentListener()); commentsNotesAddButton.addActionListener(newCommentsAddListener()); commentsNotesCancelButton.addActionListener(newCommentsCancelListener()); commentsNotesSaveButton.addActionListener(newCommentsSaveListener()); + //commentsNotesTable.addMouseListener(newCommentsTableCellListener()); //JD } - - private void initLayout(){ + + /** + * A custom renderer that sets a tool tip with the wrapped comment. JD + */ +// Obsolete JD +// class LineWrapRenderer extends DefaultTableCellRenderer +// { +// public final static int kSegmentsize = 60; +// +// protected void setValue(Object value) +// { +// String comment = (String) value; +// setText(comment); +// // Wrap long comments in a tooltip +// setToolTipText(getWrappedText(comment)); +// } +// } +// +// private String getWrappedText(String stringToWrap) +// { +// int limit = stringToWrap.length() / LineWrapRenderer.kSegmentsize; +// StringBuilder toolTip = new StringBuilder(""); +// for (int jumper = 0; jumper <= limit; jumper++) +// { +// toolTip.append(stringToWrap.substring(jumper * LineWrapRenderer.kSegmentsize, Math.min((jumper + 1) * LineWrapRenderer.kSegmentsize, stringToWrap.length()))); +// toolTip.append("
"); // Use html break to cause a line break +// } +// toolTip.append(""); +// return toolTip.toString(); +// } + private void initLayout() + { setDefaultCloseOperation(javax.swing.WindowConstants.HIDE_ON_CLOSE); - + cityComboBox.setModel(new javax.swing.DefaultComboBoxModel(ComboBoxConstants.LIST_OF_CA_CITIES)); - + mapLocLabel.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N mapLocLabel.setText("Map Loc:"); @@ -372,5 +484,5 @@ addressField.setBackground(Color.CYAN); locationField.setBackground(Color.CYAN); - + locationLabel.setText("Location:"); @@ -379,5 +491,8 @@ countyLabel.setText("County:"); - countyComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + countyComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "Item 1", "Item 2", "Item 3", "Item 4" + })); agencyLabel.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N @@ -387,5 +502,5 @@ agencyComboBox.setBackground(Color.CYAN); agencyComboBox.setEnabled(false); - + typeCodeLabel.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N typeCodeLabel.setText("Type Code:"); @@ -393,5 +508,5 @@ typeCodeComboBox.setModel(new javax.swing.DefaultComboBoxModel(ComboBoxConstants.TYPE)); typeCodeComboBox.setBackground(Color.CYAN); - + priLabel.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N priLabel.setText("Pri:"); @@ -399,5 +514,5 @@ priComboBox.setModel(new javax.swing.DefaultComboBoxModel(ComboBoxConstants.PRI)); priComboBox.setBackground(Color.CYAN); - + rightOfPriButton.setText("rightOfPriButton"); rightOfPriButton.setEnabled(false); @@ -406,7 +521,7 @@ rpField.setBackground(Color.CYAN); - + phoneLabel.setText("Phone:"); - + phoneField.setBackground(Color.CYAN); @@ -417,9 +532,15 @@ rpTypeLabel.setText("RP Type:"); - rpTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - - sectorComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + rpTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "Item 1", "Item 2", "Item 3", "Item 4" + })); + + sectorComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "Item 1", "Item 2", "Item 3", "Item 4" + })); sectorComboBox.setBackground(Color.CYAN); - + sectorLabel.setText("Sector:"); @@ -431,5 +552,5 @@ mediaComboBox.setBackground(Color.YELLOW); mediaComboBox.setEnabled(false); - + mediaLabel.setText("MEDIA:"); @@ -451,13 +572,13 @@ updateMapLocButton.setMargin(new java.awt.Insets(3, 3, 3, 3)); updateMapLocButton.setEnabled(false); - + exitSendButton.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N exitSendButton.setText("Exit / Send"); - + sentToQButton.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N sentToQButton.setText("Send to Q"); sentToQButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); sentToQButton.setEnabled(false); - + fileButton.setText("File"); fileButton.setEnabled(false); @@ -483,9 +604,9 @@ carButton.setIcon(image); carButton.setEnabled(false); - + image = new ImageIcon("images/IncidentViewerImages/buttonPerson.png"); personButton.setIcon(image); personButton.setEnabled(false); - + towRotationButton.setText("Tow Rotation"); @@ -524,5 +645,5 @@ callBackCommentField.setEditable(false); - + callBackAddButton.setText("Add"); callBackAddButton.setEnabled(false); @@ -535,8 +656,8 @@ callBackCommentTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - + recommandButton.setText("Recommand"); recommandButton.setEnabled(false); - + incidentNumLabel.setText("Incident Number:"); @@ -570,34 +691,50 @@ areaOfDivisionLabel.setText("Area Ofc/Division:"); - + addInfoCommentsField.setEditable(false); - addInfoCCJurisdictionComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - - addInfoAreaOfDivisionComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + addInfoCCJurisdictionComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "Item 1", "Item 2", "Item 3", "Item 4" + })); + + addInfoAreaOfDivisionComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "Item 1", "Item 2", "Item 3", "Item 4" + })); areaBatallionLabel.setText("Area/Batallion:"); - addInfoAreaBatallionComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + addInfoAreaBatallionComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "Item 1", "Item 2", "Item 3", "Item 4" + })); beatResponseAreaLabel.setText("Beat/Response Area:"); - addInfoBeatResponseAreaComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + addInfoBeatResponseAreaComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "Item 1", "Item 2", "Item 3", "Item 4" + })); responsePlanLabel.setText("Response Plan:"); - addInfoReponsePlanComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + addInfoReponsePlanComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "Item 1", "Item 2", "Item 3", "Item 4" + })); rotationProviderAreaLabel.setText("Rotation Provider Area:"); addInfoRotationProviderAreaField.setEditable(false); - + commentsNotesPane.setPreferredSize(new java.awt.Dimension(809, 300)); commentsNotesTable.setModel(new javax.swing.table.DefaultTableModel( - null, new String [] { - "Date", "Time", "Initial", "Block", "Comments" } - )); + null, new String[] + { + "Date", "Time", "Initial", "Block", "Comments" + })); jScrollPane3.setViewportView(commentsNotesTable); commentsNotesTable.getColumnModel().getColumn(0).setResizable(false); @@ -612,5 +749,8 @@ commentsNotesField.setEditable(false); - + commentsNotesField.setBackground(java.awt.Color.LIGHT_GRAY); + commentsNotesField.setLineWrap(true); // JD make text wrap inside the field + commentsNotesField.setBorder(BorderFactory.createLineBorder(Color.GRAY)); // JD added a border + commentsNotesAddButton.setText("Add"); commentsNotesCancelButton.setText("Cancel"); @@ -623,64 +763,60 @@ commentsNotesConfidentialCommentCheckBox.setText("Confidential Comment"); commentsNotesConfidentialCommentCheckBox.setEnabled(false); - + jScrollPane14.setViewportView(callBackCommentTable); javax.swing.GroupLayout jPanel13Layout = new javax.swing.GroupLayout(jPanel13); jPanel13.setLayout(jPanel13Layout); jPanel13Layout.setHorizontalGroup( - jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel13Layout.createSequentialGroup() + jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel13Layout.createSequentialGroup() .addContainerGap() .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addGroup(jPanel13Layout.createSequentialGroup() - .addComponent(callBackCommentField, javax.swing.GroupLayout.PREFERRED_SIZE, 519, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(callBackAddButton) - .addComponent(callBackCancelButton) - .addComponent(callBackSaveButton))) - .addComponent(jScrollPane14, javax.swing.GroupLayout.PREFERRED_SIZE, 604, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(144, Short.MAX_VALUE)) - ); + .addGroup(jPanel13Layout.createSequentialGroup() + .addComponent(callBackCommentField, javax.swing.GroupLayout.PREFERRED_SIZE, 519, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(callBackAddButton) + .addComponent(callBackCancelButton) + .addComponent(callBackSaveButton))) + .addComponent(jScrollPane14, javax.swing.GroupLayout.PREFERRED_SIZE, 604, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap(144, Short.MAX_VALUE))); jPanel13Layout.setVerticalGroup( - jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel13Layout.createSequentialGroup() + jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel13Layout.createSequentialGroup() .addContainerGap() .addGroup(jPanel13Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel13Layout.createSequentialGroup() - .addComponent(callBackAddButton) - .addGap(0, 0, 0) - .addComponent(callBackCancelButton) - .addGap(0, 0, 0) - .addComponent(callBackSaveButton)) - .addComponent(callBackCommentField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(jPanel13Layout.createSequentialGroup() + .addComponent(callBackAddButton) + .addGap(0, 0, 0) + .addComponent(callBackCancelButton) + .addGap(0, 0, 0) + .addComponent(callBackSaveButton)) + .addComponent(callBackCommentField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 68, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(jScrollPane14, javax.swing.GroupLayout.PREFERRED_SIZE, 131, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); javax.swing.GroupLayout callbacksPaneLayout = new javax.swing.GroupLayout(callbacksPane); callbacksPane.setLayout(callbacksPaneLayout); callbacksPaneLayout.setHorizontalGroup( - callbacksPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(callbacksPaneLayout.createSequentialGroup() + callbacksPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(callbacksPaneLayout.createSequentialGroup() .addGap(41, 41, 41) .addComponent(jPanel13, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) - ); + .addContainerGap())); callbacksPaneLayout.setVerticalGroup( - callbacksPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(callbacksPaneLayout.createSequentialGroup() + callbacksPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(callbacksPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel13, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(58, Short.MAX_VALUE)) - ); + .addContainerGap(58, Short.MAX_VALUE))); assignmentsPane.setPreferredSize(new java.awt.Dimension(809, 300)); assignmentsTable.setModel(new javax.swing.table.DefaultTableModel( - null, new String [] { - "Unit", "Alarm Level", "Type", "Status", "responding From", "Elapsed", "Response Number" - } - )); + null, new String[] + { + "Unit", "Alarm Level", "Type", "Status", "responding From", "Elapsed", "Response Number" + })); jScrollPane4.setViewportView(assignmentsTable); @@ -688,7 +824,8 @@ resourceTable.setModel(new javax.swing.table.DefaultTableModel( - null,new String [] { - "Resource / Capability", "", "Title 3", "Title 4"} - )); + null, new String[] + { + "Resource / Capability", "", "Title 3", "Title 4" + })); jScrollPane5.setViewportView(resourceTable); @@ -698,68 +835,62 @@ jPanel2.setLayout(jPanel2Layout); jPanel2Layout.setHorizontalGroup( - jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel2Layout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane7, javax.swing.GroupLayout.DEFAULT_SIZE, 609, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(recommandButton) - .addContainerGap()) - ); + .addContainerGap())); jPanel2Layout.setVerticalGroup( - jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel2Layout.createSequentialGroup() + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel2Layout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane7, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(recommandButton) - .addGap(47, 47, 47)) - ); + .addGap(47, 47, 47))); javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4); jPanel4.setLayout(jPanel4Layout); jPanel4Layout.setHorizontalGroup( - jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel4Layout.createSequentialGroup() + jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel4Layout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane1)) - .addGroup(jPanel4Layout.createSequentialGroup() + .addGroup(jPanel4Layout.createSequentialGroup() .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) - ); + .addContainerGap())); jPanel4Layout.setVerticalGroup( - jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel4Layout.createSequentialGroup() + jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel4Layout.createSequentialGroup() .addGap(6, 6, 6) .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 141, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); + .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); javax.swing.GroupLayout assignmentsPaneLayout = new javax.swing.GroupLayout(assignmentsPane); assignmentsPane.setLayout(assignmentsPaneLayout); assignmentsPaneLayout.setHorizontalGroup( - assignmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(assignmentsPaneLayout.createSequentialGroup() + assignmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(assignmentsPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(63, Short.MAX_VALUE)) - ); + .addContainerGap(63, Short.MAX_VALUE))); assignmentsPaneLayout.setVerticalGroup( - assignmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, assignmentsPaneLayout.createSequentialGroup() + assignmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, assignmentsPaneLayout.createSequentialGroup() .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(jPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(22, 22, 22)) - ); + .addGap(22, 22, 22))); activitiesPane.setPreferredSize(new java.awt.Dimension(809, 300)); activitiesTable.setModel(new javax.swing.table.DefaultTableModel( - null, new String [] { - "Date/Time", "Vehicle/Unit", "Activity", "Location", "Comment", "Dispatch" - } - )); + null, new String[] + { + "Date/Time", "Vehicle/Unit", "Activity", "Location", "Comment", "Dispatch" + })); jScrollPane6.setViewportView(activitiesTable); @@ -769,17 +900,15 @@ activitiesPane.setLayout(activitiesPaneLayout); activitiesPaneLayout.setHorizontalGroup( - activitiesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(activitiesPaneLayout.createSequentialGroup() + activitiesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(activitiesPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane15, javax.swing.GroupLayout.DEFAULT_SIZE, 789, Short.MAX_VALUE) - .addContainerGap()) - ); + .addContainerGap())); activitiesPaneLayout.setVerticalGroup( - activitiesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(activitiesPaneLayout.createSequentialGroup() + activitiesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(activitiesPaneLayout.createSequentialGroup() .addGap(27, 27, 27) .addComponent(jScrollPane15, javax.swing.GroupLayout.DEFAULT_SIZE, 264, Short.MAX_VALUE) - .addContainerGap()) - ); + .addContainerGap())); callBacksPane.setPreferredSize(new java.awt.Dimension(809, 300)); @@ -788,193 +917,188 @@ jPanel1.setLayout(jPanel1Layout); jPanel1Layout.setHorizontalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup() .addContainerGap() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addComponent(rotationProviderAreaLabel)) - .addGroup(jPanel1Layout.createSequentialGroup() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(callTakenLabel, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(machineNameLabel, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(incidentTypeLabel, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(incidentNumLabel, javax.swing.GroupLayout.Alignment.TRAILING)) - .addGap(4, 4, 4) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(addInfoIncidentNumField, javax.swing.GroupLayout.DEFAULT_SIZE, 194, Short.MAX_VALUE) - .addComponent(addInfoIncidentTypeField, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(addInfoCallTakenField, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(addInfoMachineNameField, javax.swing.GroupLayout.Alignment.TRAILING))) - .addGroup(jPanel1Layout.createSequentialGroup() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(callStatusLabel) - .addComponent(callTakerPhoneLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(addInfoCallTakerPhoneExtField, javax.swing.GroupLayout.DEFAULT_SIZE, 110, Short.MAX_VALUE) - .addComponent(addInfoCallStatusField)) - .addComponent(addInfoCommentsField, javax.swing.GroupLayout.PREFERRED_SIZE, 143, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(0, 31, Short.MAX_VALUE))) - .addGap(100, 100, 100) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(alarmLevelLabel) - .addComponent(ccJurisdictionLabel) - .addComponent(areaOfDivisionLabel) - .addComponent(areaBatallionLabel) - .addComponent(beatResponseAreaLabel) - .addComponent(responsePlanLabel)))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGap(0, 0, Short.MAX_VALUE) + .addComponent(rotationProviderAreaLabel)) + .addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(addInfoAlarmLevelField, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(addInfoCCJurisdictionComboBox, 0, 206, Short.MAX_VALUE) - .addComponent(addInfoAreaOfDivisionComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(addInfoAreaBatallionComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(addInfoBeatResponseAreaComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(addInfoReponsePlanComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addComponent(addInfoRotationProviderAreaField, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap()) - ); + .addGroup(jPanel1Layout.createSequentialGroup() + .addGap(0, 0, Short.MAX_VALUE) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(callTakenLabel, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(machineNameLabel, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(incidentTypeLabel, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(incidentNumLabel, javax.swing.GroupLayout.Alignment.TRAILING)) + .addGap(4, 4, 4) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(addInfoIncidentNumField, javax.swing.GroupLayout.DEFAULT_SIZE, 194, Short.MAX_VALUE) + .addComponent(addInfoIncidentTypeField, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(addInfoCallTakenField, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(addInfoMachineNameField, javax.swing.GroupLayout.Alignment.TRAILING))) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(callStatusLabel) + .addComponent(callTakerPhoneLabel)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(addInfoCallTakerPhoneExtField, javax.swing.GroupLayout.DEFAULT_SIZE, 110, Short.MAX_VALUE) + .addComponent(addInfoCallStatusField)) + .addComponent(addInfoCommentsField, javax.swing.GroupLayout.PREFERRED_SIZE, 143, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(0, 31, Short.MAX_VALUE))) + .addGap(100, 100, 100) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(alarmLevelLabel) + .addComponent(ccJurisdictionLabel) + .addComponent(areaOfDivisionLabel) + .addComponent(areaBatallionLabel) + .addComponent(beatResponseAreaLabel) + .addComponent(responsePlanLabel)))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(addInfoAlarmLevelField, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(addInfoCCJurisdictionComboBox, 0, 206, Short.MAX_VALUE) + .addComponent(addInfoAreaOfDivisionComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(addInfoAreaBatallionComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(addInfoBeatResponseAreaComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(addInfoReponsePlanComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(addInfoRotationProviderAreaField, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap())); jPanel1Layout.setVerticalGroup( - jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel1Layout.createSequentialGroup() .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addContainerGap() - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(incidentNumLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(addInfoIncidentNumField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(incidentTypeLabel) - .addComponent(addInfoIncidentTypeField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(callTakenLabel) - .addComponent(addInfoCallTakenField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(machineNameLabel) - .addComponent(addInfoMachineNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(callTakerPhoneLabel) - .addComponent(addInfoCallTakerPhoneExtField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(callStatusLabel) - .addComponent(addInfoCallStatusField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(21, 21, 21) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(alarmLevelLabel) - .addComponent(addInfoAlarmLevelField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(ccJurisdictionLabel) - .addComponent(addInfoCCJurisdictionComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(areaOfDivisionLabel) - .addComponent(addInfoAreaOfDivisionComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(areaBatallionLabel) - .addComponent(addInfoAreaBatallionComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(beatResponseAreaLabel) - .addComponent(addInfoBeatResponseAreaComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(responsePlanLabel) - .addComponent(addInfoReponsePlanComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addGroup(jPanel1Layout.createSequentialGroup() + .addContainerGap() + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(incidentNumLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(addInfoIncidentNumField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(incidentTypeLabel) + .addComponent(addInfoIncidentTypeField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(callTakenLabel) + .addComponent(addInfoCallTakenField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(machineNameLabel) + .addComponent(addInfoMachineNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(callTakerPhoneLabel) + .addComponent(addInfoCallTakerPhoneExtField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(callStatusLabel) + .addComponent(addInfoCallStatusField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGap(21, 21, 21) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(alarmLevelLabel) + .addComponent(addInfoAlarmLevelField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(ccJurisdictionLabel) + .addComponent(addInfoCCJurisdictionComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(areaOfDivisionLabel) + .addComponent(addInfoAreaOfDivisionComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(areaBatallionLabel) + .addComponent(addInfoAreaBatallionComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(beatResponseAreaLabel) + .addComponent(addInfoBeatResponseAreaComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(responsePlanLabel) + .addComponent(addInfoReponsePlanComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel1Layout.createSequentialGroup() - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(rotationProviderAreaLabel) - .addComponent(addInfoRotationProviderAreaField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGroup(jPanel1Layout.createSequentialGroup() - .addGap(23, 23, 23) - .addComponent(addInfoCommentsField, javax.swing.GroupLayout.PREFERRED_SIZE, 51, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGap(5, 5, 5)) - ); + .addGroup(jPanel1Layout.createSequentialGroup() + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(rotationProviderAreaLabel) + .addComponent(addInfoRotationProviderAreaField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(jPanel1Layout.createSequentialGroup() + .addGap(23, 23, 23) + .addComponent(addInfoCommentsField, javax.swing.GroupLayout.PREFERRED_SIZE, 51, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGap(5, 5, 5))); javax.swing.GroupLayout callBacksPaneLayout = new javax.swing.GroupLayout(callBacksPane); callBacksPane.setLayout(callBacksPaneLayout); callBacksPaneLayout.setHorizontalGroup( - callBacksPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(callBacksPaneLayout.createSequentialGroup() + callBacksPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(callBacksPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(85, Short.MAX_VALUE)) - ); + .addContainerGap(85, Short.MAX_VALUE))); callBacksPaneLayout.setVerticalGroup( - callBacksPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(callBacksPaneLayout.createSequentialGroup() + callBacksPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(callBacksPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(40, 40, 40)) - ); - + .addGap(40, 40, 40))); + javax.swing.GroupLayout commentsNotesPaneLayout = new javax.swing.GroupLayout(commentsNotesPane); commentsNotesPane.setLayout(commentsNotesPaneLayout); commentsNotesPaneLayout.setHorizontalGroup( - commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(commentsNotesPaneLayout.createSequentialGroup() + commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(commentsNotesPaneLayout.createSequentialGroup() .addContainerGap() .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 789, Short.MAX_VALUE) - .addGroup(commentsNotesPaneLayout.createSequentialGroup() - .addComponent(commentsNotesField, javax.swing.GroupLayout.PREFERRED_SIZE, 610, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(commentsNotesPaneLayout.createSequentialGroup() - .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(commentsNotesNotifyButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(commentsNotesAddButton, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(commentsNotesSaveButton, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(commentsNotesCancelButton, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addComponent(commentsNotesConfidentialCommentCheckBox)) - .addGap(0, 0, Short.MAX_VALUE))) - .addContainerGap()) - ); + .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 789, Short.MAX_VALUE) + .addGroup(commentsNotesPaneLayout.createSequentialGroup() + .addComponent(commentsNotesField, javax.swing.GroupLayout.PREFERRED_SIZE, 610, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(commentsNotesPaneLayout.createSequentialGroup() + .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(commentsNotesNotifyButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(commentsNotesAddButton, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(commentsNotesSaveButton, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(commentsNotesCancelButton, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(commentsNotesConfidentialCommentCheckBox)) + .addGap(0, 0, Short.MAX_VALUE))) + .addContainerGap())); commentsNotesPaneLayout.setVerticalGroup( - commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(commentsNotesPaneLayout.createSequentialGroup() + commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(commentsNotesPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 165, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(commentsNotesPaneLayout.createSequentialGroup() - .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(commentsNotesAddButton, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(commentsNotesCancelButton, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(0, 0, 0) - .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(commentsNotesNotifyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(commentsNotesSaveButton, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE) - .addComponent(commentsNotesConfidentialCommentCheckBox)) - .addGroup(commentsNotesPaneLayout.createSequentialGroup() - .addGap(2, 2, 2) - .addComponent(commentsNotesField))) - .addGap(40, 40, 40)) - ); + .addGroup(commentsNotesPaneLayout.createSequentialGroup() + .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(commentsNotesAddButton, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(commentsNotesCancelButton, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(0, 0, 0) + .addGroup(commentsNotesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(commentsNotesNotifyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(commentsNotesSaveButton, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE) + .addComponent(commentsNotesConfidentialCommentCheckBox)) + .addGroup(commentsNotesPaneLayout.createSequentialGroup() + .addGap(2, 2, 2) + .addComponent(commentsNotesField))) + .addGap(40, 40, 40))); editLogPane.setPreferredSize(new java.awt.Dimension(809, 300)); editLogTable.setModel(new javax.swing.table.DefaultTableModel( - null, new String [] { - "Date", "Edits/Updates", "Reason", "Changes By", "Terminal" - })); - + null, new String[] + { + "Date", "Edits/Updates", "Reason", "Changes By", "Terminal" + })); + jScrollPane8.setViewportView(editLogTable); @@ -982,25 +1106,24 @@ editLogPane.setLayout(editLogPaneLayout); editLogPaneLayout.setHorizontalGroup( - editLogPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(editLogPaneLayout.createSequentialGroup() + editLogPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(editLogPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane8, javax.swing.GroupLayout.DEFAULT_SIZE, 789, Short.MAX_VALUE) - .addContainerGap()) - ); + .addContainerGap())); editLogPaneLayout.setVerticalGroup( - editLogPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(editLogPaneLayout.createSequentialGroup() + editLogPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(editLogPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane8, javax.swing.GroupLayout.PREFERRED_SIZE, 280, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18)) - ); + .addGap(18, 18, 18))); timesPane.setPreferredSize(new java.awt.Dimension(809, 300)); timesTable.setModel(new javax.swing.table.DefaultTableModel( - null, new String [] { - "Unit", "Alarm Level", "Assigned", "Enroute", "Staged", "Arrival", - "Access", "Depart", "At Dest.", "Status 5", "Available", "Resp Num" - })); + null, new String[] + { + "Unit", "Alarm Level", "Assigned", "Enroute", "Staged", "Arrival", + "Access", "Depart", "At Dest.", "Status 5", "Available", "Resp Num" + })); jScrollPane9.setViewportView(timesTable); @@ -1016,7 +1139,7 @@ timesAllAvailableField.setEditable(false); - + callClosedLabel.setText("Call Closed:"); - + timesCallClosedField.setEditable(false); @@ -1027,48 +1150,46 @@ timesPane.setLayout(timesPaneLayout); timesPaneLayout.setHorizontalGroup( - timesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(timesPaneLayout.createSequentialGroup() + timesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(timesPaneLayout.createSequentialGroup() .addContainerGap() .addGroup(timesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(timesPaneLayout.createSequentialGroup() - .addGap(10, 10, 10) - .addComponent(ringLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(timesRingField, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(inQueueLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(timesInQueueField, javax.swing.GroupLayout.PREFERRED_SIZE, 104, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(allAvailableLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(timesAllAvailableField, javax.swing.GroupLayout.DEFAULT_SIZE, 69, Short.MAX_VALUE) - .addGap(18, 18, 18) - .addComponent(callClosedLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(timesCallClosedField, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(timesPageTimesButton)) - .addComponent(jScrollPane9)) - .addContainerGap()) - ); + .addGroup(timesPaneLayout.createSequentialGroup() + .addGap(10, 10, 10) + .addComponent(ringLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(timesRingField, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(inQueueLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(timesInQueueField, javax.swing.GroupLayout.PREFERRED_SIZE, 104, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(allAvailableLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(timesAllAvailableField, javax.swing.GroupLayout.DEFAULT_SIZE, 69, Short.MAX_VALUE) + .addGap(18, 18, 18) + .addComponent(callClosedLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(timesCallClosedField, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(timesPageTimesButton)) + .addComponent(jScrollPane9)) + .addContainerGap())); timesPaneLayout.setVerticalGroup( - timesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(timesPaneLayout.createSequentialGroup() + timesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(timesPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane9, javax.swing.GroupLayout.PREFERRED_SIZE, 174, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(timesPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(ringLabel) - .addComponent(timesRingField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(inQueueLabel) - .addComponent(timesInQueueField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(allAvailableLabel) - .addComponent(timesAllAvailableField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(callClosedLabel) - .addComponent(timesCallClosedField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(timesPageTimesButton)) - .addContainerGap(88, Short.MAX_VALUE)) - ); + .addComponent(ringLabel) + .addComponent(timesRingField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(inQueueLabel) + .addComponent(timesInQueueField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(allAvailableLabel) + .addComponent(timesAllAvailableField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(callClosedLabel) + .addComponent(timesCallClosedField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(timesPageTimesButton)) + .addContainerGap(88, Short.MAX_VALUE))); transportInfoPane.setPreferredSize(new java.awt.Dimension(809, 300)); @@ -1113,15 +1234,24 @@ transportProtocolLabel.setText("Transport Protocol..."); - transportInfoProtocolComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] {""})); + transportInfoProtocolComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "" + })); transportInfoProtocolComboBox.setEnabled(false); transportPriorityLabel.setText("Transport Priority..."); - transportInfoPriorityComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] {""})); + transportInfoPriorityComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "" + })); transportInfoPriorityComboBox.setEnabled(false); assistedByLabel.setText("Assisted By..."); - transportInfoAssistedByComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] {""})); + transportInfoAssistedByComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] + { + "" + })); transportInfoAssistedByComboBox.setEnabled(false); @@ -1129,22 +1259,21 @@ jPanel7.setLayout(jPanel7Layout); jPanel7Layout.setHorizontalGroup( - jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel7Layout.createSequentialGroup() + jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel7Layout.createSequentialGroup() .addContainerGap() .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(transportInfoProtocolComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(transportInfoPriorityComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(jPanel7Layout.createSequentialGroup() - .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(transportProtocolLabel) - .addComponent(transportPriorityLabel) - .addComponent(assistedByLabel)) - .addGap(0, 94, Short.MAX_VALUE)) - .addComponent(transportInfoAssistedByComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap()) - ); + .addComponent(transportInfoProtocolComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(transportInfoPriorityComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(jPanel7Layout.createSequentialGroup() + .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(transportProtocolLabel) + .addComponent(transportPriorityLabel) + .addComponent(assistedByLabel)) + .addGap(0, 94, Short.MAX_VALUE)) + .addComponent(transportInfoAssistedByComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap())); jPanel7Layout.setVerticalGroup( - jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel7Layout.createSequentialGroup() + jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel7Layout.createSequentialGroup() .addGap(30, 30, 30) .addComponent(transportProtocolLabel) @@ -1159,6 +1288,5 @@ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(transportInfoAssistedByComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(33, Short.MAX_VALUE)) - ); + .addContainerGap(33, Short.MAX_VALUE))); jTabbedPane2.addTab("Mode", jPanel7); @@ -1167,11 +1295,9 @@ jPanel8.setLayout(jPanel8Layout); jPanel8Layout.setHorizontalGroup( - jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 215, Short.MAX_VALUE) - ); + jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 215, Short.MAX_VALUE)); jPanel8Layout.setVerticalGroup( - jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 195, Short.MAX_VALUE) - ); + jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 195, Short.MAX_VALUE)); jTabbedPane2.addTab("Times", jPanel8); @@ -1180,11 +1306,9 @@ jPanel9.setLayout(jPanel9Layout); jPanel9Layout.setHorizontalGroup( - jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 215, Short.MAX_VALUE) - ); + jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 215, Short.MAX_VALUE)); jPanel9Layout.setVerticalGroup( - jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 195, Short.MAX_VALUE) - ); + jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 195, Short.MAX_VALUE)); jTabbedPane2.addTab("Odometer", jPanel9); @@ -1193,11 +1317,9 @@ jPanel10.setLayout(jPanel10Layout); jPanel10Layout.setHorizontalGroup( - jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 215, Short.MAX_VALUE) - ); + jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 215, Short.MAX_VALUE)); jPanel10Layout.setVerticalGroup( - jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 195, Short.MAX_VALUE) - ); + jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 195, Short.MAX_VALUE)); jTabbedPane2.addTab("Caution", jPanel10); @@ -1206,125 +1328,121 @@ jPanel6.setLayout(jPanel6Layout); jPanel6Layout.setHorizontalGroup( - jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel6Layout.createSequentialGroup() + jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel6Layout.createSequentialGroup() .addContainerGap() .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jTextField27) - .addComponent(transportInfoAddPresetTransportRecButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(transportInfoRemoveTransportRecButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(transportInfoLinkUnitToTransportRecButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jTextField27) + .addComponent(transportInfoAddPresetTransportRecButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(transportInfoRemoveTransportRecButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(transportInfoLinkUnitToTransportRecButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel6Layout.createSequentialGroup() - .addGap(5, 5, 5) - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(nameLabel) - .addComponent(transportCityLabel) - .addComponent(transportLocationLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(transportInfoAddressButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addComponent(transportStateLabel) - .addComponent(roomAptEtcLabel) - .addComponent(phoneLabel2)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(transportInfoNameField, javax.swing.GroupLayout.PREFERRED_SIZE, 170, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(transportInfoCityComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(transportInfoLocationField) - .addComponent(transportInfoAddressField) - .addGroup(jPanel6Layout.createSequentialGroup() - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel6Layout.createSequentialGroup() - .addComponent(transportInfoRoomAptEtcField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(buildingNumLabel)) - .addComponent(transportInfoStateField, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(transportInfoBuildingField, javax.swing.GroupLayout.DEFAULT_SIZE, 66, Short.MAX_VALUE) - .addGroup(jPanel6Layout.createSequentialGroup() - .addComponent(transportInfoState2Field, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE)))) - .addGroup(jPanel6Layout.createSequentialGroup() - .addComponent(transportInfoPhoneField, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(14, 14, 14) - .addComponent(transportInfoCancelButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel6Layout.createSequentialGroup() - .addGap(242, 242, 242) - .addComponent(transportInfoSaveButton, javax.swing.GroupLayout.PREFERRED_SIZE, 66, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(jPanel6Layout.createSequentialGroup() + .addGap(5, 5, 5) + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addComponent(nameLabel) + .addComponent(transportCityLabel) + .addComponent(transportLocationLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(transportInfoAddressButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(transportStateLabel) + .addComponent(roomAptEtcLabel) + .addComponent(phoneLabel2)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(transportInfoNameField, javax.swing.GroupLayout.PREFERRED_SIZE, 170, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(transportInfoCityComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(transportInfoLocationField) + .addComponent(transportInfoAddressField) + .addGroup(jPanel6Layout.createSequentialGroup() + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel6Layout.createSequentialGroup() + .addComponent(transportInfoRoomAptEtcField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(buildingNumLabel)) + .addComponent(transportInfoStateField, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(transportInfoBuildingField, javax.swing.GroupLayout.DEFAULT_SIZE, 66, Short.MAX_VALUE) + .addGroup(jPanel6Layout.createSequentialGroup() + .addComponent(transportInfoState2Field, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, Short.MAX_VALUE)))) + .addGroup(jPanel6Layout.createSequentialGroup() + .addComponent(transportInfoPhoneField, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(14, 14, 14) + .addComponent(transportInfoCancelButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel6Layout.createSequentialGroup() + .addGap(242, 242, 242) + .addComponent(transportInfoSaveButton, javax.swing.GroupLayout.PREFERRED_SIZE, 66, javax.swing.GroupLayout.PREFERRED_SIZE))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(jTabbedPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE) - .addContainerGap(84, Short.MAX_VALUE)) - ); + .addContainerGap(84, Short.MAX_VALUE))); jPanel6Layout.setVerticalGroup( - jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel6Layout.createSequentialGroup() + jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel6Layout.createSequentialGroup() .addGap(17, 17, 17) .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jTextField27, javax.swing.GroupLayout.PREFERRED_SIZE, 161, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(jPanel6Layout.createSequentialGroup() - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(nameLabel) - .addComponent(transportInfoNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(transportCityLabel) - .addComponent(transportInfoCityComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(transportLocationLabel) - .addComponent(transportInfoLocationField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(transportInfoAddressButton) - .addComponent(transportInfoAddressField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(23, 23, 23) - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(transportStateLabel) - .addComponent(transportInfoStateField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(transportInfoState2Field, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(roomAptEtcLabel) - .addComponent(transportInfoRoomAptEtcField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(buildingNumLabel) - .addComponent(transportInfoBuildingField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addComponent(jTextField27, javax.swing.GroupLayout.PREFERRED_SIZE, 161, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(jPanel6Layout.createSequentialGroup() + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(nameLabel) + .addComponent(transportInfoNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(transportCityLabel) + .addComponent(transportInfoCityComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(phoneLabel2) - .addComponent(transportInfoPhoneField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(transportInfoCancelButton)) - .addComponent(transportInfoAddPresetTransportRecButton)) + .addComponent(transportLocationLabel) + .addComponent(transportInfoLocationField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(transportInfoAddressButton) + .addComponent(transportInfoAddressField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(23, 23, 23) + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(transportStateLabel) + .addComponent(transportInfoStateField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(transportInfoState2Field, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(roomAptEtcLabel) + .addComponent(transportInfoRoomAptEtcField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(buildingNumLabel) + .addComponent(transportInfoBuildingField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel6Layout.createSequentialGroup() - .addComponent(transportInfoRemoveTransportRecButton) - .addGap(0, 0, Short.MAX_VALUE) - .addComponent(transportInfoLinkUnitToTransportRecButton)) - .addGroup(jPanel6Layout.createSequentialGroup() - .addComponent(transportInfoSaveButton) - .addGap(0, 0, Short.MAX_VALUE))) + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(phoneLabel2) + .addComponent(transportInfoPhoneField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(transportInfoCancelButton)) + .addComponent(transportInfoAddPresetTransportRecButton)) + .addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel6Layout.createSequentialGroup() + .addComponent(transportInfoRemoveTransportRecButton) + .addGap(0, 0, Short.MAX_VALUE) + .addComponent(transportInfoLinkUnitToTransportRecButton)) + .addGroup(jPanel6Layout.createSequentialGroup() + .addComponent(transportInfoSaveButton) + .addGap(0, 0, Short.MAX_VALUE))) .addContainerGap()) - .addGroup(jPanel6Layout.createSequentialGroup() + .addGroup(jPanel6Layout.createSequentialGroup() .addGap(18, 18, 18) .addComponent(jTabbedPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 223, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE)) - ); + .addGap(0, 0, Short.MAX_VALUE))); javax.swing.GroupLayout transportInfoPaneLayout = new javax.swing.GroupLayout(transportInfoPane); transportInfoPane.setLayout(transportInfoPaneLayout); transportInfoPaneLayout.setHorizontalGroup( - transportInfoPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(transportInfoPaneLayout.createSequentialGroup() + transportInfoPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(transportInfoPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) - ); + .addContainerGap())); transportInfoPaneLayout.setVerticalGroup( - transportInfoPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(transportInfoPaneLayout.createSequentialGroup() + transportInfoPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(transportInfoPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel6, javax.swing.GroupLayout.PREFERRED_SIZE, 273, Short.MAX_VALUE) - .addGap(25, 25, 25)) - ); + .addGap(25, 25, 25))); userDataPane.setPreferredSize(new java.awt.Dimension(809, 300)); @@ -1333,7 +1451,8 @@ timeStampsTable.setModel(new javax.swing.table.DefaultTableModel( - null,new String [] { - "Time Stamp Description", "Date", "Time"} - )); + null, new String[] + { + "Time Stamp Description", "Date", "Time" + })); jScrollPane10.setViewportView(timeStampsTable); @@ -1345,7 +1464,7 @@ userDataDateField.setEditable(false); - + timeLabel.setText("Time:"); - + userDataTimeField.setEditable(false); @@ -1354,6 +1473,9 @@ dataFieldsTable.setModel(new javax.swing.table.DefaultTableModel( - null, new String [] {"Data Field Discription", "Data"} )); - + null, new String[] + { + "Data Field Discription", "Data" + })); + jScrollPane11.setViewportView(dataFieldsTable); @@ -1361,5 +1483,5 @@ userDataDataField.setEditable(false); - + userDataCancelButton.setText("Cancel"); userDataCancelButton.setEnabled(false); @@ -1371,92 +1493,89 @@ jPanel11.setLayout(jPanel11Layout); jPanel11Layout.setHorizontalGroup( - jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel11Layout.createSequentialGroup() + jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel11Layout.createSequentialGroup() .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jScrollPane10, javax.swing.GroupLayout.PREFERRED_SIZE, 370, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addGroup(jPanel11Layout.createSequentialGroup() - .addContainerGap() - .addComponent(timeStampsLabel) - .addGap(310, 310, 310)) - .addGroup(jPanel11Layout.createSequentialGroup() - .addGap(27, 27, 27) - .addComponent(dateLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(userDataTimeStampField, javax.swing.GroupLayout.PREFERRED_SIZE, 230, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(jPanel11Layout.createSequentialGroup() - .addComponent(userDataDateField, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(timeLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(userDataTimeField, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(userDataStampButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) + .addComponent(jScrollPane10, javax.swing.GroupLayout.PREFERRED_SIZE, 370, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(jPanel11Layout.createSequentialGroup() + .addContainerGap() + .addComponent(timeStampsLabel) + .addGap(310, 310, 310)) + .addGroup(jPanel11Layout.createSequentialGroup() + .addGap(27, 27, 27) + .addComponent(dateLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(userDataTimeStampField, javax.swing.GroupLayout.PREFERRED_SIZE, 230, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(jPanel11Layout.createSequentialGroup() + .addComponent(userDataDateField, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(timeLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(userDataTimeField, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(userDataStampButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane11, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) - .addGroup(jPanel11Layout.createSequentialGroup() - .addComponent(dataFieldsLabel) - .addGap(0, 0, Short.MAX_VALUE)) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel11Layout.createSequentialGroup() - .addGap(0, 90, Short.MAX_VALUE) - .addComponent(userDataDataField, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(userDataCancelButton, javax.swing.GroupLayout.DEFAULT_SIZE, 70, Short.MAX_VALUE) - .addComponent(userDataSaveButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) - .addContainerGap()) - ); + .addComponent(jScrollPane11, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) + .addGroup(jPanel11Layout.createSequentialGroup() + .addComponent(dataFieldsLabel) + .addGap(0, 0, Short.MAX_VALUE)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel11Layout.createSequentialGroup() + .addGap(0, 90, Short.MAX_VALUE) + .addComponent(userDataDataField, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(userDataCancelButton, javax.swing.GroupLayout.DEFAULT_SIZE, 70, Short.MAX_VALUE) + .addComponent(userDataSaveButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) + .addContainerGap())); jPanel11Layout.setVerticalGroup( - jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(jPanel11Layout.createSequentialGroup() + jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(jPanel11Layout.createSequentialGroup() .addContainerGap() .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(timeStampsLabel) - .addComponent(dataFieldsLabel)) + .addComponent(timeStampsLabel) + .addComponent(dataFieldsLabel)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jScrollPane11, javax.swing.GroupLayout.DEFAULT_SIZE, 170, Short.MAX_VALUE) - .addComponent(jScrollPane10, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)) + .addComponent(jScrollPane11, javax.swing.GroupLayout.DEFAULT_SIZE, 170, Short.MAX_VALUE) + .addComponent(jScrollPane10, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(userDataTimeStampField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(userDataCancelButton)) + .addComponent(userDataTimeStampField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(userDataCancelButton)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(dateLabel) - .addComponent(userDataDateField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(timeLabel) - .addComponent(userDataTimeField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(userDataStampButton) - .addComponent(userDataSaveButton) - .addComponent(userDataDataField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap()) - ); + .addComponent(dateLabel) + .addComponent(userDataDateField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(timeLabel) + .addComponent(userDataTimeField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(userDataStampButton) + .addComponent(userDataSaveButton) + .addComponent(userDataDataField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap())); javax.swing.GroupLayout userDataPaneLayout = new javax.swing.GroupLayout(userDataPane); userDataPane.setLayout(userDataPaneLayout); userDataPaneLayout.setHorizontalGroup( - userDataPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(userDataPaneLayout.createSequentialGroup() + userDataPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(userDataPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel11, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()) - ); + .addContainerGap())); userDataPaneLayout.setVerticalGroup( - userDataPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(userDataPaneLayout.createSequentialGroup() + userDataPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(userDataPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jPanel11, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGap(28, 28, 28)) - ); + .addGap(28, 28, 28))); attachmentsPane.setPreferredSize(new java.awt.Dimension(809, 300)); attachmentsTable.setModel(new javax.swing.table.DefaultTableModel( - null,new String [] { - "Data", "Attachment Type", "Size", "Description"} - )); + null, new String[] + { + "Data", "Attachment Type", "Size", "Description" + })); jScrollPane12.setViewportView(attachmentsTable); @@ -1466,8 +1585,8 @@ attachmentsDescriptionField.setEditable(false); - + attachmentsBrowseButton.setText("jButton38"); attachmentsBrowseButton.setEnabled(false); - + descriptionLabel.setText("Description:"); @@ -1487,58 +1606,56 @@ attachmentsPane.setLayout(attachmentsPaneLayout); attachmentsPaneLayout.setHorizontalGroup( - attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(attachmentsPaneLayout.createSequentialGroup() + attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(attachmentsPaneLayout.createSequentialGroup() .addContainerGap() .addComponent(jScrollPane12, javax.swing.GroupLayout.PREFERRED_SIZE, 452, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(attachmentsPaneLayout.createSequentialGroup() - .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(fileNameLabel) - .addComponent(descriptionLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(attachmentsPaneLayout.createSequentialGroup() - .addComponent(attachmentsFileNameField, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(attachmentsBrowseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 27, Short.MAX_VALUE)) - .addComponent(attachmentsDescriptionField))) - .addGroup(attachmentsPaneLayout.createSequentialGroup() - .addComponent(attachmentsAddButton, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0) - .addComponent(attachmentsDeleteButton, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0) - .addComponent(attachmentsCancelButton, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0) - .addComponent(attachmentsSaveButton, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, Short.MAX_VALUE))) - .addContainerGap()) - ); + .addGroup(attachmentsPaneLayout.createSequentialGroup() + .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(fileNameLabel) + .addComponent(descriptionLabel)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(attachmentsPaneLayout.createSequentialGroup() + .addComponent(attachmentsFileNameField, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(attachmentsBrowseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 27, Short.MAX_VALUE)) + .addComponent(attachmentsDescriptionField))) + .addGroup(attachmentsPaneLayout.createSequentialGroup() + .addComponent(attachmentsAddButton, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) + .addComponent(attachmentsDeleteButton, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) + .addComponent(attachmentsCancelButton, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) + .addComponent(attachmentsSaveButton, javax.swing.GroupLayout.PREFERRED_SIZE, 74, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, Short.MAX_VALUE))) + .addContainerGap())); attachmentsPaneLayout.setVerticalGroup( - attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(attachmentsPaneLayout.createSequentialGroup() + attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(attachmentsPaneLayout.createSequentialGroup() .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(attachmentsPaneLayout.createSequentialGroup() - .addContainerGap() - .addComponent(jScrollPane12, javax.swing.GroupLayout.PREFERRED_SIZE, 250, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(attachmentsPaneLayout.createSequentialGroup() - .addGap(37, 37, 37) - .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(fileNameLabel) - .addComponent(attachmentsFileNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(attachmentsBrowseButton)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(descriptionLabel) - .addComponent(attachmentsDescriptionField, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(36, 36, 36) - .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(attachmentsAddButton) - .addComponent(attachmentsDeleteButton) - .addComponent(attachmentsCancelButton) - .addComponent(attachmentsSaveButton)))) - .addGap(48, 48, 48)) - ); + .addGroup(attachmentsPaneLayout.createSequentialGroup() + .addContainerGap() + .addComponent(jScrollPane12, javax.swing.GroupLayout.PREFERRED_SIZE, 250, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(attachmentsPaneLayout.createSequentialGroup() + .addGap(37, 37, 37) + .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(fileNameLabel) + .addComponent(attachmentsFileNameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(attachmentsBrowseButton)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(descriptionLabel) + .addComponent(attachmentsDescriptionField, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(36, 36, 36) + .addGroup(attachmentsPaneLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(attachmentsAddButton) + .addComponent(attachmentsDeleteButton) + .addComponent(attachmentsCancelButton) + .addComponent(attachmentsSaveButton)))) + .addGap(48, 48, 48))); bottomTabbedPane.addTab("Additional Information", callBacksPane); @@ -1552,277 +1669,276 @@ bottomTabbedPane.addTab("User Data", userDataPane); bottomTabbedPane.addTab("Attachments", attachmentsPane); - + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGap(10, 10, 10) - .addComponent(lawLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(lawField, javax.swing.GroupLayout.PREFERRED_SIZE, 200, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(26, 26, 26) - .addComponent(fireLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(fireField, javax.swing.GroupLayout.PREFERRED_SIZE, 224, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(emsLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(emsField, javax.swing.GroupLayout.PREFERRED_SIZE, 222, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(47, 47, 47)) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabel8) - .addComponent(mediaLabel) - .addComponent(agencyLabel) - .addComponent(locationLabel) - .addComponent(mapLocLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addGroup(layout.createSequentialGroup() - .addComponent(agencyComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(typeCodeLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(typeCodeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 115, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(priLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(priComboBox, 0, 1, Short.MAX_VALUE)) - .addGroup(layout.createSequentialGroup() - .addComponent(addressField, javax.swing.GroupLayout.PREFERRED_SIZE, 239, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(aptLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(aptField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(locationField, javax.swing.GroupLayout.PREFERRED_SIZE, 286, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(layout.createSequentialGroup() - .addComponent(mediaComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 75, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(confidentialCommentCheckBox))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(rightOfPriButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 373, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGroup(layout.createSequentialGroup() - .addGap(35, 35, 35) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(addFspChpButton) - .addComponent(hubXterButton)) - .addGap(32, 32, 32) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(aniAliButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(unitRecButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(updateMapLocButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(showAllButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(51, 51, 51) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(sentToQButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0) - .addComponent(fileButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(exitSendButton, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE)))) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGap(20, 20, 20) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(crossStLabel, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(cityLabel, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(rpLabel, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(phoneLabel, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(aliLabel, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(rpTypeLabel, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(sectorLabel, javax.swing.GroupLayout.Alignment.TRAILING)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(crossStField) - .addGroup(layout.createSequentialGroup() - .addComponent(cityComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(countyLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(countyComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addComponent(rpField) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(sectorComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 145, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(18, 18, 18) - .addComponent(beatLabel)) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addGroup(layout.createSequentialGroup() - .addComponent(phoneField, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(extLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(extField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(rpTypeComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(aliField, javax.swing.GroupLayout.PREFERRED_SIZE, 252, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGap(0, 0, Short.MAX_VALUE)))) - .addGroup(layout.createSequentialGroup() - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(informationButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(carButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(personButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(towRotationButton)) - .addGroup(layout.createSequentialGroup() - .addComponent(mapButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(premiseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(historyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(cautionButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(addButton) - .addGap(45, 45, 45)) - .addGroup(layout.createSequentialGroup() - .addGap(6, 6, 6) - .addComponent(jScrollPane13, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createSequentialGroup() - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(licensePlateInfoLabel) - .addGroup(layout.createSequentialGroup() - .addGap(30, 30, 30) - .addComponent(beatComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))))))) - .addComponent(bottomTabbedPane, javax.swing.GroupLayout.Alignment.TRAILING)) - .addContainerGap()))) - ); + .addGroup(layout.createSequentialGroup() + .addGap(10, 10, 10) + .addComponent(lawLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(lawField, javax.swing.GroupLayout.PREFERRED_SIZE, 200, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(26, 26, 26) + .addComponent(fireLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(fireField, javax.swing.GroupLayout.PREFERRED_SIZE, 224, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(emsLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(emsField, javax.swing.GroupLayout.PREFERRED_SIZE, 222, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(47, 47, 47)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(jLabel8) + .addComponent(mediaLabel) + .addComponent(agencyLabel) + .addComponent(locationLabel) + .addComponent(mapLocLabel)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(layout.createSequentialGroup() + .addComponent(agencyComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(typeCodeLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(typeCodeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 115, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(priLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(priComboBox, 0, 1, Short.MAX_VALUE)) + .addGroup(layout.createSequentialGroup() + .addComponent(addressField, javax.swing.GroupLayout.PREFERRED_SIZE, 239, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(aptLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(aptField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(locationField, javax.swing.GroupLayout.PREFERRED_SIZE, 286, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGroup(layout.createSequentialGroup() + .addComponent(mediaComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 75, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(confidentialCommentCheckBox))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(rightOfPriButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 373, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(layout.createSequentialGroup() + .addGap(35, 35, 35) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(addFspChpButton) + .addComponent(hubXterButton)) + .addGap(32, 32, 32) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(aniAliButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(unitRecButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(updateMapLocButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(showAllButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(51, 51, 51) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(sentToQButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) + .addComponent(fileButton, javax.swing.GroupLayout.PREFERRED_SIZE, 55, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(exitSendButton, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGap(20, 20, 20) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(crossStLabel, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(cityLabel, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(rpLabel, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(phoneLabel, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(aliLabel, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(rpTypeLabel, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(sectorLabel, javax.swing.GroupLayout.Alignment.TRAILING)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(crossStField) + .addGroup(layout.createSequentialGroup() + .addComponent(cityComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(countyLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(countyComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(rpField) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(sectorComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, 145, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(beatLabel)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(layout.createSequentialGroup() + .addComponent(phoneField, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(extLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(extField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(rpTypeComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(aliField, javax.swing.GroupLayout.PREFERRED_SIZE, 252, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGap(0, 0, Short.MAX_VALUE)))) + .addGroup(layout.createSequentialGroup() + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addComponent(informationButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(carButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(personButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(towRotationButton)) + .addGroup(layout.createSequentialGroup() + .addComponent(mapButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(premiseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(historyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(cautionButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(addButton) + .addGap(45, 45, 45)) + .addGroup(layout.createSequentialGroup() + .addGap(6, 6, 6) + .addComponent(jScrollPane13, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createSequentialGroup() + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(licensePlateInfoLabel) + .addGroup(layout.createSequentialGroup() + .addGap(30, 30, 30) + .addComponent(beatComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))))))) + .addComponent(bottomTabbedPane, javax.swing.GroupLayout.Alignment.TRAILING)) + .addContainerGap())))); layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(mapLocLabel) - .addComponent(addressField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(aptLabel) - .addComponent(aptField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(crossStLabel) - .addComponent(crossStField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(mapLocLabel) + .addComponent(addressField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(aptLabel) + .addComponent(aptField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(crossStLabel) + .addComponent(crossStField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(locationLabel) - .addComponent(locationField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(cityLabel) - .addComponent(cityComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(countyLabel) - .addComponent(countyComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(locationLabel) + .addComponent(locationField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(cityLabel) + .addComponent(cityComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(countyLabel) + .addComponent(countyComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(agencyLabel) - .addComponent(agencyComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(typeCodeLabel) - .addComponent(typeCodeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(priLabel) - .addComponent(priComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(mediaLabel) - .addComponent(mediaComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(confidentialCommentCheckBox))) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(rpLabel) - .addComponent(rpField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(phoneLabel) - .addComponent(phoneField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(extLabel) - .addComponent(extField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addComponent(rightOfPriButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(agencyLabel) + .addComponent(agencyComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(typeCodeLabel) + .addComponent(typeCodeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(priLabel) + .addComponent(priComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(mediaLabel) + .addComponent(mediaComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(confidentialCommentCheckBox))) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(rpLabel) + .addComponent(rpField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(phoneLabel) + .addComponent(phoneField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(extLabel) + .addComponent(extField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(rightOfPriButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(aliField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(aliLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(rpTypeLabel) - .addComponent(rpTypeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(sectorComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(beatLabel) - .addComponent(beatComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(sectorLabel)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(carButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(informationButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(personButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(towRotationButton)) - .addGap(15, 15, 15) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(mapButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(premiseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(historyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(cautionButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGroup(layout.createSequentialGroup() - .addComponent(licensePlateInfoLabel) - .addGap(4, 4, 4) - .addComponent(jScrollPane13, javax.swing.GroupLayout.PREFERRED_SIZE, 46, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(addButton)))) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel8) - .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(0, 0, 0) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(aniAliButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(updateMapLocButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(hubXterButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addComponent(exitSendButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(unitRecButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(showAllButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(sentToQButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(fileButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(addFspChpButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(aliField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(aliLabel)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(rpTypeLabel) + .addComponent(rpTypeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(sectorComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(beatLabel) + .addComponent(beatComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(sectorLabel)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(carButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(informationButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(personButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(towRotationButton)) + .addGap(15, 15, 15) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(mapButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(premiseButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(historyButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(cautionButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(layout.createSequentialGroup() + .addComponent(licensePlateInfoLabel) + .addGap(4, 4, 4) + .addComponent(jScrollPane13, javax.swing.GroupLayout.PREFERRED_SIZE, 46, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(addButton)))) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel8) + .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(0, 0, 0) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(aniAliButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(updateMapLocButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(hubXterButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addComponent(exitSendButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(unitRecButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(showAllButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(sentToQButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(fileButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(addFspChpButton, javax.swing.GroupLayout.PREFERRED_SIZE, 35, javax.swing.GroupLayout.PREFERRED_SIZE)))) .addGap(5, 5, 5) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(lawLabel) - .addComponent(lawField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(fireLabel) - .addComponent(fireField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(emsLabel) - .addComponent(emsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(lawLabel) + .addComponent(lawField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(fireLabel) + .addComponent(fireField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(emsLabel) + .addComponent(emsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(bottomTabbedPane, javax.swing.GroupLayout.PREFERRED_SIZE, 330, Short.MAX_VALUE) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))); pack(); - }// - - public JButton makeButton(ImageIcon image, ActionListener listener){ + }// + + public JButton makeButton(ImageIcon image, ActionListener listener) + { JButton button = new JButton(image); Dimension size = new Dimension(image.getImage().getWidth(null), image.getImage().getHeight(null)); @@ -1834,10 +1950,12 @@ return button; } - + /* * Updates the data stored in the incidents class upon exit. */ - public void saveInformation(int incidentId) { - try { + public void saveInformation() + { + try + { ScreenManager.theCoordinator.setCadDataIncLoc(INC_LOC.ADDRESS, incidentId, addressField.getText()); @@ -1881,5 +1999,6 @@ ScreenManager.theCoordinator.setCadDataIncLoc(INC_LOC.BEAT, incidentId, (String) beatComboBox.getSelectedItem()); - } catch (RemoteException e) { + } catch (RemoteException e) + { e.printStackTrace(); } @@ -1888,11 +2007,12 @@ /* * Updates all the strings. - * + * * @see tmcsimulator.cadclient.data.cadData.vectorForIncidentViewer(String * incidentId) for matching up strings. */ - public void refreshInformation(int incidentId) { - this.incidentId = incidentId; - try { + public void refreshInformation() + { + try + { addressField.setText(ScreenManager.theCoordinator.getCadDataIncLoc( INC_LOC.ADDRESS, incidentId)); @@ -1919,5 +2039,5 @@ addInfoIncidentNumField .setText((String) ScreenManager.theCoordinator - .getCadDataIncVal(INC_VAL.MASTER_INC, incidentId)); + .getCadDataIncVal(INC_VAL.MASTER_INC, incidentId)); addInfoIncidentTypeField.setText(ScreenManager.theCoordinator .getCadDataIncAddInfo(INC_ADD_INFO.TYPE, incidentId)); @@ -1928,14 +2048,14 @@ addInfoCallTakerPhoneExtField.setText(ScreenManager.theCoordinator .getCadDataIncAddInfo(INC_ADD_INFO.CALL_TAKER_EXT, - incidentId)); + incidentId)); addInfoCallStatusField .setText(ScreenManager.theCoordinator.getCadDataIncAddInfo( - INC_ADD_INFO.CALL_STATUS, incidentId)); + INC_ADD_INFO.CALL_STATUS, incidentId)); addInfoAlarmLevelField .setText(ScreenManager.theCoordinator.getCadDataIncAddInfo( - INC_ADD_INFO.ALARM_LEVEL, incidentId)); + INC_ADD_INFO.ALARM_LEVEL, incidentId)); addInfoRotationProviderAreaField .setText(ScreenManager.theCoordinator.getCadDataIncAddInfo( - INC_ADD_INFO.ROTATION_PROVIDER_AREA, incidentId)); + INC_ADD_INFO.ROTATION_PROVIDER_AREA, incidentId)); addInfoCommentsField.setText(ScreenManager.theCoordinator .getCadDataIncAddInfo(INC_ADD_INFO.COMMENT, incidentId)); @@ -1965,5 +2085,5 @@ rpTypeComboBox .setSelectedItem((String) ScreenManager.theCoordinator - .getCadDataIncVal(INC_VAL.RP_TYPE, incidentId)); + .getCadDataIncVal(INC_VAL.RP_TYPE, incidentId)); sectorComboBox.setSelectedItem(ScreenManager.theCoordinator .getCadDataIncLoc(INC_LOC.SECTOR, incidentId)); @@ -1972,5 +2092,6 @@ // callBackCommentTable.setModel(cadData.getIncident(incidentId).getCallBackCommentTable()); - } catch (RemoteException e) { + } catch (RemoteException e) + { e.printStackTrace(); } @@ -1982,24 +2103,27 @@ * Displays the information of the latest incident clicked. */ - public void open(int incidentId) { - try { + public void open() + { + try + { if (!ScreenManager.theCoordinator - .checkForValidIncidentID(incidentId)) { + .checkForValidIncidentID(incidentId)) + { return; } - stack.push(incidentId); - refreshInformation(incidentId); + // stack.push(incidentId); JD removed stack, it was broken + refreshInformation(); setTitle("Incident Viewer- Incident ID [" + ScreenManager.theCoordinator.getCadDataIncVal( - INC_VAL.LOG_NUM, incidentId) + INC_VAL.LOG_NUM, incidentId) + "] Master Incident ID[" + ScreenManager.theCoordinator.getCadDataIncVal( - INC_VAL.MASTER_INC, incidentId) + "]"); + INC_VAL.MASTER_INC, incidentId) + "]"); setVisible(true); bottomTabbedPane.setSelectedIndex(4); commentsNotesTable.setModel(ScreenManager.theCoordinator .getCadDataIncidentTable(INC_TABLE.COMMENTS_NOTES, - incidentId)); + incidentId)); commentsNotesTable.getColumnModel().getColumn(0).setPreferredWidth(50); commentsNotesTable.getColumnModel().getColumn(1).setPreferredWidth(50); @@ -2007,40 +2131,78 @@ commentsNotesTable.getColumnModel().getColumn(3).setPreferredWidth(15); commentsNotesTable.getColumnModel().getColumn(4).setPreferredWidth(400); + commentsNotesTable.getColumnModel().getColumn(4).setCellRenderer(new LogEntryCellRenderer()); + commentsNotesField.setText(""); commentsNotesField.setEditable(false); + commentsNotesField.setBackground(java.awt.Color.LIGHT_GRAY); // JD commentsNotesAddButton.setEnabled(true); commentsNotesCancelButton.setEnabled(false); commentsNotesSaveButton.setEnabled(false); - } catch (RemoteException e) { + + } catch (RemoteException e) + { e.printStackTrace(); } } + // JD Invoked by timer every 5 seconds. + public void refreshCommentsNotesTable() + { + try + { + commentsNotesTable.setModel(ScreenManager.theCoordinator + .getCadDataIncidentTable(INC_TABLE.COMMENTS_NOTES, + incidentId)); + //Set up tool tips for the comments column + commentsNotesTable.getColumnModel().getColumn(4).setCellRenderer(new LogEntryCellRenderer()); + + // resets the column widths to preferred width + // this will essentially mean any user changes are reset + commentsNotesTable.getColumnModel().getColumn(0).setPreferredWidth(50); + commentsNotesTable.getColumnModel().getColumn(1).setPreferredWidth(50); + commentsNotesTable.getColumnModel().getColumn(2).setPreferredWidth(15); + commentsNotesTable.getColumnModel().getColumn(3).setPreferredWidth(15); + commentsNotesTable.getColumnModel().getColumn(4).setPreferredWidth(400); + } catch (RemoteException e) + { + e.printStackTrace(); + } + } /* * Closes the information of the latest incident clicked. Closes screen if * there were no previous incidents in the stack. */ - public void close() { - saveInformation(stack.peek()); - stack.pop(); - if (stack.empty()) { - setVisible(false); - } else { - refreshInformation(stack.peek()); - try { - setTitle("Incident Viewer- Incident ID [" - + ScreenManager.theCoordinator.getCadDataIncVal( - INC_VAL.LOG_NUM, incidentId) - + "] Master Incident ID[" - + ScreenManager.theCoordinator.getCadDataIncVal( - INC_VAL.MASTER_INC, incidentId) + "]"); - } catch (RemoteException e) { - e.printStackTrace(); - } - } + + public void close() + { // JD got rid of the stack, since it was broken anyway. + saveInformation(); + setVisible(false); + + /* saveInformation(stack.peek()); + stack.pop(); + setVisible(false); + refreshInformation(stack.peek()); + // Is there a defect that this line wasn't coded? Because when the + // incident is closed, all info is refreshed EXCEPT the comments table + // commentsNotesTable.setModel(ScreenManager.theCoordinator + // .getCadDataIncidentTable(INC_TABLE.COMMENTS_NOTES, + // incidentId)); + try + { + setTitle("Incident Viewer- Incident ID [" + + ScreenManager.theCoordinator.getCadDataIncVal( + INC_VAL.LOG_NUM, incidentId) + + "] Master Incident ID[" + + ScreenManager.theCoordinator.getCadDataIncVal( + INC_VAL.MASTER_INC, incidentId) + "]"); + } catch (RemoteException e) + { + e.printStackTrace(); + } + */ + ScreenManager.refreshScreens(); ScreenManager.refreshIncidentEditor(); } - // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JPanel activitiesPane; @@ -2104,5 +2266,5 @@ private javax.swing.JButton commentsNotesCancelButton; private javax.swing.JCheckBox commentsNotesConfidentialCommentCheckBox; - private javax.swing.JTextField commentsNotesField; + private javax.swing.JTextArea commentsNotesField; // JD private javax.swing.JButton commentsNotesNotifyButton; private javax.swing.JPanel commentsNotesPane; Index: trunk/src/tmcsim/client/cadclientgui/screens/UnitStatus.java =================================================================== --- trunk/src/tmcsim/client/cadclientgui/screens/UnitStatus.java (revision 3) +++ trunk/src/tmcsim/client/cadclientgui/screens/UnitStatus.java (revision 59) @@ -4,4 +4,5 @@ import java.awt.Component; import java.awt.Dimension; +import java.awt.Point; import java.awt.Toolkit; import java.awt.datatransfer.DataFlavor; @@ -17,5 +18,4 @@ import java.rmi.RemoteException; import java.util.List; - import javax.swing.Box; import javax.swing.BoxLayout; @@ -28,5 +28,4 @@ import javax.swing.JTable; import javax.swing.ListSelectionModel; -import javax.swing.RowSorter; import javax.swing.RowSorter.SortKey; import javax.swing.SwingUtilities; @@ -34,5 +33,4 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; - import tmcsim.client.cadclientgui.enums.CADDataEnums; import tmcsim.client.cadclientgui.enums.CADScriptTags.UNIT_TAGS; @@ -41,53 +39,47 @@ /** - * This class contains the view and controller for the UnitStatus screen. The view was not built using a GUI builder plug-in - * (but may want to consider doing so in the future), and the controller uses listeners to control how the view and data act. - * + * This class contains the view and controller for the UnitStatus screen. The + * view was not built using a GUI builder plug-in (but may want to consider + * doing so in the future), and the controller uses listeners to control how the + * view and data act. + * * @author Vincent */ - -public class UnitStatus extends JFrame { - +public class UnitStatus extends JFrame +{ private final int ONE_SECOND = 1000; - private final String SCREEN_TITLE = "(Shift + F4) Unit Status"; - private final Dimension SCREEN_DIMENSIONS = new Dimension(1400, 250); - private final Dimension DROP_DOWN_MENU_LABEL_DIMENSIONS = new Dimension( 170, 20); - private final Dimension DROP_DOWN_MENU_DIMENSIONS = new Dimension(170, 300); - private final Dimension BUTTON_DIMENSIONS = new Dimension(100, 25); - private final int COLUMN_WIDTH = 120; - - private final String[] LABELS = { "10-8", "OFC", "OOS", - "Open Unit Details", "Open Unit Activity Log", "Map", - "Change Vehicle", "Unit Poll", "Quick Note...", - "Activate User Timer...", "Filters", "Page...", "Roster System", - "10-10" }; - - private final String[] WITH_ASSIGNED_INC_LABELS = { "STAGE", "10-97", - "10-8", "ASSIGNED ALT...", "ENRT ALT...", "10-97 ALT...", - "Open Incident", "Recall Incident", "Open Unit Details", - "Open Unit Activity Log", "Map", "Recall Linked Incidents", - "Cancel", "Reassign", "Duplicate", "Unit Poll", "Quick Note...", - "Activate User Timer...", "Filters", "Page...", "Fax..." }; - + private final String[] LABELS = + { + "10-8", "OFC", "OOS", + "Open Unit Details", "Open Unit Activity Log", "Map", + "Change Vehicle", "Unit Poll", "Quick Note...", + "Activate User Timer...", "Filters", "Page...", "Roster System", + "10-10" + }; + private final String[] WITH_ASSIGNED_INC_LABELS = + { + "STAGE", "10-97", + "10-8", "ASSIGNED ALT...", "ENRT ALT...", "10-97 ALT...", + "Open Incident", "Recall Incident", "Open Unit Details", + "Open Unit Activity Log", "Map", "Recall Linked Incidents", + "Cancel", "Reassign", "Duplicate", "Unit Poll", "Quick Note...", + "Activate User Timer...", "Filters", "Page...", "Fax..." + }; private final String LABEL_SPACING = " "; - // this box holds both the table and the buttons below private Box unitStatusFrame; - private JTable unitStatusTable; private JFrame unitStatusMenu; private JFrame unitStatusWithAssignedIncMenu; - // labels for the drop down menu private JLabel[] dropDownLabels = new JLabel[LABELS.length]; private JLabel[] dropDownWithAssignedIncLabels = new JLabel[WITH_ASSIGNED_INC_LABELS.length]; - private JButton buttonEnrt; private JButton buttonStage; @@ -101,9 +93,11 @@ private JButton buttonOOS; - public UnitStatus() { + public UnitStatus() + { initComponents(); } - private void initComponents() { + private void initComponents() + { initializeTable(); initControllers(); @@ -138,43 +132,51 @@ * drop feature. */ - private void initializeTable() { - unitStatusTable = new JTable() { + private void initializeTable() + { + unitStatusTable = new JTable() + { /** * Custom renderer to set different background/foreground colors - * - * @see javax.swing.JTable#prepareRenderer(javax.swing.table.TableCellRenderer, - * int, int) + * + * @see + * javax.swing.JTable#prepareRenderer(javax.swing.table.TableCellRenderer, + * int, int) */ public Component prepareRenderer(TableCellRenderer renderer, - int row, int column) { + int row, int column) + { Component comp = super.prepareRenderer(renderer, row, column); int unitNumColumn = 2; - try { + try + { switch (ScreenManager.theCoordinator .getCadDataUnitStatus((String) unitStatusTable - .getValueAt(row, unitNumColumn))) { - case Assignable: - comp.setForeground(Color.GREEN); - comp.setBackground(Color.BLACK); - break; - case Arrived: - comp.setForeground(Color.YELLOW); - comp.setBackground(Color.BLACK); - break; - case NotAssignable: - comp.setForeground(Color.BLACK); - comp.setBackground(Color.GRAY); - break; - case Enroute: - comp.setForeground(Color.CYAN); - comp.setBackground(Color.BLACK); - break; + .getValueAt(row, unitNumColumn))) + { + case Assignable: + comp.setForeground(Color.GREEN); + comp.setBackground(Color.BLACK); + break; + case Arrived: + comp.setForeground(Color.YELLOW); + comp.setBackground(Color.BLACK); + break; + case NotAssignable: + comp.setForeground(Color.BLACK); + comp.setBackground(Color.GRAY); + break; + case Enroute: + comp.setForeground(Color.CYAN); + comp.setBackground(Color.BLACK); + break; } - } catch (RemoteException e) { + } catch (RemoteException e) + { e.printStackTrace(); } - if (getSelectedRow() == row) { + if (getSelectedRow() == row) + { comp.setForeground(Color.WHITE); comp.setBackground(Color.BLUE); @@ -198,8 +200,10 @@ .setColumnIdentifiers(TableHeaders.UNIT_STATUS_HEADERS); - unitStatusTable.setTransferHandler(new TransferHandler() { - - public boolean canImport(TransferHandler.TransferSupport info) { - if (!info.isDataFlavorSupported(DataFlavor.stringFlavor)) { + unitStatusTable.setTransferHandler(new TransferHandler() + { + public boolean canImport(TransferHandler.TransferSupport info) + { + if (!info.isDataFlavorSupported(DataFlavor.stringFlavor)) + { return false; } @@ -207,16 +211,18 @@ } - public int getSourceActions(JComponent c) { + public int getSourceActions(JComponent c) + { return TransferHandler.COPY_OR_MOVE; } - protected Transferable createTransferable(JComponent c) { + protected Transferable createTransferable(JComponent c) + { return new StringSelection((String) unitStatusTable.getValueAt( unitStatusTable.getSelectedRow(), 2)); } - }); - for (int i = 0; i < unitStatusTable.getColumnCount(); i++) { + for (int i = 0; i < unitStatusTable.getColumnCount(); i++) + { unitStatusTable.getColumnModel().getColumn(i) .setPreferredWidth(COLUMN_WIDTH); @@ -228,24 +234,57 @@ * screen. */ - private void initControllers() { - unitStatusTable.addMouseListener(new MouseListener() { - public void mouseClicked(MouseEvent e) { +//TODO: JD If one unit has been selected, but you right-click on a different one. +//Exception in thread "AWT-EventQueue-0" java.lang.IndexOutOfBoundsException: Invalid index +// at javax.swing.DefaultRowSorter.convertRowIndexToModel(DefaultRowSorter.java:514) +// at javax.swing.JTable.convertRowIndexToModel(JTable.java:2642) +// at javax.swing.JTable.getValueAt(JTable.java:2717) +// at tmcsim.client.cadclientgui.screens.UnitStatus$3.mouseClicked(UnitStatus.java:234) + private void initControllers() + { + unitStatusTable.addMouseListener(new MouseListener() + { + public void mouseClicked(MouseEvent e) + { int unitColumn = 2; + // Fixed to force right click to cause the row to be selected. JD + // get the coordinates of the mouse click + Point p = e.getPoint(); + // get the row index that contains that coordinate + int rowNumber = unitStatusTable.rowAtPoint(p); + // Get the ListSelectionModel of the JTable + ListSelectionModel model = unitStatusTable.getSelectionModel(); + // set the selected interval of rows. Using the "rowNumber" + // variable for the beginning and end selects only that one row. + model.setSelectionInterval(rowNumber, rowNumber); + String unitNum = (String) unitStatusTable.getValueAt( - unitStatusTable.getSelectedRow(), unitColumn); - if (SwingUtilities.isRightMouseButton(e)) { - try { + rowNumber, unitColumn); + // Validity check for non-empty unit number + if (unitNum.equals("")) + { + return; + } + if (SwingUtilities.isRightMouseButton(e)) + { + try + { if (ScreenManager.theCoordinator .getCadDataUnitStatus(unitNum) == UnitStatusEnums.Enroute || ScreenManager.theCoordinator - .getCadDataUnitStatus(unitNum) == UnitStatusEnums.Arrived) { + .getCadDataUnitStatus(unitNum) == UnitStatusEnums.Arrived) + { openDropDownWithAssignedIncMenu(e); - } else { + } + else + { openDropDownMenu(e); } - } catch (RemoteException e1) { + } catch (RemoteException e1) + { e1.printStackTrace(); } - } else { + } + else + { closeDropDownMenu(); closeDropDownWithAssignedIncMenu(); @@ -253,29 +292,38 @@ } - public void mouseEntered(MouseEvent e) { - } - - public void mouseExited(MouseEvent e) { - } - - public void mousePressed(MouseEvent e) { - } - - public void mouseReleased(MouseEvent e) { + public void mouseEntered(MouseEvent e) + { + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + } + + public void mouseReleased(MouseEvent e) + { } }); - addComponentListener(new ComponentListener() { - public void componentHidden(ComponentEvent e) { - } - - public void componentMoved(ComponentEvent e) { + addComponentListener(new ComponentListener() + { + public void componentHidden(ComponentEvent e) + { + } + + public void componentMoved(ComponentEvent e) + { closeDropDownMenu(); } - public void componentResized(ComponentEvent e) { - } - - public void componentShown(ComponentEvent e) { + public void componentResized(ComponentEvent e) + { + } + + public void componentShown(ComponentEvent e) + { } }); @@ -286,5 +334,6 @@ * on the table. */ - private void initializeDropDownMenus() { + private void initializeDropDownMenus() + { Box menu = new Box(BoxLayout.Y_AXIS); initializeDropDownLabels(); @@ -319,6 +368,8 @@ * labels are not implemented so no listeners are added. */ - private void initializeDropDownLabels() { - for (int i = 0; i < dropDownLabels.length; i++) { + private void initializeDropDownLabels() + { + for (int i = 0; i < dropDownLabels.length; i++) + { dropDownLabels[i] = new JLabel(LABEL_SPACING + LABELS[i]); dropDownLabels[i].setMaximumSize(DROP_DOWN_MENU_LABEL_DIMENSIONS); @@ -330,6 +381,8 @@ * Sets the text and size and adds a listener to each activated label. */ - private void initializeDropDownWithAssignedIncLabels() { - for (int i = 0; i < dropDownWithAssignedIncLabels.length; i++) { + private void initializeDropDownWithAssignedIncLabels() + { + for (int i = 0; i < dropDownWithAssignedIncLabels.length; i++) + { dropDownWithAssignedIncLabels[i] = new JLabel(LABEL_SPACING + WITH_ASSIGNED_INC_LABELS[i]); @@ -347,5 +400,6 @@ * between. */ - private void addLabelsToBox(Box menu) { + private void addLabelsToBox(Box menu) + { menu.add(dropDownLabels[0]); menu.add(dropDownLabels[1]); @@ -400,5 +454,6 @@ * between. */ - private void addWithAssignedIncLabelsToBox(Box menu) { + private void addWithAssignedIncLabelsToBox(Box menu) + { menu.add(dropDownWithAssignedIncLabels[0]); menu.add(dropDownWithAssignedIncLabels[1]); @@ -454,17 +509,22 @@ * Creates each button and handles the action performed by the button. */ - public void initializeBottomButtons(Box bottomButtons) { - bottomButtons.add(buttonEnrt = makeButton("ENRT", new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - try { + public void initializeBottomButtons(Box bottomButtons) + { + bottomButtons.add(buttonEnrt = makeButton("ENRT", new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { + try + { ScreenManager.theCoordinator.setCadDataUnitValue( (String) unitStatusTable.getValueAt( - unitStatusTable.getSelectedRow(), 2), + unitStatusTable.getSelectedRow(), 2), UNIT_TAGS.STATUS, "ENRT"); ScreenManager.theCoordinator.setCadDataUnitValue( (String) unitStatusTable.getValueAt( - unitStatusTable.getSelectedRow(), 2), + unitStatusTable.getSelectedRow(), 2), UNIT_TAGS.UNIT_STATUS, UnitStatusEnums.Enroute); - } catch (RemoteException e) { + } catch (RemoteException e) + { e.printStackTrace(); } @@ -473,69 +533,85 @@ })); bottomButtons.add(buttonStage = makeButton("STAGE", - new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - try { - ScreenManager.theCoordinator.setCadDataUnitValue( - (String) unitStatusTable - .getValueAt(unitStatusTable - .getSelectedRow(), 2), - UNIT_TAGS.STATUS, "STAGE"); - } catch (RemoteException e) { - e.printStackTrace(); - } - refreshTable(); - } - })); + new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { + try + { + ScreenManager.theCoordinator.setCadDataUnitValue( + (String) unitStatusTable + .getValueAt(unitStatusTable + .getSelectedRow(), 2), + UNIT_TAGS.STATUS, "STAGE"); + } catch (RemoteException e) + { + e.printStackTrace(); + } + refreshTable(); + } + })); bottomButtons.add(button1097 = makeButton("10-97", - new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - try { - ScreenManager.theCoordinator.setCadDataUnitValue( - (String) unitStatusTable - .getValueAt(unitStatusTable - .getSelectedRow(), 2), - UNIT_TAGS.STATUS, "10-97"); - ScreenManager.theCoordinator.setCadDataUnitValue( - (String) unitStatusTable - .getValueAt(unitStatusTable - .getSelectedRow(), 2), - UNIT_TAGS.UNIT_STATUS, - UnitStatusEnums.Arrived); - } catch (RemoteException e) { - e.printStackTrace(); - } - refreshTable(); - } - })); + new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { + try + { + ScreenManager.theCoordinator.setCadDataUnitValue( + (String) unitStatusTable + .getValueAt(unitStatusTable + .getSelectedRow(), 2), + UNIT_TAGS.STATUS, "10-97"); + ScreenManager.theCoordinator.setCadDataUnitValue( + (String) unitStatusTable + .getValueAt(unitStatusTable + .getSelectedRow(), 2), + UNIT_TAGS.UNIT_STATUS, + UnitStatusEnums.Arrived); + } catch (RemoteException e) + { + e.printStackTrace(); + } + refreshTable(); + } + })); bottomButtons.add(buttonCode4 = makeButton("CODE 4", - new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - try { - ScreenManager.theCoordinator.setCadDataUnitValue( - (String) unitStatusTable - .getValueAt(unitStatusTable - .getSelectedRow(), 2), - UNIT_TAGS.STATUS, "CODE 4"); - } catch (RemoteException e) { - e.printStackTrace(); - } - refreshTable(); - } - })); + new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { + try + { + ScreenManager.theCoordinator.setCadDataUnitValue( + (String) unitStatusTable + .getValueAt(unitStatusTable + .getSelectedRow(), 2), + UNIT_TAGS.STATUS, "CODE 4"); + } catch (RemoteException e) + { + e.printStackTrace(); + } + refreshTable(); + } + })); bottomButtons.add(buttonDash1 = makeButton("-", null)); bottomButtons.add(buttonDash2 = makeButton("-", null)); bottomButtons.add(buttonDash3 = makeButton("-", null)); - bottomButtons.add(button108 = makeButton("10-8", new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - try { + bottomButtons.add(button108 = makeButton("10-8", new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { + try + { ScreenManager.theCoordinator.setCadDataUnitValue( (String) unitStatusTable.getValueAt( - unitStatusTable.getSelectedRow(), 2), + unitStatusTable.getSelectedRow(), 2), UNIT_TAGS.STATUS, "10-8"); ScreenManager.theCoordinator.setCadDataUnitValue( (String) unitStatusTable.getValueAt( - unitStatusTable.getSelectedRow(), 2), + unitStatusTable.getSelectedRow(), 2), UNIT_TAGS.UNIT_STATUS, UnitStatusEnums.Assignable); - } catch (RemoteException e) { + } catch (RemoteException e) + { e.printStackTrace(); } @@ -543,16 +619,20 @@ } })); - bottomButtons.add(buttonOFC = makeButton("OFC", new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - try { + bottomButtons.add(buttonOFC = makeButton("OFC", new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { + try + { ScreenManager.theCoordinator.setCadDataUnitValue( (String) unitStatusTable.getValueAt( - unitStatusTable.getSelectedRow(), 2), + unitStatusTable.getSelectedRow(), 2), UNIT_TAGS.STATUS, "OFC"); ScreenManager.theCoordinator.setCadDataUnitValue( (String) unitStatusTable.getValueAt( - unitStatusTable.getSelectedRow(), 2), + unitStatusTable.getSelectedRow(), 2), UNIT_TAGS.UNIT_STATUS, UnitStatusEnums.Arrived); - } catch (RemoteException e) { + } catch (RemoteException e) + { e.printStackTrace(); } @@ -560,17 +640,21 @@ } })); - bottomButtons.add(buttonOOS = makeButton("OOS", new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - try { + bottomButtons.add(buttonOOS = makeButton("OOS", new ActionListener() + { + public void actionPerformed(ActionEvent arg0) + { + try + { ScreenManager.theCoordinator.setCadDataUnitValue( (String) unitStatusTable.getValueAt( - unitStatusTable.getSelectedRow(), 2), + unitStatusTable.getSelectedRow(), 2), UNIT_TAGS.STATUS, "OOS"); ScreenManager.theCoordinator.setCadDataUnitValue( (String) unitStatusTable.getValueAt( - unitStatusTable.getSelectedRow(), 2), + unitStatusTable.getSelectedRow(), 2), UNIT_TAGS.UNIT_STATUS, UnitStatusEnums.NotAssignable); - } catch (RemoteException e) { + } catch (RemoteException e) + { e.printStackTrace(); } @@ -582,12 +666,13 @@ /* * Makes a JButton with an text and listener. - * + * * @param text the text to be displayed - * + * * @param listener the action listener for this button. - * + * * @return the JButton. */ - public JButton makeButton(String text, ActionListener listener) { + public JButton makeButton(String text, ActionListener listener) + { JButton button = new JButton(text); button.setBackground(Color.GRAY); @@ -606,9 +691,11 @@ * Sets the highlighted color(when the mouse is over it) of the JLabels. * Note: the color is not shown until .setOpaque(true) is called. - * + * * @param color the highlighted color */ - public void setMenuHighlightedBackground(Color color) { - for (int i = 0; i < dropDownLabels.length; i++) { + public void setMenuHighlightedBackground(Color color) + { + for (int i = 0; i < dropDownLabels.length; i++) + { dropDownLabels[i].setBackground(color); } @@ -618,9 +705,11 @@ * Sets the highlighted color(when the mouse is over it) of the JLabels. * Note: the color is not shown until .setOpaque(true) is called. - * + * * @param color the highlighted color */ - public void setWithAssignedIncMenuHighlightedBackground(Color color) { - for (int i = 0; i < dropDownWithAssignedIncLabels.length; i++) { + public void setWithAssignedIncMenuHighlightedBackground(Color color) + { + for (int i = 0; i < dropDownWithAssignedIncLabels.length; i++) + { dropDownWithAssignedIncLabels[i].setBackground(color); } @@ -630,6 +719,8 @@ * Sets all JLabels to not display a highlighted background */ - public void unSelectAllLabels() { - for (int i = 0; i < dropDownLabels.length; i++) { + public void unSelectAllLabels() + { + for (int i = 0; i < dropDownLabels.length; i++) + { dropDownLabels[i].setOpaque(false); } @@ -639,6 +730,8 @@ * Sets all JLabels to not display a highlighted background */ - public void unSelectAllWithAssignedIncLabels() { - for (int i = 0; i < dropDownWithAssignedIncLabels.length; i++) { + public void unSelectAllWithAssignedIncLabels() + { + for (int i = 0; i < dropDownWithAssignedIncLabels.length; i++) + { dropDownWithAssignedIncLabels[i].setOpaque(false); } @@ -647,8 +740,9 @@ /* * Sets the label to have a highlighted background. - * + * * @param label the label that is selected/highlighted */ - public void selectLabel(Object label) { + public void selectLabel(Object label) + { ((JLabel) label).setOpaque(true); } @@ -657,33 +751,47 @@ * Performs the label action depending on which label was clicked. */ - public void performLabelAction(Object label) { - if (label.equals(dropDownLabels[0])) { // 10-8 - - } else if (label.equals(dropDownLabels[1])) { // OFC - - } else if (label.equals(dropDownLabels[2])) { // OOS - - } else if (label.equals(dropDownLabels[3])) { // Open Unit Details - - } else if (label.equals(dropDownLabels[4])) { // Open Unit Activity Log - - } else if (label.equals(dropDownLabels[5])) { // Map - - } else if (label.equals(dropDownLabels[6])) { // Change Vehicle - - } else if (label.equals(dropDownLabels[7])) { // Unit Poll - - } else if (label.equals(dropDownLabels[8])) { // Quick Notes - - } else if (label.equals(dropDownLabels[9])) { // Activate User Timer - - } else if (label.equals(dropDownLabels[10])) { // Filters - - } else if (label.equals(dropDownLabels[11])) { // Page - - } else if (label.equals(dropDownLabels[12])) { // Roster System - - } else if (label.equals(dropDownLabels[13])) { // 10-10 - + public void performLabelAction(Object label) + { + if (label.equals(dropDownLabels[0])) + { // 10-8 + } + else if (label.equals(dropDownLabels[1])) + { // OFC + } + else if (label.equals(dropDownLabels[2])) + { // OOS + } + else if (label.equals(dropDownLabels[3])) + { // Open Unit Details + } + else if (label.equals(dropDownLabels[4])) + { // Open Unit Activity Log + } + else if (label.equals(dropDownLabels[5])) + { // Map + } + else if (label.equals(dropDownLabels[6])) + { // Change Vehicle + } + else if (label.equals(dropDownLabels[7])) + { // Unit Poll + } + else if (label.equals(dropDownLabels[8])) + { // Quick Notes + } + else if (label.equals(dropDownLabels[9])) + { // Activate User Timer + } + else if (label.equals(dropDownLabels[10])) + { // Filters + } + else if (label.equals(dropDownLabels[11])) + { // Page + } + else if (label.equals(dropDownLabels[12])) + { // Roster System + } + else if (label.equals(dropDownLabels[13])) + { // 10-10 } } @@ -692,66 +800,88 @@ * Performs the label action depending on which label was clicked. */ - public void performWithAssignedIncLabelAction(Object label) { - if (label.equals(dropDownWithAssignedIncLabels[0])) { // STAGE - - } else if (label.equals(dropDownWithAssignedIncLabels[1])) { // 10-97 - - } else if (label.equals(dropDownWithAssignedIncLabels[2])) { // 10-8 - - } else if (label.equals(dropDownWithAssignedIncLabels[3])) { // ASSIGN - // ALT... - - } else if (label.equals(dropDownWithAssignedIncLabels[4])) { // ENRT - // ALT... - - } else if (label.equals(dropDownWithAssignedIncLabels[5])) { // 10-97 - // ALT... - - } else if (label.equals(dropDownWithAssignedIncLabels[6])) { // Open - // Incident + public void performWithAssignedIncLabelAction(Object label) + { + if (label.equals(dropDownWithAssignedIncLabels[0])) + { // STAGE + } + else if (label.equals(dropDownWithAssignedIncLabels[1])) + { // 10-97 + } + else if (label.equals(dropDownWithAssignedIncLabels[2])) + { // 10-8 + } + else if (label.equals(dropDownWithAssignedIncLabels[3])) + { // ASSIGN + // ALT... + } + else if (label.equals(dropDownWithAssignedIncLabels[4])) + { // ENRT + // ALT... + } + else if (label.equals(dropDownWithAssignedIncLabels[5])) + { // 10-97 + // ALT... + } + else if (label.equals(dropDownWithAssignedIncLabels[6])) + { // Open + // Incident int idColumn = 0; ScreenManager.openIncidentViewer(Integer .parseInt((String) unitStatusTable.getValueAt( - unitStatusTable.getSelectedRow(), idColumn))); - } else if (label.equals(dropDownWithAssignedIncLabels[7])) { // Recall - // Incident - - } else if (label.equals(dropDownWithAssignedIncLabels[8])) { // Open - // Unit - // Details - - } else if (label.equals(dropDownWithAssignedIncLabels[9])) { // Open - // Unit - // Activity - // Log - - } else if (label.equals(dropDownWithAssignedIncLabels[10])) { // Map - - } else if (label.equals(dropDownWithAssignedIncLabels[11])) { // Recall - // Linked - // Incidents - - } else if (label.equals(dropDownWithAssignedIncLabels[12])) { // Cancel - - } else if (label.equals(dropDownWithAssignedIncLabels[13])) { // Reassign - - } else if (label.equals(dropDownWithAssignedIncLabels[14])) { // Duplicate - - } else if (label.equals(dropDownWithAssignedIncLabels[15])) { // Unit - // Poll - - } else if (label.equals(dropDownWithAssignedIncLabels[16])) { // Quick - // Note... - - } else if (label.equals(dropDownWithAssignedIncLabels[17])) { // Activate - // User - // Timer... - - } else if (label.equals(dropDownWithAssignedIncLabels[18])) { // Filters - - } else if (label.equals(dropDownWithAssignedIncLabels[19])) { // Page... - - } else if (label.equals(dropDownWithAssignedIncLabels[20])) { // Fax... - + unitStatusTable.getSelectedRow(), idColumn))); + } + else if (label.equals(dropDownWithAssignedIncLabels[7])) + { // Recall + // Incident + } + else if (label.equals(dropDownWithAssignedIncLabels[8])) + { // Open + // Unit + // Details + } + else if (label.equals(dropDownWithAssignedIncLabels[9])) + { // Open + // Unit + // Activity + // Log + } + else if (label.equals(dropDownWithAssignedIncLabels[10])) + { // Map + } + else if (label.equals(dropDownWithAssignedIncLabels[11])) + { // Recall + // Linked + // Incidents + } + else if (label.equals(dropDownWithAssignedIncLabels[12])) + { // Cancel + } + else if (label.equals(dropDownWithAssignedIncLabels[13])) + { // Reassign + } + else if (label.equals(dropDownWithAssignedIncLabels[14])) + { // Duplicate + } + else if (label.equals(dropDownWithAssignedIncLabels[15])) + { // Unit + // Poll + } + else if (label.equals(dropDownWithAssignedIncLabels[16])) + { // Quick + // Note... + } + else if (label.equals(dropDownWithAssignedIncLabels[17])) + { // Activate + // User + // Timer... + } + else if (label.equals(dropDownWithAssignedIncLabels[18])) + { // Filters + } + else if (label.equals(dropDownWithAssignedIncLabels[19])) + { // Page... + } + else if (label.equals(dropDownWithAssignedIncLabels[20])) + { // Fax... } } @@ -763,10 +893,14 @@ * designates. */ - public void addMouseListenersToLabel(JLabel label) { - label.addMouseMotionListener(new MouseMotionListener() { - public void mouseDragged(MouseEvent e) { - } - - public void mouseMoved(MouseEvent e) { + public void addMouseListenersToLabel(JLabel label) + { + label.addMouseMotionListener(new MouseMotionListener() + { + public void mouseDragged(MouseEvent e) + { + } + + public void mouseMoved(MouseEvent e) + { unSelectAllLabels(); selectLabel(e.getSource()); @@ -775,6 +909,8 @@ } }); - label.addMouseListener(new MouseListener() { - public void mouseClicked(MouseEvent e) { + label.addMouseListener(new MouseListener() + { + public void mouseClicked(MouseEvent e) + { performLabelAction(e.getSource()); unSelectAllLabels(); @@ -784,14 +920,18 @@ } - public void mouseEntered(MouseEvent e) { - } - - public void mouseExited(MouseEvent e) { - } - - public void mousePressed(MouseEvent e) { - } - - public void mouseReleased(MouseEvent e) { + public void mouseEntered(MouseEvent e) + { + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + } + + public void mouseReleased(MouseEvent e) + { } }); @@ -804,10 +944,14 @@ * designates. */ - public void addMouseListenersToWithAssignedIncLabel(JLabel label) { - label.addMouseMotionListener(new MouseMotionListener() { - public void mouseDragged(MouseEvent e) { - } - - public void mouseMoved(MouseEvent e) { + public void addMouseListenersToWithAssignedIncLabel(JLabel label) + { + label.addMouseMotionListener(new MouseMotionListener() + { + public void mouseDragged(MouseEvent e) + { + } + + public void mouseMoved(MouseEvent e) + { unSelectAllLabels(); selectLabel(e.getSource()); @@ -816,6 +960,8 @@ } }); - label.addMouseListener(new MouseListener() { - public void mouseClicked(MouseEvent e) { + label.addMouseListener(new MouseListener() + { + public void mouseClicked(MouseEvent e) + { performWithAssignedIncLabelAction(e.getSource()); unSelectAllLabels(); @@ -825,14 +971,18 @@ } - public void mouseEntered(MouseEvent e) { - } - - public void mouseExited(MouseEvent e) { - } - - public void mousePressed(MouseEvent e) { - } - - public void mouseReleased(MouseEvent e) { + public void mouseEntered(MouseEvent e) + { + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + } + + public void mouseReleased(MouseEvent e) + { } }); @@ -842,5 +992,6 @@ * Displays the menu where the right click occurred. */ - public void openDropDownMenu(MouseEvent e) { + public void openDropDownMenu(MouseEvent e) + { unitStatusMenu.setLocation(e.getX() + this.getX(), e.getY() + this.getY()); @@ -851,5 +1002,6 @@ * Displays the menu where the right click occurred. */ - public void openDropDownWithAssignedIncMenu(MouseEvent e) { + public void openDropDownWithAssignedIncMenu(MouseEvent e) + { unitStatusWithAssignedIncMenu.setLocation(e.getX() + this.getX(), e.getY() + this.getY()); @@ -860,5 +1012,6 @@ * Hides the menu. */ - public void closeDropDownMenu() { + public void closeDropDownMenu() + { unSelectAllLabels(); unitStatusMenu.revalidate(); @@ -870,5 +1023,6 @@ * Hides the menu. */ - public void closeDropDownWithAssignedIncMenu() { + public void closeDropDownWithAssignedIncMenu() + { unSelectAllLabels(); unitStatusWithAssignedIncMenu.revalidate(); @@ -879,30 +1033,36 @@ /* * Refreshes the data in the table by updating all data and repainting the - * screen. It saves user preferences(like column sizes, selected row, sorted preferences) + * screen. It saves user preferences(like column sizes, selected row, sorted preferences) * and applies them to the updated model it receives from the server. */ - public void refreshTable() { - if(unitStatusTable.getTableHeader().getResizingColumn() == null){//only update info if resize not in progress - try { + public void refreshTable() + { + if (unitStatusTable.getTableHeader().getResizingColumn() == null) + {//only update info if resize not in progress + try + { int index = unitStatusTable.getSelectedRow(); List keys = unitStatusTable.getRowSorter().getSortKeys(); int[] columnWidths = new int[20]; - for(int i = 0; i < unitStatusTable.getColumnCount(); i++){ + for (int i = 0; i < unitStatusTable.getColumnCount(); i++) + { columnWidths[i] = unitStatusTable.getColumnModel().getColumn(i).getWidth(); } - + unitStatusTable.setModel(ScreenManager.theCoordinator.getCadDataTable(CADDataEnums.TABLE.UNIT_STATUS)); - - for(int i = 0; i < unitStatusTable.getColumnCount(); i++){ + + for (int i = 0; i < unitStatusTable.getColumnCount(); i++) + { unitStatusTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidths[i]); } unitStatusTable.getRowSorter().setSortKeys(keys); unitStatusTable.getSelectionModel().setSelectionInterval(index, index); - } catch (RemoteException e) { - e.printStackTrace(); - } - revalidate(); - repaint(); - } + } catch (RemoteException e) + { + e.printStackTrace(); + } + revalidate(); + repaint(); + } } @@ -910,5 +1070,6 @@ * Makes screen visible. */ - public void open() { + public void open() + { setVisible(true); } @@ -917,5 +1078,6 @@ * Hides screen. */ - public void close() { + public void close() + { setVisible(false); } @@ -923,26 +1085,52 @@ /** * This method is called every second in ScreenManger to update the display - * time every second. - */ - public void handleUpdateTime() { - int timerColumn = 13; - int unitColumn = 2; - for (int i = 0; i < unitStatusTable.getModel().getRowCount(); i++) { - try { - unitStatusTable.getModel().setValueAt( - ScreenManager.theCoordinator.getCadDataUnitValue( - (String) unitStatusTable.getModel().getValueAt( - i, unitColumn), UNIT_TAGS.TIMER), i, - timerColumn); - } catch (RemoteException e) { - e.printStackTrace(); - } - } - } - + * time every second. Seems redundant: refreshTable already takes care of + * it. JD + */ +// public void handleUpdateTime() +// { +// int timerColumn = 13; +// int unitColumn = 2; +// for (int i = 0; i < unitStatusTable.getModel().getRowCount(); i++) +// { +// try +// { +// unitStatusTable.getModel().setValueAt( +// ScreenManager.theCoordinator.getCadDataUnitValue( +// (String) unitStatusTable.getModel().getValueAt( +// i, unitColumn), UNIT_TAGS.TIMER), i, +// timerColumn); +// } catch (RemoteException e) +// { +// e.printStackTrace(); +// } +// } +// } +// +// /** +// * Replaces handleUpdateTime +// */ +// public void updateTimeColumn() +// { +// int unitColumn = 2; +// try +// { +// DefaultTableModel dm = ScreenManager.theCoordinator.getCadDataTable(CADDataEnums.TABLE.UNIT_STATUS); +// int size = dm.getRowCount(); +// for (int i = 0; i < size; i++) +// { +// String cell = (String) dm.getValueAt(i, unitColumn); +// String currTime = ScreenManager.theCoordinator.getCadDataUnitValue(cell, UNIT_TAGS.TIMER); +// } +// } catch (RemoteException e) +// { +// e.printStackTrace(); +// } +// } /** * Removes drag and drop feature/button clicking. */ - public void removeDispatcherAuthority() { + public void removeDispatcherAuthority() + { unitStatusTable.setTransferHandler(new TransferHandler("")); buttonEnrt.setEnabled(false); @@ -957,4 +1145,3 @@ buttonOOS.setEnabled(false); } - } Index: trunk/src/tmcsim/client/cadclientgui/screens/PendingIncidents.java =================================================================== --- trunk/src/tmcsim/client/cadclientgui/screens/PendingIncidents.java (revision 3) +++ trunk/src/tmcsim/client/cadclientgui/screens/PendingIncidents.java (revision 59) @@ -4,4 +4,5 @@ import java.awt.Component; import java.awt.Dimension; +import java.awt.Point; import java.awt.Toolkit; import java.awt.datatransfer.DataFlavor; @@ -14,5 +15,4 @@ import java.rmi.RemoteException; import java.util.List; - import javax.swing.Box; import javax.swing.BoxLayout; @@ -23,61 +23,57 @@ import javax.swing.JTable; import javax.swing.ListSelectionModel; +import javax.swing.RowSorter.SortKey; import javax.swing.SwingUtilities; import javax.swing.TransferHandler; -import javax.swing.RowSorter.SortKey; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; - import tmcsim.client.cadclientgui.enums.CADDataEnums; +import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_VAL; +import tmcsim.client.cadclientgui.enums.CADScriptTags.UNIT_TAGS; import tmcsim.client.cadclientgui.enums.IncidentEnums; import tmcsim.client.cadclientgui.enums.TableHeaders; import tmcsim.client.cadclientgui.enums.UnitStatusEnums; -import tmcsim.client.cadclientgui.enums.CADDataEnums.INC_VAL; -import tmcsim.client.cadclientgui.enums.CADScriptTags.UNIT_TAGS; /** - * This class contains the view and controller for the PendingIncidents screen. The view was not built using a GUI builder plug-in - * (but may want to consider doing so in the future), and the controller uses listeners to control how the view and data act. - * + * This class contains the view and controller for the PendingIncidents screen. + * The view was not built using a GUI builder plug-in (but may want to consider + * doing so in the future), and the controller uses listeners to control how the + * view and data act. + * * @author Vincent */ - -public class PendingIncidents extends JFrame { - +public class PendingIncidents extends JFrame +{ private final String SCREEN_TITLE = "(Shift + F2) Pending Incidents"; - - private final Dimension SCREEN_DIMENSIONS = new Dimension(1400,250); - - private final Dimension DROP_DOWN_MENU_LABEL_DIMENSIONS = new Dimension(170,20); - - private final Dimension DROP_DOWN_MENU_DIMENSIONS = new Dimension(170,180); - + private final Dimension SCREEN_DIMENSIONS = new Dimension(1400, 250); + private final Dimension DROP_DOWN_MENU_LABEL_DIMENSIONS = new Dimension(170, 20); + private final Dimension DROP_DOWN_MENU_DIMENSIONS = new Dimension(170, 180); private final int COLUMN_WIDTH = 120; - - private final String[] LABELS = {"Recommend...", "Add Resources...", "Open", "Recall Incident", - "Cancel", "Link/Append", "Map", "Recall Linked Incidents", "Read Notes", "Mail...", "Fax..."}; - + private final String[] LABELS = + { + "Recommend...", "Add Resources...", "Open", "Recall Incident", + "Cancel", "Link/Append", "Map", "Recall Linked Incidents", "Read Notes", "Mail...", "Fax..." + }; private final String LABEL_SPACING = " "; - private JTable pendingIncidentsTable; private JFrame pendingIncidentsMenu; - //labels for the drop down menu private JLabel[] dropDownLabels = new JLabel[LABELS.length]; - private long lastLeftClick;//used for double clicking feature - - public PendingIncidents(){ + + public PendingIncidents() + { initComponents(); } - - private void initComponents() { + + private void initComponents() + { initializeTable(); initControllers(); initializeDropDownMenu(); - - JScrollPane scrollpane = new JScrollPane(pendingIncidentsTable ); + + JScrollPane scrollpane = new JScrollPane(pendingIncidentsTable); scrollpane.getViewport().setBackground(Color.WHITE); - + setTitle(SCREEN_TITLE); setPreferredSize(SCREEN_DIMENSIONS); @@ -86,38 +82,43 @@ pack(); Dimension dim = Toolkit.getDefaultToolkit().getScreenSize(); - setLocation(0, (int) (dim.getHeight()*3/4)); + setLocation(0, (int) (dim.getHeight() * 3 / 4)); setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); - setVisible(false); - } - + setVisible(false); + } + /* * Initializes the table and prepares the cell renderer for color management. It initializes the default settings * and handles the drag and drop feature. */ - private void initializeTable(){ - pendingIncidentsTable = new JTable(){ + private void initializeTable() + { + pendingIncidentsTable = new JTable() + { /* * Custom renderer to set different background/foreground colors * @see javax.swing.JTable#prepareRenderer(javax.swing.table.TableCellRenderer, int, int) */ - public Component prepareRenderer(TableCellRenderer renderer, int row, int column){ + public Component prepareRenderer(TableCellRenderer renderer, int row, int column) + { Component comp = super.prepareRenderer(renderer, row, column); - + comp.setForeground(Color.BLACK); comp.setBackground(Color.CYAN); - - if (getSelectedRow() == row){ + + if (getSelectedRow() == row) + { comp.setForeground(Color.WHITE); comp.setBackground(Color.BLUE); } - + return comp; } - - public Class getColumnClass(int c) { + + public Class getColumnClass(int c) + { return getValueAt(0, c).getClass(); } }; - + pendingIncidentsTable.setOpaque(true); pendingIncidentsTable.setIntercellSpacing(new Dimension(1, 0)); @@ -127,107 +128,162 @@ pendingIncidentsTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); pendingIncidentsTable.setAutoCreateRowSorter(true); - + pendingIncidentsTable.setModel(new DefaultTableModel()); ((DefaultTableModel) pendingIncidentsTable.getModel()).setColumnIdentifiers(TableHeaders.PENDING_INCIDENTS_HEADERS); - - pendingIncidentsTable.setTransferHandler(new TransferHandler(){ - - public boolean canImport(TransferHandler.TransferSupport info) { + + pendingIncidentsTable.setTransferHandler(new TransferHandler() + { + public boolean canImport(TransferHandler.TransferSupport info) + { // Check for String flavor - if (!info.isDataFlavorSupported(DataFlavor.stringFlavor)) { + if (!info.isDataFlavorSupported(DataFlavor.stringFlavor)) + { return false; } return true; - } - - public boolean importData(TransferHandler.TransferSupport info) { - if (!info.isDrop()) { + } + + public boolean importData(TransferHandler.TransferSupport info) + { + if (!info.isDrop()) + { return false; } - - DefaultTableModel tableModel = (DefaultTableModel)pendingIncidentsTable.getModel(); - JTable.DropLocation dl = (JTable.DropLocation)info.getDropLocation(); + + DefaultTableModel tableModel = (DefaultTableModel) pendingIncidentsTable.getModel(); + JTable.DropLocation dl = (JTable.DropLocation) info.getDropLocation(); int index = dl.getRow(); - + // Get the string that is being dropped. Transferable t = info.getTransferable(); String data; - try { - data = (String)t.getTransferData(DataFlavor.stringFlavor); - } - catch (Exception e) { return false; } - + try + { + data = (String) t.getTransferData(DataFlavor.stringFlavor); + } catch (Exception e) + { + return false; + } + // Perform the actual import // TODO - int incidentId = (Integer)pendingIncidentsTable.getValueAt(dl.getRow(), 0); - try { - String masterInc = (String) ScreenManager.theCoordinator. - getCadDataIncVal(INC_VAL.MASTER_INC, incidentId); - ScreenManager.theCoordinator.setCadDataUnitValue(data, - UNIT_TAGS.MASTER_INC_NUM, masterInc); - - ScreenManager.theCoordinator.setCadDataUnitAssignedId(data, incidentId); - ScreenManager.theCoordinator.setCadDataUnitValue(data, - UNIT_TAGS.UNIT_STATUS, UnitStatusEnums.Arrived); - ScreenManager.theCoordinator.addCadDataIncidentAssignedUnitNum(incidentId, data); - ScreenManager.theCoordinator.setCadDataIncidentStatus(incidentId, IncidentEnums.Assigned); - } catch (RemoteException e) { - e.printStackTrace(); - } + int incidentId = (Integer) pendingIncidentsTable.getValueAt(dl.getRow(), 0); + try + { + String masterInc = (String) ScreenManager.theCoordinator. + getCadDataIncVal(INC_VAL.MASTER_INC, incidentId); + ScreenManager.theCoordinator.setCadDataUnitValue(data, + UNIT_TAGS.MASTER_INC_NUM, masterInc); + + ScreenManager.theCoordinator.setCadDataUnitAssignedId(data, incidentId); + ScreenManager.theCoordinator.setCadDataUnitValue(data, + UNIT_TAGS.UNIT_STATUS, UnitStatusEnums.Arrived); + ScreenManager.theCoordinator.addCadDataIncidentAssignedUnitNum(incidentId, data); + ScreenManager.theCoordinator.setCadDataIncidentStatus(incidentId, IncidentEnums.Assigned); + } catch (RemoteException e) + { + e.printStackTrace(); + } return true; } }); - for(int i = 0; i < pendingIncidentsTable.getColumnCount(); i++){ + for (int i = 0; i < pendingIncidentsTable.getColumnCount(); i++) + { pendingIncidentsTable.getColumnModel().getColumn(i).setPreferredWidth(120); } } - - /* + + /* * Adds the key and mouse listeners for the table and component listener for screen. */ - private void initControllers(){ - pendingIncidentsTable.addMouseListener(new MouseListener(){ - public void mouseClicked(MouseEvent e) { - if(SwingUtilities.isLeftMouseButton(e)){ - if(System.currentTimeMillis() - lastLeftClick < 1000){ + private void initControllers() + { + pendingIncidentsTable.addMouseListener(new MouseListener() + { + public void mouseClicked(MouseEvent e) + { + if (SwingUtilities.isLeftMouseButton(e)) + { + if (System.currentTimeMillis() - lastLeftClick < 1000) + { int idColumn = 0; - ScreenManager.openIncidentViewer((Integer) pendingIncidentsTable.getValueAt(pendingIncidentsTable.getSelectedRow(),idColumn)); - }else{ + ScreenManager.openIncidentViewer((Integer) pendingIncidentsTable.getValueAt(pendingIncidentsTable.getSelectedRow(), idColumn)); + } + else + { lastLeftClick = System.currentTimeMillis(); } } - if(SwingUtilities.isRightMouseButton(e)){ + if (SwingUtilities.isRightMouseButton(e)) + { + // Fixed to force right click to cause the row to be selected. JD + // get the coordinates of the mouse click + Point p = e.getPoint(); + // get the row index that contains that coordinate + int rowNumber = pendingIncidentsTable.rowAtPoint(p); + // Get the ListSelectionModel of the JTable + ListSelectionModel model = pendingIncidentsTable.getSelectionModel(); + // set the selected interval of rows. Using the "rowNumber" + // variable for the beginning and end selects only that one row. + model.setSelectionInterval(rowNumber, rowNumber); + // go open the drop down menu openDropDownMenu(e); - }else{ + } + else + { closeDropDownMenu(); } } - public void mouseEntered(MouseEvent e) {} - public void mouseExited(MouseEvent e) {} - public void mousePressed(MouseEvent e) {} - public void mouseReleased(MouseEvent e) {} + + public void mouseEntered(MouseEvent e) + { + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + } + + public void mouseReleased(MouseEvent e) + { + } }); - - addComponentListener( new ComponentListener(){ - public void componentHidden(ComponentEvent e) {} - public void componentMoved(ComponentEvent e) { + + addComponentListener(new ComponentListener() + { + public void componentHidden(ComponentEvent e) + { + } + + public void componentMoved(ComponentEvent e) + { closeDropDownMenu(); } - public void componentResized(ComponentEvent e) {} - public void componentShown(ComponentEvent e) {} + + public void componentResized(ComponentEvent e) + { + } + + public void componentShown(ComponentEvent e) + { + } }); } - + /* * Creates the drop down menu that appears when a right click is performed on the table. */ - private void initializeDropDownMenu(){ + private void initializeDropDownMenu() + { Box menu = new Box(BoxLayout.Y_AXIS); initializeDropDownLabels(); addLabelsToBox(menu); - + //Sets the highlighted background color, note that it does not become "Highlighted" until opaque(true) is called setMenuHighlightedBackground(Color.BLUE); - + pendingIncidentsMenu = new JFrame(); pendingIncidentsMenu.getContentPane().add(menu); @@ -237,10 +293,12 @@ pendingIncidentsMenu.setVisible(false); } - + /* * Sets the text and size and adds a listener to each label. */ - private void initializeDropDownLabels(){ - for(int i = 0; i < dropDownLabels.length; i++){ + private void initializeDropDownLabels() + { + for (int i = 0; i < dropDownLabels.length; i++) + { dropDownLabels[i] = new JLabel(LABEL_SPACING + LABELS[i]); dropDownLabels[i].setMaximumSize(DROP_DOWN_MENU_LABEL_DIMENSIONS); @@ -252,39 +310,40 @@ addMouseListenersToLabel(dropDownLabels[8]); } - - /* - * Add the labels to the box in order with separators and spacings in between. - */ - private void addLabelsToBox(Box menu){ + + /* + * Add the labels to the box in order with separators and spacings in between. + */ + private void addLabelsToBox(Box menu) + { menu.add(dropDownLabels[0]); menu.add(dropDownLabels[1]); - + menu.add(Box.createVerticalStrut(5)); menu.add(new JSeparator()); menu.add(Box.createVerticalStrut(5)); - + menu.add(dropDownLabels[2]); menu.add(dropDownLabels[3]); menu.add(dropDownLabels[4]); menu.add(dropDownLabels[5]); - + menu.add(Box.createVerticalStrut(5)); menu.add(new JSeparator()); menu.add(Box.createVerticalStrut(5)); - + menu.add(dropDownLabels[6]); menu.add(dropDownLabels[7]); menu.add(dropDownLabels[8]); - + menu.add(Box.createVerticalStrut(5)); menu.add(new JSeparator()); menu.add(Box.createVerticalStrut(5)); - + menu.add(dropDownLabels[9]); menu.add(dropDownLabels[10]); - - menu.add(Box.createVerticalStrut(5)); - } - + + menu.add(Box.createVerticalStrut(5)); + } + /* * Sets the highlighted color(when the mouse is over it) of the JLabels. @@ -292,15 +351,19 @@ * @param color the highlighted color */ - public void setMenuHighlightedBackground(Color color){ - for(int i = 0; i < dropDownLabels.length; i++){ + public void setMenuHighlightedBackground(Color color) + { + for (int i = 0; i < dropDownLabels.length; i++) + { dropDownLabels[i].setBackground(color); } } - + /* * Sets all JLabels to not display a highlighted background */ - public void unSelectAllLabels(){ - for(int i = 0; i < dropDownLabels.length; i++){ + public void unSelectAllLabels() + { + for (int i = 0; i < dropDownLabels.length; i++) + { dropDownLabels[i].setOpaque(false); } @@ -311,49 +374,70 @@ * @param label the label that is selected/highlighted */ - public void selectLabel(Object label){ - ((JLabel)label).setOpaque(true); - } - + public void selectLabel(Object label) + { + ((JLabel) label).setOpaque(true); + } + /* * Performs the label action depending on which label was clicked. */ - public void performLabelAction(Object label){ - if(label.equals(dropDownLabels[0])){//Recommend - - }else if(label.equals(dropDownLabels[1])){//Add Resources - - }else if(label.equals(dropDownLabels[2])){//Open - int idColumn = 0; + public void performLabelAction(Object label) + { + if (label.equals(dropDownLabels[0])) + {//Recommend + } + else if (label.equals(dropDownLabels[1])) + {//Add Resources + } + else if (label.equals(dropDownLabels[2])) + {//Open + int idColumn = 0; ScreenManager.openIncidentViewer((Integer) pendingIncidentsTable.getValueAt( - pendingIncidentsTable.getSelectedRow(),idColumn)); - }else if(label.equals(dropDownLabels[3])){//Recall Incident - - }else if(label.equals(dropDownLabels[4])){//Cancel - }else if(label.equals(dropDownLabels[5])){//Link Append - - }else if(label.equals(dropDownLabels[6])){//Map - - }else if(label.equals(dropDownLabels[7])){//Recall Linked Incidents - - }else if(label.equals(dropDownLabels[8])){//Read Notes - int idColumn = 0; + pendingIncidentsTable.getSelectedRow(), idColumn)); + } + else if (label.equals(dropDownLabels[3])) + {//Recall Incident + } + else if (label.equals(dropDownLabels[4])) + {//Cancel + } + else if (label.equals(dropDownLabels[5])) + {//Link Append + } + else if (label.equals(dropDownLabels[6])) + {//Map + } + else if (label.equals(dropDownLabels[7])) + {//Recall Linked Incidents + } + else if (label.equals(dropDownLabels[8])) + {//Read Notes + int idColumn = 0; ScreenManager.openIncidentViewer((Integer) pendingIncidentsTable.getValueAt( - pendingIncidentsTable.getSelectedRow(),idColumn)); - }else if(label.equals(dropDownLabels[9])){//Mail - - }else if(label.equals(dropDownLabels[10])){//Fax - - } - } - - /* - * Factory method. Adds a mouse listeners to the label. The MouseMotionListener detects + pendingIncidentsTable.getSelectedRow(), idColumn)); + } + else if (label.equals(dropDownLabels[9])) + {//Mail + } + else if (label.equals(dropDownLabels[10])) + {//Fax + } + } + + /* + * Factory method. Adds a mouse listeners to the label. The MouseMotionListener detects * the mouse's location to highlight the label. The MouseListener detects * for clicks and performs the action of the label designates. */ - public void addMouseListenersToLabel(JLabel label){ - label.addMouseMotionListener(new MouseMotionListener(){ - public void mouseDragged(MouseEvent e) {} - public void mouseMoved(MouseEvent e) { + public void addMouseListenersToLabel(JLabel label) + { + label.addMouseMotionListener(new MouseMotionListener() + { + public void mouseDragged(MouseEvent e) + { + } + + public void mouseMoved(MouseEvent e) + { unSelectAllLabels(); selectLabel(e.getSource()); @@ -362,6 +446,8 @@ } }); - label.addMouseListener(new MouseListener() { - public void mouseClicked(MouseEvent e) { + label.addMouseListener(new MouseListener() + { + public void mouseClicked(MouseEvent e) + { performLabelAction(e.getSource()); unSelectAllLabels(); @@ -370,23 +456,37 @@ pendingIncidentsMenu.setVisible(false); } - public void mouseEntered(MouseEvent e) {} - public void mouseExited(MouseEvent e) {} - public void mousePressed(MouseEvent e) {} - public void mouseReleased(MouseEvent e) {} + + public void mouseEntered(MouseEvent e) + { + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + } + + public void mouseReleased(MouseEvent e) + { + } }); } - + /* * Displays the menu where the right click occurred. */ - public void openDropDownMenu(MouseEvent e){ + public void openDropDownMenu(MouseEvent e) + { pendingIncidentsMenu.setLocation(e.getX() + this.getX(), e.getY() + this.getY()); pendingIncidentsMenu.setVisible(true); } - + /* * Hides the menu. */ - public void closeDropDownMenu(){ + public void closeDropDownMenu() + { unSelectAllLabels(); pendingIncidentsMenu.revalidate(); @@ -394,49 +494,56 @@ pendingIncidentsMenu.setVisible(false); } - + /* * Refreshes the data in the table by updating all data and repainting the - * screen. It saves user preferences(like column sizes, selected row, sorted preferences) + * screen. It saves user preferences(like column sizes, selected row, sorted preferences) * and applies them to the updated model it receives from the server. */ - public void refreshTable(){ - - if(pendingIncidentsTable.getTableHeader().getResizingColumn() == null){//only update info if resize not in progress - try { - int index = pendingIncidentsTable.getSelectedRow(); - int[] columnWidths = new int[20]; - List keys = pendingIncidentsTable.getRowSorter().getSortKeys(); - for(int i = 0; i < pendingIncidentsTable.getColumnCount(); i++){ - columnWidths[i] = pendingIncidentsTable.getColumnModel().getColumn(i).getWidth(); - } - - pendingIncidentsTable.setModel(ScreenManager.theCoordinator.getCadDataTable(CADDataEnums.TABLE.PENDING_INCIDENTS)); - - for(int i = 0; i < pendingIncidentsTable.getColumnCount(); i++){ - pendingIncidentsTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidths[i]); - } - pendingIncidentsTable.getRowSorter().setSortKeys(keys); - pendingIncidentsTable.getSelectionModel().setSelectionInterval(index, index); - } catch (RemoteException e) { + public void refreshTable() + { + + if (pendingIncidentsTable.getTableHeader().getResizingColumn() == null) + {//only update info if resize not in progress + try + { + int index = pendingIncidentsTable.getSelectedRow(); + int[] columnWidths = new int[20]; + List keys = pendingIncidentsTable.getRowSorter().getSortKeys(); + for (int i = 0; i < pendingIncidentsTable.getColumnCount(); i++) + { + columnWidths[i] = pendingIncidentsTable.getColumnModel().getColumn(i).getWidth(); + } + + pendingIncidentsTable.setModel(ScreenManager.theCoordinator.getCadDataTable(CADDataEnums.TABLE.PENDING_INCIDENTS)); + + for (int i = 0; i < pendingIncidentsTable.getColumnCount(); i++) + { + pendingIncidentsTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidths[i]); + } + pendingIncidentsTable.getRowSorter().setSortKeys(keys); + pendingIncidentsTable.getSelectionModel().setSelectionInterval(index, index); + } catch (RemoteException e) + { e.printStackTrace(); } revalidate(); repaint(); - } - } - - /* + } + } + + /* * Makes screen visible. */ - public void open(){ + public void open() + { setVisible(true); } - + /* * Hides screen. */ - public void close(){ + public void close() + { setVisible(false); } - } Index: trunk/src/tmcsim/client/cadclientgui/screens/AssignedIncidents.java =================================================================== --- trunk/src/tmcsim/client/cadclientgui/screens/AssignedIncidents.java (revision 3) +++ trunk/src/tmcsim/client/cadclientgui/screens/AssignedIncidents.java (revision 59) @@ -4,4 +4,5 @@ import java.awt.Component; import java.awt.Dimension; +import java.awt.Point; import java.awt.Toolkit; import java.awt.datatransfer.DataFlavor; @@ -14,5 +15,4 @@ import java.rmi.RemoteException; import java.util.List; - import javax.swing.Box; import javax.swing.BoxLayout; @@ -23,10 +23,9 @@ import javax.swing.JTable; import javax.swing.ListSelectionModel; +import javax.swing.RowSorter.SortKey; import javax.swing.SwingUtilities; import javax.swing.TransferHandler; -import javax.swing.RowSorter.SortKey; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; - import tmcsim.client.cadclientgui.enums.CADDataEnums; import tmcsim.client.cadclientgui.enums.CADScriptTags.UNIT_TAGS; @@ -36,43 +35,40 @@ /** - * This class contains the view and controller for the AssignedIncidents screen. The view was not built using a GUI builder plug-in - * (but may want to consider doing so in the future), and the controller uses listeners to control how the view and data act. - * + * This class contains the view and controller for the AssignedIncidents screen. + * The view was not built using a GUI builder plug-in (but may want to consider + * doing so in the future), and the controller uses listeners to control how the + * view and data act. + * * @author Vincent */ - -public class AssignedIncidents extends JFrame { - +public class AssignedIncidents extends JFrame +{ private final String SCREEN_TITLE = "(Shift + F3) Assigned Incidents"; - private final Dimension SCREEN_DIMENSIONS = new Dimension(1400, 250); - private final Dimension DROP_DOWN_MENU_LABEL_DIMENSIONS = new Dimension( 170, 20); - private final Dimension DROP_DOWN_MENU_DIMENSIONS = new Dimension(170, 230); - private final int COLUMN_WIDTH = 120; - - private final String[] LABELS = { "Add Resources...", "Greater Alarm...", - "Reconfigure", "Open", "Recall Incident", "Cancel", "Reassign", - "Link/Append", "Map", "Recall Linked Incidents", "Read Notes", - "Page...", "Mail...", "Fax..." }; - + private final String[] LABELS = + { + "Add Resources...", "Greater Alarm...", + "Reconfigure", "Open", "Recall Incident", "Cancel", "Reassign", + "Link/Append", "Map", "Recall Linked Incidents", "Read Notes", + "Page...", "Mail...", "Fax..." + }; private final String LABEL_SPACING = " "; - private JTable assignedIncidentsTable; private JFrame assignedIncidentsMenu; - // labels for the drop down menu private JLabel[] dropDownLabels = new JLabel[LABELS.length]; - private long lastLeftClick;// used for double clicking feature - public AssignedIncidents() { + public AssignedIncidents() + { initComponents(); } - private void initComponents() { + private void initComponents() + { initializeTable(); initController(); @@ -98,51 +94,67 @@ * drop feature. */ - private void initializeTable() { - assignedIncidentsTable = new JTable(){ + private void initializeTable() + { + assignedIncidentsTable = new JTable() + { /* * Custom renderer to set different background/foreground colors * @see javax.swing.JTable#prepareRenderer(javax.swing.table.TableCellRenderer, int, int) */ - public Component prepareRenderer(TableCellRenderer renderer, int row, int column){ + public Component prepareRenderer(TableCellRenderer renderer, int row, int column) + { Component comp = super.prepareRenderer(renderer, row, column); - + comp.setForeground(Color.BLACK); comp.setBackground(Color.CYAN); - if(assignedIncidentsTable.getModel().getColumnName(column).equals("Unit/s")){//4 is the column for "Unit/s" - System.out.println("Commenting this line breaks the client"); + if (assignedIncidentsTable.getModel().getColumnName(column).equals("Unit/s")) + {//4 is the column for "Unit/s" + //System.out.println("Diagnostic: in AssignedIncidents.prepareRenderer()"); //Commenting this line breaks the client comp.setBackground(Color.BLACK); int primaryColumn = 3; - try { - switch(ScreenManager.theCoordinator.getCadDataUnitStatus( - (String) assignedIncidentsTable.getValueAt(row,primaryColumn))){ - case Assignable: - comp.setForeground(Color.GREEN); - break; - case Arrived: - comp.setForeground(Color.YELLOW); - break; - case Enroute: - comp.setForeground(Color.CYAN); - break; - } - }catch (RemoteException e){ - e.printStackTrace(); + try + { + // get the unit name from the table JD + String unitname = (String) assignedIncidentsTable.getValueAt(row, primaryColumn); + // Validate that unitname isn't blank + if (!unitname.equals("")) + { + // Fetch the unit's current status from server + UnitStatusEnums ustatus = ScreenManager.theCoordinator.getCadDataUnitStatus(unitname); + // Decide which color to use for displaying the status + switch (ustatus) + { + case Assignable: + comp.setForeground(Color.GREEN); + break; + case Arrived: + comp.setForeground(Color.YELLOW); + break; + case Enroute: + comp.setForeground(Color.CYAN); + break; + } + } + } catch (RemoteException e) + { + e.printStackTrace(); } } - - if (getSelectedRow() == row){ + + if (getSelectedRow() == row) + { comp.setForeground(Color.WHITE); comp.setBackground(Color.BLUE); } - + return comp; } - - public Class getColumnClass(int c) { + + public Class getColumnClass(int c) + { return getValueAt(0, c).getClass(); } - }; - + assignedIncidentsTable.setOpaque(true); assignedIncidentsTable.setIntercellSpacing(new Dimension(1, 0)); @@ -153,105 +165,151 @@ assignedIncidentsTable.setAutoCreateRowSorter(true); assignedIncidentsTable.setModel(new DefaultTableModel()); - + ((DefaultTableModel) assignedIncidentsTable.getModel()).setColumnIdentifiers(TableHeaders.ASSIGNED_INCIDENTS_HEADERS); - - assignedIncidentsTable.setTransferHandler(new TransferHandler(){ - - public boolean canImport(TransferHandler.TransferSupport info) { + + assignedIncidentsTable.setTransferHandler(new TransferHandler() + { + public boolean canImport(TransferHandler.TransferSupport info) + { // Check for String flavor - if (!info.isDataFlavorSupported(DataFlavor.stringFlavor)) { + if (!info.isDataFlavorSupported(DataFlavor.stringFlavor)) + { return false; } return true; - } - - public boolean importData(TransferHandler.TransferSupport info) { - if (!info.isDrop()) { + } + + public boolean importData(TransferHandler.TransferSupport info) + { + if (!info.isDrop()) + { return false; } - - DefaultTableModel tableModel = (DefaultTableModel)assignedIncidentsTable.getModel(); - JTable.DropLocation dl = (JTable.DropLocation)info.getDropLocation(); + + DefaultTableModel tableModel = (DefaultTableModel) assignedIncidentsTable.getModel(); + JTable.DropLocation dl = (JTable.DropLocation) info.getDropLocation(); int index = dl.getRow(); - + // Get the string that is being dropped. Transferable t = info.getTransferable(); String data; - try { - data = (String)t.getTransferData(DataFlavor.stringFlavor); - } - catch (Exception e) { return false; } - + try + { + data = (String) t.getTransferData(DataFlavor.stringFlavor); + } catch (Exception e) + { + return false; + } + // Perform the actual import - int incidentId = (Integer)assignedIncidentsTable.getValueAt(dl.getRow(), 0); - try { - ScreenManager.theCoordinator.setCadDataUnitAssignedId(data, incidentId); - ScreenManager.theCoordinator.setCadDataUnitValue(data, - UNIT_TAGS.UNIT_STATUS, UnitStatusEnums.Arrived); - ScreenManager.theCoordinator.addCadDataIncidentAssignedUnitNum(incidentId, data); - ScreenManager.theCoordinator.setCadDataIncidentStatus(incidentId, IncidentEnums.Assigned); - } catch (RemoteException e) { - e.printStackTrace(); - } + int incidentId = (Integer) assignedIncidentsTable.getValueAt(dl.getRow(), 0); + try + { + ScreenManager.theCoordinator.setCadDataUnitAssignedId(data, incidentId); + ScreenManager.theCoordinator.setCadDataUnitValue(data, + UNIT_TAGS.UNIT_STATUS, UnitStatusEnums.Arrived); + ScreenManager.theCoordinator.addCadDataIncidentAssignedUnitNum(incidentId, data); + ScreenManager.theCoordinator.setCadDataIncidentStatus(incidentId, IncidentEnums.Assigned); + } catch (RemoteException e) + { + e.printStackTrace(); + } ScreenManager.refreshScreens(); return true; } }); - - for(int i = 0; i < assignedIncidentsTable.getColumnCount(); i++){ + + for (int i = 0; i < assignedIncidentsTable.getColumnCount(); i++) + { assignedIncidentsTable.getColumnModel().getColumn(i).setPreferredWidth(120); } } - + /* * Adds the key and mouse listeners for the table and component listener for * screen. */ - private void initController() { - assignedIncidentsTable.addMouseListener(new MouseListener() { - public void mouseClicked(MouseEvent e) { - if (SwingUtilities.isLeftMouseButton(e)) { - if (System.currentTimeMillis() - lastLeftClick < 1000) { + private void initController() + { + assignedIncidentsTable.addMouseListener(new MouseListener() + { + public void mouseClicked(MouseEvent e) + { + if (SwingUtilities.isLeftMouseButton(e)) + { + // TODO: Use e.getClickCount() == 2 + if (System.currentTimeMillis() - lastLeftClick < 1000) + { int idColumn = 0; - ScreenManager - .openIncidentViewer((Integer) assignedIncidentsTable - .getValueAt(assignedIncidentsTable - .getSelectedRow(), idColumn)); - } else { + int selectedRow = assignedIncidentsTable.getSelectedRow(); + try + { + int selectedValue = (Integer) assignedIncidentsTable.getValueAt(selectedRow, idColumn); + ScreenManager.openIncidentViewer(selectedValue); + } catch (IndexOutOfBoundsException ex) + { + ex.printStackTrace(); + } + } + else + { lastLeftClick = System.currentTimeMillis(); } } - if (SwingUtilities.isRightMouseButton(e)) { + if (SwingUtilities.isRightMouseButton(e)) + { + // Fixed to force right click to cause the row to be selected. JD + // get the coordinates of the mouse click + Point p = e.getPoint(); + // get the row index that contains that coordinate + int rowNumber = assignedIncidentsTable.rowAtPoint(p); + // Get the ListSelectionModel of the JTable + ListSelectionModel model = assignedIncidentsTable.getSelectionModel(); + // set the selected interval of rows. Using the "rowNumber" + // variable for the beginning and end selects only that one row. + model.setSelectionInterval(rowNumber, rowNumber); + // go open the drop down menu openDropDownMenu(e); - } else { + } + else + { closeDropDownMenu(); } } - public void mouseEntered(MouseEvent e) { - } - - public void mouseExited(MouseEvent e) { - } - - public void mousePressed(MouseEvent e) { - } - - public void mouseReleased(MouseEvent e) { + public void mouseEntered(MouseEvent e) + { + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + } + + public void mouseReleased(MouseEvent e) + { } }); - addComponentListener(new ComponentListener() { - public void componentHidden(ComponentEvent e) { - } - - public void componentMoved(ComponentEvent e) { + addComponentListener(new ComponentListener() + { + public void componentHidden(ComponentEvent e) + { + } + + public void componentMoved(ComponentEvent e) + { closeDropDownMenu(); } - public void componentResized(ComponentEvent e) { - } - - public void componentShown(ComponentEvent e) { + public void componentResized(ComponentEvent e) + { + } + + public void componentShown(ComponentEvent e) + { } }); @@ -262,5 +320,6 @@ * on the table. */ - private void initializeDropDownMenu() { + private void initializeDropDownMenu() + { Box menu = new Box(BoxLayout.Y_AXIS); initializeDropDownLabels(); @@ -282,6 +341,8 @@ * Sets the text and size and adds a listener to each activated label. */ - private void initializeDropDownLabels() { - for (int i = 0; i < dropDownLabels.length; i++) { + private void initializeDropDownLabels() + { + for (int i = 0; i < dropDownLabels.length; i++) + { dropDownLabels[i] = new JLabel(LABEL_SPACING + LABELS[i]); dropDownLabels[i].setMaximumSize(DROP_DOWN_MENU_LABEL_DIMENSIONS); @@ -298,5 +359,6 @@ * between. */ - private void addLabelsToBox(Box menu) { + private void addLabelsToBox(Box menu) + { menu.add(dropDownLabels[0]); menu.add(dropDownLabels[1]); @@ -335,9 +397,11 @@ * Sets the highlighted color(when the mouse is over it) of the JLabels. * Note: the color is not shown until .setOpaque(true) is called. - * + * * @param color the highlighted color */ - public void setMenuHighlightedBackground(Color color) { - for (int i = 0; i < dropDownLabels.length; i++) { + public void setMenuHighlightedBackground(Color color) + { + for (int i = 0; i < dropDownLabels.length; i++) + { dropDownLabels[i].setBackground(color); } @@ -347,6 +411,8 @@ * Sets all JLabels to not display a highlighted background */ - public void unSelectAllLabels() { - for (int i = 0; i < dropDownLabels.length; i++) { + public void unSelectAllLabels() + { + for (int i = 0; i < dropDownLabels.length; i++) + { dropDownLabels[i].setOpaque(false); } @@ -355,8 +421,9 @@ /* * Sets the label to have a highlighted background. - * + * * @param label the label that is selected/highlighted */ - public void selectLabel(Object label) { + public void selectLabel(Object label) + { ((JLabel) label).setOpaque(true); } @@ -365,39 +432,61 @@ * Performs the label action depending on which label was clicked. */ - public void performLabelAction(Object label) { - if (label.equals(dropDownLabels[0])) {// Add Resources - - } else if (label.equals(dropDownLabels[1])) {// Greater Alarm - - } else if (label.equals(dropDownLabels[2])) {// Reconfigure - - } else if (label.equals(dropDownLabels[3])) {// Open + public void performLabelAction(Object label) + { + if (label.equals(dropDownLabels[0])) + {// Add Resources + } + else if (label.equals(dropDownLabels[1])) + {// Greater Alarm + } + else if (label.equals(dropDownLabels[2])) + {// Reconfigure + } + else if (label.equals(dropDownLabels[3])) + {// Open + int idColumn = 0; + int selectedRow = assignedIncidentsTable.getSelectedRow(); + try + { + int selectedValue = (Integer) assignedIncidentsTable.getValueAt(selectedRow, idColumn); + ScreenManager.openIncidentViewer(selectedValue); + } catch (IndexOutOfBoundsException ex) + { + ex.printStackTrace(); + } + } + else if (label.equals(dropDownLabels[4])) + {// Recall Incident + } + else if (label.equals(dropDownLabels[5])) + {// Cancel + } + else if (label.equals(dropDownLabels[6])) + {// Reassign + } + else if (label.equals(dropDownLabels[7])) + {// Link append + } + else if (label.equals(dropDownLabels[8])) + {// Map + } + else if (label.equals(dropDownLabels[9])) + {// Recall Linked Incidents + } + else if (label.equals(dropDownLabels[10])) + {// Read Notes int idColumn = 0; ScreenManager.openIncidentViewer((Integer) assignedIncidentsTable .getValueAt(assignedIncidentsTable.getSelectedRow(), - idColumn)); - } else if (label.equals(dropDownLabels[4])) {// Recall Incident - - } else if (label.equals(dropDownLabels[5])) {// Cancel - - } else if (label.equals(dropDownLabels[6])) {// Reassign - - } else if (label.equals(dropDownLabels[7])) {// Link append - - } else if (label.equals(dropDownLabels[8])) {// Map - - } else if (label.equals(dropDownLabels[9])) {// Recall Linked Incidents - - } else if (label.equals(dropDownLabels[10])) {// Read Notes - int idColumn = 0; - ScreenManager.openIncidentViewer((Integer) assignedIncidentsTable - .getValueAt(assignedIncidentsTable.getSelectedRow(), - idColumn)); - } else if (label.equals(dropDownLabels[11])) {// Page - - } else if (label.equals(dropDownLabels[12])) {// Mail - - } else if (label.equals(dropDownLabels[13])) {// Fax - + idColumn)); + } + else if (label.equals(dropDownLabels[11])) + {// Page + } + else if (label.equals(dropDownLabels[12])) + {// Mail + } + else if (label.equals(dropDownLabels[13])) + {// Fax } } @@ -409,10 +498,14 @@ * designates. */ - public void addMouseListenersToLabel(JLabel label) { - label.addMouseMotionListener(new MouseMotionListener() { - public void mouseDragged(MouseEvent e) { - } - - public void mouseMoved(MouseEvent e) { + public void addMouseListenersToLabel(JLabel label) + { + label.addMouseMotionListener(new MouseMotionListener() + { + public void mouseDragged(MouseEvent e) + { + } + + public void mouseMoved(MouseEvent e) + { unSelectAllLabels(); selectLabel(e.getSource()); @@ -421,6 +514,8 @@ } }); - label.addMouseListener(new MouseListener() { - public void mouseClicked(MouseEvent e) { + label.addMouseListener(new MouseListener() + { + public void mouseClicked(MouseEvent e) + { performLabelAction(e.getSource()); unSelectAllLabels(); @@ -430,14 +525,18 @@ } - public void mouseEntered(MouseEvent e) { - } - - public void mouseExited(MouseEvent e) { - } - - public void mousePressed(MouseEvent e) { - } - - public void mouseReleased(MouseEvent e) { + public void mouseEntered(MouseEvent e) + { + } + + public void mouseExited(MouseEvent e) + { + } + + public void mousePressed(MouseEvent e) + { + } + + public void mouseReleased(MouseEvent e) + { } }); @@ -447,5 +546,6 @@ * Displays the menu where the right click occurred. */ - public void openDropDownMenu(MouseEvent e) { + public void openDropDownMenu(MouseEvent e) + { assignedIncidentsMenu.setLocation(e.getX() + this.getX(), e.getY() + this.getY()); @@ -456,5 +556,6 @@ * Hides the menu. */ - public void closeDropDownMenu() { + public void closeDropDownMenu() + { unSelectAllLabels(); assignedIncidentsMenu.revalidate(); @@ -465,31 +566,37 @@ /* * Refreshes the data in the table by updating all data and repainting the - * screen. It saves user preferences(like column sizes, selected row, sorted preferences) + * screen. It saves user preferences(like column sizes, selected row, sorted preferences) * and applies them to the updated model it receives from the server. */ - public void refreshTable() { - - if(assignedIncidentsTable.getTableHeader().getResizingColumn() == null){//only update info if resize not in progress - try { + public void refreshTable() + { + + if (assignedIncidentsTable.getTableHeader().getResizingColumn() == null) + {//only update info if resize not in progress + try + { int index = assignedIncidentsTable.getSelectedRow(); int[] columnWidths = new int[20]; List keys = assignedIncidentsTable.getRowSorter().getSortKeys(); - for(int i = 0; i < assignedIncidentsTable.getColumnCount(); i++){ + for (int i = 0; i < assignedIncidentsTable.getColumnCount(); i++) + { columnWidths[i] = assignedIncidentsTable.getColumnModel().getColumn(i).getWidth(); } - + assignedIncidentsTable.setModel(ScreenManager.theCoordinator.getCadDataTable(CADDataEnums.TABLE.ASSIGNED_INCIDENTS)); - - for(int i = 0; i < assignedIncidentsTable.getColumnCount(); i++){ + + for (int i = 0; i < assignedIncidentsTable.getColumnCount(); i++) + { assignedIncidentsTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidths[i]); } assignedIncidentsTable.getRowSorter().setSortKeys(keys); assignedIncidentsTable.getSelectionModel().setSelectionInterval(index, index); - } catch (RemoteException e) { - e.printStackTrace(); - } - revalidate(); - repaint(); - } + } catch (RemoteException e) + { + e.printStackTrace(); + } + revalidate(); + repaint(); + } } @@ -497,5 +604,6 @@ * Makes screen visible. */ - public void open() { + public void open() + { setVisible(true); } @@ -504,7 +612,7 @@ * Hides screen. */ - public void close() { + public void close() + { setVisible(false); } - } Index: trunk/src/tmcsim/client/cadclientgui/data/Incident.java =================================================================== --- trunk/src/tmcsim/client/cadclientgui/data/Incident.java (revision 53) +++ trunk/src/tmcsim/client/cadclientgui/data/Incident.java (revision 59) @@ -526,5 +526,5 @@ public void addToCommentsNotesTable(String[] fields) { - this.commentsNotesTable.insertRow(0, fields); //JD - new notes go 1st + this.commentsNotesTable.insertRow(0, fields); // new notes go 1st } Index: trunk/src/tmcsim/simulationmanager/model/LogEntryCellRenderer.java =================================================================== --- trunk/src/tmcsim/simulationmanager/model/LogEntryCellRenderer.java (revision 2) +++ trunk/src/tmcsim/simulationmanager/model/LogEntryCellRenderer.java (revision 59) @@ -1,4 +1,5 @@ package tmcsim.simulationmanager.model; +import java.awt.Color; import java.awt.Component; import java.util.Enumeration; @@ -6,5 +7,4 @@ import java.util.Iterator; import java.util.Map; - import javax.swing.JTable; import javax.swing.JTextArea; @@ -16,23 +16,28 @@ /** * TableCellRender to display a multi-line cell. - * + * * http://www.roseindia.net/javatutorials/JTable_in_JDK.shtml + * * @author Dr. Heinz M. Kabutz */ @SuppressWarnings("serial") public class LogEntryCellRenderer extends JTextArea implements - TableCellRenderer { - - /** DefaultTableCellRenderer for displaying multi line cells*/ + TableCellRenderer +{ + /** + * DefaultTableCellRenderer for displaying multi line cells + */ private final DefaultTableCellRenderer adaptee; - - /** map from table to map of rows to map of column heights */ + /** + * map from table to map of rows to map of column heights + */ private final Map>> cellSizes; - public LogEntryCellRenderer() { + public LogEntryCellRenderer() + { - adaptee = new DefaultTableCellRenderer(); + adaptee = new DefaultTableCellRenderer(); cellSizes = new HashMap>>(); - + setLineWrap(true); setWrapStyleWord(true); @@ -40,11 +45,23 @@ public Component getTableCellRendererComponent(JTable table, Object obj, - boolean isSelected, boolean hasFocus, int row, int column) { + boolean isSelected, boolean hasFocus, int row, int column) + { // set the colours, etc. using the standard for that platform adaptee.getTableCellRendererComponent(table, obj, isSelected, hasFocus, row, column); - setForeground(adaptee.getForeground()); - setBackground(adaptee.getBackground()); + // FIXES defect where cell text disappears when selected + // TODO: Better would be to make table not selectable + // http://stackoverflow.com/questions/8291329/set-all-jtable-cells-unselectable + if (isSelected) + { + setForeground(Color.WHITE); + setBackground(Color.GRAY); + } + else + { + setForeground(adaptee.getForeground()); + setBackground(adaptee.getBackground()); + } setBorder(adaptee.getBorder()); setFont(adaptee.getFont()); @@ -57,19 +74,23 @@ addSize(table, row, column, height_wanted); height_wanted = findTotalMaximumRowSize(table, row); - if (height_wanted != table.getRowHeight(row)) { + if (height_wanted != table.getRowHeight(row)) + { table.setRowHeight(row, height_wanted); } - + return this; } - private void addSize(JTable table, int row, int column, int height) { + private void addSize(JTable table, int row, int column, int height) + { Map> rows = cellSizes.get(table); - if (rows == null) { + if (rows == null) + { cellSizes.put(table, rows = new HashMap>()); } - + Map rowheights = rows.get(new Integer(row)); - if (rowheights == null) { + if (rowheights == null) + { rows.put(new Integer(row), rowheights = new HashMap()); } @@ -78,15 +99,18 @@ /** - * Look through all columns and get the renderer. If it is - * also a TextAreaRenderer, we look at the maximum height in - * its hash table for this row. + * Look through all columns and get the renderer. If it is also a + * TextAreaRenderer, we look at the maximum height in its hash table for + * this row. */ - private int findTotalMaximumRowSize(JTable table, int row) { + private int findTotalMaximumRowSize(JTable table, int row) + { int maximum_height = 0; Enumeration columns = table.getColumnModel().getColumns(); - while (columns.hasMoreElements()) { + while (columns.hasMoreElements()) + { TableColumn tc = (TableColumn) columns.nextElement(); TableCellRenderer cellRenderer = tc.getCellRenderer(); - if (cellRenderer instanceof LogEntryCellRenderer) { + if (cellRenderer instanceof LogEntryCellRenderer) + { LogEntryCellRenderer tar = (LogEntryCellRenderer) cellRenderer; maximum_height = Math.max(maximum_height, tar @@ -97,15 +121,21 @@ } - private int findMaximumRowSize(JTable table, int row) { + private int findMaximumRowSize(JTable table, int row) + { Map> rows = cellSizes.get(table); if (rows == null) + { return 0; - + } + Map rowheights = rows.get(new Integer(row)); if (rowheights == null) + { return 0; + } int maximum_height = 0; - - for (Iterator it = rowheights.entrySet().iterator(); it.hasNext();) { + + for (Iterator it = rowheights.entrySet().iterator(); it.hasNext();) + { Map.Entry entry = (Map.Entry) it.next(); int cellHeight = ((Integer) entry.getValue()).intValue(); Index: trunk/IDE_metadata/NetBeans/TMCSim/build.xml =================================================================== --- trunk/IDE_metadata/NetBeans/TMCSim/build.xml (revision 56) +++ trunk/IDE_metadata/NetBeans/TMCSim/build.xml (revision 59) @@ -12,4 +12,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <Paramics> <Network_Status>WARMING</Network_Status> <Network_ID>1</Network_ID> </Paramics> + + + + <Paramics> <Network_Status>LOADED</Network_Status> <Network_ID>1</Network_ID> </Paramics> + + + @@ -60,6 +111,31 @@ /> - - + + + + + + + + + + + + + + + + + + + +