Skip to content

Commit ab42939

Browse files
OmerKhureshiOmerKhureshi
committed
changed message to eventType. Fixed expansion highlight size. Removed node only highlight.
1 parent 4e87239 commit ab42939

File tree

8 files changed

+78
-71
lines changed

8 files changed

+78
-71
lines changed

‎src/main/java/com/csgt/controller/EventHandlers.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void setCustomMouseEventHandlers(final Node node) {
7575

7676

7777
String sql = "Select E.ID as EID, TIME_INSTANT, METHOD_ID, PROCESS_ID, THREAD_ID, PARAMETERS, COLLAPSED, " +
78-
"MESSAGE, LOCKOBJID, BOUND_BOX_X_COORDINATE, BOUND_BOX_Y_COORDINATE from " + TableNames.ELEMENT_TABLE + " AS E " +
78+
"event_type, LOCKOBJID, BOUND_BOX_X_COORDINATE, BOUND_BOX_Y_COORDINATE from " + TableNames.ELEMENT_TABLE + " AS E " +
7979
"JOIN " + TableNames.CALL_TRACE_TABLE + " AS CT ON CT.id = E.ID_ENTER_CALL_TRACE " +
8080
"WHERE E.ID = " + cell.getCellId();
8181

@@ -87,7 +87,7 @@ public void setCustomMouseEventHandlers(final Node node) {
8787
processId = callTraceRS.getInt("process_id");
8888
threadId = callTraceRS.getInt("thread_id");
8989
parameters = callTraceRS.getString("parameters");
90-
eventType = callTraceRS.getString("message");
90+
eventType = callTraceRS.getString("EVENT_TYPE");
9191
lockObjectId = callTraceRS.getString("lockobjid");
9292
xCord = callTraceRS.getFloat("bound_box_x_coordinate");
9393
yCord = callTraceRS.getFloat("bound_box_y_coordinate");
@@ -165,7 +165,7 @@ public void setCustomMouseEventHandlers(final Node node) {
165165
if (eventType.equalsIgnoreCase("WAIT-ENTER")) {
166166
int ctId = -2; // Will throw exception if value not changed. Which is what we want.
167167
sql = "lockobjid = '" + lockObjectId + "'" +
168-
" AND (message = 'NOTIFY-ENTER' OR message = 'NOTIFYALL-ENTER')" +
168+
" AND (EVENT_TYPE = 'NOTIFY-ENTER' OR EVENT_TYPE = 'NOTIFYALL-ENTER')" +
169169
" AND time_instant >= " + "'" + timeStamp + "'";
170170

171171
// // get thread ids of nodes that may acquire the lock that was just released.
@@ -191,12 +191,12 @@ public void setCustomMouseEventHandlers(final Node node) {
191191

192192
try (Connection conn = DatabaseUtil.getConnection(); Statement ps = conn.createStatement()) {
193193
sql = "SELECT * FROM " + TableNames.CALL_TRACE_TABLE + " AS parent\n" +
194-
"WHERE MESSAGE = 'WAIT-EXIT' \n" +
194+
"WHERE event_type = 'WAIT-EXIT' \n" +
195195
"AND LOCKOBJID = '" + lockObjectId + "' " +
196196
"AND TIME_INSTANT >= '" + timeStamp + "' \n" +
197197
"AND (SELECT count(*) \n" +
198198
"FROM " + TableNames.CALL_TRACE_TABLE + " AS child \n" +
199-
"WHERE child.message = 'WAIT-ENTER' \n" +
199+
"WHERE child.event_type = 'WAIT-ENTER' \n" +
200200
"AND LOCKOBJID = '" + lockObjectId + "' " +
201201
"AND child.TIME_INSTANT >= '" + timeStamp + "' \n" +
202202
"AND child.TIME_INSTANT <= parent.time_instant\n" +
@@ -226,11 +226,11 @@ public void setCustomMouseEventHandlers(final Node node) {
226226
Statement ps = conn.createStatement()) {
227227

228228

229-
sql = "SELECT * FROM " + TableNames.CALL_TRACE_TABLE + " AS parent WHERE MESSAGE = 'WAIT-EXIT' " +
229+
sql = "SELECT * FROM " + TableNames.CALL_TRACE_TABLE + " AS parent WHERE event_type = 'WAIT-EXIT' " +
230230
"AND LOCKOBJID = '" + lockObjectId + "' " +
231231
"AND TIME_INSTANT >= '" + timeStamp + "' " +
232232
"AND (SELECT count(*) FROM " + TableNames.CALL_TRACE_TABLE + " AS child " +
233-
"WHERE child.message = 'WAIT-ENTER' " +
233+
"WHERE child.event_type = 'WAIT-ENTER' " +
234234
"AND LOCKOBJID = '" + lockObjectId + "' " +
235235
"AND child.TIME_INSTANT >= '" + timeStamp + "' " +
236236
"AND child.TIME_INSTANT <= parent.time_instant ) = 0";

‎src/main/java/com/csgt/controller/MenuController.java‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,10 @@ private void firstTimeSetUpHighlightsWindow() {
428428
colorsMap = new HashMap<>();
429429
anyColorChange = false;
430430

431+
int subtreeCheckBoxColInd = 0;
432+
int methodNameColInd = 1;
433+
int colorPickerColInd = 2;
434+
431435
GridPane gridPane = new GridPane();
432436
gridPane.setPadding(SizeProp.INSETS);
433437
gridPane.setHgap(10);
@@ -438,31 +442,30 @@ private void firstTimeSetUpHighlightsWindow() {
438442
Label headingCol1 = new Label("Package and method name");
439443
headingCol1.setWrapText(true);
440444
headingCol1.setFont(Font.font("Verdana", FontWeight.BOLD, headingCol1.getFont().getSize() * 1.1));
441-
GridPane.setConstraints(headingCol1, 0, 0);
445+
GridPane.setConstraints(headingCol1, methodNameColInd, 0);
442446
GridPane.setHalignment(headingCol1, HPos.CENTER);
443447

444-
Label headingCol2 = new Label("Highlight node only");
445-
headingCol2.setWrapText(true);
446-
headingCol2.setFont(Font.font("Verdana", FontWeight.BOLD, headingCol2.getFont().getSize() * 1.1));
447-
GridPane.setConstraints(headingCol2, 1, 0);
448-
GridPane.setHalignment(headingCol2, HPos.CENTER);
448+
// Label headingCol2 = new Label("Highlight node only");
449+
// headingCol2.setWrapText(true);
450+
// headingCol2.setFont(Font.font("Verdana", FontWeight.BOLD, headingCol2.getFont().getSize() * 1.1));
451+
// GridPane.setConstraints(headingCol2, 1, 0);
452+
// GridPane.setHalignment(headingCol2, HPos.CENTER);
449453

450454
Label headingCol3 = new Label("Highlight node subtree");
451455
headingCol3.setWrapText(true);
452456
headingCol3.setFont(Font.font("Verdana", FontWeight.BOLD, headingCol3.getFont().getSize() * 1.1));
453-
GridPane.setConstraints(headingCol3, 2, 0);
457+
GridPane.setConstraints(headingCol3, subtreeCheckBoxColInd, 0);
454458
GridPane.setHalignment(headingCol3, HPos.CENTER);
455459

456460

457461
Label headingCol4 = new Label("Choose color");
458462
headingCol4.setWrapText(true);
459463
headingCol4.setFont(Font.font("Verdana", FontWeight.BOLD, headingCol4.getFont().getSize() * 1.1));
460-
GridPane.setConstraints(headingCol4, 3, 0);
464+
GridPane.setConstraints(headingCol4, colorPickerColInd, 0);
461465
GridPane.setHalignment(headingCol4, HPos.CENTER);
462466

463-
464467
gridPane.getChildren().addAll(
465-
headingCol1, headingCol2, headingCol3, headingCol4
468+
headingCol3, headingCol1, headingCol4
466469
);
467470

468471
applyButton = new Button("Apply");
@@ -532,30 +535,30 @@ protected void succeeded() {
532535
Label name = new Label(fullName);
533536
name.setWrapText(true);
534537
// name.setMaxWidth(250);
535-
GridPane.setConstraints(name, 0, rowInd.get());
536-
GridPane.setHalignment(name, HPos.CENTER);
538+
GridPane.setConstraints(name, methodNameColInd, rowInd.get());
539+
GridPane.setHalignment(name, HPos.LEFT);
537540
GridPane.setHgrow(name, Priority.ALWAYS);
538541

539542

540543
// First checkbox
541-
CheckBox firstCB = new CheckBox();
542-
GridPane.setConstraints(firstCB, 1, rowInd.get());
543-
GridPane.setHalignment(firstCB, HPos.CENTER);
544-
GridPane.setValignment(firstCB, VPos.CENTER);
545-
GridPane.setHgrow(firstCB, Priority.ALWAYS);
546-
firstCB.selectedProperty().addListener((observable, oldValue, newValue) -> {
547-
if (newValue) {
548-
firstCBMap.put(fullName, firstCB);
549-
} else {
550-
firstCBMap.remove(fullName);
551-
}
552-
});
544+
// CheckBox firstCB = new CheckBox();
545+
// GridPane.setConstraints(firstCB, 1, rowInd.get());
546+
// GridPane.setHalignment(firstCB, HPos.CENTER);
547+
// GridPane.setValignment(firstCB, VPos.CENTER);
548+
// GridPane.setHgrow(firstCB, Priority.ALWAYS);
549+
// firstCB.selectedProperty().addListener((observable, oldValue, newValue) -> {
550+
// if (newValue) {
551+
// firstCBMap.put(fullName, firstCB);
552+
// } else {
553+
// firstCBMap.remove(fullName);
554+
// }
555+
// });
553556

554557

555558
// Second checkbox
556559
CheckBox secondCB = new CheckBox();
557560
// secondCB.setAlignment(Pos.CENTER);
558-
GridPane.setConstraints(secondCB, 2, rowInd.get());
561+
GridPane.setConstraints(secondCB, subtreeCheckBoxColInd, rowInd.get());
559562
GridPane.setHalignment(secondCB, HPos.CENTER);
560563
GridPane.setValignment(secondCB, VPos.CENTER);
561564
GridPane.setHgrow(secondCB, Priority.ALWAYS);
@@ -575,7 +578,7 @@ protected void succeeded() {
575578
colorPicker.setStyle(
576579
"-fx-color-label-visible: false; " +
577580
"-fx-background-radius: 15 15 15 15;");
578-
GridPane.setConstraints(colorPicker, 3, rowInd.get());
581+
GridPane.setConstraints(colorPicker, colorPickerColInd, rowInd.get());
579582
GridPane.setHalignment(colorPicker, HPos.CENTER);
580583
GridPane.setValignment(colorPicker, VPos.CENTER);
581584
GridPane.setHgrow(colorPicker, Priority.ALWAYS);
@@ -592,7 +595,7 @@ protected void succeeded() {
592595
rowInd.incrementAndGet();
593596

594597
// Put every thing together
595-
gridPane.getChildren().addAll(name, firstCB, secondCB, colorPicker);
598+
gridPane.getChildren().addAll(name, secondCB, colorPicker);
596599

597600
});
598601
}

‎src/main/java/com/csgt/dataaccess/DAO/BookmarksDAOImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public static Map<String, BookmarkDTO> getBookmarkDTOs() {
100100
}
101101

102102
Map<String, BookmarkDTO> result = new HashMap<>();
103-
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 " +
103+
String query = "SELECT E.ID as EID, CT.THREAD_ID, CT.EVENT_TYPE, B.COLOR, E.BOUND_BOX_X_COORDINATE, E.BOUND_BOX_Y_COORDINATE, E.COLLAPSED " +
104104
"FROM " + TableNames.BOOKMARKS + " AS B " +
105105
"JOIN " + TableNames.ELEMENT_TABLE + " AS E ON B.ELEMENT_ID = E.ID " +
106106
"JOIN " + TableNames.CALL_TRACE_TABLE + " AS CT ON E.ID_ENTER_CALL_TRACE = CT.ID ";
@@ -111,7 +111,7 @@ public static Map<String, BookmarkDTO> getBookmarkDTOs() {
111111
new BookmarkDTO(
112112
rs.getString("EID"),
113113
rs.getString("THREAD_ID"),
114-
rs.getString("MESSAGE"),
114+
rs.getString("EVENT_TYPE"),
115115
rs.getString("COLOR"),
116116
rs.getDouble("BOUND_BOX_X_COORDINATE"),
117117
rs.getDouble("BOUND_BOX_Y_COORDINATE"),
@@ -131,7 +131,7 @@ public static Map<String, Bookmark> getBookmarks() {
131131
createTable();
132132

133133
Map<String, Bookmark> result = new HashMap<>();
134-
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 " +
134+
String query = "SELECT E.ID as EID, CT.THREAD_ID, CT.EVENT_TYPE, B.COLOR, E.BOUND_BOX_X_COORDINATE, E.BOUND_BOX_Y_COORDINATE, E.COLLAPSED " +
135135
"FROM " + TableNames.BOOKMARKS + " AS B " +
136136
"JOIN " + TableNames.ELEMENT_TABLE + " AS E ON B.ELEMENT_ID = E.ID " +
137137
"JOIN " + TableNames.CALL_TRACE_TABLE + " AS CT ON E.ID_ENTER_CALL_TRACE = CT.ID ";
@@ -142,7 +142,7 @@ public static Map<String, Bookmark> getBookmarks() {
142142
new Bookmark(
143143
rs.getString("EID"),
144144
rs.getString("THREAD_ID"),
145-
rs.getString("MESSAGE"),
145+
rs.getString("EVENT_TYPE"),
146146
rs.getString("COLOR"),
147147
rs.getDouble("BOUND_BOX_X_COORDINATE"),
148148
rs.getDouble("BOUND_BOX_Y_COORDINATE"),

‎src/main/java/com/csgt/dataaccess/DAO/CallTraceDAOImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static void createTable() {
2424
"process_id INTEGER not null, " +
2525
"thread_id INTEGER, " +
2626
"method_id INTEGER, " +
27-
"message VARCHAR(20), " +
27+
"event_type VARCHAR(20), " +
2828
"parameters VARCHAR(800), " +
2929
"lockObjId VARCHAR(50), " +
3030
// "time_instant VARCHAR(24)" +
@@ -69,7 +69,7 @@ public static int insert(List<String> val) {
6969
"process_id, " +
7070
"thread_id, " +
7171
"method_id, " +
72-
"message, " +
72+
"event_type, " +
7373
"parameters, " +
7474
"lockObjId, " +
7575
"time_instant" +

‎src/main/java/com/csgt/dataaccess/DAO/ElementDAOImpl.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@ public static List<ElementDTO> getElementDTOsInViewport(BoundingBox viewPort) {
303303
// Get element properties for those elements that are inside the expanded region calculated above.
304304
String sql = "SELECT E.ID AS EID, parent_id, collapsed, " +
305305
"bound_box_x_coordinate, bound_box_y_coordinate, " +
306-
"message, id_enter_call_trace, method_id, " +
306+
"EVENT_TYPE, id_enter_call_trace, method_id, " +
307307
"(CASE " +
308-
" WHEN M.METHOD_NAME IS null THEN MESSAGE " +
308+
" WHEN M.METHOD_NAME IS null THEN EVENT_TYPE " +
309309
" ELSE M.METHOD_NAME " +
310310
"END) AS method_name " +
311311
"FROM " + TableNames.CALL_TRACE_TABLE + " AS CT " +
@@ -320,6 +320,8 @@ public static List<ElementDTO> getElementDTOsInViewport(BoundingBox viewPort) {
320320
" AND (E.COLLAPSED = 0" +
321321
" OR E.COLLAPSED = 2)";
322322

323+
System.out.println("sql = " + sql);
324+
323325
try (ResultSet rs = DatabaseUtil.select(sql)) {
324326
while (rs != null && rs.next()) {
325327
ElementDTO elementDTO = new ElementDTO();
@@ -357,6 +359,8 @@ public static int getMaxLevelCount(String threadId) {
357359
"join " + TableNames.CALL_TRACE_TABLE + " CT on E.ID_ENTER_CALL_TRACE = CT.ID " +
358360
"where CT.THREAD_ID = " + threadId;
359361

362+
System.out.println("SQLMaxLevelCount = " + SQLMaxLevelCount);
363+
360364
int levelCount = DatabaseUtil.executeSelectForInt(SQLMaxLevelCount);
361365
return levelCount;
362366
}

‎src/main/java/com/csgt/dataaccess/DAO/HighlightDAOImpl.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ public static List<String> getParentHighlightResizeQueries(ElementDTO clickedEle
299299
List<String> queries = new ArrayList<>();
300300

301301
double startXOffset = 30;
302-
double widthOffset = 35;
302+
double widthOffset = 50;
303303
double startYOffset = -10;
304304
double heightOffset = -20;
305305

@@ -341,25 +341,25 @@ public static List<String> getParentHighlightResizeQueries(ElementDTO clickedEle
341341

342342
// For all the highlights obtained above, adjust their width and height
343343
// so that the highlights cover only the visible cells.
344-
queries.add(
345-
"UPDATE " + TableNames.HIGHLIGHT_ELEMENT + " AS H " +
346-
"SET H.HEIGHT = HEIGHT - " + deltaY + " " +
347-
"WHERE H.ID = " + rs.getInt("ID"));
348-
349-
queries.add(
350-
"UPDATE " + TableNames.HIGHLIGHT_ELEMENT + " AS H " +
351-
"SET " +
352-
// "H.HEIGHT = HEIGHT - " + delta + ", " +
353-
"H.WIDTH = " +
354-
"((SELECT MAX(E1.BOUND_BOX_X_TOP_RIGHT) FROM " + TableNames.ELEMENT_TABLE + " AS E1 " +
355-
"JOIN " + TableNames.CALL_TRACE_TABLE + " AS CT ON E1.ID_ENTER_CALL_TRACE = CT.ID " +
356-
"WHERE E1.BOUND_BOX_Y_COORDINATE >= H.START_Y " +
357-
"AND E1.BOUND_BOX_Y_COORDINATE <= (H.START_Y + H.HEIGHT) " +
358-
"AND E1.BOUND_BOX_X_COORDINATE >= H.START_X " +
359-
"AND CT.THREAD_ID = " + threadId + " " +
360-
"AND (E1.COLLAPSED = 0 OR E1.COLLAPSED = 2)" +
361-
") - H.START_X + " + widthOffset + ") " +
362-
"WHERE H.ID = " + rs.getInt("ID"));
344+
String updateHighlightHeight = "UPDATE " + TableNames.HIGHLIGHT_ELEMENT + " AS H " +
345+
"SET H.HEIGHT = HEIGHT - " + deltaY + " " +
346+
"WHERE H.ID = " + rs.getInt("ID");
347+
queries.add(updateHighlightHeight);
348+
349+
String updateHighlightWidth = "UPDATE " + TableNames.HIGHLIGHT_ELEMENT + " AS H " +
350+
"SET " +
351+
// "H.HEIGHT = HEIGHT - " + delta + ", " +
352+
"H.WIDTH = " +
353+
"((SELECT MAX(E1.BOUND_BOX_X_TOP_RIGHT) FROM " + TableNames.ELEMENT_TABLE + " AS E1 " +
354+
"JOIN " + TableNames.CALL_TRACE_TABLE + " AS CT ON E1.ID_ENTER_CALL_TRACE = CT.ID " +
355+
"WHERE E1.BOUND_BOX_Y_COORDINATE >= H.START_Y " +
356+
"AND E1.BOUND_BOX_Y_COORDINATE <= (H.START_Y + H.HEIGHT) " +
357+
"AND E1.BOUND_BOX_X_COORDINATE >= H.START_X " +
358+
"AND CT.THREAD_ID = " + threadId + " " +
359+
"AND (E1.COLLAPSED = 0 OR E1.COLLAPSED = 2)" +
360+
") - H.START_X + " + widthOffset + ") " +
361+
"WHERE H.ID = " + rs.getInt("ID");
362+
queries.add(updateHighlightWidth);
363363
}
364364
} catch (SQLException e) {
365365
e.printStackTrace();
@@ -378,7 +378,7 @@ public static List<String> getChildrenHighlightResizeQueries(ElementDTO clickedE
378378
double startX = 0, startY = 0, width = 0, height = 0;
379379

380380
double startXOffset = 30;
381-
double widthOffset = 30;
381+
double widthOffset = 50;
382382
double startYOffset = -10;
383383
double heightOffset = -20;
384384

‎src/main/java/com/csgt/dataaccess/DTO/CallTraceDTO.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ public class CallTraceDTO extends BaseDTO{
66
private int processId;
77
private int threadId;
88
private int methodId;
9-
private String message;
9+
private String eventType;
1010
private String params;
1111
private String lockObjId;
1212
private Date timeStamp;
1313

1414
public CallTraceDTO() {
1515
}
1616

17-
public CallTraceDTO(int processId, int threadId, int methodId, String message, String params, String lockObjId, Date timeStamp) {
17+
public CallTraceDTO(int processId, int threadId, int methodId, String eventType, String params, String lockObjId, Date timeStamp) {
1818
this.processId = processId;
1919
this.threadId = threadId;
2020
this.methodId = methodId;
21-
this.message = message;
21+
this.eventType = eventType;
2222
this.params = params;
2323
this.lockObjId = lockObjId;
2424
this.timeStamp = timeStamp;
@@ -48,12 +48,12 @@ public void setMethodId(int methodId) {
4848
this.methodId = methodId;
4949
}
5050

51-
public String getMessage() {
52-
return message;
51+
public String getEventType() {
52+
return eventType;
5353
}
5454

55-
public void setMessage(String message) {
56-
this.message = message;
55+
public void setEventType(String eventType) {
56+
this.eventType = eventType;
5757
}
5858

5959
public String getParams() {

0 commit comments

Comments
 (0)