7192: Event browser should be able to search and show event type ids

Reviewed-by: hirt
RealCLanger · Nov 20, 2023 · d734567 · d734567
1 parent 2a076d2
commit d734567
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...recorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/TypeFilterBuilder.java b/...recorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/common/TypeFilterBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -271,6 +271,9 @@ private boolean isLeaf(Object element) {
 
 		private boolean matches(Object element) {
 			String label = labelProvider.apply(element);
+			if (element instanceof EventTypeNode) {
+				label = label.concat(" " + ((EventTypeNode) element).getType().getIdentifier());
+			}
 			if (FilterMatcher.getInstance().match(label, filterString, true)) {
 				return true;
 			}

diff --git a/...htrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/EventBrowserPage.java b/...htrecorder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/pages/EventBrowserPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -350,6 +350,8 @@ private void rebuildItemList() {
 					newColumns.add(0, new ColumnSettings(combinedId, false, null, null));
 				}
 			});
+			// add a column for the event type id, hidden by default
+			itemListBuilder.addColumn(JfrAttributes.EVENT_TYPE_ID);
 			listColumns.addAll(0, newColumns);
 
 			saveFilterActionStates();