Index: trunk/src/event/editor/TelephonePanel.form
===================================================================
--- trunk/src/event/editor/TelephonePanel.form (revision 145)
+++ trunk/src/event/editor/TelephonePanel.form (revision 187)
@@ -19,11 +19,5 @@
-
-
-
-
-
-
-
+
@@ -32,9 +26,18 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
@@ -43,7 +46,5 @@
-
-
-
+
@@ -84,7 +85,4 @@
-
-
-
@@ -107,14 +105,4 @@
-
-
-
-
-
-
-
-
-
-
Index: trunk/src/event/editor/TelephonePanel.java
===================================================================
--- trunk/src/event/editor/TelephonePanel.java (revision 145)
+++ trunk/src/event/editor/TelephonePanel.java (revision 187)
@@ -99,4 +99,5 @@
event.roles.remove(e.getLastRow());
event.lines.remove(e.getLastRow());
+ System.out.println("deleted table row");
}
}
@@ -110,4 +111,5 @@
}
+ /** Implementation of remove this event action */
@Override
public boolean removeAssociatedEvent()
@@ -139,5 +141,4 @@
txtInstructorRole = new javax.swing.JTextField();
jLabel1 = new javax.swing.JLabel();
- removeButton = new javax.swing.JButton();
addStudentButton.setText("Add Student Line");
@@ -148,9 +149,4 @@
deleteSelectedButton.setText("Delete Selected Line");
deleteSelectedButton.setToolTipText("Deletes the selected row in the table");
- deleteSelectedButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- deleteSelectedButtonActionPerformed(evt);
- }
- });
addInstructorButton.setText("Add Instructor Line");
@@ -165,17 +161,4 @@
jLabel1.setText("Role of instructor:");
-
- 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);
- }
- });
org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
@@ -185,11 +168,6 @@
.add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 602, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
- .add(jLabel1)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(txtInstructorRole, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 478, Short.MAX_VALUE))
- .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
.add(addInstructorButton)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
@@ -197,14 +175,18 @@
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(deleteSelectedButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 178, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 86, Short.MAX_VALUE))
- .add(removeButton))
- .add(26, 26, 26))
+ .addContainerGap(133, Short.MAX_VALUE))
+ .add(layout.createSequentialGroup()
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 602, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
+ .add(jLabel1)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(txtInstructorRole, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 478, Short.MAX_VALUE)))
+ .add(26, 26, 26))))
);
layout.setVerticalGroup(
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(layout.createSequentialGroup()
- .addContainerGap()
- .add(removeButton)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(49, 49, 49)
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(txtInstructorRole, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
@@ -221,12 +203,4 @@
}// //GEN-END:initComponents
- private void removeThisProperty(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_removeThisProperty
- //linked to remove button - removes the current buton
- if (removeListener != null)
- {
- removeListener.actionPerformed(new ActionEvent(this, 0, ""));
- }
- }//GEN-LAST:event_removeThisProperty
-
private void addInstructorButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addInstructorButtonActionPerformed
// TODO add your handling code here:
@@ -237,12 +211,4 @@
}//GEN-LAST:event_addInstructorButtonActionPerformed
- private void removeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeButtonActionPerformed
- // TODO add your handling code here:
- }//GEN-LAST:event_removeButtonActionPerformed
-
- private void deleteSelectedButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteSelectedButtonActionPerformed
- // TODO add your handling code here:
- }//GEN-LAST:event_deleteSelectedButtonActionPerformed
-
// Variables declaration - do not modify//GEN-BEGIN:variables
@@ -252,5 +218,4 @@
private javax.swing.JLabel jLabel1;
private javax.swing.JScrollPane jScrollPane1;
- private javax.swing.JButton removeButton;
private javax.swing.JTextField txtInstructorRole;
// End of variables declaration//GEN-END:variables