Index: trunk/src/event/editor/frame/Editor.java =================================================================== --- trunk/src/event/editor/frame/Editor.java (revision 102) +++ trunk/src/event/editor/frame/Editor.java (revision 119) @@ -100,8 +100,8 @@ // For each menu - for (int menuCtr = 0; menuCtr < jMenuBar1.getMenuCount(); menuCtr++) + for (int menuCtr = 0; menuCtr < editorMenuBar.getMenuCount(); menuCtr++) { // for each menu item - for (java.awt.Component comp : jMenuBar1.getMenu(menuCtr).getMenuComponents()) + for (java.awt.Component comp : editorMenuBar.getMenu(menuCtr).getMenuComponents()) { JMenuItem item = (JMenuItem) comp; @@ -164,11 +164,10 @@ { - jPanel1 = new javax.swing.JPanel(); - jTabbedPane1 = new javax.swing.JTabbedPane(); - jPanel2 = new javax.swing.JPanel(); + eventTabsPane = new javax.swing.JTabbedPane(); + bottomFramePanel = new javax.swing.JPanel(); txtEventStart = new javax.swing.JTextField(); btnRemoveCurrentEvent = new javax.swing.JButton(); - jMenuBar1 = new javax.swing.JMenuBar(); - jMenu1 = new javax.swing.JMenu(); + editorMenuBar = new javax.swing.JMenuBar(); + menuEvaluations = new javax.swing.JMenu(); ATMS = new javax.swing.JCheckBoxMenuItem(); ActivityLog = new javax.swing.JCheckBoxMenuItem(); @@ -177,9 +176,9 @@ Facilitator = new javax.swing.JCheckBoxMenuItem(); Radio = new javax.swing.JCheckBoxMenuItem(); - JMenu2 = new javax.swing.JMenu(); + menuInstructor = new javax.swing.JMenu(); MaintenanceRadio = new javax.swing.JCheckBoxMenuItem(); TMTRadio = new javax.swing.JCheckBoxMenuItem(); Telephone = new javax.swing.JCheckBoxMenuItem(); - jMenu3 = new javax.swing.JMenu(); + menuAutoData = new javax.swing.JMenu(); Audio = new javax.swing.JMenuItem(); CADLog = new javax.swing.JMenuItem(); @@ -191,26 +190,15 @@ Witness = new javax.swing.JMenuItem(); - org.jdesktop.layout.GroupLayout jPanel1Layout = new org.jdesktop.layout.GroupLayout(jPanel1); - jPanel1.setLayout(jPanel1Layout); - jPanel1Layout.setHorizontalGroup( - jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 100, Short.MAX_VALUE) - ); - jPanel1Layout.setVerticalGroup( - jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(0, 100, Short.MAX_VALUE) - ); - setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("Event Editor"); - org.jdesktop.layout.GroupLayout jPanel2Layout = new org.jdesktop.layout.GroupLayout(jPanel2); - jPanel2.setLayout(jPanel2Layout); - jPanel2Layout.setHorizontalGroup( - jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + org.jdesktop.layout.GroupLayout bottomFramePanelLayout = new org.jdesktop.layout.GroupLayout(bottomFramePanel); + bottomFramePanel.setLayout(bottomFramePanelLayout); + bottomFramePanelLayout.setHorizontalGroup( + bottomFramePanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(0, 613, Short.MAX_VALUE) ); - jPanel2Layout.setVerticalGroup( - jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + bottomFramePanelLayout.setVerticalGroup( + bottomFramePanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(0, 34, Short.MAX_VALUE) ); @@ -227,5 +215,5 @@ }); - jMenu1.setText("Evaluations"); + menuEvaluations.setText("Evaluations"); ATMS.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_A, java.awt.event.InputEvent.CTRL_MASK)); @@ -239,5 +227,5 @@ } }); - jMenu1.add(ATMS); + menuEvaluations.add(ATMS); ActivityLog.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_A, java.awt.event.InputEvent.ALT_MASK)); @@ -251,5 +239,5 @@ } }); - jMenu1.add(ActivityLog); + menuEvaluations.add(ActivityLog); CAD.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_C, java.awt.event.InputEvent.ALT_MASK)); @@ -263,5 +251,5 @@ } }); - jMenu1.add(CAD); + menuEvaluations.add(CAD); CMS.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_C, java.awt.event.InputEvent.ALT_MASK | java.awt.event.InputEvent.CTRL_MASK)); @@ -282,5 +270,5 @@ } }); - jMenu1.add(CMS); + menuEvaluations.add(CMS); Facilitator.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_F, java.awt.event.InputEvent.CTRL_MASK)); @@ -294,5 +282,5 @@ } }); - jMenu1.add(Facilitator); + menuEvaluations.add(Facilitator); Radio.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_R, java.awt.event.InputEvent.CTRL_MASK)); @@ -306,9 +294,9 @@ } }); - jMenu1.add(Radio); - - jMenuBar1.add(jMenu1); - - JMenu2.setText("Instructor Actions"); + menuEvaluations.add(Radio); + + editorMenuBar.add(menuEvaluations); + + menuInstructor.setText("Instructor Actions"); MaintenanceRadio.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_M, java.awt.event.InputEvent.CTRL_MASK)); @@ -322,5 +310,5 @@ } }); - JMenu2.add(MaintenanceRadio); + menuInstructor.add(MaintenanceRadio); TMTRadio.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_T, java.awt.event.InputEvent.ALT_MASK | java.awt.event.InputEvent.CTRL_MASK)); @@ -334,5 +322,5 @@ } }); - JMenu2.add(TMTRadio); + menuInstructor.add(TMTRadio); Telephone.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_T, java.awt.event.InputEvent.SHIFT_MASK | java.awt.event.InputEvent.CTRL_MASK)); @@ -346,24 +334,24 @@ } }); - JMenu2.add(Telephone); - - jMenuBar1.add(JMenu2); - - jMenu3.setText("Automated Data"); + menuInstructor.add(Telephone); + + editorMenuBar.add(menuInstructor); + + menuAutoData.setText("Automated Data"); Audio.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_A, java.awt.event.InputEvent.CTRL_MASK)); Audio.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/Audio.png"))); // NOI18N Audio.setText("Audio"); - jMenu3.add(Audio); + menuAutoData.add(Audio); CADLog.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_C, java.awt.event.InputEvent.CTRL_MASK)); CADLog.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/CAD.png"))); // NOI18N CADLog.setText("CAD Log"); - jMenu3.add(CADLog); + menuAutoData.add(CADLog); CCTV.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_V, java.awt.event.InputEvent.CTRL_MASK)); CCTV.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/CCTV.png"))); // NOI18N CCTV.setText("CCTV"); - jMenu3.add(CCTV); + menuAutoData.add(CCTV); CHPRadio.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_C, java.awt.event.InputEvent.ALT_MASK)); @@ -377,29 +365,29 @@ } }); - jMenu3.add(CHPRadio); + menuAutoData.add(CHPRadio); Paramics.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_P, java.awt.event.InputEvent.CTRL_MASK)); Paramics.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/Paramics.png"))); // NOI18N Paramics.setText("Paramics"); - jMenu3.add(Paramics); + menuAutoData.add(Paramics); Tow.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_T, java.awt.event.InputEvent.CTRL_MASK)); Tow.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/Tow.png"))); // NOI18N Tow.setText("Tow"); - jMenu3.add(Tow); + menuAutoData.add(Tow); Unit.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_U, java.awt.event.InputEvent.CTRL_MASK)); Unit.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/Unit.png"))); // NOI18N Unit.setText("Unit"); - jMenu3.add(Unit); + menuAutoData.add(Unit); Witness.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_W, java.awt.event.InputEvent.CTRL_MASK)); Witness.setIcon(new javax.swing.ImageIcon(getClass().getResource("/images/Witness.png"))); // NOI18N Witness.setText("Witness"); - jMenu3.add(Witness); - - jMenuBar1.add(jMenu3); - - setJMenuBar(jMenuBar1); + menuAutoData.add(Witness); + + editorMenuBar.add(menuAutoData); + + setJMenuBar(editorMenuBar); org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane()); @@ -407,10 +395,10 @@ layout.setHorizontalGroup( layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(org.jdesktop.layout.GroupLayout.TRAILING, jTabbedPane1) + .add(org.jdesktop.layout.GroupLayout.TRAILING, eventTabsPane) .add(layout.createSequentialGroup() .addContainerGap() .add(txtEventStart, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(jPanel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(bottomFramePanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(btnRemoveCurrentEvent, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 226, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) @@ -421,8 +409,8 @@ .add(layout.createSequentialGroup() .addContainerGap() - .add(jTabbedPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE) + .add(eventTabsPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(jPanel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(bottomFramePanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) .add(txtEventStart, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) .add(btnRemoveCurrentEvent))) @@ -447,11 +435,14 @@ {//GEN-HEADEREND:event_btnRemoveCurrentEventActionPerformed - int index = jTabbedPane1.getSelectedIndex(); - - if (index >= 0 && jTabbedPane1.getTabComponentAt(index) != null) - { - JPanel removable = (JPanel) jTabbedPane1 + int index = eventTabsPane.getSelectedIndex(); + + if (index >= 0 && eventTabsPane.getTabComponentAt(index) != null) + { + JPanel removable = (JPanel) eventTabsPane .getSelectedComponent(); - this.model.properties.removeProperty(removable); + PropertyPanel update = this.model.properties.removeProperty(removable); + + ((I_ScriptEventEditorPanel) update.getPanel()).removeAssociatedEvent(); + } @@ -466,23 +457,22 @@ int secs = Integer.parseInt(tokens[2]); - int time = (3600 * hrs) + (60 * mins) + secs; - - int index = jTabbedPane1.getSelectedIndex(); - - if (index >= 0 && jTabbedPane1.getTabComponentAt(index) != null) - { - JPanel removable = (JPanel) jTabbedPane1 + int newTime = (3600 * hrs) + (60 * mins) + secs; + + int index = eventTabsPane.getSelectedIndex(); + + if (index >= 0 && eventTabsPane.getTabComponentAt(index) != null) + { + JPanel removable = (JPanel) eventTabsPane .getSelectedComponent(); I_ScriptEvent ise = this.model.eventMap.get(removable); - if (time != slice.getTime()) - { - System.out.println("New time = " + time); + if (newTime != slice.getTime() && incident.changeEventStart(ise, slice.getTime(), newTime)) + { this.model.properties.removeProperty(removable); - incident.addNewEvent(ise, time); - SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss"); - df.setTimeZone(TimeZone.getTimeZone("GMT")); - String eventTime = df.format(new Date(slice.getTime() * 1000)); - txtEventStart.setText(eventTime); - } + + } + SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss"); + df.setTimeZone(TimeZone.getTimeZone("GMT")); + String eventTime = df.format(new Date(slice.getTime() * 1000)); + txtEventStart.setText(eventTime); } } @@ -514,5 +504,4 @@ private javax.swing.JMenuItem CMS; private javax.swing.JCheckBoxMenuItem Facilitator; - private javax.swing.JMenu JMenu2; private javax.swing.JCheckBoxMenuItem MaintenanceRadio; private javax.swing.JMenuItem Paramics; @@ -523,11 +512,11 @@ private javax.swing.JMenuItem Unit; private javax.swing.JMenuItem Witness; + private javax.swing.JPanel bottomFramePanel; private javax.swing.JButton btnRemoveCurrentEvent; - private javax.swing.JMenu jMenu1; - private javax.swing.JMenu jMenu3; - private javax.swing.JMenuBar jMenuBar1; - private javax.swing.JPanel jPanel1; - private javax.swing.JPanel jPanel2; - private javax.swing.JTabbedPane jTabbedPane1; + private javax.swing.JMenuBar editorMenuBar; + private javax.swing.JTabbedPane eventTabsPane; + private javax.swing.JMenu menuAutoData; + private javax.swing.JMenu menuEvaluations; + private javax.swing.JMenu menuInstructor; private javax.swing.JTextField txtEventStart; // End of variables declaration//GEN-END:variables @@ -552,22 +541,18 @@ if (update.getType() == UpdateType.Add) { - jTabbedPane1.insertTab(null, null, + eventTabsPane.insertTab(null, null, update.getPanel().getPanel(), null, update.getPosition()); - jTabbedPane1.setTabComponentAt(update.getPosition(), title); - jTabbedPane1.setSelectedIndex(update.getPosition()); + eventTabsPane.setTabComponentAt(update.getPosition(), title); + eventTabsPane.setSelectedIndex(update.getPosition()); topFrame.repaint(); } else if (update.getType() == UpdateType.Remove) { - jTabbedPane1.remove(update.getPanel().getPanel()); - if (update.getPanel().getPanel() instanceof I_ScriptEventEditorPanel) - { - ((I_ScriptEventEditorPanel) update.getPanel().getPanel()).removeAssociatedEvent(); - } + eventTabsPane.remove(update.getPanel().getPanel()); topFrame.repaint(); } else if (update.getType() == UpdateType.TitleChange) { - final int index = jTabbedPane1.indexOfComponent( + final int index = eventTabsPane.indexOfComponent( update.getPanel().getPanel()); @@ -576,6 +561,6 @@ public void run() { - Color c = jTabbedPane1.getForegroundAt(index); - jTabbedPane1.setForegroundAt(index, Color.blue); + Color c = eventTabsPane.getForegroundAt(index); + eventTabsPane.setForegroundAt(index, Color.blue); try { @@ -585,7 +570,7 @@ { } - if (index < jTabbedPane1.getTabCount()) + if (index < eventTabsPane.getTabCount()) { - jTabbedPane1.setTabComponentAt(index, title); + eventTabsPane.setTabComponentAt(index, title); } try @@ -596,7 +581,7 @@ { } - if (index < jTabbedPane1.getTabCount()) + if (index < eventTabsPane.getTabCount()) { - jTabbedPane1.setForegroundAt(index, c); + eventTabsPane.setForegroundAt(index, c); } } Index: trunk/src/event/editor/frame/PropertyPanels.java =================================================================== --- trunk/src/event/editor/frame/PropertyPanels.java (revision 94) +++ trunk/src/event/editor/frame/PropertyPanels.java (revision 119) @@ -90,12 +90,12 @@ } - private boolean remove(PropertyPanel panel) + private boolean remove(PropertyPanel removablePanel) { boolean result = false; - if ((result = properties.remove(panel))) + if ((result = properties.remove(removablePanel))) { setChanged(); - notifyObservers(new PropertyUpdate(UpdateType.Remove, panel)); + notifyObservers(new PropertyUpdate(UpdateType.Remove, removablePanel)); } else @@ -104,15 +104,15 @@ } - if (panel.getProperty().getType() == PropertyTypes.Multiple) + if (removablePanel.getProperty().getType() == PropertyTypes.Multiple) { Vector panelsOfSameType = new Vector(); Vector panelsOfGreaterIndex = new Vector(); - propertyCounter.put(panel.getProperty(), propertyCounter.get(panel.getProperty()) - 1); + propertyCounter.put(removablePanel.getProperty(), propertyCounter.get(removablePanel.getProperty()) - 1); // extract panels of the same property type for (PropertyPanel pan : properties) { - if (pan.getProperty() == panel.getProperty()) + if (pan.getProperty() == removablePanel.getProperty()) { panelsOfSameType.add((MultPropertyPanel) pan); @@ -124,5 +124,5 @@ for (MultPropertyPanel pan : panelsOfSameType) { - if (pan.getIndex() > ((MultPropertyPanel) panel).getIndex()) + if (pan.getIndex() > ((MultPropertyPanel) removablePanel).getIndex()) { panelsOfGreaterIndex.add(pan); @@ -138,5 +138,5 @@ } } - else if (panel.getProperty().getType() == PropertyTypes.Optional) + else if (removablePanel.getProperty().getType() == PropertyTypes.Optional) { // do nothing Index: trunk/src/event/editor/frame/Editor.form =================================================================== --- trunk/src/event/editor/frame/Editor.form (revision 101) +++ trunk/src/event/editor/frame/Editor.form (revision 119) @@ -3,22 +3,7 @@
- - - - - - - - - - - - - - - - + - + @@ -112,5 +97,5 @@ - + @@ -161,5 +146,5 @@ - + @@ -267,5 +252,5 @@ - + @@ -286,10 +271,10 @@ - + - + @@ -302,8 +287,8 @@ - + - + @@ -314,9 +299,9 @@ - + - +