Changeset 123 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder

Timestamp:

09/19/2017 02:41:52 PM (9 years ago)

Author:

bmcguffin

Message:

Fixed a bug in saveIncidentActionPerformed() which caused a null pointer exception if the user didn't select an incident to save.

Changed the color of the absolute-time TimeStamp? panel to a more neutral color.

Added "Script:" and "Incident:" labels at the beginning of the absolute-time and relative-time TimeStamp? panels, respectively.

Location:

trunk/src/scriptbuilder/gui

Files:

• ScriptBuilderFrame.java (modified) (4 diffs)
• panels/TimeStampPanel.java (modified) (4 diffs)

trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java

@@ -1544 +1544 @@
             script.numberOfIncidents++;
             IncidentEditorFrame editor = new IncidentEditorFrame(script.incidents.get(indx), this);
-            
+
             editor.setVisible(true);
         }
@@ -1616 +1616 @@
 
         addIncidentName.setText("");
-        
+
         int newLogNum = 100;
         boolean found = false;
@@ -1633 +1633 @@
                 }
             }
-        } 
-        
+        }
+
         addIncidentNumber.setValue(newLogNum);
         addIncidentStart.setValue(0);
@@ -1837 +1837 @@
                 incidentList,
                 script.incidents.get(0));
+        if (result == null)
+        {
+            return;
+        }
         input = result.toString();
         int i = 0;

trunk/src/scriptbuilder/gui/panels/TimeStampPanel.java

@@ -6 +6 @@
 import java.awt.Graphics2D;
 import javax.swing.JPanel;
+import scriptbuilder.gui.IncidentEditorFrame;
 import scriptbuilder.gui.ScriptBuilderGuiConstants;
 import scriptbuilder.structures.ScriptIncident;
@@ -151 +152 @@
     {
         super.paint(g);
-
+        String title = "";
         Graphics2D g2d = (Graphics2D) g;
         g2d.setFont(ScriptBuilderGuiConstants.TIMELINE_TICK_TIME_FONT);
@@ -160 +161 @@
                 + ScriptBuilderGuiConstants.TICK_TIMELINE_LEFT_MARGIN;
         int seconds = offset;
+        if(getTopLevelAncestor() instanceof IncidentEditorFrame)
+        {
+            title = "Incident:";
+        }
 
         // Major Ticks
         if (isAbsolute)
         {
-            g2d.setColor(Color.red);
+            g2d.setColor(Color.getHSBColor(.5f, .9f, .5f));
+            title = "Script:";
         }
         else
@@ -170 +176 @@
             g2d.setColor(ScriptBuilderGuiConstants.TIMELINE_TICK_COLOR);
         }
+        g2d.drawString(title, 0, 18);
         for (int i = ScriptBuilderGuiConstants.TICK_TIMELINE_LEFT_MARGIN;
                 i <= longestLengthPlusMargin;