fixed: collapsed tree not expanding on clicking bookmark

Author: OmerKhureshi

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

@@ -603,7 +603,10 @@ public void stackRectangles() {
     }
 
     public void jumpTo(String cellId, String threadId, int collapsed) {
-        ControllerLoader.eventHandlers.jumpTo(cellId, threadId, collapsed);
+        // collapsed value might have changes since the last time event handlers were set on the the bookmarks buttons.
+        // get new collapsed value.
+        ElementDTO elementDTO = ElementDAOImpl.getElementDTO(cellId);
+        ControllerLoader.eventHandlers.jumpTo(cellId, threadId, elementDTO.getCollapsed());
     }
 
 }

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

@@ -258,7 +258,7 @@ public void handle(MouseEvent event) {
                     String finalPackageName = packageName;
                     String finalMethodName = methodName;
                     eleIdList.stream().forEach(eId -> {
-                        String query = "SELECT E.ID AS EID, bound_box_x_coordinate, bound_box_y_coordinate, THREAD_ID " +
+                        String query = "SELECT E.ID AS EID, bound_box_x_coordinate, bound_box_y_coordinate, THREAD_ID, collapsed " +
                                 "FROM CALL_TRACE AS CT " +
                                 "JOIN ELEMENT AS E ON CT.ID = E.ID_ENTER_CALL_TRACE " +
                                 "WHERE E.ID = " + eId;
@@ -269,12 +269,13 @@ public void handle(MouseEvent event) {
                                 String targetThreadId = String.valueOf(elementRS.getInt("thread_id"));
                                 float xCoordinate = elementRS.getFloat("bound_box_x_coordinate");
                                 float yCoordinate = elementRS.getFloat("bound_box_y_coordinate");
+                                int targetElementCollapsed = elementRS.getInt("collapsed");
 
                                 // go to location.
                                 Button jumpToButton = new Button();
                                 jumpToButton.setOnMouseClicked(event1 -> {
                                     System.out.println("EventHandlers.handle: jumpToButton Clicked. for eleId: " + eId);
-                                    jumpTo(String.valueOf(eId), targetThreadId, collapsed);
+                                    jumpTo(String.valueOf(eId), targetThreadId, targetElementCollapsed);
                                 });
                                 buttonList.add(jumpToButton);
                             }
@@ -900,7 +901,6 @@ private void expandParentTreeChain(ElementDTO elementDTO , String threadId) {
     }
 
     public void jumpTo(String cellId, String threadId, int collapsed) {
-
         // make changes in DB if needed
         if (collapsed != 0) {
             ElementDTO elementDTO = ElementDAOImpl.getElementDTO(cellId);

src/main/java/com/application/db/DAO/DAOImplementation/BookmarksDAOImpl.java

@@ -91,6 +91,13 @@ public static Map<String, BookmarkDTO> getBookmarkDTOs() {
         if (!isTableCreated())
             createTable();
 
+        if (!ElementDAOImpl.isTableCreated()) {
+            ElementDAOImpl.createTable();
+        }
+        if (!CallTraceDAOImpl.isTableCreated()) {
+            CallTraceDAOImpl.createTable();
+        }
+
         Map<String, BookmarkDTO> result = new HashMap<>();
         String query = "SELECT E.ID as EID, CT.THREAD_ID, CT.MESSAGE, B.COLOR, E.BOUND_BOX_X_COORDINATE, E.BOUND_BOX_Y_COORDINATE, E.COLLAPSED " +
                 "FROM " + TableNames.BOOKMARKS + " AS B " +

src/main/java/com/application/db/DAO/DAOImplementation/ElementDAOImpl.java

@@ -452,7 +452,7 @@ public static float calculateNewDeltaX(ElementDTO elementDTO, String nextCellId)
     public static List<ElementDTO> getAllParentElementDTOs(ElementDTO elementDTO, String threadId) {
         List<ElementDTO> elementDTOs = new ArrayList<>();
 
-        String getAllParentIDsQuery = "SELECT MAX(ID) AS IDS " +
+        String getAllParentIDsQuery = "SELECT MAX(ID) AS ID " +
                 "FROM " + TableNames.ELEMENT_TABLE + " AS E " +
                 "WHERE E.ID < " + elementDTO.getId() + " " +
                 "AND E.BOUND_BOX_X_COORDINATE < (SELECT BOUND_BOX_X_COORDINATE " +
@@ -464,7 +464,7 @@ public static List<ElementDTO> getAllParentElementDTOs(ElementDTO elementDTO, St
                 "AND E.PARENT_ID > 1 " +
                 "AND E.COLLAPSED <> 0 " +
                 "GROUP BY E.BOUND_BOX_X_COORDINATE " +
-                "ORDER BY IDS ASC ";
+                "ORDER BY ID ASC ";
 
         try (ResultSet rs = DatabaseUtil.select(getAllParentIDsQuery)) {
             while (rs.next()) {

src/main/java/com/application/db/DatabaseUtil.java

@@ -61,7 +61,7 @@ private static Connection createDatabaseConnection() {
                 dataSourceDir = new File(prefix + sDate);
             } else {
                 url = "jdbc:derby:" + dataSourceDir.getPath() + ";create=true";
-                // System.out.println("DatabaseUtil.createDatabaseConnection. use existing db. url: " + url);
+                System.out.println("DatabaseUtil.createDatabaseConnection. use existing db. url: " + url);
             }
 
             conn = DriverManager.getConnection(url);