ui changes

Author: Khureshi

src/main/java/com/application/controller/CanvasController.java

@@ -76,8 +76,6 @@ public void setUp() {
 
     private void setUpCenterLayout() {
         canvas = new Pane();
-        // Group canvasContainer = new Group();
-        // canvasContainer.getChildren().add(canvas);
         scrollPane = new ZoomableScrollPane(canvas);
         scrollPane.setFitToWidth(true);
         scrollPane.setFitToHeight(true);
@@ -95,7 +93,8 @@ private void setUpCenterLayout() {
         drawPlaceHolderLines();
         setListeners();
 
-        // canvas.setStyle("-fx-background-color: blue;");
+
+        scrollPane.setStyle("-fx-background: WHITE;");
     }
 
 
@@ -117,6 +116,9 @@ private void addCanvasComponentsFromDB() {
     }
 
     private void addUIComponents() {
+        if (ControllerLoader.centerLayoutController.getCurrentThreadId() == null) {
+            return;
+        }
         addCirclesToUI();
         addEdgesToUI();
         addHighlightsToUI();
@@ -131,6 +133,10 @@ private void removeUIComponents() {
         removeHighlightsFromUI();
     }
 
+
+    /**
+     * Determines all the element nodes that should be drawn in the current viewport and draws them if not already present.
+     */
     private void addCirclesToUI() {
         BoundingBox viewPort = getPrefetchViewPortDims();
 
@@ -142,6 +148,11 @@ private void addCirclesToUI() {
         circleCells.forEach(this::addNewCellToUI);
     }
 
+    /**
+     * Draws a new element node on UI if not already present.
+     *
+     * @param circleCell
+     */
     private void addNewCellToUI(CircleCell circleCell) {
         if (!circleCellsOnUI.containsKey(circleCell.getCellId())) {
             circleCellsOnUI.put(circleCell.getCellId(), circleCell);
@@ -532,6 +543,10 @@ private void removeListeners() {
 
     private void drawPlaceHolderLines() {
         String currentThreadId = ControllerLoader.centerLayoutController.getCurrentThreadId();
+        if (currentThreadId == null) {
+            System.out.println("CanvasController.drawPlaceHolderLines. currentThreadId is null. Returning without loading.");
+            return;
+        }
         int height = graphLoaderModule.computePlaceHolderHeight(currentThreadId);
         int width = graphLoaderModule.computePlaceHolderWidth(currentThreadId);
 

src/main/java/com/application/controller/CenterLayoutController.java

@@ -72,6 +72,10 @@ private void initialize() {
 
     private void setUpPaneButtonsActions() {
         threadsToggleButton.setSelected(false);
+        threadsToggleButton.setStyle("-fx-focus-color: transparent; " +
+                "-fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color; " +
+                "-fx-background-insets: 0, 1, 2; " +
+                "-fx-background-radius: 5, 4, 3;");
         verticalSplitPanePosProperty = verticalSplitPane.getDividers().get(0).positionProperty();
         verticalSplitPanePosProperty.setValue(0);
 
@@ -124,6 +128,9 @@ public void setUpThreadsListView() {
         threadListView.setItems(threadsObsList);
 
         threadListView.setOnMouseClicked((e) -> {
+            if (threadsObsList.size() == 0) {
+                return;
+            }
             String threadId = threadListView.getSelectionModel().getSelectedItem().split(" ")[1];
             switchCurrentThread(threadId);
         });

src/main/java/com/application/controller/InstructionsPaneController.java

@@ -104,7 +104,7 @@ public void setMethodDefGraphics(boolean enabled) {
             methodDefInfoLabel.setGraphic(methodDefInfoGlyph);
 
         } else {
-            methodDefInfoGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.ARROW_RIGHT);
+            methodDefInfoGlyph.setIcon(FontAwesome.Glyph.ARROW_RIGHT);
             methodDefInfoGlyph.setColor(ColorProp.GREY);
         }
     }
@@ -118,7 +118,7 @@ public void setCallTraceGraphics(boolean enabled) {
                     + LoadedFiles.getFile(FileNames.Call_Trace.getFileName()).getName());
 
         } else {
-            callTraceInfoGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.ARROW_RIGHT);
+            callTraceInfoGlyph.setIcon(FontAwesome.Glyph.ARROW_RIGHT);
             callTraceInfoGlyph.setColor(ColorProp.BLACK);
         }
     }
@@ -141,7 +141,7 @@ public void setDBInfoGraphics(boolean enabled) {
                     + LoadedFiles.getFile(FileNames.DB.getFileName()).getName());
 
         } else {
-            dbInfoGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.ARROW_RIGHT);
+            dbInfoGlyph.setIcon(FontAwesome.Glyph.ARROW_RIGHT);
             dbInfoGlyph.setColor(ColorProp.BLACK);
         }
     }

src/main/java/com/application/controller/MainController.java

@@ -1,16 +1,21 @@
 package com.application.controller;
 
+import com.application.db.DatabaseUtil;
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Region;
 
 import java.io.IOException;
 
 public class MainController {
     @FXML private BorderPane borderPane;
 
-    // @FXML private CenterLayoutController centerLayoutController;
+    public boolean alertShown = false;
 
     @FXML protected void initialize() {
         ControllerLoader.register(this);
@@ -30,17 +35,41 @@ void showInstructionsPane() {
     }
 
     void loadGraphPane() {
+        if (!DatabaseUtil.isDBValid()) {
+            System.out.println("MainController.loadGraphPane. db not valid.");
+            return;
+        }
+
         try {
             FXMLLoader fxmlLoader = new FXMLLoader();
             fxmlLoader.setLocation(getClass().getResource("/fxml/centerLayout.fxml"));
             Node content = fxmlLoader.load();
             borderPane.setCenter(content);
-
-            // centerLayoutController = fxmlLoader.getController();
-
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
+    public void showErrorPopup(String title, String header, String message) {
+        System.out.println("MainController.showErrorPopup.");
+
+        if (alertShown) {
+            System.out.println("MainController.showErrorPopup. alert shown.");
+            return;
+        }
+        alertShown = true;
+
+        Alert alert = new Alert(Alert.AlertType.ERROR);
+        alert.setTitle(title);
+        alert.setHeaderText(header);
+        alert.setContentText(message);
+        ButtonType resetButtonType = new ButtonType("Close");
+        alert.getButtonTypes().setAll(resetButtonType);
+
+        alert.getDialogPane().setMinWidth(Region.USE_PREF_SIZE);
+        alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
+
+        alert.show();
+    }
+
 }