Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 53) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 54) @@ -2677,5 +2677,41 @@ private void editIncidentActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_editIncidentActionPerformed {//GEN-HEADEREND:event_editIncidentActionPerformed - new IncidentEditorFrame().setVisible(true); + Object[] incidentList = script.incidents.toArray(); + String input = ""; + ScriptIncident inc = null; + Object result = JOptionPane.showInputDialog( + this, + "Select Incident:", + "Save Incident", + JOptionPane.PLAIN_MESSAGE, + null, + incidentList, + script.incidents.get(0)); + + System.out.println("RESULT = " + result.toString()); + + input = result.toString(); + + System.out.println("INPUT = " + input); + + int i = 0; + for (ScriptIncident incident : script.incidents) + { + if (incident == null) + { + continue; + } + System.out.println((++i) + ": " + incident.toString()); + if (incident.toString().equals(input)) + { + inc = incident; + } + } + + if (inc != null) + { + new IncidentEditorFrame(inc).setVisible(true); + } + update(script, script); }//GEN-LAST:event_editIncidentActionPerformed Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java (revision 53) +++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java (revision 54) @@ -47,9 +47,10 @@ public class IncidentEditorFrame extends javax.swing.JFrame implements Observer { - - /** - * The script model. - */ - private SimulationScript script; + + /** + * The script incident currently being edited. + */ + private ScriptIncident theIncident; + /** * The current type of selected event. @@ -74,7 +75,7 @@ * @return the script model object */ - public SimulationScript getScript() + public ScriptIncident getIncident() { - return script; + return theIncident; } @@ -247,10 +248,9 @@ * for all buttons. */ - public IncidentEditorFrame() + public IncidentEditorFrame(ScriptIncident theIncident) { - script = new SimulationScript(); - script.addObserver(this); + this.theIncident = theIncident; initComponents(); - this.update(null, script); + this.update(null, theIncident); selectButton.addKeyListener(new TimelineKeyListener()); cadButton.addKeyListener(new TimelineKeyListener()); @@ -315,37 +315,14 @@ public void update(Observable o, Object arg) { - if (arg instanceof SimulationScript) - { - script = (SimulationScript) arg; - - if (script.incidents.size() != 10) - { - return; - } - - timelineTickPanel.update(script); - timeStampPanel.update(script); - - incidentTimelinePanel1.timelinePanelUpdate(script.incidents.get(0)); - incidentTimelinePanel2.timelinePanelUpdate(script.incidents.get(1)); - incidentTimelinePanel3.timelinePanelUpdate(script.incidents.get(2)); - incidentTimelinePanel4.timelinePanelUpdate(script.incidents.get(3)); - incidentTimelinePanel5.timelinePanelUpdate(script.incidents.get(4)); - incidentTimelinePanel6.timelinePanelUpdate(script.incidents.get(5)); - incidentTimelinePanel7.timelinePanelUpdate(script.incidents.get(6)); - incidentTimelinePanel8.timelinePanelUpdate(script.incidents.get(7)); - incidentTimelinePanel9.timelinePanelUpdate(script.incidents.get(8)); - incidentTimelinePanel10.timelinePanelUpdate(script.incidents.get(9)); - - incidentNumberPanel1.update(script.incidents.get(0)); - incidentNumberPanel2.update(script.incidents.get(1)); - incidentNumberPanel3.update(script.incidents.get(2)); - incidentNumberPanel4.update(script.incidents.get(3)); - incidentNumberPanel5.update(script.incidents.get(4)); - incidentNumberPanel6.update(script.incidents.get(5)); - incidentNumberPanel7.update(script.incidents.get(6)); - incidentNumberPanel8.update(script.incidents.get(7)); - incidentNumberPanel9.update(script.incidents.get(8)); - incidentNumberPanel10.update(script.incidents.get(9)); + if (arg instanceof ScriptIncident) + { + theIncident = (ScriptIncident) arg; + + timelineTickPanel.update(theIncident); + timeStampPanel.update(theIncident); + + incidentTimelinePanel1.timelinePanelUpdate(theIncident); + + incidentNumberPanel1.update(theIncident); /** @@ -390,6 +367,4 @@ { - incidentPopupMenu = new javax.swing.JPopupMenu(); - popupDeleteIncident = new javax.swing.JMenuItem(); eventPopupMenu = new javax.swing.JPopupMenu(); cadEvent = new javax.swing.JMenuItem(); @@ -412,21 +387,4 @@ editEventList = new javax.swing.JMenuItem(); deleteEventList = new javax.swing.JMenuItem(); - incidentFrame = new javax.swing.JFrame(); - jLabel6 = new javax.swing.JLabel(); - jLabel8 = new javax.swing.JLabel(); - jLabel9 = new javax.swing.JLabel(); - jLabel10 = new javax.swing.JLabel(); - jScrollPane1 = new javax.swing.JScrollPane(); - addIncidentDescription = new javax.swing.JTextArea(); - incidentOkButton = new javax.swing.JButton(); - incidentCancelButton = new javax.swing.JButton(); - addIncidentNumber = new javax.swing.JSpinner(); - addIncidentName = new javax.swing.JTextField(); - jLabel11 = new javax.swing.JLabel(); - addIncidentLength = new javax.swing.JSpinner(); - jLabel12 = new javax.swing.JLabel(); - addIncidentStart = new javax.swing.JSpinner(); - jButton3 = new javax.swing.JButton(); - incidentColorField = new javax.swing.JTextField(); addNoiseFrame = new javax.swing.JFrame(); jLabel13 = new javax.swing.JLabel(); @@ -445,27 +403,8 @@ jLabel20 = new javax.swing.JLabel(); jLabel21 = new javax.swing.JLabel(); - incidentColorChooser = new javax.swing.JColorChooser(); timelinesScrollPane = new javax.swing.JScrollPane(); timelineTickPanel = new scriptbuilder.gui.panels.TimelineTickPanel(); incidentTimelinePanel1 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); - incidentTimelinePanel2 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); - incidentTimelinePanel8 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); - incidentTimelinePanel3 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); - incidentTimelinePanel6 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); - incidentTimelinePanel5 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); - incidentTimelinePanel4 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); - incidentTimelinePanel7 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); - incidentTimelinePanel10 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); - incidentTimelinePanel9 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel(); incidentNumberPanel1 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); - incidentNumberPanel2 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); - incidentNumberPanel3 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); - incidentNumberPanel4 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); - incidentNumberPanel5 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); - incidentNumberPanel6 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); - incidentNumberPanel7 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); - incidentNumberPanel8 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); - incidentNumberPanel9 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); - incidentNumberPanel10 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel(); scriptEventsPanel = new javax.swing.JPanel(); scriptEventsPane = new javax.swing.JScrollPane(); @@ -504,33 +443,4 @@ timeStampScrollPane = new javax.swing.JScrollPane(); timeStampPanel = new scriptbuilder.gui.panels.TimeStampPanel(); - scriptBuilderMenuBar = new javax.swing.JMenuBar(); - fileMenu = new javax.swing.JMenu(); - fileNew = new javax.swing.JMenuItem(); - jSeparator1 = new javax.swing.JPopupMenu.Separator(); - fileOpen = new javax.swing.JMenuItem(); - jSeparator2 = new javax.swing.JPopupMenu.Separator(); - fileSave = new javax.swing.JMenuItem(); - fileSaveAs = new javax.swing.JMenuItem(); - generateMenu = new javax.swing.JMenu(); - generateNotebooks = new javax.swing.JMenuItem(); - jMenuItem3 = new javax.swing.JMenuItem(); - generateScorecards = new javax.swing.JMenuItem(); - generateOrganizationChart = new javax.swing.JMenuItem(); - jSeparator3 = new javax.swing.JPopupMenu.Separator(); - generateProjectRequirements = new javax.swing.JMenuItem(); - incidentMenu = new javax.swing.JMenu(); - newIncident = new javax.swing.JMenuItem(); - editIncident = new javax.swing.JMenuItem(); - jSeparator4 = new javax.swing.JPopupMenu.Separator(); - saveIncident = new javax.swing.JMenuItem(); - loadIncident = new javax.swing.JMenuItem(); - generateNoiseMenu = new javax.swing.JMenu(); - generateNoiseOption = new javax.swing.JMenuItem(); - helpMenu = new javax.swing.JMenu(); - helpTutorial = new javax.swing.JMenuItem(); - helpAbout = new javax.swing.JMenuItem(); - - popupDeleteIncident.setText("Delete Incident..."); - incidentPopupMenu.add(popupDeleteIncident); cadEvent.setText("CAD Event"); @@ -675,135 +585,4 @@ deleteEventList.setText("Delete..."); eventListPopupMenu.add(deleteEventList); - - incidentFrame.setTitle("Incident"); - incidentFrame.setMinimumSize(new java.awt.Dimension(400, 400)); - - jLabel6.setText("Incident Number: "); - - jLabel8.setText("Incident Name:"); - - jLabel9.setText("Incident Color: "); - - jLabel10.setText("Incident Description:"); - - jScrollPane1.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - jScrollPane1.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); - - addIncidentDescription.setColumns(20); - addIncidentDescription.setLineWrap(true); - addIncidentDescription.setRows(5); - addIncidentDescription.setWrapStyleWord(true); - jScrollPane1.setViewportView(addIncidentDescription); - - incidentOkButton.setText("OK"); - incidentOkButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - incidentOkButtonActionPerformed(evt); - } - }); - - incidentCancelButton.setText("Cancel"); - incidentCancelButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - incidentCancelButtonActionPerformed(evt); - } - }); - - addIncidentNumber.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(101), Integer.valueOf(101), null, Integer.valueOf(1))); - - jLabel11.setText("Incident Length in Minutes: "); - - addIncidentLength.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(0), Integer.valueOf(0), null, Integer.valueOf(1))); - - jLabel12.setText("Incident Start Time in Minutes:"); - - addIncidentStart.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(0), Integer.valueOf(0), null, Integer.valueOf(1))); - - jButton3.setText("Choose..."); - jButton3.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - jButton3ActionPerformed(evt); - } - }); - - incidentColorField.setEditable(false); - incidentColorField.setBackground(new java.awt.Color(0, 0, 0)); - - javax.swing.GroupLayout incidentFrameLayout = new javax.swing.GroupLayout(incidentFrame.getContentPane()); - incidentFrame.getContentPane().setLayout(incidentFrameLayout); - incidentFrameLayout.setHorizontalGroup( - incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, incidentFrameLayout.createSequentialGroup() - .addContainerGap() - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 322, Short.MAX_VALUE) - .addComponent(jLabel10, javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, incidentFrameLayout.createSequentialGroup() - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel6) - .addComponent(jLabel8) - .addComponent(jLabel9)) - .addGap(18, 18, 18) - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(addIncidentName, javax.swing.GroupLayout.DEFAULT_SIZE, 218, Short.MAX_VALUE) - .addComponent(addIncidentNumber, javax.swing.GroupLayout.DEFAULT_SIZE, 218, Short.MAX_VALUE) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, incidentFrameLayout.createSequentialGroup() - .addComponent(incidentColorField, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jButton3, javax.swing.GroupLayout.PREFERRED_SIZE, 93, javax.swing.GroupLayout.PREFERRED_SIZE)))) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, incidentFrameLayout.createSequentialGroup() - .addComponent(incidentCancelButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 188, Short.MAX_VALUE) - .addComponent(incidentOkButton, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, incidentFrameLayout.createSequentialGroup() - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel12) - .addComponent(jLabel11)) - .addGap(18, 18, 18) - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(addIncidentStart, javax.swing.GroupLayout.DEFAULT_SIZE, 158, Short.MAX_VALUE) - .addComponent(addIncidentLength, javax.swing.GroupLayout.DEFAULT_SIZE, 158, Short.MAX_VALUE)))) - .addContainerGap()) - ); - incidentFrameLayout.setVerticalGroup( - incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(incidentFrameLayout.createSequentialGroup() - .addContainerGap() - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel6) - .addComponent(addIncidentNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel8) - .addComponent(addIncidentName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel9) - .addComponent(jButton3) - .addComponent(incidentColorField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel10) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 106, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(addIncidentStart, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel12)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(addIncidentLength, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel11)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(incidentCancelButton) - .addComponent(incidentOkButton)) - .addContainerGap()) - ); addNoiseFrame.setTitle("Generate Noise"); @@ -954,126 +733,9 @@ incidentTimelinePanel1Layout.setHorizontalGroup( incidentTimelinePanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 6778, Short.MAX_VALUE) + .addGap(0, 6776, Short.MAX_VALUE) ); incidentTimelinePanel1Layout.setVerticalGroup( incidentTimelinePanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentTimelinePanel2.setOpaque(false); - - javax.swing.GroupLayout incidentTimelinePanel2Layout = new javax.swing.GroupLayout(incidentTimelinePanel2); - incidentTimelinePanel2.setLayout(incidentTimelinePanel2Layout); - incidentTimelinePanel2Layout.setHorizontalGroup( - incidentTimelinePanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 6726, Short.MAX_VALUE) - ); - incidentTimelinePanel2Layout.setVerticalGroup( - incidentTimelinePanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentTimelinePanel8.setOpaque(false); - - javax.swing.GroupLayout incidentTimelinePanel8Layout = new javax.swing.GroupLayout(incidentTimelinePanel8); - incidentTimelinePanel8.setLayout(incidentTimelinePanel8Layout); - incidentTimelinePanel8Layout.setHorizontalGroup( - incidentTimelinePanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 5686, Short.MAX_VALUE) - ); - incidentTimelinePanel8Layout.setVerticalGroup( - incidentTimelinePanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentTimelinePanel3.setOpaque(false); - - javax.swing.GroupLayout incidentTimelinePanel3Layout = new javax.swing.GroupLayout(incidentTimelinePanel3); - incidentTimelinePanel3.setLayout(incidentTimelinePanel3Layout); - incidentTimelinePanel3Layout.setHorizontalGroup( - incidentTimelinePanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 605, Short.MAX_VALUE) - ); - incidentTimelinePanel3Layout.setVerticalGroup( - incidentTimelinePanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentTimelinePanel6.setOpaque(false); - - javax.swing.GroupLayout incidentTimelinePanel6Layout = new javax.swing.GroupLayout(incidentTimelinePanel6); - incidentTimelinePanel6.setLayout(incidentTimelinePanel6Layout); - incidentTimelinePanel6Layout.setHorizontalGroup( - incidentTimelinePanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 605, Short.MAX_VALUE) - ); - incidentTimelinePanel6Layout.setVerticalGroup( - incidentTimelinePanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentTimelinePanel5.setOpaque(false); - - javax.swing.GroupLayout incidentTimelinePanel5Layout = new javax.swing.GroupLayout(incidentTimelinePanel5); - incidentTimelinePanel5.setLayout(incidentTimelinePanel5Layout); - incidentTimelinePanel5Layout.setHorizontalGroup( - incidentTimelinePanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 0, Short.MAX_VALUE) - ); - incidentTimelinePanel5Layout.setVerticalGroup( - incidentTimelinePanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentTimelinePanel4.setOpaque(false); - - javax.swing.GroupLayout incidentTimelinePanel4Layout = new javax.swing.GroupLayout(incidentTimelinePanel4); - incidentTimelinePanel4.setLayout(incidentTimelinePanel4Layout); - incidentTimelinePanel4Layout.setHorizontalGroup( - incidentTimelinePanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 617, Short.MAX_VALUE) - ); - incidentTimelinePanel4Layout.setVerticalGroup( - incidentTimelinePanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentTimelinePanel7.setOpaque(false); - - javax.swing.GroupLayout incidentTimelinePanel7Layout = new javax.swing.GroupLayout(incidentTimelinePanel7); - incidentTimelinePanel7.setLayout(incidentTimelinePanel7Layout); - incidentTimelinePanel7Layout.setHorizontalGroup( - incidentTimelinePanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 6882, Short.MAX_VALUE) - ); - incidentTimelinePanel7Layout.setVerticalGroup( - incidentTimelinePanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentTimelinePanel10.setOpaque(false); - - javax.swing.GroupLayout incidentTimelinePanel10Layout = new javax.swing.GroupLayout(incidentTimelinePanel10); - incidentTimelinePanel10.setLayout(incidentTimelinePanel10Layout); - incidentTimelinePanel10Layout.setHorizontalGroup( - incidentTimelinePanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 6573, Short.MAX_VALUE) - ); - incidentTimelinePanel10Layout.setVerticalGroup( - incidentTimelinePanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentTimelinePanel9.setOpaque(false); - - javax.swing.GroupLayout incidentTimelinePanel9Layout = new javax.swing.GroupLayout(incidentTimelinePanel9); - incidentTimelinePanel9.setLayout(incidentTimelinePanel9Layout); - incidentTimelinePanel9Layout.setHorizontalGroup( - incidentTimelinePanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 6470, Short.MAX_VALUE) - ); - incidentTimelinePanel9Layout.setVerticalGroup( - incidentTimelinePanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 334, Short.MAX_VALUE) ); @@ -1088,122 +750,5 @@ incidentNumberPanel1Layout.setVerticalGroup( incidentNumberPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentNumberPanel2.setOpaque(false); - - javax.swing.GroupLayout incidentNumberPanel2Layout = new javax.swing.GroupLayout(incidentNumberPanel2); - incidentNumberPanel2.setLayout(incidentNumberPanel2Layout); - incidentNumberPanel2Layout.setHorizontalGroup( - incidentNumberPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - incidentNumberPanel2Layout.setVerticalGroup( - incidentNumberPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentNumberPanel3.setOpaque(false); - - javax.swing.GroupLayout incidentNumberPanel3Layout = new javax.swing.GroupLayout(incidentNumberPanel3); - incidentNumberPanel3.setLayout(incidentNumberPanel3Layout); - incidentNumberPanel3Layout.setHorizontalGroup( - incidentNumberPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - incidentNumberPanel3Layout.setVerticalGroup( - incidentNumberPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentNumberPanel4.setOpaque(false); - - javax.swing.GroupLayout incidentNumberPanel4Layout = new javax.swing.GroupLayout(incidentNumberPanel4); - incidentNumberPanel4.setLayout(incidentNumberPanel4Layout); - incidentNumberPanel4Layout.setHorizontalGroup( - incidentNumberPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - incidentNumberPanel4Layout.setVerticalGroup( - incidentNumberPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentNumberPanel5.setOpaque(false); - - javax.swing.GroupLayout incidentNumberPanel5Layout = new javax.swing.GroupLayout(incidentNumberPanel5); - incidentNumberPanel5.setLayout(incidentNumberPanel5Layout); - incidentNumberPanel5Layout.setHorizontalGroup( - incidentNumberPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - incidentNumberPanel5Layout.setVerticalGroup( - incidentNumberPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentNumberPanel6.setOpaque(false); - - javax.swing.GroupLayout incidentNumberPanel6Layout = new javax.swing.GroupLayout(incidentNumberPanel6); - incidentNumberPanel6.setLayout(incidentNumberPanel6Layout); - incidentNumberPanel6Layout.setHorizontalGroup( - incidentNumberPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - incidentNumberPanel6Layout.setVerticalGroup( - incidentNumberPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentNumberPanel7.setOpaque(false); - - javax.swing.GroupLayout incidentNumberPanel7Layout = new javax.swing.GroupLayout(incidentNumberPanel7); - incidentNumberPanel7.setLayout(incidentNumberPanel7Layout); - incidentNumberPanel7Layout.setHorizontalGroup( - incidentNumberPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - incidentNumberPanel7Layout.setVerticalGroup( - incidentNumberPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentNumberPanel8.setOpaque(false); - - javax.swing.GroupLayout incidentNumberPanel8Layout = new javax.swing.GroupLayout(incidentNumberPanel8); - incidentNumberPanel8.setLayout(incidentNumberPanel8Layout); - incidentNumberPanel8Layout.setHorizontalGroup( - incidentNumberPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - incidentNumberPanel8Layout.setVerticalGroup( - incidentNumberPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentNumberPanel9.setOpaque(false); - - javax.swing.GroupLayout incidentNumberPanel9Layout = new javax.swing.GroupLayout(incidentNumberPanel9); - incidentNumberPanel9.setLayout(incidentNumberPanel9Layout); - incidentNumberPanel9Layout.setHorizontalGroup( - incidentNumberPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - incidentNumberPanel9Layout.setVerticalGroup( - incidentNumberPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - - incidentNumberPanel10.setOpaque(false); - - javax.swing.GroupLayout incidentNumberPanel10Layout = new javax.swing.GroupLayout(incidentNumberPanel10); - incidentNumberPanel10.setLayout(incidentNumberPanel10Layout); - incidentNumberPanel10Layout.setHorizontalGroup( - incidentNumberPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) - ); - incidentNumberPanel10Layout.setVerticalGroup( - incidentNumberPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1214,31 +759,8 @@ .addGroup(timelineTickPanelLayout.createSequentialGroup() .addContainerGap() - .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(incidentNumberPanel8, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentNumberPanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(incidentNumberPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentNumberPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentNumberPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentNumberPanel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentNumberPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentNumberPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentNumberPanel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(incidentNumberPanel10, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(10, 10, 10) - .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(incidentTimelinePanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(incidentTimelinePanel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) - .addComponent(incidentTimelinePanel5, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(incidentTimelinePanel4, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(incidentTimelinePanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentTimelinePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 6778, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentTimelinePanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentTimelinePanel8, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentTimelinePanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentTimelinePanel10, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(190, 190, 190)) + .addComponent(incidentNumberPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(incidentTimelinePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 6776, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(300, Short.MAX_VALUE)) ); timelineTickPanelLayout.setVerticalGroup( @@ -1246,48 +768,8 @@ .addGroup(timelineTickPanelLayout.createSequentialGroup() .addContainerGap() - .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(incidentNumberPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentTimelinePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(timelineTickPanelLayout.createSequentialGroup() - .addComponent(incidentNumberPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentNumberPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentNumberPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentNumberPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentNumberPanel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(timelineTickPanelLayout.createSequentialGroup() - .addComponent(incidentTimelinePanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentTimelinePanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentTimelinePanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentTimelinePanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentTimelinePanel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(incidentTimelinePanel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentNumberPanel7, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(timelineTickPanelLayout.createSequentialGroup() - .addComponent(incidentTimelinePanel8, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentTimelinePanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(timelineTickPanelLayout.createSequentialGroup() - .addComponent(incidentNumberPanel8, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentNumberPanel9, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(incidentNumberPanel10, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(incidentTimelinePanel10, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addContainerGap(251, Short.MAX_VALUE)) + .addGroup(timelineTickPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(incidentTimelinePanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 334, Short.MAX_VALUE) + .addComponent(incidentNumberPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(977, Short.MAX_VALUE)) ); @@ -1777,197 +1259,4 @@ timeStampScrollPane.setViewportView(timeStampPanel); - fileMenu.setText("File"); - fileMenu.setMargin(new java.awt.Insets(0, 10, 0, 10)); - fileMenu.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - fileMenuActionPerformed(evt); - } - }); - - fileNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_N, java.awt.event.InputEvent.SHIFT_MASK | java.awt.event.InputEvent.CTRL_MASK)); - fileNew.setText("New"); - fileNew.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - fileNewActionPerformed(evt); - } - }); - fileMenu.add(fileNew); - fileMenu.add(jSeparator1); - - fileOpen.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O, java.awt.event.InputEvent.SHIFT_MASK | java.awt.event.InputEvent.CTRL_MASK)); - fileOpen.setText("Open..."); - fileOpen.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - fileOpenActionPerformed(evt); - } - }); - fileMenu.add(fileOpen); - fileMenu.add(jSeparator2); - - fileSave.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_S, java.awt.event.InputEvent.CTRL_MASK)); - fileSave.setText("Save"); - fileSave.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - fileSaveActionPerformed(evt); - } - }); - fileMenu.add(fileSave); - - fileSaveAs.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_S, java.awt.event.InputEvent.SHIFT_MASK | java.awt.event.InputEvent.CTRL_MASK)); - fileSaveAs.setText("Save as..."); - fileSaveAs.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - fileSaveAsActionPerformed(evt); - } - }); - fileMenu.add(fileSaveAs); - - scriptBuilderMenuBar.add(fileMenu); - - generateMenu.setLabel("Generate"); - generateMenu.setMargin(new java.awt.Insets(0, 10, 0, 10)); - - generateNotebooks.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_N, java.awt.event.InputEvent.ALT_MASK | java.awt.event.InputEvent.CTRL_MASK)); - generateNotebooks.setText("Generate Notebooks..."); - generateNotebooks.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - generateNotebooksActionPerformed(evt); - } - }); - generateMenu.add(generateNotebooks); - - jMenuItem3.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_W, java.awt.event.InputEvent.ALT_MASK | java.awt.event.InputEvent.CTRL_MASK)); - jMenuItem3.setText("Generate Web Notebook..."); - generateMenu.add(jMenuItem3); - - generateScorecards.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_S, java.awt.event.InputEvent.ALT_MASK | java.awt.event.InputEvent.CTRL_MASK)); - generateScorecards.setText("Generate Scorecards..."); - generateScorecards.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - generateScorecardsActionPerformed(evt); - } - }); - generateMenu.add(generateScorecards); - - generateOrganizationChart.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O, java.awt.event.InputEvent.ALT_MASK | java.awt.event.InputEvent.CTRL_MASK)); - generateOrganizationChart.setText("Generate D14 TMC Org Chart..."); - generateOrganizationChart.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - generateOrganizationChartActionPerformed(evt); - } - }); - generateMenu.add(generateOrganizationChart); - generateMenu.add(jSeparator3); - - generateProjectRequirements.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_R, java.awt.event.InputEvent.ALT_MASK | java.awt.event.InputEvent.CTRL_MASK)); - generateProjectRequirements.setText("Generate Project Worklist..."); - generateProjectRequirements.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - generateProjectRequirementsActionPerformed(evt); - } - }); - generateMenu.add(generateProjectRequirements); - - scriptBuilderMenuBar.add(generateMenu); - - incidentMenu.setText("Incidents"); - incidentMenu.setMargin(new java.awt.Insets(0, 10, 0, 10)); - - newIncident.setText("New Incident..."); - newIncident.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - newIncidentActionPerformed(evt); - } - }); - incidentMenu.add(newIncident); - - editIncident.setText("Edit Incident..."); - editIncident.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - editIncidentActionPerformed(evt); - } - }); - incidentMenu.add(editIncident); - incidentMenu.add(jSeparator4); - - saveIncident.setText("Save Incident..."); - saveIncident.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - saveIncidentActionPerformed(evt); - } - }); - incidentMenu.add(saveIncident); - - loadIncident.setText("Load Incident..."); - loadIncident.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - loadIncidentActionPerformed(evt); - } - }); - incidentMenu.add(loadIncident); - - scriptBuilderMenuBar.add(incidentMenu); - - generateNoiseMenu.setText("Noise"); - - generateNoiseOption.setText("Generate Noise..."); - generateNoiseOption.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - generateNoiseOptionActionPerformed(evt); - } - }); - generateNoiseMenu.add(generateNoiseOption); - - scriptBuilderMenuBar.add(generateNoiseMenu); - - helpMenu.setText("Help"); - helpMenu.setMargin(new java.awt.Insets(0, 10, 0, 10)); - - helpTutorial.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_F1, 0)); - helpTutorial.setText("Tutorial..."); - helpMenu.add(helpTutorial); - - helpAbout.setText("About..."); - helpAbout.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - helpAboutActionPerformed(evt); - } - }); - helpMenu.add(helpAbout); - - scriptBuilderMenuBar.add(helpMenu); - - setJMenuBar(scriptBuilderMenuBar); - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); @@ -2023,5 +1312,5 @@ .addComponent(scriptEventsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(scriptEventsPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap()) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); @@ -2036,5 +1325,5 @@ private void zoomSliderStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_zoomSliderStateChanged ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK = zoomSlider.getValue() * 2; - this.update(script, script); + this.update(null, theIncident); pack(); repaint(); @@ -2068,115 +1357,4 @@ /** - * Executed when the "OK" button is pressed on the Incident editor. If - * incident is new, and is valid, adds it to the model and updates. If - * editing existing incident, verifies changes are valid and applies them. - * Then closes editor window. - * - * @param evt the button press event - */ - private void incidentOkButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_incidentOkButtonActionPerformed - if (!editingIncident) - { - boolean found = false; - int indx = 0; - for (ScriptIncident i : script.incidents) - { - if (i == null) - { - found = true; - break; - } - ++indx; - if (i.number == (Integer) addIncidentNumber.getValue()) - { - JOptionPane.showMessageDialog(this, "Incident number already in use.", - "Unable to Create Incident", JOptionPane.ERROR_MESSAGE); - incidentFrame.setVisible(true); - return; - } - } - if (!found) - { - JOptionPane.showMessageDialog(this, "Script already has the max number of incidents.", - "Unable to Create Incident", JOptionPane.ERROR_MESSAGE); - incidentFrame.setVisible(true); - return; - } - - script.incidents.remove(indx); - SimulationScript.incidentColors[indx] = selectedColor; - script.incidents.add(indx, - new ScriptIncident(SimulationScript.incidentColors[indx], - (Integer) addIncidentNumber.getValue(), addIncidentName.getText(), addIncidentDescription.getText(), - script)); - script.incidents.get(indx).length = (Integer) addIncidentLength.getValue() * 60; - script.incidents.get(indx).setOffset((Integer) addIncidentStart.getValue() * 60); - } - else - { - ScriptIncident backup = script.incidents.get(oldIncidentIndex); - script.incidents.remove(oldIncidentIndex); - script.incidents.add(oldIncidentIndex, null); - - for (ScriptIncident i : script.incidents) - { - if (i != null && i.number == (Integer) addIncidentNumber.getValue()) - { - script.incidents.remove(oldIncidentIndex); - script.incidents.add(oldIncidentIndex, backup); - JOptionPane.showMessageDialog(this, "Incident number already in use.", - "Unable to Create Incident", JOptionPane.ERROR_MESSAGE); - incidentFrame.setVisible(true); - return; - } - } - - script.incidents.remove(oldIncidentIndex); - SimulationScript.incidentColors[oldIncidentIndex] = selectedColor; - script.incidents.add(oldIncidentIndex, - new ScriptIncident(SimulationScript.incidentColors[oldIncidentIndex], - (Integer) addIncidentNumber.getValue(), addIncidentName.getText(), addIncidentDescription.getText(), - script)); - script.incidents.get(oldIncidentIndex).length = (Integer) addIncidentLength.getValue() * 60; - script.incidents.get(oldIncidentIndex).slices = backup.slices; - script.incidents.get(oldIncidentIndex).offset = backup.offset; - script.incidents.get(oldIncidentIndex).setOffset((Integer) addIncidentStart.getValue() * 60); - } - - incidentFrame.setVisible(false); - update(script,script); - repaint(); - }//GEN-LAST:event_incidentOkButtonActionPerformed - - /** - * Closes editor window upon click of cancel button. - * - * @param evt the button press event - */ - private void incidentCancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_incidentCancelButtonActionPerformed - incidentFrame.setVisible(false); - }//GEN-LAST:event_incidentCancelButtonActionPerformed - - /** - * Opens incident editor window and preps for addition of new incident, upon - * click of "New Incident" menu option. - * - * @param evt the button press event - */ - private void newIncidentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newIncidentActionPerformed - editingIncident = false; - - addIncidentName.setText(""); - addIncidentNumber.setValue(101); - addIncidentStart.setValue(0); - addIncidentLength.setValue(0); - incidentColorField.setBackground(Color.BLACK); - selectedColor = Color.BLACK; - addIncidentDescription.setText(""); - - incidentFrame.setVisible(true); - }//GEN-LAST:event_newIncidentActionPerformed - - /** * Deselects new event type upon click of blank "select" button. * @@ -2237,114 +1415,4 @@ }//GEN-LAST:event_chpRadioButtonActionPerformed - private void fileMenuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileMenuActionPerformed - }//GEN-LAST:event_fileMenuActionPerformed - - /** - * Upon click of "Open file" menu option, opens a window to load a new .sim - * file. - * - * @param evt the button press event - */ - private void fileOpenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileOpenActionPerformed - JFileChooser fc = new JFileChooser(); - - fc.setFileFilter(new ExtensionFileFilter("Simulation Script XML (.xml)", - new String[] - { - "xml" - })); - if (fc.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) - { - System.out.println(fc.getSelectedFile().getName()); - script.loadScriptFromFile(fc.getSelectedFile()); - script.saveFile = fc.getSelectedFile(); - } - }//GEN-LAST:event_fileOpenActionPerformed - - /** - * Upon click of "Save as" menu option, opens a window to choose a .sim file - * to save this as. - * - * @param evt the button press event - */ - private void fileSaveAsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileSaveAsActionPerformed - JFileChooser fc = new JFileChooser(); - - fc.setFileFilter(new ExtensionFileFilter("Simulation Script XML (.xml)", - new String[] - { - "xml" - })); - - if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) - { - script.saveScriptToFile(fc.getSelectedFile()); - script.saveFile = fc.getSelectedFile(); - } - }//GEN-LAST:event_fileSaveAsActionPerformed - - /** - * Upon click of "Save" menu option, opens a window to choose a .sim file to - * save this as. - * - * @param evt the button press event - */ - private void fileSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileSaveActionPerformed - if (script.saveFile == null) - { - fileSaveAsActionPerformed(evt); - } - else - { - script.saveScriptToFile(script.saveFile); - } - }//GEN-LAST:event_fileSaveActionPerformed - - /** - * Upon click of "Edit incident" menu option, brings up a dropdown menu of - * all existing incidents. Once an incident is selected, opens incident - * editor window with that event's details loaded. - * - * @param evt the button press event - */ - private void editIncidentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editIncidentActionPerformed - Object[] incidentList = script.incidents.toArray(); - ScriptIncident i = (ScriptIncident) JOptionPane.showInputDialog( - this, - "Select Incident:", - "Edit Incident", - JOptionPane.PLAIN_MESSAGE, - null, - incidentList, - script.incidents.get(0)); - - // If a valid incident was selected - if (i != null) - { - editingIncident = true; - oldIncidentIndex = script.incidents.indexOf(i); - - addIncidentName.setText(i.name); - addIncidentNumber.setValue(i.number); - addIncidentStart.setValue(i.offset / 60); - addIncidentLength.setValue(i.length / 60); - incidentColorField.setBackground(i.color); - selectedColor = i.color; - addIncidentDescription.setText(i.description); - - incidentFrame.setVisible(true); - } - }//GEN-LAST:event_editIncidentActionPerformed - - /** - * Brings up the noise generation screen upon click of the "Generate Noise" - * menu option. - * - * @param evt the button press event - */ - private void generateNoiseOptionActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_generateNoiseOptionActionPerformed - addNoiseFrame.setVisible(true); - }//GEN-LAST:event_generateNoiseOptionActionPerformed - /** * Hides the noise generation screen upon click of the "Cancel" button. @@ -2370,7 +1438,7 @@ total /= 5; - for (int i = 0; i < script.incidents.get(9).slices.size(); i++) - { - script.incidents.get(9).slices.get(i).events.clear(); + for (int i = 0; i < theIncident.slices.size(); i++) + { + theIncident.slices.get(i).events.clear(); } @@ -2393,116 +1461,11 @@ } - script.incidents.get(9).slices.get(s % (script.incidents.get(9).slices.size())).addEvent(ScriptEvent.factoryByType(eventTypes[e % eventTypes.length])); + theIncident.slices.get(s % (theIncident.slices.size())).addEvent(ScriptEvent.factoryByType(eventTypes[e % eventTypes.length])); } addNoiseFrame.setVisible(false); - update(script, script); + update(null, theIncident); }//GEN-LAST:event_jButton2ActionPerformed - - /** - * Allow the user to pick an incident from a dropdown, then save it to an - * XML file. - * - * @param evt the button press event - */ - private void saveIncidentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveIncidentActionPerformed - Object[] incidentList = script.incidents.toArray(); - String input = ""; - ScriptIncident inc = null; - Object result = JOptionPane.showInputDialog( - this, - "Select Incident:", - "Save Incident", - JOptionPane.PLAIN_MESSAGE, - null, - incidentList, - script.incidents.get(0)); - - System.out.println("RESULT = " + result.toString()); - - input = result.toString(); - - System.out.println("INPUT = " + input); - - int i = 0; - for (ScriptIncident incident : script.incidents) - { - if (incident == null) - { - continue; - } - System.out.println((++i) + ": " + incident.toString()); - if (incident.toString().equals(input)) - { - inc = incident; - } - } - - if (inc == null) - { - System.out.println("DIDN'T FIND ANYTHING"); - return; - } - - JFileChooser fc = new JFileChooser(); - fc.setFileFilter(new ExtensionFileFilter("Script Incident (.xml)", new String[] - { - "xml" - })); - if (fc.showSaveDialog(this) == JFileChooser.APPROVE_OPTION) - { - inc.saveIncidentToFile(fc.getSelectedFile()); - } - }//GEN-LAST:event_saveIncidentActionPerformed - - private void loadIncidentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_loadIncidentActionPerformed - JFileChooser fc = new JFileChooser(); - fc.setFileFilter(new ExtensionFileFilter("Script Incident (.xml)", new String[] - { - "xml" - })); - fc.showOpenDialog(this); - }//GEN-LAST:event_loadIncidentActionPerformed - - private void generateProjectRequirementsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_generateProjectRequirementsActionPerformed - JFileChooser fc = new JFileChooser(); - fc.setFileFilter(new ExtensionFileFilter("Portable Document Format (.pdf)", new String[] - { - "pdf" - })); - fc.setSelectedFile(new File("Requirements.pdf")); - fc.showSaveDialog(this); - }//GEN-LAST:event_generateProjectRequirementsActionPerformed - - private void generateNotebooksActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_generateNotebooksActionPerformed - JFileChooser fc = new JFileChooser(); - fc.setFileFilter(new ExtensionFileFilter("Portable Document Format (.pdf)", new String[] - { - "pdf" - })); - fc.setSelectedFile(new File("Notebooks.pdf")); - fc.showSaveDialog(this); - }//GEN-LAST:event_generateNotebooksActionPerformed - - private void generateScorecardsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_generateScorecardsActionPerformed - JFileChooser fc = new JFileChooser(); - fc.setFileFilter(new ExtensionFileFilter("Portable Document Format (.pdf)", new String[] - { - "pdf" - })); - fc.setSelectedFile(new File("Scorecards.pdf")); - fc.showSaveDialog(this); - }//GEN-LAST:event_generateScorecardsActionPerformed - - private void generateOrganizationChartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_generateOrganizationChartActionPerformed - JFileChooser fc = new JFileChooser(); - fc.setFileFilter(new ExtensionFileFilter("Portable Document Format (.pdf)", new String[] - { - "pdf" - })); - fc.setSelectedFile(new File("OrganizationChart.pdf")); - fc.showSaveDialog(this); - }//GEN-LAST:event_generateOrganizationChartActionPerformed /** @@ -2734,31 +1697,4 @@ }//GEN-LAST:event_zoomOutIconMouseClicked private Color selectedColor = Color.BLACK; - - private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed - Color newColor = incidentColorChooser.showDialog(this, "Incident Color", incidentColorField.getBackground()); - if (newColor != null) - { - selectedColor = newColor; - incidentColorField.setBackground(newColor); - } - }//GEN-LAST:event_jButton3ActionPerformed - - /* Help > About simply displays the current SVN revision number so - * the user can determine which version of the source code was used to - * build the executable she is running. - */ - private void helpAboutActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_helpAboutActionPerformed - {//GEN-HEADEREND:event_helpAboutActionPerformed - JOptionPane.showMessageDialog(rootPane, "Revision: " + getAppVersion(), "About", JOptionPane.INFORMATION_MESSAGE); - }//GEN-LAST:event_helpAboutActionPerformed - - private void fileNewActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_fileNewActionPerformed - {//GEN-HEADEREND:event_fileNewActionPerformed - System.out.println("NEW SCRIPT"); - script = new SimulationScript(); - script.update(); - update(null, script); - repaint(); - }//GEN-LAST:event_fileNewActionPerformed /** @@ -2848,9 +1784,4 @@ // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton activityLogEvalButton; - private javax.swing.JTextArea addIncidentDescription; - private javax.swing.JSpinner addIncidentLength; - private javax.swing.JTextField addIncidentName; - private javax.swing.JSpinner addIncidentNumber; - private javax.swing.JSpinner addIncidentStart; private javax.swing.JFrame addNoiseFrame; private javax.swing.JButton atmsEvalButton; @@ -2866,62 +1797,17 @@ private javax.swing.JMenuItem deleteEventList; private javax.swing.JMenuItem editEventList; - private javax.swing.JMenuItem editIncident; private javax.swing.JPanel evaluationEventsPanel; private javax.swing.JPopupMenu eventListPopupMenu; private javax.swing.JPopupMenu eventPopupMenu; private javax.swing.JButton facilitatorEvalButton; - private javax.swing.JMenu fileMenu; - private javax.swing.JMenuItem fileNew; - private javax.swing.JMenuItem fileOpen; - private javax.swing.JMenuItem fileSave; - private javax.swing.JMenuItem fileSaveAs; - private javax.swing.JMenu generateMenu; - private javax.swing.JMenu generateNoiseMenu; - private javax.swing.JMenuItem generateNoiseOption; - private javax.swing.JMenuItem generateNotebooks; - private javax.swing.JMenuItem generateOrganizationChart; - private javax.swing.JMenuItem generateProjectRequirements; - private javax.swing.JMenuItem generateScorecards; - private javax.swing.JMenuItem helpAbout; - private javax.swing.JMenu helpMenu; - private javax.swing.JMenuItem helpTutorial; - private javax.swing.JButton incidentCancelButton; - private javax.swing.JColorChooser incidentColorChooser; - private javax.swing.JTextField incidentColorField; private javax.swing.JTextArea incidentDescription; private javax.swing.JScrollPane incidentDescriptionPane; private javax.swing.JPanel incidentEventsPanel; - private javax.swing.JFrame incidentFrame; - private javax.swing.JMenu incidentMenu; private javax.swing.JTextField incidentName; private javax.swing.JTextField incidentNumber; private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel1; - private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel10; - private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel2; - private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel3; - private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel4; - private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel5; - private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel6; - private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel7; - private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel8; - private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel9; - private javax.swing.JButton incidentOkButton; - private javax.swing.JPopupMenu incidentPopupMenu; private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel1; - private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel10; - private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel2; - private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel3; - private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel4; - private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel5; - private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel6; - private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel7; - private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel8; - private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel9; private javax.swing.JButton jButton1; private javax.swing.JButton jButton2; - private javax.swing.JButton jButton3; - private javax.swing.JLabel jLabel10; - private javax.swing.JLabel jLabel11; - private javax.swing.JLabel jLabel12; private javax.swing.JLabel jLabel13; private javax.swing.JLabel jLabel14; @@ -2935,18 +1821,9 @@ private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; - private javax.swing.JLabel jLabel6; private javax.swing.JLabel jLabel7; - private javax.swing.JLabel jLabel8; - private javax.swing.JLabel jLabel9; private javax.swing.JMenuItem jMenuItem2; - private javax.swing.JMenuItem jMenuItem3; private javax.swing.JMenuItem jMenuItem4; private javax.swing.JMenuItem jMenuItem5; private javax.swing.JMenuItem jMenuItem6; - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JPopupMenu.Separator jSeparator1; - private javax.swing.JPopupMenu.Separator jSeparator2; - private javax.swing.JPopupMenu.Separator jSeparator3; - private javax.swing.JPopupMenu.Separator jSeparator4; private javax.swing.JSlider jSlider1; private javax.swing.JSlider jSlider2; @@ -2955,10 +1832,7 @@ private javax.swing.JSlider jSlider5; private javax.swing.JTextArea jTextArea1; - private javax.swing.JMenuItem loadIncident; private javax.swing.JButton maintenanceRadioButton; - private javax.swing.JMenuItem newIncident; private javax.swing.JButton okButton; private javax.swing.JButton paramicsButton; - private javax.swing.JMenuItem popupDeleteIncident; private javax.swing.JButton radioEvalButton; private javax.swing.JMenuItem radioEvent; @@ -2968,6 +1842,4 @@ private javax.swing.JComboBox radioTypeComboBox; private javax.swing.JLabel radioTypeLabel; - private javax.swing.JMenuItem saveIncident; - private javax.swing.JMenuBar scriptBuilderMenuBar; private javax.swing.JList scriptEventsList; private javax.swing.JScrollPane scriptEventsPane; Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.form =================================================================== --- trunk/src/scriptbuilder/gui/IncidentEditorFrame.form (revision 53) +++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.form (revision 54) @@ -3,17 +3,4 @@
- - - - - - - - - - - - - @@ -227,210 +214,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -633,220 +414,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -861,5 +426,4 @@ - @@ -941,5 +505,5 @@ - + @@ -978,36 +542,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -1017,57 +553,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -1089,172 +577,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1274,167 +600,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Index: trunk/src/scriptbuilder/gui/panels/ScriptBuilderTimelinePanel.java =================================================================== --- trunk/src/scriptbuilder/gui/panels/ScriptBuilderTimelinePanel.java (revision 53) +++ trunk/src/scriptbuilder/gui/panels/ScriptBuilderTimelinePanel.java (revision 54) @@ -11,4 +11,5 @@ import javax.swing.JPanel; import javax.swing.event.MouseInputAdapter; +import scriptbuilder.gui.IncidentEditorFrame; import scriptbuilder.gui.ScriptBuilderFrame; import scriptbuilder.gui.ScriptBuilderGuiConstants; @@ -100,5 +101,14 @@ { Editor ed = new Editor(); - ScriptBuilderFrame f = (ScriptBuilderFrame) getTopLevelAncestor(); + ScriptBuilderFrame f = null; + IncidentEditorFrame g = null; + if (getTopLevelAncestor() instanceof ScriptBuilderFrame) + { + f = (ScriptBuilderFrame) getTopLevelAncestor(); + } + else if (getTopLevelAncestor() instanceof IncidentEditorFrame) + { + g = (IncidentEditorFrame) getTopLevelAncestor(); + } x = cursorTime = e.getX(); @@ -142,17 +152,37 @@ if (e.getButton() == MouseEvent.BUTTON1) { - if (f.currentEventType != null) - { - I_ScriptEvent s = ScriptEvent.factoryByType(f.currentEventType); - ed.addProperty(eventTypeToPropertyMap.get(f.currentEventType), s); - if (incident.slices.get(newSlice) == null) + if (getTopLevelAncestor() instanceof ScriptBuilderFrame) + { + if (f.currentEventType != null) { - incident.addNewEvent(s, newSlice); + I_ScriptEvent s = ScriptEvent.factoryByType(f.currentEventType); + ed.addProperty(eventTypeToPropertyMap.get(f.currentEventType), s); + if (incident.slices.get(newSlice) == null) + { + incident.addNewEvent(s, newSlice); + } + else + { + incident.slices.get(newSlice).addEvent(s); + } + f.update(f.getScript(), f.getScript()); } - else + } + if (getTopLevelAncestor() instanceof IncidentEditorFrame) + { + if (g.currentEventType != null) { - incident.slices.get(newSlice).addEvent(s); + I_ScriptEvent s = ScriptEvent.factoryByType(g.currentEventType); + ed.addProperty(eventTypeToPropertyMap.get(g.currentEventType), s); + if (incident.slices.get(newSlice) == null) + { + incident.addNewEvent(s, newSlice); + } + else + { + incident.slices.get(newSlice).addEvent(s); + } + g.update(null, g.getIncident()); } - f.update(f.getScript(), f.getScript()); } } @@ -294,14 +324,33 @@ Graphics2D g2d = (Graphics2D) g; - IncidentTimelineDrawer.DrawScriptBuilderTimeline(g2d, incident); + if (getTopLevelAncestor() instanceof ScriptBuilderFrame) + { + IncidentTimelineDrawer.DrawScriptBuilderTimeline(g2d, incident); + } + if (getTopLevelAncestor() instanceof IncidentEditorFrame) + { + IncidentTimelineDrawer.DrawIncidentTimeline(g2d, incident, false); + } if (focused) { CursorDrawer.DrawCursor(g2d, cursorTime, false); - if (((ScriptBuilderFrame) this.getTopLevelAncestor()).currentEventType != null) - { - EventIconDrawer.DrawEventIcon(g2d, - ((ScriptBuilderFrame) this.getTopLevelAncestor()).currentEventType, - x + 5, y + 10); + if (this.getTopLevelAncestor() instanceof ScriptBuilderFrame) + { + if (((ScriptBuilderFrame) this.getTopLevelAncestor()).currentEventType != null) + { + EventIconDrawer.DrawEventIcon(g2d, + ((ScriptBuilderFrame) this.getTopLevelAncestor()).currentEventType, + x + 5, y + 10); + } + } + if (this.getTopLevelAncestor() instanceof IncidentEditorFrame) + { + if (((IncidentEditorFrame) this.getTopLevelAncestor()).currentEventType != null) + { + EventIconDrawer.DrawEventIcon(g2d, + ((IncidentEditorFrame) this.getTopLevelAncestor()).currentEventType, + x + 5, y + 10); + } } } Index: trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java =================================================================== --- trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java (revision 1) +++ trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java (revision 54) @@ -89,4 +89,46 @@ /** + * Update the length interval and the dimensions of the panel. NOTE: This + * method implementation is an exact duplication of the update method in + * panels.TimelineTickPanel. I'm not sure if it actually accomplishes + * anything here. + * + * @param script The simulation script model + */ + public void update(ScriptIncident incident) + { + longestLength = ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH; + + // Get the stats on the incidents + int height = ScriptBuilderGuiConstants.TICK_TOP_MARGIN * 4; + if (incident != null) + { + height += incident.collapsed + ? ScriptBuilderGuiConstants.TIMELINE_OPENED_HEIGHT + : ScriptBuilderGuiConstants.TIMELINE_OPENED_HEIGHT; + if ((incident.length + incident.offset) > longestLength) + { + longestLength = incident.length + incident.offset; + } + } + + if (incident != null && incident.number == 100) + { + incident.length = longestLength; + incident.offset = 0; + } + + Dimension newSize = new Dimension(longestLength + / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION + * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK + + ScriptBuilderGuiConstants.TICK_TIMELINE_LEFT_MARGIN + 50, + height); + this.setPreferredSize(newSize); + this.setSize(newSize); + + this.invalidate(); + } + + /** * Refresh the panel. Draw the timestamps for the appropriate intervals * based on zoom level. Index: trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java =================================================================== --- trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java (revision 31) +++ trunk/src/scriptbuilder/gui/panels/TimelineTickPanel.java (revision 54) @@ -7,4 +7,5 @@ import javax.swing.JPanel; import javax.swing.event.MouseInputAdapter; +import scriptbuilder.gui.IncidentEditorFrame; import scriptbuilder.gui.ScriptBuilderFrame; import scriptbuilder.gui.ScriptBuilderGuiConstants; @@ -130,4 +131,40 @@ /** + * Update the panel's dimensions based on number of events, zoom level, and + * which events are collapsed. + * + * @param script The main script model + */ + public void update(ScriptIncident incident) + { + longestLength = ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH; + + // Get the stats on the incidents + int height = ScriptBuilderGuiConstants.TICK_TOP_MARGIN * 4; + + if (incident != null) + { + height += incident.collapsed + ? ScriptBuilderGuiConstants.TIMELINE_OPENED_HEIGHT + : ScriptBuilderGuiConstants.TIMELINE_OPENED_HEIGHT; + if ((incident.length + incident.offset) > longestLength) + { + longestLength = incident.length + incident.offset; + } + + } + + Dimension newSize = new Dimension(longestLength + / ScriptBuilderGuiConstants.HORIZONTAL_TICK_RESOLUTION + * ScriptBuilderGuiConstants.PIXEL_WIDTH_PER_HORIZONTAL_TICK + + ScriptBuilderGuiConstants.TICK_TIMELINE_LEFT_MARGIN + 50, + height); + this.setPreferredSize(newSize); + this.setSize(newSize); + + this.invalidate(); + } + + /** * Refresh the panel. Redraw the ticks based on zoom level, panel * dimensions, and offset. If the user is trying to add an event, draw that @@ -182,10 +219,23 @@ paintChildren(g); - if (focused - && ((ScriptBuilderFrame) this.getTopLevelAncestor()).currentEventType != null) - { - EventIconDrawer.DrawEventIcon(g2d, - ((ScriptBuilderFrame) this.getTopLevelAncestor()).currentEventType, - x, y); + if (this.getTopLevelAncestor() instanceof ScriptBuilderFrame) + { + if (focused + && ((ScriptBuilderFrame) this.getTopLevelAncestor()).currentEventType != null) + { + EventIconDrawer.DrawEventIcon(g2d, + ((ScriptBuilderFrame) this.getTopLevelAncestor()).currentEventType, + x, y); + } + } + if (this.getTopLevelAncestor() instanceof IncidentEditorFrame) + { + if (focused + && ((IncidentEditorFrame) this.getTopLevelAncestor()).currentEventType != null) + { + EventIconDrawer.DrawEventIcon(g2d, + ((IncidentEditorFrame) this.getTopLevelAncestor()).currentEventType, + x, y); + } } }