Index: /trunk/src/event/editor/WitnessPanel.form =================================================================== --- /trunk/src/event/editor/WitnessPanel.form (revision 1) +++ /trunk/src/event/editor/WitnessPanel.form (revision 92) @@ -20,5 +20,4 @@ - @@ -47,7 +46,5 @@ - - - + @@ -75,12 +72,4 @@ - - - - - - - - Index: /trunk/src/event/editor/UnitPanel.java =================================================================== --- /trunk/src/event/editor/UnitPanel.java (revision 89) +++ /trunk/src/event/editor/UnitPanel.java (revision 92) @@ -10,5 +10,5 @@ * @author nathaniellehrer */ -public class UnitPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel +public class UnitPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { @@ -39,9 +39,5 @@ } - public void setRemoveListener(ActionListener listener) - { - removeListener = listener; - } - + @Override public void getEventObject(I_ScriptEvent sei) { @@ -118,4 +114,5 @@ } + @Override public void update(Observable o, Object arg) { @@ -143,5 +140,4 @@ jLabel1 = new javax.swing.JLabel(); txtUnitNumber = new javax.swing.JFormattedTextField(); - removeButton = new javax.swing.JButton(); jLabel2 = new javax.swing.JLabel(); StatusDropdown = new javax.swing.JComboBox(); @@ -157,13 +153,4 @@ txtUnitNumber.setToolTipText(""); - removeButton.setText("Remove"); - removeButton.addMouseListener(new java.awt.event.MouseAdapter() - { - public void mouseClicked(java.awt.event.MouseEvent evt) - { - removeThisProperty(evt); - } - }); - jLabel2.setText("Status"); @@ -185,5 +172,4 @@ .addContainerGap() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(org.jdesktop.layout.GroupLayout.TRAILING, removeButton) .add(org.jdesktop.layout.GroupLayout.TRAILING, help, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 565, Short.MAX_VALUE) .add(layout.createSequentialGroup() @@ -208,7 +194,5 @@ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createSequentialGroup() - .addContainerGap() - .add(removeButton) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(47, 47, 47) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) .add(jLabel1) @@ -231,11 +215,4 @@ ); }// //GEN-END:initComponents - - private void removeThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeThisProperty - if (removeListener != null) - { - removeListener.actionPerformed(new ActionEvent(this, 0, "")); - } - }//GEN-LAST:event_removeThisProperty @@ -249,5 +226,4 @@ private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; - private javax.swing.JButton removeButton; private javax.swing.JFormattedTextField txtUnitNumber; // End of variables declaration//GEN-END:variables Index: /trunk/src/event/editor/CCTVPanel.form =================================================================== --- /trunk/src/event/editor/CCTVPanel.form (revision 50) +++ /trunk/src/event/editor/CCTVPanel.form (revision 92) @@ -21,5 +21,4 @@ - @@ -43,7 +42,5 @@ - - - + @@ -68,13 +65,4 @@ - - - - - - - - - Index: /trunk/src/event/editor/TMTRadioPanel.java =================================================================== --- /trunk/src/event/editor/TMTRadioPanel.java (revision 89) +++ /trunk/src/event/editor/TMTRadioPanel.java (revision 92) @@ -9,5 +9,5 @@ * @author nathaniellehrer */ -public class TMTRadioPanel extends javax.swing.JPanel implements ScriptEventEditorPanel +public class TMTRadioPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { Index: /trunk/src/event/editor/AudioPanel.form =================================================================== --- /trunk/src/event/editor/AudioPanel.form (revision 1) +++ /trunk/src/event/editor/AudioPanel.form (revision 92) @@ -20,20 +20,15 @@ - + + + + + - - - - + - - - - - - - - + + @@ -44,7 +39,5 @@ - - - + @@ -63,14 +56,4 @@ - - - - - - - - - - Index: /trunk/src/event/editor/I_ScriptEventEditorPanel.java =================================================================== --- /trunk/src/event/editor/I_ScriptEventEditorPanel.java (revision 92) +++ /trunk/src/event/editor/I_ScriptEventEditorPanel.java (revision 92) @@ -0,0 +1,31 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package event.editor; + +import java.util.Observer; +import scriptbuilder.structures.events.I_ScriptEvent; + +/** + * + * @author Bryan McGuffin + */ +public interface I_ScriptEventEditorPanel extends Observer +{ + + /** + * Load the script event associated with this editor panel. + * + * @param sei The script event in question + */ + void getEventObject(I_ScriptEvent sei); + + /** + * Remove the event associated with this panel. + * + * @return true if the event was successfully deleted. + */ + boolean removeAssociatedEvent(); +} Index: /trunk/src/event/editor/CHPRadioPanel.java =================================================================== --- /trunk/src/event/editor/CHPRadioPanel.java (revision 89) +++ /trunk/src/event/editor/CHPRadioPanel.java (revision 92) @@ -12,5 +12,5 @@ * @author nathaniellehrer */ -public class CHPRadioPanel extends javax.swing.JPanel implements ScriptEventEditorPanel +public class CHPRadioPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { Index: /trunk/src/event/editor/CADLogPanel.java =================================================================== --- /trunk/src/event/editor/CADLogPanel.java (revision 89) +++ /trunk/src/event/editor/CADLogPanel.java (revision 92) @@ -10,5 +10,5 @@ * @author nathaniellehrer */ -public class CADLogPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel +public class CADLogPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { @@ -23,10 +23,4 @@ initComponents(); } - - public void setRemoveListener(ActionListener listener) - { - removeListener = listener; - } - /** * Load the script event associated with this editor panel. @@ -60,4 +54,5 @@ } + @Override public void update(Observable o, Object arg) { @@ -83,17 +78,7 @@ { - removeButton = new javax.swing.JButton(); jLabel1 = new javax.swing.JLabel(); jScrollPane1 = new javax.swing.JScrollPane(); CadTextField = new javax.swing.JTextArea(); - - removeButton.setText("Remove"); - removeButton.addMouseListener(new java.awt.event.MouseAdapter() - { - public void mouseClicked(java.awt.event.MouseEvent evt) - { - removeButtonremoveThisProperty(evt); - } - }); jLabel1.setText("Cad Log Text"); @@ -113,6 +98,5 @@ .add(layout.createSequentialGroup() .add(jLabel1) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 330, Short.MAX_VALUE) - .add(removeButton))) + .add(0, 0, Short.MAX_VALUE))) .addContainerGap()) ); @@ -120,8 +104,6 @@ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createSequentialGroup() - .addContainerGap() - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) - .add(removeButton) - .add(jLabel1)) + .add(19, 19, 19) + .add(jLabel1) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE) @@ -130,11 +112,4 @@ }// //GEN-END:initComponents - private void removeButtonremoveThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeButtonremoveThisProperty - if (removeListener != null) - { - removeListener.actionPerformed(new ActionEvent(this, 0, "")); - } -}//GEN-LAST:event_removeButtonremoveThisProperty - // Variables declaration - do not modify//GEN-BEGIN:variables @@ -142,5 +117,4 @@ private javax.swing.JLabel jLabel1; private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JButton removeButton; // End of variables declaration//GEN-END:variables Index: /trunk/src/event/editor/ParamicsPanel.java =================================================================== --- /trunk/src/event/editor/ParamicsPanel.java (revision 89) +++ /trunk/src/event/editor/ParamicsPanel.java (revision 92) @@ -12,5 +12,5 @@ * @author nathaniellehrer */ -public class ParamicsPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel +public class ParamicsPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { @@ -26,9 +26,5 @@ } - public void setRemoveListener(ActionListener listener) - { - removeListener = listener; - } - + @Override public void getEventObject(I_ScriptEvent sei) { @@ -107,4 +103,5 @@ } + @Override public void update(Observable o, Object arg) { @@ -130,5 +127,4 @@ { - removeButton = new javax.swing.JButton(); jLabel1 = new javax.swing.JLabel(); jLabel2 = new javax.swing.JLabel(); @@ -148,13 +144,4 @@ jCheckBox10 = new javax.swing.JCheckBox(); LocationDropdown = new javax.swing.JComboBox(); - - removeButton.setText("Remove"); - removeButton.addMouseListener(new java.awt.event.MouseAdapter() - { - public void mouseClicked(java.awt.event.MouseEvent evt) - { - removeThisProperty(evt); - } - }); jLabel1.setText("Location"); @@ -292,5 +279,4 @@ .add(jCheckBox10) .add(jCheckBox9))) - .add(removeButton) .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) @@ -307,7 +293,5 @@ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createSequentialGroup() - .addContainerGap() - .add(removeButton) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(41, 41, 41) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) .add(jLabel1) @@ -351,11 +335,4 @@ }// //GEN-END:initComponents - private void removeThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeThisProperty - if (removeListener != null) - { - removeListener.actionPerformed(new ActionEvent(this, 0, "")); - } - }//GEN-LAST:event_removeThisProperty - private void jCheckBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox1ActionPerformed if (jCheckBox1.isSelected()) @@ -547,5 +524,4 @@ private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; - private javax.swing.JButton removeButton; // End of variables declaration//GEN-END:variables Index: /trunk/src/event/editor/UnitPanel.form =================================================================== --- /trunk/src/event/editor/UnitPanel.form (revision 1) +++ /trunk/src/event/editor/UnitPanel.form (revision 92) @@ -20,5 +20,4 @@ - @@ -52,7 +51,5 @@ - - - + @@ -92,12 +89,4 @@ - - - - - - - - Index: /trunk/src/event/editor/MaintenanceRadioPanel.java =================================================================== --- /trunk/src/event/editor/MaintenanceRadioPanel.java (revision 89) +++ /trunk/src/event/editor/MaintenanceRadioPanel.java (revision 92) @@ -9,5 +9,5 @@ * @author nathaniellehrer */ -public class MaintenanceRadioPanel extends javax.swing.JPanel implements ScriptEventEditorPanel +public class MaintenanceRadioPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { Index: /trunk/src/event/editor/TowPanel.java =================================================================== --- /trunk/src/event/editor/TowPanel.java (revision 89) +++ /trunk/src/event/editor/TowPanel.java (revision 92) @@ -10,5 +10,5 @@ * @author nathaniellehrer */ -public class TowPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel +public class TowPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { @@ -55,9 +55,5 @@ } - public void setRemoveListener(ActionListener listener) - { - removeListener = listener; - } - + @Override public void getEventObject(I_ScriptEvent sei) { @@ -133,4 +129,5 @@ } + @Override public void update(Observable o, Object arg) { @@ -156,5 +153,4 @@ { - removeButton = new javax.swing.JButton(); jLabel1 = new javax.swing.JLabel(); txtCompany = new javax.swing.JTextField(); @@ -167,20 +163,4 @@ help = new javax.swing.JLabel(); - removeButton.setText("Remove"); - removeButton.addMouseListener(new java.awt.event.MouseAdapter() - { - public void mouseClicked(java.awt.event.MouseEvent evt) - { - removeThisProperty(evt); - } - }); - removeButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - removeButtonActionPerformed(evt); - } - }); - jLabel1.setText("Company"); @@ -215,5 +195,4 @@ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(help, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 543, Short.MAX_VALUE) - .add(org.jdesktop.layout.GroupLayout.TRAILING, removeButton) .add(layout.createSequentialGroup() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) @@ -233,7 +212,5 @@ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup() - .addContainerGap() - .add(removeButton) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(47, 47, 47) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) .add(jLabel1) @@ -257,15 +234,4 @@ }// //GEN-END:initComponents - private void removeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeButtonActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_removeButtonActionPerformed - - private void removeThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeThisProperty - if (removeListener != null) - { - removeListener.actionPerformed(new ActionEvent(this, 0, "")); - } - }//GEN-LAST:event_removeThisProperty - // Variables declaration - do not modify//GEN-BEGIN:variables @@ -275,5 +241,4 @@ private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; - private javax.swing.JButton removeButton; private javax.swing.JTextField txtBeat; private javax.swing.JTextField txtCompany; Index: /trunk/src/event/editor/CMSEvaluationPanel.java =================================================================== --- /trunk/src/event/editor/CMSEvaluationPanel.java (revision 89) +++ /trunk/src/event/editor/CMSEvaluationPanel.java (revision 92) @@ -13,10 +13,9 @@ * @author nathaniellehrer */ -public class CMSEvaluationPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel +public class CMSEvaluationPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { private HashMap properties; private JTable dialogTable; - private ActionListener removeListener; private CMSEvaluationEvent event; @@ -31,9 +30,4 @@ } - public void setRemoveListener(ActionListener listener) - { - removeListener = listener; - } - @Override public void getEventObject(I_ScriptEvent sei) @@ -133,4 +127,5 @@ } + @Override public void update(Observable o, Object arg) { @@ -156,5 +151,4 @@ { - removeButton = new javax.swing.JButton(); jLabel3 = new javax.swing.JLabel(); txtLocation = new javax.swing.JTextField(); @@ -167,14 +161,4 @@ txtMessage = new javax.swing.JTextArea(); addButton = new javax.swing.JButton(); - - removeButton.setText("Remove"); - removeButton.setToolTipText("Removes this property"); - removeButton.addMouseListener(new java.awt.event.MouseAdapter() - { - public void mouseClicked(java.awt.event.MouseEvent evt) - { - removeButtonremoveThisProperty(evt); - } - }); jLabel3.setText("Location"); @@ -218,5 +202,4 @@ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(jScrollPane1) - .add(org.jdesktop.layout.GroupLayout.TRAILING, removeButton) .add(layout.createSequentialGroup() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) @@ -234,7 +217,5 @@ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createSequentialGroup() - .add(17, 17, 17) - .add(removeButton) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(52, 52, 52) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) .add(jLabel1) @@ -257,11 +238,4 @@ ); }// //GEN-END:initComponents - - private void removeButtonremoveThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeButtonremoveThisProperty - if (removeListener != null) - { - removeListener.actionPerformed(new ActionEvent(this, 0, "")); - } -}//GEN-LAST:event_removeButtonremoveThisProperty @@ -274,5 +248,4 @@ private javax.swing.JLabel jLabel3; private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JButton removeButton; private javax.swing.JFormattedTextField txtID; private javax.swing.JTextField txtLocation; Index: /trunk/src/event/editor/CADLogPanel.form =================================================================== --- /trunk/src/event/editor/CADLogPanel.form (revision 1) +++ /trunk/src/event/editor/CADLogPanel.form (revision 92) @@ -23,6 +23,5 @@ - - + @@ -34,9 +33,6 @@ - - - - - + + @@ -47,12 +43,4 @@ - - - - - - - - Index: /trunk/src/event/editor/ParamicsPanel.form =================================================================== --- /trunk/src/event/editor/ParamicsPanel.form (revision 1) +++ /trunk/src/event/editor/ParamicsPanel.form (revision 92) @@ -49,5 +49,4 @@ - @@ -70,7 +69,5 @@ - - - + @@ -128,12 +125,4 @@ - - - - - - - - Index: /trunk/src/event/editor/TelephonePanel.java =================================================================== --- /trunk/src/event/editor/TelephonePanel.java (revision 89) +++ /trunk/src/event/editor/TelephonePanel.java (revision 92) @@ -13,5 +13,5 @@ * @author nathaniellehrer */ -public class TelephonePanel extends javax.swing.JPanel implements ScriptEventEditorPanel +public class TelephonePanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { Index: /trunk/src/event/editor/PropertyModel.java =================================================================== --- /trunk/src/event/editor/PropertyModel.java (revision 89) +++ /trunk/src/event/editor/PropertyModel.java (revision 92) @@ -53,25 +53,7 @@ final PropertyPanel propertyPanel = properties.addPropertyPanel(property, panel); - if (panel instanceof ScriptEventEditorPanel) + if (panel instanceof I_ScriptEventEditorPanel) { - ((ScriptEventEditorPanel) panel).getEventObject(se); - } - if (property.getType() == PropertyTypes.Multiple) - { - - if (panel instanceof RemoveablePanel) - { - ((RemoveablePanel) panel).setRemoveListener(new ActionListener() - { - public void actionPerformed(ActionEvent evt) - { - properties.removeProperty(propertyPanel); - } - }); - } - else - { - throw new RuntimeException("Property was multiple but panel was not removeable"); - } + ((I_ScriptEventEditorPanel) panel).getEventObject(se); } } Index: /trunk/src/event/editor/TowPanel.form =================================================================== --- /trunk/src/event/editor/TowPanel.form (revision 1) +++ /trunk/src/event/editor/TowPanel.form (revision 92) @@ -21,5 +21,4 @@ - @@ -45,7 +44,5 @@ - - - + @@ -75,13 +72,4 @@ - - - - - - - - - Index: /trunk/src/event/editor/CMSEvaluationPanel.form =================================================================== --- /trunk/src/event/editor/CMSEvaluationPanel.form (revision 1) +++ /trunk/src/event/editor/CMSEvaluationPanel.form (revision 92) @@ -30,5 +30,4 @@ - @@ -54,7 +53,5 @@ - - - + @@ -84,13 +81,4 @@ - - - - - - - - - Index: /trunk/src/event/editor/WitnessPanel.java =================================================================== --- /trunk/src/event/editor/WitnessPanel.java (revision 89) +++ /trunk/src/event/editor/WitnessPanel.java (revision 92) @@ -11,5 +11,5 @@ * @author nathaniellehrer */ -public class WitnessPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel +public class WitnessPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { @@ -25,9 +25,5 @@ } - public void setRemoveListener(ActionListener listener) - { - removeListener = listener; - } - + @Override public void getEventObject(I_ScriptEvent sei) { @@ -119,4 +115,5 @@ } + @Override public void update(Observable o, Object arg) { @@ -142,5 +139,4 @@ { - removeButton = new javax.swing.JButton(); jLabel1 = new javax.swing.JLabel(); txtFirstName = new javax.swing.JTextField(); @@ -152,13 +148,4 @@ txtPhoneNumber = new javax.swing.JFormattedTextField(); - removeButton.setText("Remove"); - removeButton.addMouseListener(new java.awt.event.MouseAdapter() - { - public void mouseClicked(java.awt.event.MouseEvent evt) - { - removeThisProperty(evt); - } - }); - jLabel1.setText("First Name"); @@ -178,5 +165,4 @@ .addContainerGap() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) - .add(removeButton) .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) @@ -198,7 +184,5 @@ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createSequentialGroup() - .addContainerGap() - .add(removeButton) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(47, 47, 47) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) .add(txtFirstName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) @@ -220,11 +204,4 @@ }// //GEN-END:initComponents - private void removeThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeThisProperty - if (removeListener != null) - { - removeListener.actionPerformed(new ActionEvent(this, 0, "")); - } - }//GEN-LAST:event_removeThisProperty - // Variables declaration - do not modify//GEN-BEGIN:variables @@ -233,5 +210,4 @@ private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; - private javax.swing.JButton removeButton; private javax.swing.JTextField txtAddress; private javax.swing.JTextField txtFirstName; Index: /trunk/src/event/editor/CCTVPanel.java =================================================================== --- /trunk/src/event/editor/CCTVPanel.java (revision 89) +++ /trunk/src/event/editor/CCTVPanel.java (revision 92) @@ -10,8 +10,7 @@ * @author nathaniellehrer */ -public class CCTVPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel +public class CCTVPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { - private ActionListener removeListener; private CCTVEvent event; @@ -55,10 +54,4 @@ @Override - public void setRemoveListener(ActionListener listener) - { - removeListener = listener; - } - - @Override public void getEventObject(I_ScriptEvent sei) { @@ -94,5 +87,4 @@ { - removeButton = new javax.swing.JButton(); jLabel1 = new javax.swing.JLabel(); txtDirField = new javax.swing.JFormattedTextField(); @@ -102,20 +94,4 @@ txtToggleField = new javax.swing.JFormattedTextField(); help = new javax.swing.JLabel(); - - removeButton.setText("Remove"); - removeButton.addMouseListener(new java.awt.event.MouseAdapter() - { - public void mouseClicked(java.awt.event.MouseEvent evt) - { - removeButtonremoveThisProperty(evt); - } - }); - removeButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - removeButtonActionPerformed(evt); - } - }); jLabel1.setText("ID"); @@ -137,5 +113,4 @@ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(org.jdesktop.layout.GroupLayout.TRAILING, help, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 540, Short.MAX_VALUE) - .add(org.jdesktop.layout.GroupLayout.TRAILING, removeButton) .add(layout.createSequentialGroup() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) @@ -153,7 +128,5 @@ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createSequentialGroup() - .addContainerGap() - .add(removeButton) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED) + .add(47, 47, 47) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) .add(jLabel1) @@ -173,15 +146,4 @@ }// //GEN-END:initComponents - private void removeButtonremoveThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeButtonremoveThisProperty - if (removeListener != null) - { - removeListener.actionPerformed(new ActionEvent(this, 0, "")); - } -}//GEN-LAST:event_removeButtonremoveThisProperty - - private void removeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeButtonActionPerformed - // TODO add your handling code here: -}//GEN-LAST:event_removeButtonActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables @@ -190,5 +152,4 @@ private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; - private javax.swing.JButton removeButton; private javax.swing.JFormattedTextField txtDirField; private javax.swing.JTextField txtIDField; Index: /trunk/src/event/editor/AudioPanel.java =================================================================== --- /trunk/src/event/editor/AudioPanel.java (revision 89) +++ /trunk/src/event/editor/AudioPanel.java (revision 92) @@ -11,5 +11,5 @@ * @author nathaniellehrer */ -public class AudioPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel +public class AudioPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { @@ -26,9 +26,4 @@ } - /** - * Load the script event associated with this editor panel. - * - * @param sei The script event in question - */ @Override public void getEventObject(I_ScriptEvent sei) @@ -85,9 +80,5 @@ } - public void setRemoveListener(ActionListener listener) - { - removeListener = listener; - } - + @Override public void update(Observable o, Object arg) { @@ -113,5 +104,4 @@ { - removeButton = new javax.swing.JButton(); jLabel1 = new javax.swing.JLabel(); audioFileText = new javax.swing.JTextField(); @@ -119,21 +109,4 @@ audioLengthText = new javax.swing.JFormattedTextField(); browseButton = new javax.swing.JButton(); - - removeButton.setText("Remove"); - removeButton.setToolTipText("Removes this property"); - removeButton.addMouseListener(new java.awt.event.MouseAdapter() - { - public void mouseClicked(java.awt.event.MouseEvent evt) - { - removeThisProperty(evt); - } - }); - removeButton.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(java.awt.event.ActionEvent evt) - { - removeButtonActionPerformed(evt); - } - }); jLabel1.setText("Audio File"); @@ -162,16 +135,13 @@ .addContainerGap() .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(org.jdesktop.layout.GroupLayout.TRAILING, removeButton) + .add(jLabel1) + .add(jLabel2)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createSequentialGroup() - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(jLabel1) - .add(jLabel2)) + .add(audioFileText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 395, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) - .add(layout.createSequentialGroup() - .add(audioFileText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 395, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) - .add(browseButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 93, Short.MAX_VALUE)) - .add(audioLengthText, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 497, Short.MAX_VALUE)))) + .add(browseButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 93, Short.MAX_VALUE)) + .add(audioLengthText, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 497, Short.MAX_VALUE)) .addContainerGap()) ); @@ -179,7 +149,5 @@ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) .add(layout.createSequentialGroup() - .addContainerGap() - .add(removeButton) - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(41, 41, 41) .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) .add(audioFileText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) @@ -193,15 +161,4 @@ ); }// //GEN-END:initComponents - - private void removeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeButtonActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_removeButtonActionPerformed - - private void removeThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeThisProperty - if (removeListener != null) - { - removeListener.actionPerformed(new ActionEvent(this, 0, "")); - } - }//GEN-LAST:event_removeThisProperty private void browse(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_browse @@ -221,5 +178,4 @@ private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; - private javax.swing.JButton removeButton; // End of variables declaration//GEN-END:variables Index: /trunk/src/event/editor/GenericEvaluationPanel.java =================================================================== --- /trunk/src/event/editor/GenericEvaluationPanel.java (revision 89) +++ /trunk/src/event/editor/GenericEvaluationPanel.java (revision 92) @@ -14,8 +14,7 @@ * @author nathaniellehrer */ -public class GenericEvaluationPanel extends javax.swing.JPanel implements RemoveablePanel, ScriptEventEditorPanel +public class GenericEvaluationPanel extends javax.swing.JPanel implements I_ScriptEventEditorPanel { - private ActionListener removeListener; private I_EvaluationEvent event; private JTable dialogTable; @@ -32,9 +31,5 @@ } - public void setRemoveListener(ActionListener listener) - { - removeListener = listener; - } - + @Override public void getEventObject(I_ScriptEvent sei) { @@ -75,4 +70,5 @@ } + @Override public void update(Observable o, Object arg) { Index: /trunk/src/event/editor/Editor.java =================================================================== --- /trunk/src/event/editor/Editor.java (revision 89) +++ /trunk/src/event/editor/Editor.java (revision 92) @@ -456,7 +456,7 @@ { jTabbedPane1.remove(update.getPanel().getPanel()); - if (update.getPanel().getPanel() instanceof ScriptEventEditorPanel) - { - ((ScriptEventEditorPanel) update.getPanel().getPanel()).removeAssociatedEvent(); + if (update.getPanel().getPanel() instanceof I_ScriptEventEditorPanel) + { + ((I_ScriptEventEditorPanel) update.getPanel().getPanel()).removeAssociatedEvent(); } topFrame.repaint(); Index: unk/src/event/editor/RemoveablePanel.java =================================================================== --- /trunk/src/event/editor/RemoveablePanel.java (revision 89) +++ (revision ) @@ -1,14 +1,0 @@ -package event.editor; - -import java.awt.event.*; - -public interface RemoveablePanel -{ - - /** - * Set up the listener for removing this panel. - * - * @param listener the remove listener to be added - */ - void setRemoveListener(ActionListener listener); -} Index: unk/src/event/editor/ScriptEventEditorPanel.java =================================================================== --- /trunk/src/event/editor/ScriptEventEditorPanel.java (revision 89) +++ (revision ) @@ -1,31 +1,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package event.editor; - -import java.util.Observer; -import scriptbuilder.structures.events.I_ScriptEvent; - -/** - * - * @author Bryan McGuffin - */ -public interface ScriptEventEditorPanel extends Observer -{ - - /** - * Load the script event associated with this editor panel. - * - * @param sei The script event in question - */ - void getEventObject(I_ScriptEvent sei); - - /** - * Remove the event associated with this panel. - * - * @return true if the event was successfully deleted. - */ - boolean removeAssociatedEvent(); -}