Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java (revision 124) +++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java (revision 135) @@ -406,5 +406,6 @@ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents - private void initComponents() { + private void initComponents() + { eventPopupMenu = new javax.swing.JPopupMenu(); @@ -491,9 +492,12 @@ cadEvent.setText("CAD Event"); - cadEvent.addMouseListener(new java.awt.event.MouseAdapter() { - public void mousePressed(java.awt.event.MouseEvent evt) { + cadEvent.addMouseListener(new java.awt.event.MouseAdapter() + { + public void mousePressed(java.awt.event.MouseEvent evt) + { cadEventMousePressed(evt); } - public void mouseReleased(java.awt.event.MouseEvent evt) { + public void mouseReleased(java.awt.event.MouseEvent evt) + { cadEventMouseReleased(evt); } @@ -505,6 +509,8 @@ radioEvent.setText("Radio Event"); - radioEvent.addMouseListener(new java.awt.event.MouseAdapter() { - public void mousePressed(java.awt.event.MouseEvent evt) { + radioEvent.addMouseListener(new java.awt.event.MouseAdapter() + { + public void mousePressed(java.awt.event.MouseEvent evt) + { radioEventMousePressed(evt); } @@ -560,6 +566,8 @@ okButton.setText("OK"); - okButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + okButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { okButtonActionPerformed(evt); } @@ -567,6 +575,8 @@ cancelButton.setText("Cancel"); - cancelButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + cancelButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { cancelButtonActionPerformed(evt); } @@ -611,6 +621,8 @@ editEventList.setText("Edit..."); - editEventList.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + editEventList.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { editEventListActionPerformed(evt); } @@ -654,6 +666,8 @@ btnCancelNoise.setText("Cancel"); - btnCancelNoise.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + btnCancelNoise.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { btnCancelNoiseActionPerformed(evt); } @@ -661,6 +675,8 @@ btnGenerateNoise.setText("Generate"); - btnGenerateNoise.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + btnGenerateNoise.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { btnGenerateNoiseActionPerformed(evt); } @@ -837,6 +853,8 @@ zoomSlider.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR)); zoomSlider.setFocusable(false); - zoomSlider.addChangeListener(new javax.swing.event.ChangeListener() { - public void stateChanged(javax.swing.event.ChangeEvent evt) { + zoomSlider.addChangeListener(new javax.swing.event.ChangeListener() + { + public void stateChanged(javax.swing.event.ChangeEvent evt) + { zoomSliderStateChanged(evt); } @@ -917,6 +935,8 @@ maintenanceRadioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); maintenanceRadioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - maintenanceRadioButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + maintenanceRadioButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { maintenanceRadioButtonActionPerformed(evt); } @@ -929,6 +949,8 @@ tmtRadioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); tmtRadioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - tmtRadioButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + tmtRadioButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { tmtRadioButtonActionPerformed(evt); } @@ -941,6 +963,8 @@ telephoneButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); telephoneButton.setPreferredSize(new java.awt.Dimension(30, 25)); - telephoneButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + telephoneButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { telephoneButtonActionPerformed(evt); } @@ -953,6 +977,8 @@ unitButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); unitButton.setPreferredSize(new java.awt.Dimension(30, 25)); - unitButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + unitButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { unitButtonActionPerformed(evt); } @@ -965,6 +991,8 @@ witnessButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); witnessButton.setPreferredSize(new java.awt.Dimension(30, 25)); - witnessButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + witnessButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { witnessButtonActionPerformed(evt); } @@ -977,6 +1005,8 @@ paramicsButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); paramicsButton.setPreferredSize(new java.awt.Dimension(30, 25)); - paramicsButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + paramicsButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { paramicsButtonActionPerformed(evt); } @@ -989,6 +1019,8 @@ towButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); towButton.setPreferredSize(new java.awt.Dimension(30, 25)); - towButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + towButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { towButtonActionPerformed(evt); } @@ -1001,6 +1033,8 @@ audioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); audioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - audioButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + audioButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { audioButtonActionPerformed(evt); } @@ -1013,6 +1047,8 @@ cctvButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); cctvButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cctvButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + cctvButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { cctvButtonActionPerformed(evt); } @@ -1025,6 +1061,8 @@ cadButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); cadButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cadButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + cadButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { cadButtonActionPerformed(evt); } @@ -1037,6 +1075,8 @@ chpRadioButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); chpRadioButton.setPreferredSize(new java.awt.Dimension(30, 25)); - chpRadioButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + chpRadioButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { chpRadioButtonActionPerformed(evt); } @@ -1107,6 +1147,8 @@ atmsEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); atmsEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - atmsEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + atmsEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { atmsEvalButtonActionPerformed(evt); } @@ -1119,6 +1161,8 @@ cmsEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); cmsEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cmsEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + cmsEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { cmsEvalButtonActionPerformed(evt); } @@ -1131,6 +1175,8 @@ cadEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); cadEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - cadEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + cadEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { cadEvalButtonActionPerformed(evt); } @@ -1143,6 +1189,8 @@ facilitatorEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); facilitatorEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - facilitatorEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + facilitatorEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { facilitatorEvalButtonActionPerformed(evt); } @@ -1155,6 +1203,8 @@ activityLogEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); activityLogEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - activityLogEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + activityLogEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { activityLogEvalButtonActionPerformed(evt); } @@ -1167,6 +1217,8 @@ radioEvalButton.setMargin(new java.awt.Insets(2, 10, 2, 10)); radioEvalButton.setPreferredSize(new java.awt.Dimension(30, 25)); - radioEvalButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + radioEvalButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { radioEvalButtonActionPerformed(evt); } @@ -1212,6 +1264,8 @@ zoomInIcon.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/ZoomIn.png"))); // NOI18N zoomInIcon.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); - zoomInIcon.addMouseListener(new java.awt.event.MouseAdapter() { - public void mouseClicked(java.awt.event.MouseEvent evt) { + zoomInIcon.addMouseListener(new java.awt.event.MouseAdapter() + { + public void mouseClicked(java.awt.event.MouseEvent evt) + { zoomInIconMouseClicked(evt); } @@ -1220,6 +1274,8 @@ zoomOutIcon.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/ZoomOut.png"))); // NOI18N zoomOutIcon.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); - zoomOutIcon.addMouseListener(new java.awt.event.MouseAdapter() { - public void mouseClicked(java.awt.event.MouseEvent evt) { + zoomOutIcon.addMouseListener(new java.awt.event.MouseAdapter() + { + public void mouseClicked(java.awt.event.MouseEvent evt) + { zoomOutIconMouseClicked(evt); } @@ -1260,7 +1316,9 @@ timeStampScrollPane1.setViewportView(relativeTimeStampPanel); - btnAddTime.setText("+15:00"); - btnAddTime.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + btnAddTime.setText("+15"); + btnAddTime.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { btnAddTimeActionPerformed(evt); } @@ -1268,6 +1326,8 @@ btnToggleTimeStart.setText("to Start"); - btnToggleTimeStart.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + btnToggleTimeStart.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { btnToggleTimeStartActionPerformed(evt); } @@ -1276,6 +1336,8 @@ btnToggleTimeEnd.setSelected(true); btnToggleTimeEnd.setText("to End"); - btnToggleTimeEnd.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + btnToggleTimeEnd.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { btnToggleTimeEndActionPerformed(evt); } Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.form =================================================================== --- trunk/src/scriptbuilder/gui/IncidentEditorFrame.form (revision 124) +++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.form (revision 135) @@ -1346,5 +1346,5 @@ - +