Fixed issue #709.

nilsschmidt1337 · Aug 18, 2023 · 6b2ba4b · 6b2ba4b
1 parent 6e4e103
commit 6b2ba4b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/src/org/nschmidt/ldparteditor/helper/compositetext/ProjectActions.java b/src/org/nschmidt/ldparteditor/helper/compositetext/ProjectActions.java
@@ -28,6 +28,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 import org.nschmidt.ldparteditor.data.DatFile;
 import org.nschmidt.ldparteditor.dialog.newproject.NewProjectDialog;
 import org.nschmidt.ldparteditor.enumtype.MyLanguage;
+import org.nschmidt.ldparteditor.enumtype.View;
 import org.nschmidt.ldparteditor.i18n.I18n;
 import org.nschmidt.ldparteditor.logger.NLogger;
 import org.nschmidt.ldparteditor.project.Project;
@@ -132,7 +133,16 @@ private static boolean askForUnsavedChanges(Editor3DWindow win, boolean createOn
                             w.closeAllTabs();
                         }
                     }
+
                     Editor3DWindow.getWindow().closeAllComposite3D();
+
+                    // Remove all opened files, unless they are unsaved
+                    Project.getOpenedFiles().removeIf(df -> !Project.getUnsavedFiles().contains(df));
+                    Editor3DWindow.getWindow().closeAllTabs();
+                    Project.setFileToEdit(View.DUMMY_DATFILE);
+
+                    // We may clear all old project informations
+                    Project.clearProjectTree();
                 } else if (result == SWT.YES) {
                     // Keep the files open and continue
                 } else return false;

diff --git a/src/org/nschmidt/ldparteditor/project/Project.java b/src/org/nschmidt/ldparteditor/project/Project.java
@@ -72,6 +72,15 @@ public static void create(boolean withFolders) {
         createFileStructure(withFolders);
         updateEditor();
 
+        clearProjectTree();
+
+        Editor3DWindow.getWindow().getShell().update();
+        Editor3DWindow.getWindow().getProjectParts().getParent().build();
+        Editor3DWindow.getWindow().getProjectParts().getParent().redraw();
+        Editor3DWindow.getWindow().getProjectParts().getParent().update();
+    }
+
+    public static void clearProjectTree() {
         Editor3DWindow.getWindow().getProjectParts().getItems().clear();
         Editor3DWindow.getWindow().getProjectParts().setData(new ArrayList<>());
 
@@ -86,11 +95,6 @@ public static void create(boolean withFolders) {
 
         Editor3DWindow.getWindow().getProjectPrimitives8().getItems().clear();
         Editor3DWindow.getWindow().getProjectPrimitives8().setData(new ArrayList<>());
-
-        Editor3DWindow.getWindow().getShell().update();
-        Editor3DWindow.getWindow().getProjectParts().getParent().build();
-        Editor3DWindow.getWindow().getProjectParts().getParent().redraw();
-        Editor3DWindow.getWindow().getProjectParts().getParent().update();
     }
 
     /**

diff --git a/src/org/nschmidt/ldparteditor/shell/editor3d/Editor3DDesign.java b/src/org/nschmidt/ldparteditor/shell/editor3d/Editor3DDesign.java
@@ -1232,7 +1232,6 @@ protected Control createContents(Composite parent) {
                         treeItemNewPart.setData(Project.getFileToEdit());
                         Project.addUnsavedFile(Project.getFileToEdit());
 
-
                         if (NLogger.debugging) {
                             try (UTF8BufferedReader reader = new UTF8BufferedReader("testsource.txt")) { //$NON-NLS-1$
                                 StringBuilder sb = new StringBuilder();

diff --git a/src/org/nschmidt/ldparteditor/shell/editor3d/Editor3DWindow.java b/src/org/nschmidt/ldparteditor/shell/editor3d/Editor3DWindow.java
@@ -3962,6 +3962,13 @@ public void closeTabWithDatFile(DatFile df) {
             }
         }
     }
+
+    public void closeAllTabs() {
+        for (CTabItem ti : tabFolderOpenDatFilesPtr[0].getItems()) {
+            ti.dispose();
+        }
+    }
+
 
     public static AtomicBoolean getNoSyncDeadlock() {
         return no_sync_deadlock;

diff --git a/src/org/nschmidt/ldparteditor/shell/editor3d/toolitem/NewOpenSaveDatfileToolItem.java b/src/org/nschmidt/ldparteditor/shell/editor3d/toolitem/NewOpenSaveDatfileToolItem.java
@@ -161,8 +161,10 @@ private void addListeners() {
                                 win.getOfficialParts().setData(null);
                                 win.getSearchText().setText(" "); //$NON-NLS-1$
                                 win.getSearchText().setText(""); //$NON-NLS-1$
-                                win.updateTreeUnsavedEntries();
                             }
+
+                            Project.setFileToEdit(View.DUMMY_DATFILE);
+                            win.updateTreeUnsavedEntries();
                             win.regainFocus();
                         });
                     }

diff --git a/src/org/nschmidt/ldparteditor/shell/editor3d/toolitem/NewOpenSaveProjectToolItem.java b/src/org/nschmidt/ldparteditor/shell/editor3d/toolitem/NewOpenSaveProjectToolItem.java
@@ -90,6 +90,8 @@ private static void addListeners() {
             if (ProjectActions.createNewProject(Editor3DWindow.getWindow(), false)) {
                 addRecentFile(Project.getProjectPath());
             }
+
+            win.updateTreeUnsavedEntries();
             win.regainFocus();
         });
         widgetUtil(btnOpenPtr[0]).addSelectionListener(e -> {
@@ -108,8 +110,9 @@ private static void addListeners() {
                 win.getOfficialParts().setData(null);
                 win.getSearchText().setText(" "); //$NON-NLS-1$
                 win.getSearchText().setText(""); //$NON-NLS-1$
-                win.updateTreeUnsavedEntries();
             }
+
+            win.updateTreeUnsavedEntries();
             win.regainFocus();
         });
         widgetUtil(btnSavePtr[0]).addSelectionListener(new WidgetSelectionListener() {
@@ -175,6 +178,8 @@ public void widgetSelected(SelectionEvent e) {
                         Project.setLastVisitedPath(Project.getProjectPath());
                     }
                 }
+
+                win.updateTreeUnsavedEntries();
                 win.regainFocus();
             }