Changeset 180 in tmcsimulator-scriptbuilder for trunk/src/event/editor/frame/Editor.java

Timestamp:

12/23/2019 08:57:26 AM (6 years ago)

Author:

sdanthin

Message:

PropertyPanels?.java added a function to get properties from a certain jPanel.
Editor.java used above function to auto-close the editor window when it has no more events contained.
AudioPanel?.java modified to NOT allow audioEvents in the Event Editor to be deleted.

File:

• trunk/src/event/editor/frame/Editor.java (modified) (1 diff)

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

@@ -549 +549 @@
 
         int index = eventTabsPane.getSelectedIndex();
-
+        //checks if there is a component at the tab selected, if so, then remove the associated event from the data model,
+        //and if it is removed, then remove the associated editor window.
         if (index >= 0 && eventTabsPane.getTabComponentAt(index) != null)
         {
             JPanel removable = (JPanel) eventTabsPane
                     .getSelectedComponent();
-            PropertyPanel update = this.model.properties.removeProperty(removable);
-
-            ((I_ScriptEventEditorPanel) update.getPanel()).removeAssociatedEvent();
-
+            PropertyPanel removedProperty = this.model.properties.getProperty(removable);
+            
+            if(((I_ScriptEventEditorPanel) removedProperty.getPanel()).removeAssociatedEvent())
+            {
+                this.model.properties.removeProperty(removable);
+            }
+
+        }
+        
+        //prevents an "empty editor" from appearing
+        if(eventTabsPane.getSelectedComponent() == null)
+        {
+            updateEventTime();
+            this.closeWindow();
         }