Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 106) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (revision 108) @@ -23,4 +23,5 @@ import javax.swing.JFileChooser; import javax.swing.JOptionPane; +import javax.swing.SwingConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -253,5 +254,6 @@ @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents - private void initComponents() { + private void initComponents() + { incidentPopupMenu = new javax.swing.JPopupMenu(); @@ -289,9 +291,9 @@ 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(); + labelIncidentLength = new javax.swing.JLabel(); addNoiseFrame = new javax.swing.JFrame(); jLabel13 = new javax.swing.JLabel(); @@ -370,9 +372,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); } @@ -384,6 +389,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); } @@ -439,6 +446,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); } @@ -446,6 +455,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); } @@ -490,6 +501,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); } @@ -521,6 +534,8 @@ incidentOkButton.setText("OK"); - incidentOkButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + incidentOkButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { incidentOkButtonActionPerformed(evt); } @@ -528,23 +543,25 @@ incidentCancelButton.setText("Cancel"); - incidentCancelButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + incidentCancelButton.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { incidentCancelButtonActionPerformed(evt); } }); - addIncidentNumber.setModel(new javax.swing.SpinnerNumberModel(101, 101, null, 1)); + 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(0, 0, null, 1)); - jLabel12.setText("Incident Start Time in Minutes:"); - addIncidentStart.setModel(new javax.swing.SpinnerNumberModel(0, 0, null, 1)); + 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) { + jButton3.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { jButton3ActionPerformed(evt); } @@ -553,4 +570,8 @@ incidentColorField.setEditable(false); incidentColorField.setBackground(new java.awt.Color(0, 0, 0)); + + labelIncidentLength.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); + labelIncidentLength.setText("0"); + labelIncidentLength.setToolTipText(""); javax.swing.GroupLayout incidentFrameLayout = new javax.swing.GroupLayout(incidentFrame.getContentPane()); @@ -586,6 +607,9 @@ .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)))) + .addGroup(incidentFrameLayout.createSequentialGroup() + .addGap(6, 6, 6) + .addComponent(labelIncidentLength, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGap(22, 22, 22)) + .addComponent(addIncidentStart, javax.swing.GroupLayout.DEFAULT_SIZE, 158, Short.MAX_VALUE)))) .addContainerGap()) ); @@ -609,5 +633,5 @@ .addComponent(jLabel10) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 106, Short.MAX_VALUE) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 118, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) @@ -616,6 +640,6 @@ .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)) + .addComponent(jLabel11) + .addComponent(labelIncidentLength)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(incidentFrameLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) @@ -658,6 +682,8 @@ jButton1.setText("Cancel"); - jButton1.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + jButton1.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { jButton1ActionPerformed(evt); } @@ -665,6 +691,8 @@ jButton2.setText("Generate"); - jButton2.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + jButton2.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { jButton2ActionPerformed(evt); } @@ -1115,6 +1143,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); } @@ -1123,6 +1153,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); } @@ -1131,6 +1163,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); } @@ -1155,6 +1189,8 @@ btnAddTime.setText("+15:00"); - btnAddTime.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + btnAddTime.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { btnAddTimeActionPerformed(evt); } @@ -1163,6 +1199,8 @@ 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) { + fileMenu.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { fileMenuActionPerformed(evt); } @@ -1171,6 +1209,8 @@ 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) { + fileNew.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { fileNewActionPerformed(evt); } @@ -1181,6 +1221,8 @@ 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) { + fileOpen.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { fileOpenActionPerformed(evt); } @@ -1191,6 +1233,8 @@ 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) { + fileSave.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { fileSaveActionPerformed(evt); } @@ -1200,6 +1244,8 @@ 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) { + fileSaveAs.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { fileSaveAsActionPerformed(evt); } @@ -1214,6 +1260,8 @@ 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) { + generateNotebooks.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { generateNotebooksActionPerformed(evt); } @@ -1227,6 +1275,8 @@ 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) { + generateScorecards.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { generateScorecardsActionPerformed(evt); } @@ -1236,6 +1286,8 @@ 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) { + generateOrganizationChart.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { generateOrganizationChartActionPerformed(evt); } @@ -1246,6 +1298,8 @@ 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) { + generateProjectRequirements.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { generateProjectRequirementsActionPerformed(evt); } @@ -1259,6 +1313,8 @@ newIncident.setText("New Incident..."); - newIncident.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + newIncident.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { newIncidentActionPerformed(evt); } @@ -1267,6 +1323,8 @@ deleteIncident.setText("Delete Incident"); - deleteIncident.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + deleteIncident.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { deleteIncidentActionPerformed(evt); } @@ -1276,6 +1334,8 @@ saveIncident.setText("Save Incident..."); - saveIncident.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + saveIncident.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { saveIncidentActionPerformed(evt); } @@ -1284,6 +1344,8 @@ loadIncident.setText("Load Incident..."); - loadIncident.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + loadIncident.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { loadIncidentActionPerformed(evt); } @@ -1296,6 +1358,8 @@ generateNoiseOption.setText("Generate Noise..."); - generateNoiseOption.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + generateNoiseOption.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { generateNoiseOptionActionPerformed(evt); } @@ -1313,6 +1377,8 @@ helpAbout.setText("About..."); - helpAbout.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { + helpAbout.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(java.awt.event.ActionEvent evt) + { helpAboutActionPerformed(evt); } @@ -1549,5 +1615,5 @@ addIncidentNumber.setValue(101); addIncidentStart.setValue(0); - //addIncidentLength.setValue(0); + labelIncidentLength.setText("0"); incidentColorField.setBackground(Color.BLACK); selectedColor = Color.BLACK; @@ -1639,4 +1705,6 @@ addIncidentNumber.setValue(i.number); addIncidentStart.setValue(i.offset / 60); + labelIncidentLength.setText(""+(i.length/60) ); + labelIncidentLength.setHorizontalTextPosition(SwingConstants.RIGHT); //addIncidentLength.setValue(i.length / 60); incidentColorField.setBackground(i.color); @@ -2005,5 +2073,4 @@ // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JTextArea addIncidentDescription; - private javax.swing.JSpinner addIncidentLength; private javax.swing.JTextField addIncidentName; private javax.swing.JSpinner addIncidentNumber; @@ -2095,4 +2162,5 @@ private javax.swing.JSlider jSlider5; private javax.swing.JTextArea jTextArea1; + private javax.swing.JLabel labelIncidentLength; private javax.swing.JMenuItem loadIncident; private javax.swing.JMenuItem newIncident; Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form =================================================================== --- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form (revision 105) +++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form (revision 108) @@ -274,6 +274,10 @@ - - + + + + + + @@ -305,5 +309,5 @@ - + @@ -313,6 +317,6 @@ - + @@ -398,11 +402,4 @@ - - - - - - - @@ -431,4 +428,11 @@ + + + + + + +