Changeset 119 in tmcsimulator-scriptbuilder for trunk/src/event/editor/frame/PropertyPanels.java

Timestamp:

09/13/2017 12:30:19 PM (9 years ago)

Author:

bmcguffin

Message:

Fixed a bug which caused an event to be destroyed if it was the only event in its incident and the user attempted to change its start time. (See  http://git.tokomak.net:8888/ticket/20 for more details.)

File:

• trunk/src/event/editor/frame/PropertyPanels.java (modified) (4 diffs)

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

@@ -90 +90 @@
     }
 
-    private boolean remove(PropertyPanel panel)
+    private boolean remove(PropertyPanel removablePanel)
     {
         boolean result = false;
 
-        if ((result = properties.remove(panel)))
+        if ((result = properties.remove(removablePanel)))
         {
             setChanged();
-            notifyObservers(new PropertyUpdate(UpdateType.Remove, panel));
+            notifyObservers(new PropertyUpdate(UpdateType.Remove, removablePanel));
         }
         else
@@ -104 +104 @@
         }
 
-        if (panel.getProperty().getType() == PropertyTypes.Multiple)
+        if (removablePanel.getProperty().getType() == PropertyTypes.Multiple)
         {
             Vector<MultPropertyPanel> panelsOfSameType = new Vector<MultPropertyPanel>();
             Vector<MultPropertyPanel> panelsOfGreaterIndex = new Vector<MultPropertyPanel>();
 
-            propertyCounter.put(panel.getProperty(), propertyCounter.get(panel.getProperty()) - 1);
+            propertyCounter.put(removablePanel.getProperty(), propertyCounter.get(removablePanel.getProperty()) - 1);
 
             // extract panels of the same property type
             for (PropertyPanel pan : properties)
             {
-                if (pan.getProperty() == panel.getProperty())
+                if (pan.getProperty() == removablePanel.getProperty())
                 {
                     panelsOfSameType.add((MultPropertyPanel) pan);
@@ -124 +124 @@
             for (MultPropertyPanel pan : panelsOfSameType)
             {
-                if (pan.getIndex() > ((MultPropertyPanel) panel).getIndex())
+                if (pan.getIndex() > ((MultPropertyPanel) removablePanel).getIndex())
                 {
                     panelsOfGreaterIndex.add(pan);
@@ -138 +138 @@
             }
         }
-        else if (panel.getProperty().getType() == PropertyTypes.Optional)
+        else if (removablePanel.getProperty().getType() == PropertyTypes.Optional)
         {
             // do nothing