Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 51) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 52) @@ -365,5 +365,4 @@ model.addElement(e); } - scriptEventsList.setModel(model); } else if (arg instanceof IncidentFocusedEvent) @@ -371,7 +370,4 @@ ScriptIncident i = ((IncidentFocusedEvent) arg).incident; - incidentNumber.setText(Integer.toString(i.number)); - incidentName.setText(i.name); - incidentDescription.setText(i.description); //gotoIncident.setSelectedItem(i); @@ -467,16 +463,5 @@ incidentNumberPanel9 = new scriptbuilder.gui.panels.IncidentNumberPanel(); incidentNumberPanel10 = new scriptbuilder.gui.panels.IncidentNumberPanel(); - scriptEventsPanel = new javax.swing.JPanel(); - scriptEventsPane = new javax.swing.JScrollPane(); - scriptEventsList = new javax.swing.JList(); zoomSlider = new javax.swing.JSlider(); - scriptEventsPanel1 = new javax.swing.JPanel(); - jLabel2 = new javax.swing.JLabel(); - jLabel3 = new javax.swing.JLabel(); - jLabel4 = new javax.swing.JLabel(); - incidentName = new javax.swing.JTextField(); - incidentDescriptionPane = new javax.swing.JScrollPane(); - incidentDescription = new javax.swing.JTextArea(); - incidentNumber = new javax.swing.JTextField(); selectButton = new javax.swing.JButton(); incidentEventsPanel = new javax.swing.JPanel(); @@ -521,4 +506,5 @@ newIncident = new javax.swing.JMenuItem(); editIncident = new javax.swing.JMenuItem(); + incidentDetails = new javax.swing.JMenuItem(); jSeparator4 = new javax.swing.JPopupMenu.Separator(); saveIncident = new javax.swing.JMenuItem(); @@ -932,6 +918,8 @@ setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); setTitle("Script Builder"); + setBounds(new java.awt.Rectangle(0, 23, 800, 700)); setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); - setMinimumSize(new java.awt.Dimension(800, 800)); + setMaximumSize(new java.awt.Dimension(2147483647, 800)); + setMinimumSize(new java.awt.Dimension(800, 700)); timelinesScrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS); @@ -940,4 +928,5 @@ timelinesScrollPane.setFocusTraversalPolicyProvider(true); timelinesScrollPane.setPreferredSize(new java.awt.Dimension(72000, 1341)); + timelinesScrollPane.setWheelScrollingEnabled(false); timelineTickPanel.setMaximumSize(new java.awt.Dimension(7200, 32767)); @@ -953,5 +942,5 @@ incidentTimelinePanel1Layout.setHorizontalGroup( incidentTimelinePanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 6778, Short.MAX_VALUE) + .addGap(0, 691, Short.MAX_VALUE) ); incidentTimelinePanel1Layout.setVerticalGroup( @@ -966,9 +955,9 @@ incidentTimelinePanel2Layout.setHorizontalGroup( incidentTimelinePanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 6726, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentTimelinePanel2Layout.setVerticalGroup( incidentTimelinePanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -979,9 +968,9 @@ incidentTimelinePanel8Layout.setHorizontalGroup( incidentTimelinePanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 5686, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentTimelinePanel8Layout.setVerticalGroup( incidentTimelinePanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -992,9 +981,9 @@ incidentTimelinePanel3Layout.setHorizontalGroup( incidentTimelinePanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 605, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentTimelinePanel3Layout.setVerticalGroup( incidentTimelinePanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1005,9 +994,9 @@ incidentTimelinePanel6Layout.setHorizontalGroup( incidentTimelinePanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 605, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentTimelinePanel6Layout.setVerticalGroup( incidentTimelinePanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1022,5 +1011,5 @@ incidentTimelinePanel5Layout.setVerticalGroup( incidentTimelinePanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1031,9 +1020,9 @@ incidentTimelinePanel4Layout.setHorizontalGroup( incidentTimelinePanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 617, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentTimelinePanel4Layout.setVerticalGroup( incidentTimelinePanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1044,9 +1033,9 @@ incidentTimelinePanel7Layout.setHorizontalGroup( incidentTimelinePanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 6882, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentTimelinePanel7Layout.setVerticalGroup( incidentTimelinePanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1057,9 +1046,9 @@ incidentTimelinePanel10Layout.setHorizontalGroup( incidentTimelinePanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 6573, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentTimelinePanel10Layout.setVerticalGroup( incidentTimelinePanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1070,9 +1059,9 @@ incidentTimelinePanel9Layout.setHorizontalGroup( incidentTimelinePanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 6470, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentTimelinePanel9Layout.setVerticalGroup( incidentTimelinePanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1083,9 +1072,9 @@ incidentNumberPanel1Layout.setHorizontalGroup( incidentNumberPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 106, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentNumberPanel1Layout.setVerticalGroup( incidentNumberPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1096,9 +1085,9 @@ incidentNumberPanel2Layout.setHorizontalGroup( incidentNumberPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentNumberPanel2Layout.setVerticalGroup( incidentNumberPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1109,9 +1098,9 @@ incidentNumberPanel3Layout.setHorizontalGroup( incidentNumberPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentNumberPanel3Layout.setVerticalGroup( incidentNumberPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1122,9 +1111,9 @@ incidentNumberPanel4Layout.setHorizontalGroup( incidentNumberPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentNumberPanel4Layout.setVerticalGroup( incidentNumberPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1135,9 +1124,9 @@ incidentNumberPanel5Layout.setHorizontalGroup( incidentNumberPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentNumberPanel5Layout.setVerticalGroup( incidentNumberPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1148,9 +1137,9 @@ incidentNumberPanel6Layout.setHorizontalGroup( incidentNumberPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentNumberPanel6Layout.setVerticalGroup( incidentNumberPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1161,9 +1150,9 @@ incidentNumberPanel7Layout.setHorizontalGroup( incidentNumberPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentNumberPanel7Layout.setVerticalGroup( incidentNumberPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1174,9 +1163,9 @@ incidentNumberPanel8Layout.setHorizontalGroup( incidentNumberPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentNumberPanel8Layout.setVerticalGroup( incidentNumberPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1187,9 +1176,9 @@ incidentNumberPanel9Layout.setHorizontalGroup( incidentNumberPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentNumberPanel9Layout.setVerticalGroup( incidentNumberPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1200,9 +1189,9 @@ incidentNumberPanel10Layout.setHorizontalGroup( incidentNumberPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); incidentNumberPanel10Layout.setVerticalGroup( incidentNumberPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1234,5 +1223,5 @@ .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(incidentTimelinePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 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) @@ -1288,32 +1277,8 @@ .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)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); timelinesScrollPane.setViewportView(timelineTickPanel); - - scriptEventsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Script Events")); - - scriptEventsPane.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); - - scriptEventsList.setModel(new DefaultListModel()); - scriptEventsList.setComponentPopupMenu(eventListPopupMenu); - scriptEventsPane.setViewportView(scriptEventsList); - - javax.swing.GroupLayout scriptEventsPanelLayout = new javax.swing.GroupLayout(scriptEventsPanel); - scriptEventsPanel.setLayout(scriptEventsPanelLayout); - scriptEventsPanelLayout.setHorizontalGroup( - scriptEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(scriptEventsPanelLayout.createSequentialGroup() - .addContainerGap() - .addComponent(scriptEventsPane) - .addContainerGap()) - ); - scriptEventsPanelLayout.setVerticalGroup( - scriptEventsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(scriptEventsPanelLayout.createSequentialGroup() - .addComponent(scriptEventsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 197, Short.MAX_VALUE) - .addContainerGap()) - ); zoomSlider.setMaximum(21); @@ -1330,64 +1295,4 @@ } }); - - scriptEventsPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Incident Information")); - - jLabel2.setText("Incident Number:"); - - jLabel3.setText("Incident Name:"); - - jLabel4.setText("Incident Description:"); - - incidentName.setEditable(false); - incidentName.setText("Media"); - - incidentDescriptionPane.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); - - incidentDescription.setColumns(20); - incidentDescription.setEditable(false); - incidentDescription.setLineWrap(true); - incidentDescription.setRows(5); - incidentDescription.setText("All media message events are found in this incident."); - incidentDescription.setWrapStyleWord(true); - incidentDescriptionPane.setViewportView(incidentDescription); - - incidentNumber.setEditable(false); - incidentNumber.setText("100"); - - javax.swing.GroupLayout scriptEventsPanel1Layout = new javax.swing.GroupLayout(scriptEventsPanel1); - scriptEventsPanel1.setLayout(scriptEventsPanel1Layout); - scriptEventsPanel1Layout.setHorizontalGroup( - scriptEventsPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(scriptEventsPanel1Layout.createSequentialGroup() - .addContainerGap() - .addGroup(scriptEventsPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(incidentDescriptionPane, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jLabel4) - .addGroup(scriptEventsPanel1Layout.createSequentialGroup() - .addGroup(scriptEventsPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel2) - .addComponent(jLabel3)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(scriptEventsPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(incidentName) - .addComponent(incidentNumber)))) - .addContainerGap()) - ); - scriptEventsPanel1Layout.setVerticalGroup( - scriptEventsPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(scriptEventsPanel1Layout.createSequentialGroup() - .addGroup(scriptEventsPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jLabel2) - .addComponent(incidentNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(scriptEventsPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(incidentName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel3)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel4) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(incidentDescriptionPane, javax.swing.GroupLayout.DEFAULT_SIZE, 125, Short.MAX_VALUE) - .addContainerGap()) - ); selectButton.setToolTipText("Select"); @@ -1767,9 +1672,9 @@ timeStampPanelLayout.setHorizontalGroup( timeStampPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 1032, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); timeStampPanelLayout.setVerticalGroup( timeStampPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGap(0, 100, Short.MAX_VALUE) + .addGap(0, 0, Short.MAX_VALUE) ); @@ -1910,4 +1815,14 @@ }); incidentMenu.add(editIncident); + + incidentDetails.setText("Incident Details..."); + incidentDetails.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { + incidentDetailsActionPerformed(evt); + } + }); + incidentMenu.add(incidentDetails); incidentMenu.add(jSeparator4); @@ -1978,8 +1893,4 @@ .addComponent(timelinesScrollPane, 0, 0, Short.MAX_VALUE) .addComponent(timeStampScrollPane) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(scriptEventsPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(scriptEventsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addGroup(layout.createSequentialGroup() .addComponent(selectButton, javax.swing.GroupLayout.PREFERRED_SIZE, 40, javax.swing.GroupLayout.PREFERRED_SIZE) @@ -2017,9 +1928,5 @@ .addComponent(timeStampScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 20, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(timelinesScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 365, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .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)) + .addComponent(timelinesScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addContainerGap()) ); @@ -2307,5 +2214,5 @@ * @param evt the button press event */ - private void editIncidentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_editIncidentActionPerformed + private void incidentDetailsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_incidentDetailsActionPerformed Object[] incidentList = script.incidents.toArray(); ScriptIncident i = (ScriptIncident) JOptionPane.showInputDialog( @@ -2334,5 +2241,5 @@ incidentFrame.setVisible(true); } - }//GEN-LAST:event_editIncidentActionPerformed + }//GEN-LAST:event_incidentDetailsActionPerformed /** @@ -2760,4 +2667,9 @@ repaint(); }//GEN-LAST:event_fileNewActionPerformed + + private void editIncidentActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_editIncidentActionPerformed + {//GEN-HEADEREND:event_editIncidentActionPerformed + new IncidentEditorFrame().setVisible(true); + }//GEN-LAST:event_editIncidentActionPerformed /** @@ -2888,11 +2800,8 @@ private javax.swing.JColorChooser incidentColorChooser; private javax.swing.JTextField incidentColorField; - private javax.swing.JTextArea incidentDescription; - private javax.swing.JScrollPane incidentDescriptionPane; + private javax.swing.JMenuItem incidentDetails; 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.IncidentNumberPanel incidentNumberPanel1; private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel10; @@ -2928,9 +2837,6 @@ private javax.swing.JLabel jLabel16; private javax.swing.JLabel jLabel17; - private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel20; private javax.swing.JLabel jLabel21; - private javax.swing.JLabel jLabel3; - private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; private javax.swing.JLabel jLabel6; @@ -2969,8 +2875,4 @@ private javax.swing.JMenuItem saveIncident; private javax.swing.JMenuBar scriptBuilderMenuBar; - private javax.swing.JList scriptEventsList; - private javax.swing.JScrollPane scriptEventsPane; - private javax.swing.JPanel scriptEventsPanel; - private javax.swing.JPanel scriptEventsPanel1; private javax.swing.JButton selectButton; private javax.swing.JButton telephoneButton;