1
0
mirror of https://github.com/aNNiMON/HotaruFX.git synced 2024-09-19 14:14:21 +03:00

Small refactoring

This commit is contained in:
Victor 2017-09-09 13:06:50 +03:00
parent b1408c5891
commit e6b9d32b2e
2 changed files with 11 additions and 13 deletions

View File

@ -117,8 +117,7 @@ public class EditorController implements Initializable, DocumentListener {
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();
} catch (Exception e) { } catch (Exception e) {
logError("Unable to open about window"); showError("Unable to open about window");
logPane.setExpanded(true);
} }
} }
@ -151,11 +150,9 @@ public class EditorController implements Initializable, DocumentListener {
stage.show(); stage.show();
}); });
} catch (RendererException re) { } catch (RendererException re) {
logError(re.getMessage()); showError(re.getMessage());
logPane.setExpanded(true);
} catch (RuntimeException e) { } catch (RuntimeException e) {
logError(Exceptions.stackTraceToString(e)); showError(Exceptions.stackTraceToString(e));
logPane.setExpanded(true);
} }
} }
@ -189,8 +186,7 @@ public class EditorController implements Initializable, DocumentListener {
stage.setTitle(task.getMessage()); stage.setTitle(task.getMessage());
}); });
task.setOnFailed(ev -> { task.setOnFailed(ev -> {
logError(Exceptions.stackTraceToString(ev.getSource().getException())); showError(Exceptions.stackTraceToString(ev.getSource().getException()));
logPane.setExpanded(true);
stage.close(); stage.close();
}); });
task.setOnSucceeded(ev -> stage.close()); task.setOnSucceeded(ev -> stage.close());
@ -199,11 +195,9 @@ public class EditorController implements Initializable, DocumentListener {
stage.show(); stage.show();
}); });
} catch (RendererException re) { } catch (RendererException re) {
logError(re.getMessage()); showError(re.getMessage());
logPane.setExpanded(true);
} catch (RuntimeException e) { } catch (RuntimeException e) {
logError(Exceptions.stackTraceToString(e)); showError(Exceptions.stackTraceToString(e));
logPane.setExpanded(true);
} }
} }
@ -285,6 +279,11 @@ public class EditorController implements Initializable, DocumentListener {
syntaxHighlighter.release(); syntaxHighlighter.release();
} }
public void showError(String message) {
logError(message);
logPane.setExpanded(true);
}
@Override @Override
public void logError(String message) { public void logError(String message) {
log.insertText(0, message + System.lineSeparator()); log.insertText(0, message + System.lineSeparator());

View File

@ -29,7 +29,6 @@ public class RenderTask extends Task<Boolean> {
frameRate = timeLine.getFrameRate(); frameRate = timeLine.getFrameRate();
} }
@Override @Override
protected Boolean call() throws Exception { protected Boolean call() throws Exception {
val fxTimeline = timeLine.getFxTimeline(); val fxTimeline = timeLine.getFxTimeline();