throw exception when gui is not ready

Ogefest · Feb 18, 2021 · af8404e · af8404e
1 parent dac7208
commit af8404e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/main/java/notepack/MainViewController.java b/src/main/java/notepack/MainViewController.java
@@ -77,12 +77,6 @@ public void windowRestore() {
         SplitPane notePaneBackground;
         try {
 
-//            FXMLLoader loader2 = new FXMLLoader(getClass().getResource("/notepack/TodoPaneBackground.fxml"));
-//            BorderPane todoPaneBackground = loader2.load();
-//            TodoPaneBackgroundController ctrl2 = loader2.getController();
-//            todoPaneBackground.setUserData(ctrl2);
-//            ctrl2.setApp(app);
-
             FXMLLoader loader = new FXMLLoader(getClass().getResource("/notepack/NotePaneBackground.fxml"));
             notePaneBackground = loader.load();
             NotePaneBackgroundController ctrl = loader.getController();

diff --git a/src/main/java/notepack/app/task/WorkspaceSelectNote.java b/src/main/java/notepack/app/task/WorkspaceSelectNote.java
@@ -7,6 +7,7 @@
 import notepack.app.domain.Note;
 import notepack.app.domain.Task;
 import notepack.app.domain.Workspace;
+import notepack.app.domain.exception.GuiNotReadyError;
 import notepack.gui.TaskUtil;
 
 public class WorkspaceSelectNote implements Task, TypeGui {
@@ -26,11 +27,14 @@ public WorkspaceSelectNote(Note note) {
     }
 
     @Override
-    public void guiWork(TaskUtil taskUtil, App app) {
+    public void guiWork(TaskUtil taskUtil, App app) throws GuiNotReadyError {
 
         Workspace workspace = note.getWorkspace();
         TabPane container = taskUtil.getWorkspaceContainer();
         Tab workspaceTab = taskUtil.getWorkspaceTab(workspace);
+        if (workspaceTab == null) {
+            throw new GuiNotReadyError("Workspace tab container not exists");
+        }
         WorkspaceTabController ctrl = (WorkspaceTabController) workspaceTab.getUserData();
 
         container.getSelectionModel().select(workspaceTab);