use GuiUtil's createIntConfigRadioMenu in EntryMarkersMenu

Author: supersaiyansubtlety

enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/EntryMarkersMenu.java

@@ -1,74 +1,23 @@
 package org.quiltmc.enigma.gui.element.menu_bar.view;
 
-import org.quiltmc.config.api.values.TrackedValue;
 import org.quiltmc.enigma.gui.Gui;
 import org.quiltmc.enigma.gui.config.Config;
 import org.quiltmc.enigma.gui.element.menu_bar.AbstractEnigmaMenu;
 import org.quiltmc.enigma.gui.util.GuiUtil;
 import org.quiltmc.enigma.util.I18n;
 
-import javax.swing.ButtonGroup;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JMenu;
-import javax.swing.JRadioButtonMenuItem;
 import javax.swing.JToolBar;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 import static org.quiltmc.enigma.gui.config.EntryMarkersSection.MAX_MAX_MARKERS_PER_LINE;
 import static org.quiltmc.enigma.gui.config.EntryMarkersSection.MIN_MAX_MARKERS_PER_LINE;
 
 public class EntryMarkersMenu extends AbstractEnigmaMenu {
-	@SuppressWarnings("SameParameterValue")
-	private static JMenu createIntConfigRadioMenu(
-			TrackedValue<Integer> config, int min, int max, Runnable onUpdate
-	) {
-		final Map<Integer, JRadioButtonMenuItem> radiosByChoice = IntStream.range(min, max + 1)
-				.boxed()
-				.collect(Collectors.toMap(
-					Function.identity(),
-					choice -> {
-						final JRadioButtonMenuItem choiceItem = new JRadioButtonMenuItem();
-						choiceItem.setText(Integer.toString(choice));
-						if (choice.equals(config.value())) {
-							choiceItem.setSelected(true);
-						}
-
-						final int finalChoice = choice;
-						choiceItem.addActionListener(e -> {
-							config.setValue(finalChoice);
-							onUpdate.run();
-						});
-
-						return choiceItem;
-					}
-				));
-
-		final ButtonGroup choicesGroup = new ButtonGroup();
-		final JMenu menu = new JMenu();
-		for (final JRadioButtonMenuItem radio : radiosByChoice.values()) {
-			choicesGroup.add(radio);
-			menu.add(radio);
-		}
-
-		config.registerCallback(updated -> {
-			final JRadioButtonMenuItem choiceItem = radiosByChoice.get(updated.value());
-
-			if (!choiceItem.isSelected()) {
-				choiceItem.setSelected(true);
-				onUpdate.run();
-			}
-		});
-
-		return menu;
-	}
-
 	private final JCheckBoxMenuItem tooltip = GuiUtil
 			.createSyncedMenuCheckBox(Config.editor().entryMarkers.tooltip);
 
-	private final JMenu maxMarkersPerLineMenu = createIntConfigRadioMenu(
+	private final JMenu maxMarkersPerLineMenu = GuiUtil.createIntConfigRadioMenu(
 			Config.editor().entryMarkers.maxMarkersPerLine,
 			MIN_MAX_MARKERS_PER_LINE, MAX_MAX_MARKERS_PER_LINE,
 			this::translateMarkersPerLineMenu