Fix null pointer exception when closing tabs

asciidocfx · Jan 8, 2024 · e5cb2ab · e5cb2ab
1 parent 5d4e9da
commit e5cb2ab
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/main/java/com/kodedu/controller/ApplicationController.java b/src/main/java/com/kodedu/controller/ApplicationController.java
@@ -2397,7 +2397,12 @@ private void renderText() throws InterruptedException {
 
                 String backend = (String) document.getAttribute("backend", "html5");
 
-                ConverterResult converterResult = asciidoctorjConverter.convert(document, textChangeEvent);
+                EditorPane editorPane = current.currentEditor();
+                if (Objects.isNull(editorPane)) {
+                    return;
+                }
+
+                ConverterResult converterResult = asciidoctorjConverter.convert(document, editorPane, textChangeEvent);
                 this.lastConverterResult = converterResult;
 
                 if (Objects.nonNull(latestTextChangeEvent.get())) {

diff --git a/src/main/java/com/kodedu/engine/AsciidocAsciidoctorjConverter.java b/src/main/java/com/kodedu/engine/AsciidocAsciidoctorjConverter.java
@@ -1,5 +1,6 @@
 package com.kodedu.engine;
 
+import com.kodedu.component.EditorPane;
 import com.kodedu.component.ViewPanel;
 import com.kodedu.config.*;
 import com.kodedu.controller.ApplicationController;
@@ -97,18 +98,18 @@ public String applyReplacements(String asciidoc) {
 		return null;
 	}
 
-	public ConverterResult convert(Document document, TextChangeEvent textChangeEvent) {
+	public ConverterResult convert(Document document, EditorPane editorPane, TextChangeEvent textChangeEvent) {
 		String backend = (String) document.getAttribute("backend", "html5");
 		Map<String, Object> attributes = document.getAttributes();
-		current.currentEditor().updateAttributes(attributes);
+		editorPane.updateAttributes(attributes);
 		return switch (backend) {
-			case "html5" -> convert(document, textChangeEvent, previewConfigBean);
-			case "revealjs" -> convert(document, textChangeEvent, revealjsConfigBean);
+			case "html5" -> convert(document, editorPane, textChangeEvent, previewConfigBean);
+			case "revealjs" -> convert(document, editorPane, textChangeEvent, revealjsConfigBean);
 			default -> throw new RuntimeException("Backend not found: " + backend);
 		};
 	}
 
-	private ConverterResult convert(Document document, TextChangeEvent textChangeEvent, AsciidoctorConfigBase<?> configBean) {
+	private ConverterResult convert(Document document, EditorPane editorPane, TextChangeEvent textChangeEvent, AsciidoctorConfigBase<?> configBean) {
 		SafeMode safe = convertSafe(configBean.getSafe());
 		String backend = (String) document.getAttribute("backend", "html5");
 		Attributes attributes = configBean.getAsciiDocAttributes(document.getAttributes());
@@ -139,7 +140,7 @@ private ConverterResult convert(Document document, TextChangeEvent textChangeEve
 		String content = textChangeEvent.getText();
 		String converted = asciidoctor.convert(content, options)  ;
 		Document finalDocument = (Document) DOCUMENT_MAP.get(docUUID);
-		current.currentEditor().setLastDocument(finalDocument);
+		editorPane.setLastDocument(finalDocument);
 		DOCUMENT_MAP.remove(docUUID);
 		logger.info("Converted Asciidoc to {}", backend.toUpperCase());
 

diff --git a/src/main/java/com/kodedu/other/Current.java b/src/main/java/com/kodedu/other/Current.java
@@ -49,7 +49,11 @@ public WebView currentWebView() {
     }
 
     public EditorPane currentEditor() {
-        return currentTab().getEditorPane();
+        MyTab currentTab = currentTab();
+        if (Objects.isNull(currentTab)) {
+            return null;
+        }
+        return currentTab.getEditorPane();
     }
 
     public WebEngine currentEngine() {