Changeset 187 in tmcsimulator-scriptbuilder for trunk/src/event/editor

Timestamp:

01/14/2020 06:49:40 AM (6 years ago)

Author:

jdalbey

Message:

TelephonePanel?.java deleted "Remove" button as it's function is not performed by the "Remove this event" button.

Location:

trunk/src/event/editor

Files:

• TelephonePanel.form (modified) (5 diffs)
• TelephonePanel.java (modified) (10 diffs)

trunk/src/event/editor/TelephonePanel.form

@@ -19 +19 @@
           <Group type="102" alignment="1" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="1" attributes="0">
-                  <Component id="jScrollPane1" alignment="0" pref="602" max="32767" attributes="0"/>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="txtInstructorRole" pref="478" max="32767" attributes="0"/>
-                  </Group>
+              <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="addInstructorButton" min="-2" max="-2" attributes="0"/>
@@ -32 +26 @@
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="deleteSelectedButton" min="-2" pref="178" max="-2" attributes="0"/>
-                      <EmptySpace pref="86" max="32767" attributes="0"/>
+                      <EmptySpace pref="133" max="32767" attributes="0"/>
                   </Group>
-                  <Component id="removeButton" alignment="1" min="-2" max="-2" attributes="0"/>
+                  <Group type="102" attributes="0">
+                      <Group type="103" groupAlignment="1" attributes="0">
+                          <Component id="jScrollPane1" alignment="0" pref="602" max="32767" attributes="0"/>
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Component id="txtInstructorRole" pref="478" max="32767" attributes="0"/>
+                          </Group>
+                      </Group>
+                      <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
+                  </Group>
               </Group>
-              <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
           </Group>
       </Group>
@@ -43 +46 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="removeButton" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="49" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="txtInstructorRole" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -84 +85 @@
         <Property name="toolTipText" type="java.lang.String" value="Deletes the selected row in the table"/>
       </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="deleteSelectedButtonActionPerformed"/>
-      </Events>
     </Component>
     <Component class="javax.swing.JButton" name="addInstructorButton">
@@ -107 +105 @@
       </Properties>
     </Component>
-    <Component class="javax.swing.JButton" name="removeButton">
-      <Properties>
-        <Property name="text" type="java.lang.String" value="Remove"/>
-        <Property name="toolTipText" type="java.lang.String" value="Removes this property"/>
-      </Properties>
-      <Events>
-        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="removeThisProperty"/>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="removeButtonActionPerformed"/>
-      </Events>
-    </Component>
   </SubComponents>
 </Form>

trunk/src/event/editor/TelephonePanel.java

@@ -99 +99 @@
                     event.roles.remove(e.getLastRow());
                     event.lines.remove(e.getLastRow());
+                    System.out.println("deleted table row");
                 }
             }
@@ -110 +111 @@
     }
     
+    /** Implementation of remove this event action */
     @Override
     public boolean removeAssociatedEvent()
@@ -139 +141 @@
         txtInstructorRole = new javax.swing.JTextField();
         jLabel1 = new javax.swing.JLabel();
-        removeButton = new javax.swing.JButton();
 
         addStudentButton.setText("Add Student Line");
@@ -148 +149 @@
         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 +161 @@
 
         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 +168 @@
             .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 +175 @@
                         .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 +203 @@
     }// </editor-fold>//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 +211 @@
     }//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 +218 @@
     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