From 0ad27c309b798ad8ec89e70f6993e80cda2974ab Mon Sep 17 00:00:00 2001 From: Aymane Harmaz Date: Mon, 27 Oct 2025 13:05:06 +0100 Subject: [PATCH] 8451: Should make the Event Type the first column of event types tree table --- .../jmc/flightrecorder/ui/common/DataPageToolkit.java | 9 +++++---- .../jmc/flightrecorder/ui/pages/EventBrowserPage.java | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/DataPageToolkit.java b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/DataPageToolkit.java index 529d73a2b..8209ef055 100644 --- a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/DataPageToolkit.java +++ b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/DataPageToolkit.java @@ -198,10 +198,11 @@ public Color getColor(IItem item) { // FIXME: Handle ColorProvider and combined events Map columnsOrderMap = new HashMap<>(); - columnsOrderMap.put(createColumnId(JfrAttributes.START_TIME), 1); - columnsOrderMap.put(createColumnId(JfrAttributes.DURATION), 2); - columnsOrderMap.put(createColumnId(JfrAttributes.END_TIME), 3); - columnsOrderMap.put(createColumnId(JfrAttributes.EVENT_THREAD), 4); + columnsOrderMap.put(createColumnId(JfrAttributes.EVENT_TYPE), 1); + columnsOrderMap.put(createColumnId(JfrAttributes.START_TIME), 2); + columnsOrderMap.put(createColumnId(JfrAttributes.DURATION), 3); + columnsOrderMap.put(createColumnId(JfrAttributes.END_TIME), 4); + columnsOrderMap.put(createColumnId(JfrAttributes.EVENT_THREAD), 5); DEFAULT_COLUMNS_ORDER = Collections.unmodifiableMap(columnsOrderMap); } diff --git a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/EventBrowserPage.java b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/EventBrowserPage.java index 8dd8b2dff..acf033701 100644 --- a/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/EventBrowserPage.java +++ b/application/org.openjdk.jmc.flightrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/EventBrowserPage.java @@ -312,7 +312,6 @@ private void rebuildItemList() { } // FIXME: Possibly move to attribute toolkit/handler? - // FIXME: Make sure to get Event Type as the first column // FIXME: Stream -> Stream should be delegated to some context (e.g. the editor) Stream> commonAttributes = Stream.empty(); if (types.hasNext()) {