Changeset 89 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

Timestamp:

08/28/2017 01:38:15 PM (9 years ago)

Author:

bmcguffin

Message:

Added dropdown menu item to ScriptBuilderFrame?: "Delete Incident". When clicked, user may select an existing incident to delete. Program will prompt user to confirm the deletion, then remove the incident from the script and refresh the display.

Added button to individual event editor window: "Remove this event". When clicked, the currently displayed event will be removed from the timeslice it is in. The display will be refreshed accordingly. NOTE: This still has some bugs, namely that the last remaining event in a timeslice fails to be deleted.

Restructured Interface ScriptEventEditorPanel? to include a removeAssociatedEvent method, which calls a new method in I_ScriptEvent called removeThis, which causes the event to be removed from its timeslice.

Editor.Java previously contained several classes and enums, none of which were set to private scope. Moved these extra classes to their own files to decrease clutter in Editor.java and increase readability of all files.

File:

• trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java (modified) (11 diffs)

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -158 +158 @@
         timelinesScrollPane.getHorizontalScrollBar().addAdjustmentListener(listener);
         timelinesScrollPane.getVerticalScrollBar().addAdjustmentListener(listener);
+        repaint();
     }
 
@@ -236 +237 @@
                 / Math.max(script.absoluteLength(), ScriptBuilderGuiConstants.TICK_TIMELINE_SMALLEST_LENGTH));
         zoomSlider.setMaximum(zoomSlider.getMinimum() + 20);
+        repaint();
     }
 
@@ -350 +352 @@
         editIncident = new javax.swing.JMenuItem();
         incidentDetails = new javax.swing.JMenuItem();
+        deleteIncident = new javax.swing.JMenuItem();
         jSeparator4 = new javax.swing.JPopupMenu.Separator();
         saveIncident = new javax.swing.JMenuItem();
@@ -1318 +1321 @@
         });
         incidentMenu.add(incidentDetails);
+
+        deleteIncident.setText("Delete Incident");
+        deleteIncident.addActionListener(new java.awt.event.ActionListener()
+        {
+            public void actionPerformed(java.awt.event.ActionEvent evt)
+            {
+                deleteIncidentActionPerformed(evt);
+            }
+        });
+        incidentMenu.add(deleteIncident);
         incidentMenu.add(jSeparator4);
 
@@ -1555 +1568 @@
 
         incidentFrame.setVisible(false);
-        update(script, script);
+        this.update(script, script);
         repaint();
     }//GEN-LAST:event_incidentOkButtonActionPerformed
@@ -1624 +1637 @@
             script.saveFile = fc.getSelectedFile();
         }
-        update(script, script);
+        this.update(script, script);
         zoomSlider.setValue(zoomSlider.getMinimum());
         repaint();
@@ -1765 +1778 @@
         addNoiseFrame.setVisible(false);
 
-        update(script, script);
+        this.update(script, script);
+        repaint();
 }//GEN-LAST:event_jButton2ActionPerformed
 
@@ -1912 +1926 @@
         script = new SimulationScript();
         script.update();
-        update(null, script);
+        this.update(null, script);
         repaint();
     }//GEN-LAST:event_fileNewActionPerformed
@@ -1932 +1946 @@
         if (result != null)
         {
-            System.out.println("RESULT = " + result.toString());
-
             input = result.toString();
-
-            System.out.println("INPUT = " + input);
-
             int i = 0;
             for (ScriptIncident incident : script.incidents)
@@ -1959 +1968 @@
             }
         }
-        update(script, script);
+        this.update(script, script);
+        repaint();
     }//GEN-LAST:event_editIncidentActionPerformed
+
+    private void deleteIncidentActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_deleteIncidentActionPerformed
+    {//GEN-HEADEREND:event_deleteIncidentActionPerformed
+        Object[] incidentList = script.incidents.toArray();
+        String input = "";
+        ScriptIncident inc = null;
+        Object result = JOptionPane.showInputDialog(
+                this,
+                "Select Incident:",
+                "Save Incident",
+                JOptionPane.PLAIN_MESSAGE,
+                null,
+                incidentList,
+                script.incidents.get(0));
+
+        if (result != null)
+        {
+            input = result.toString();
+            int incidentIndex = 0;
+            for (ScriptIncident incident : script.incidents)
+            {
+                incidentIndex++;
+                if (incident == null)
+                {
+                    continue;
+                }
+                if (incident.toString().equals(input))
+                {
+                    inc = incident;
+                }
+            }
+
+            if (inc != null)
+            {
+                int confirm = JOptionPane.showConfirmDialog(this,
+                        "Are you sure you want to delete " + inc.toString() + "?");
+                if (confirm == JOptionPane.YES_OPTION)
+                {
+                    script.incidents.remove(inc);
+                    script.incidents.add(null);
+                }
+            }
+        }
+        this.update(script, script);
+        repaint();
+    }//GEN-LAST:event_deleteIncidentActionPerformed
 
     /**
@@ -2057 +2113 @@
     private javax.swing.JButton cancelButton;
     private javax.swing.JMenuItem deleteEventList;
+    private javax.swing.JMenuItem deleteIncident;
     private javax.swing.JMenuItem editEventList;
     private javax.swing.JMenuItem editIncident;