From 67aec353708da5936ec4e9408e561cdf68af0ca4 Mon Sep 17 00:00:00 2001 From: Alex Ciminian Date: Tue, 12 Jan 2021 11:28:31 +0000 Subject: [PATCH] 7002: update max graph nodes dropdown values --- .../graphview/views/GraphView.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java index aae352cd6f..ea8d6c9ad0 100644 --- a/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java +++ b/application/org.openjdk.jmc.flightrecorder.graphview/src/main/java/org/openjdk/jmc/flightrecorder/graphview/views/GraphView.java @@ -39,6 +39,7 @@ import java.io.InputStream; import java.text.MessageFormat; import java.util.Base64; +import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; @@ -70,6 +71,7 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.ViewPart; import org.openjdk.jmc.common.item.IItemCollection; +import org.openjdk.jmc.common.util.Pair; import org.openjdk.jmc.common.util.StringToolkit; import org.openjdk.jmc.flightrecorder.ext.graphview.graph.DotGenerator; import org.openjdk.jmc.flightrecorder.stacktrace.FrameSeparator; @@ -181,6 +183,8 @@ public void dispose() { private class NodeThresholdSelection extends Action implements IMenuCreator { private Menu menu; + private final List> items = List.of(new Pair<>("100", 100), new Pair<>("500", 500), + new Pair<>("1000", 1000)); NodeThresholdSelection() { super("Max Nodes", IAction.AS_DROP_DOWN_MENU); @@ -189,7 +193,7 @@ private class NodeThresholdSelection extends Action implements IMenuCreator { @Override public void dispose() { - // TODO: understand when this needs to be called + // do nothing } @Override @@ -211,10 +215,9 @@ public Menu getMenu(Menu parent) { } private void populate(Menu menu) { - int[] values = new int[] {1, 50, 100, 500, 1000}; - for (int i : values) { + for (Pair item : items) { ActionContributionItem actionItem = new ActionContributionItem( - new SetNodeThreshold(i, i == maxNodesRendered)); + new SetNodeThreshold(item, item.right == maxNodesRendered)); actionItem.fill(menu, -1); } } @@ -223,9 +226,9 @@ private void populate(Menu menu) { private class SetNodeThreshold extends Action { private int value; - SetNodeThreshold(int value, boolean isSelected) { - super(String.valueOf(value), IAction.AS_RADIO_BUTTON); - this.value = value; + SetNodeThreshold(Pair item, boolean isSelected) { + super(item.left, IAction.AS_RADIO_BUTTON); + this.value = item.right; setChecked(isSelected); }