diff --git a/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java b/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java index 6635ec7..27294ef 100644 --- a/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java +++ b/app/src/main/java/com/annimon/hotarufx/ui/controller/EditorController.java @@ -117,8 +117,7 @@ public class EditorController implements Initializable, DocumentListener { stage.setScene(scene); stage.show(); } catch (Exception e) { - logError("Unable to open about window"); - logPane.setExpanded(true); + showError("Unable to open about window"); } } @@ -151,11 +150,9 @@ public class EditorController implements Initializable, DocumentListener { stage.show(); }); } catch (RendererException re) { - logError(re.getMessage()); - logPane.setExpanded(true); + showError(re.getMessage()); } catch (RuntimeException e) { - logError(Exceptions.stackTraceToString(e)); - logPane.setExpanded(true); + showError(Exceptions.stackTraceToString(e)); } } @@ -189,8 +186,7 @@ public class EditorController implements Initializable, DocumentListener { stage.setTitle(task.getMessage()); }); task.setOnFailed(ev -> { - logError(Exceptions.stackTraceToString(ev.getSource().getException())); - logPane.setExpanded(true); + showError(Exceptions.stackTraceToString(ev.getSource().getException())); stage.close(); }); task.setOnSucceeded(ev -> stage.close()); @@ -199,11 +195,9 @@ public class EditorController implements Initializable, DocumentListener { stage.show(); }); } catch (RendererException re) { - logError(re.getMessage()); - logPane.setExpanded(true); + showError(re.getMessage()); } catch (RuntimeException e) { - logError(Exceptions.stackTraceToString(e)); - logPane.setExpanded(true); + showError(Exceptions.stackTraceToString(e)); } } @@ -285,6 +279,11 @@ public class EditorController implements Initializable, DocumentListener { syntaxHighlighter.release(); } + public void showError(String message) { + logError(message); + logPane.setExpanded(true); + } + @Override public void logError(String message) { log.insertText(0, message + System.lineSeparator()); diff --git a/app/src/main/java/com/annimon/hotarufx/ui/controller/RenderTask.java b/app/src/main/java/com/annimon/hotarufx/ui/controller/RenderTask.java index 27cd86d..da0fb11 100644 --- a/app/src/main/java/com/annimon/hotarufx/ui/controller/RenderTask.java +++ b/app/src/main/java/com/annimon/hotarufx/ui/controller/RenderTask.java @@ -29,7 +29,6 @@ public class RenderTask extends Task { frameRate = timeLine.getFrameRate(); } - @Override protected Boolean call() throws Exception { val fxTimeline = timeLine.getFxTimeline();