Connected up the "Close Project" Action and completed the closeProjec…

…t() method a bit more.
raceimaztion · May 12, 2011 · fdb425f · fdb425f
1 parent da94954
commit fdb425f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/create/simulator/window/CreateProject.java b/create/simulator/window/CreateProject.java
@@ -6,8 +6,6 @@
 import create.simulator.utils.*;
 
 import org.fife.ui.rsyntaxtextarea.*;
-import org.fife.ui.rsyntaxtextarea.FileLocation;
-
 
 /**
  * Contains all the information about a project required to build it, as well as starting a simulator/etc.

diff --git a/create/simulator/window/EditorWindow.java b/create/simulator/window/EditorWindow.java
@@ -111,7 +111,7 @@ public EditorWindow(CreateProject project)
 	private void setup()
 	{
 		window = new JFrame("Create Simulator: Editor");
-		window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		window.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 		window.setMinimumSize(new Dimension(300, 450));
 		window.addWindowListener(this);
 
@@ -259,6 +259,10 @@ protected void closeProject()
 		editorProjectName.setText("");
 		editorProjectName.setVisible(false);
 
+		editorPanes.removeAllElements();
+		editorScrollers.removeAllElements();
+		editorTabs.removeAll();
+
 		updateProjectList();
 		windowLayout.show(mainContainer, CHOOSER_PANEL);
 	}
@@ -322,10 +326,14 @@ public void actionPerformed(ActionEvent e)
 		else if (command.equals(COMMAND_LOAD_PROJECT))
 		{
 			// Project -> Load project...
+			// TODO: See if this is permanent enough:
+			EditorWindow newWindow = new EditorWindow();
+			newWindow.show();
 		}
 		else if (command.equals(COMMAND_CLOSE_PROJECT))
 		{
 			// Project -> Close project
+			closeProject();
 		}
 		else if (command.equals(COMMAND_PROJECT_PROPERTIES))
 		{