apply custom text snippet to mind map; clear snippet view when no fil…

…e is opened
mindolph · Dec 17, 2024 · 9cca971 · 9cca971
1 parent 35fe8e1
commit 9cca971
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/code/mindolph-base/src/main/java/com/mindolph/base/control/snippet/SnippetView.java b/code/mindolph-base/src/main/java/com/mindolph/base/control/snippet/SnippetView.java
@@ -65,29 +65,29 @@ public SnippetView() {
 
         // for switching snippets by listening file activation.
         EventBus.getIns().subscribeFileActivated(fileChange -> {
-            NodeData nodeData = fileChange.newData();
-            if (fileChange.oldData() != null && fileChange.newData() != null
-                    && fileChange.oldData().isSameFileType(fileChange.newData())) {
+            NodeData activatedData = fileChange.newData();
+            if (fileChange.oldData() != null && activatedData != null
+                    && fileChange.oldData().isSameFileType(activatedData)) {
                 return;
             }
-            if (nodeData == null) {
+            if (activatedData == null) {
                 this.reload(null, null);
                 return;
             }
-            switch (nodeData.getNodeType()) {
+            switch (activatedData.getNodeType()) {
                 case FOLDER -> {
                     this.reload(null, null);
                 }
                 case FILE -> {
-                    if (nodeData.isPlantUml()) {
+                    if (activatedData.isPlantUml()) {
                         currentFileType = TYPE_PLANTUML;
                         this.reloadForFileType(TYPE_PLANTUML);
                     }
-                    else if (nodeData.isMindMap()) {
+                    else if (activatedData.isMindMap()) {
                         currentFileType = TYPE_MIND_MAP;
                         this.reloadForFileType(TYPE_MIND_MAP);
                     }
-                    else if (nodeData.isMarkdown()) {
+                    else if (activatedData.isMarkdown()) {
                         currentFileType = TYPE_MARKDOWN;
                         this.reloadForFileType(TYPE_MARKDOWN);
                     }

diff --git a/code/mindolph-base/src/main/java/com/mindolph/base/dialog/SnippetDialog.java b/code/mindolph-base/src/main/java/com/mindolph/base/dialog/SnippetDialog.java
@@ -73,7 +73,7 @@ public SnippetDialog(String fileType, Snippet<?> snippet) {
 
         dialog = new CustomDialogBuilder<Snippet<?>>()
                 .owner(DialogFactory.DEFAULT_WINDOW)
-                .title(snippet == null ? "New" : "Edit" + " Snippet")
+                .title("%s Snippet".formatted(snippet == null ? "New" : "Edit"))
                 .fxmlUri("dialog/snippet_dialog.fxml")
                 .buttons(ButtonType.OK, ButtonType.CANCEL)
                 .icon(ButtonType.OK, FontIconManager.getIns().getIcon(IconKey.OK))

diff --git a/code/mindolph-fx/src/main/java/com/mindolph/fx/view/FileTabView.java b/code/mindolph-fx/src/main/java/com/mindolph/fx/view/FileTabView.java
@@ -66,10 +66,10 @@ public class FileTabView extends BaseView {
     public FileTabView() {
         super("/view/file_tab_view.fxml");
         tabPane.getSelectionModel().selectedItemProperty().addListener((observable, selectedTab, selectingTab) -> {
+            Object oldData = selectedTab == null ? null : selectedTab.getUserData();
             if (selectingTab != null && selectedTab != selectingTab && !selectingTab.isDisabled()) {
                 // disabled tab means it is closing, no need to be loaded(for close all or close others from context menu)
                 log.debug("Tab selection changed from %s to %s".formatted(selectedTab == null ? "null" : selectedTab.getText(), selectingTab.getText()));
-                Object oldData = selectedTab == null ? null : selectedTab.getUserData();
                 TabManager.getIns().activeTab(selectingTab);
                 BaseEditor editor = (BaseEditor) tabEditorMap.get(selectingTab);
                 Object tabUserData = selectingTab.getUserData();
@@ -95,6 +95,7 @@ public FileTabView() {
             else {
                 this.updateMenuState(null);
                 EventBus.getIns().notifyOutline(null); // clear the outline view since there is no tab exists.
+                EventBus.getIns().notifyFileActivated(new FileActivatedEvent((NodeData) oldData, null));
             }
         });
         tabPane.setOnMouseClicked(mouseEvent -> {

diff --git a/code/mindolph-mindmap/src/main/java/com/mindolph/mindmap/MindMapEditor.java b/code/mindolph-mindmap/src/main/java/com/mindolph/mindmap/MindMapEditor.java
@@ -377,6 +377,9 @@ public void onSnippet(Snippet snippet) {
             if (StringUtils.isNotBlank(snippet.getFilePath())) {
                 ImagePopUpMenuExtension.loadImageFileToSelectedTopics((ExtensionContext) mindMapView, new File(snippet.getFilePath()));
             }
+            else {
+                mindMapView.appendTextAsTopicTree(snippet.getCode(), "");
+            }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -377,6 +377,9 @@ public void onSnippet(Snippet snippet) { @@
                 if (StringUtils.isNotBlank(snippet.getFilePath())) {
                     ImagePopUpMenuExtension.loadImageFileToSelectedTopics((ExtensionContext) mindMapView, new File(snippet.getFilePath()));
                 }
+                else {
+                    mindMapView.appendTextAsTopicTree(snippet.getCode(), "");
+                }
             }
         }
@@ Expand Down @@