Changeset 166 in tmcsimulator-scriptbuilder for trunk/src/event

Timestamp:

12/16/2019 02:57:51 PM (6 years ago)

Author:

sdanthin

Message:

Editor.java removed legacy time text box

Location:

trunk/src/event/editor/frame

Files:

• Editor.form (modified) (3 diffs)
• Editor.java (modified) (9 diffs)

trunk/src/event/editor/frame/Editor.form

@@ -276 +276 @@
           <Component id="eventTabsPane" alignment="1" max="32767" attributes="0"/>
           <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="txtEventStart" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="84" max="-2" attributes="0"/>
               <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
@@ -309 +307 @@
                   <Component id="bottomFramePanel" min="-2" max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="3" attributes="0">
-                      <Component id="txtEventStart" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="timeSecondComboSelector" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="timeMinuteComboSelector" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -346 +343 @@
       </Layout>
     </Container>
-    <Component class="javax.swing.JTextField" name="txtEventStart">
-      <Properties>
-        <Property name="text" type="java.lang.String" value="00:00:00"/>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="txtEventStartActionPerformed"/>
-      </Events>
-    </Component>
     <Component class="javax.swing.JButton" name="saveCloseBtn">
       <Properties>

trunk/src/event/editor/frame/Editor.java

@@ -55 +55 @@
             String eventTime = df.format(new Date(slice.getTime() * 1000));
             System.out.println("[" + eventTime + "]");
-            txtEventStart.setText(eventTime);
+            
             List<Integer> timesS = timeGenerator(eventTime,"s");
             List<Integer> timesM = timeGenerator(eventTime,"m");
@@ -189 +189 @@
         String eventTime = "";
 
-        txtEventStart.setText(eventTime);
-
-        txtEventStart.addKeyListener(new KeyListener()
-        {
-
-            @Override
-            public void keyTyped(KeyEvent e)
-            {
-            }
-
-            @Override
-            public void keyPressed(KeyEvent e)
-            {
-                if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                {
-                    updateEventTime();
-                }
-            }
-
-            @Override
-            public void keyReleased(KeyEvent e)
-            {
-            }
-        });
+        
         this.addWindowListener(new WindowAdapter()
         {
@@ -263 +240 @@
         eventTabsPane = new javax.swing.JTabbedPane();
         bottomFramePanel = new javax.swing.JPanel();
-        txtEventStart = new javax.swing.JTextField();
         saveCloseBtn = new javax.swing.JButton();
         btnRemoveCurrentEvent = new javax.swing.JButton();
@@ -308 +284 @@
         );
 
-        txtEventStart.setText("00:00:00");
-        txtEventStart.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                txtEventStartActionPerformed(evt);
-            }
-        });
-
         saveCloseBtn.setText("Save and Close");
         saveCloseBtn.addActionListener(new java.awt.event.ActionListener() {
@@ -521 +490 @@
             .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(84, 84, 84)
                 .add(jLabel1)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
@@ -552 +519 @@
                     .add(bottomFramePanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                     .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                        .add(txtEventStart, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(timeSecondComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                         .add(timeMinuteComboSelector, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
@@ -606 +572 @@
         
         //updateEventTime();
-        if(!txtEventStart.getText().equals(""))
-        {
-            updateEventTime();
-        }
+        
+        updateEventTime();
+        
         model.closePanels();
         closeWindow();
@@ -622 +587 @@
         // TODO add your handling code here:
     }//GEN-LAST:event_timeMinuteComboSelectorActionPerformed
-
-    private void txtEventStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_txtEventStartActionPerformed
-        // TODO add your handling code here:
-    }//GEN-LAST:event_txtEventStartActionPerformed
 
     private void timeHourComboSelectorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_timeHourComboSelectorActionPerformed
@@ -713 +674 @@
     private javax.swing.JComboBox<String> timeMinuteComboSelector;
     private javax.swing.JComboBox<String> timeSecondComboSelector;
-    private javax.swing.JTextField txtEventStart;
     // End of variables declaration//GEN-END:variables