Changeset 189 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/gui

Timestamp:

01/20/2020 06:16:07 PM (6 years ago)

Author:

sdanthin

Message:

IncidentPaletteFrame?.java changed behavior of create new in the incident selector to show the incidentFrame window instead of just bringing up the IncidentEditorFrame? itself
ScriptBuilderFrame?.java created separate method to bring up the IncidentFrame? window so that it can be shown/initialized outside of ScriptBuilderFrame? scope

Location:

trunk/src/scriptbuilder/gui

Files:

• IncidentPaletteFrame.java (modified) (1 diff)
• ScriptBuilderFrame.java (modified) (2 diffs)

trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java

@@ -455 +455 @@
     private void btnCreateIncidentActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnCreateIncidentActionPerformed
     {//GEN-HEADEREND:event_btnCreateIncidentActionPerformed
-        int newLogNum = 100;
-        boolean found = false;
-        while (!found)
-        {
-            newLogNum++;
-            if (!scriptContainsLogNum(script, newLogNum))
-            {
-                found = true;
-                for (ScriptIncident incident : incidentList)
-                {
-                    if (incident.number == newLogNum)
-                    {
-                        found = false;
-                    }
-                }
-            }
-        }
-
-        ScriptIncident newInc = new ScriptIncident(newLogNum, "New Incident", LocalDate.now().toString(), script);
-        if (script.addIncident(newInc))
-        {
-            new IncidentEditorFrame(newInc, parent).setVisible(true);
-            this.dispose();
-        }
+       parent.openIncidentCreateWindow();
+       this.dispose();
+//        int newLogNum = 100;
+//        boolean found = false;
+//        while (!found)
+//        {
+//            newLogNum++;
+//            if (!scriptContainsLogNum(script, newLogNum))
+//            {
+//                found = true;
+//                for (ScriptIncident incident : incidentList)
+//                {
+//                    if (incident.number == newLogNum)
+//                    {
+//                        found = false;
+//                    }
+//                }
+//            }
+//        }
+//        parent.
+//
+//        ScriptIncident newInc = new ScriptIncident(newLogNum, "New Incident", LocalDate.now().toString(), script);
+//        if (script.addIncident(newInc))
+//        {
+//            new IncidentEditorFrame(newInc, parent).setVisible(true);
+//            this.dispose();
+//        }
 
     }//GEN-LAST:event_btnCreateIncidentActionPerformed

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -1780 +1780 @@
      */
     private void newIncidentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newIncidentActionPerformed
+        openIncidentCreateWindow();
+    }//GEN-LAST:event_newIncidentActionPerformed
+
+    public void openIncidentCreateWindow()
+    {
         editingIncident = false;
-
         addIncidentName.setText("");
         int newLogNum = 100;
@@ -1812 +1816 @@
 
         incidentFrame.setVisible(true);
-    }//GEN-LAST:event_newIncidentActionPerformed
-
+    }
     private void fileMenuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileMenuActionPerformed
     }//GEN-LAST:event_fileMenuActionPerformed