use montoya api to create context menu highlight colors

Author: aress31

src/main/java/swurg/gui/components/menus/ParametersContextMenu.java

@@ -11,21 +11,27 @@
 import javax.swing.JTable;
 import javax.swing.SwingUtilities;
 
+import burp.api.montoya.MontoyaApi;
+import burp.api.montoya.core.HighlightColor;
+import burp.api.montoya.ui.swing.SwingUtils;
 import swurg.gui.components.tables.renderers.CustomTableCellRenderer;
 
 public class ParametersContextMenu extends JPopupMenu {
 
+  private final SwingUtils swingUtils;
+
   private final JTable table;
 
-  public ParametersContextMenu(JTable table) {
+  public ParametersContextMenu(MontoyaApi montoyaApi, JTable table) {
+    this.swingUtils = montoyaApi.userInterface().swingUtils();
+
     this.table = table;
 
     initComponents();
   }
 
   private void initComponents() {
-    JMenu highlightMenu = createHighlightMenu();
-    this.add(highlightMenu);
+    this.add(createHighlightMenu());
   }
 
   private void processSelectedRows(Consumer<Integer> action) {
@@ -39,9 +45,12 @@ private void processSelectedRows(Consumer<Integer> action) {
   private JMenu createHighlightMenu() {
     JMenu highlightMenu = new JMenu("Highlight");
 
-    Arrays.asList(null, Color.RED, Color.ORANGE, Color.YELLOW, Color.GREEN, Color.BLUE,
-        Color.MAGENTA, Color.PINK, Color.GRAY)
-        .forEach(color -> highlightMenu.add(createHighlightMenuItem(color)));
+    Arrays.stream(HighlightColor.values())
+        .forEach(highlightColor -> {
+          Color color = (highlightColor.compareTo(HighlightColor.NONE) == 0) ? null
+              : this.swingUtils.colorForHighLight(highlightColor);
+          highlightMenu.add(createHighlightMenuItem(color));
+        });
 
     return highlightMenu;
   }
@@ -56,9 +65,7 @@ private JMenuItem createHighlightMenuItem(Color color) {
     CustomTableCellRenderer renderer = (CustomTableCellRenderer) table.getDefaultRenderer(Object.class);
 
     menuItem.addActionListener(e -> processSelectedRows(index -> {
-      SwingUtilities.invokeLater(() -> {
-        renderer.setRowHighlightColor(index, color);
-      });
+      SwingUtilities.invokeLater(() -> renderer.setRowHighlightColor(index, color));
     }));
 
     return menuItem;

src/main/java/swurg/gui/components/menus/ParserContextMenu.java

@@ -20,22 +20,27 @@
 import javax.swing.SwingUtilities;
 
 import burp.api.montoya.MontoyaApi;
+import burp.api.montoya.core.HighlightColor;
 import burp.api.montoya.http.message.HttpRequestResponse;
 import burp.api.montoya.http.message.requests.HttpRequest;
 import burp.api.montoya.http.message.responses.HttpResponse;
 import burp.api.montoya.scanner.AuditConfiguration;
 import burp.api.montoya.scanner.BuiltInAuditConfiguration;
+import burp.api.montoya.ui.swing.SwingUtils;
 import swurg.gui.components.tables.models.ParserTableModel;
 import swurg.gui.components.tables.renderers.CustomTableCellRenderer;
 
 public class ParserContextMenu extends JPopupMenu {
 
   private final MontoyaApi montoyaApi;
+  private final SwingUtils swingUtils;
 
   private final JTable table;
 
   public ParserContextMenu(MontoyaApi montoyaApi, JTable table) {
     this.montoyaApi = montoyaApi;
+    this.swingUtils = montoyaApi.userInterface().swingUtils();
+
     this.table = table;
 
     initComponents();
@@ -205,9 +210,12 @@ private JMenuItem createSendToComparerMenuItem() {
   private JMenu createHighlightMenu() {
     JMenu highlightMenu = new JMenu("Highlight");
 
-    Arrays.asList(null, Color.RED, Color.ORANGE, Color.YELLOW, Color.GREEN, Color.BLUE,
-        Color.MAGENTA, Color.PINK, Color.GRAY)
-        .forEach(color -> highlightMenu.add(createHighlightMenuItem(color)));
+    Arrays.stream(HighlightColor.values())
+        .forEach(highlightColor -> {
+          Color color = (highlightColor.compareTo(HighlightColor.NONE) == 0) ? null
+              : this.swingUtils.colorForHighLight(highlightColor);
+          highlightMenu.add(createHighlightMenuItem(color));
+        });
 
     return highlightMenu;
   }
@@ -222,9 +230,7 @@ private JMenuItem createHighlightMenuItem(Color color) {
     CustomTableCellRenderer renderer = (CustomTableCellRenderer) table.getDefaultRenderer(Object.class);
 
     menuItem.addActionListener(e -> processSelectedRows(index -> {
-      SwingUtilities.invokeLater(() -> {
-        renderer.setRowHighlightColor(index, color);
-      });
+      SwingUtilities.invokeLater(() -> renderer.setRowHighlightColor(index, color));
     }));
 
     return menuItem;

src/main/java/swurg/gui/views/ParametersPanel.java

@@ -44,6 +44,7 @@
 public class ParametersPanel extends JPanel
         implements HttpHandler, TableModelObserver {
 
+    private final MontoyaApi montoyaApi;
     private final Frame suiteFrame;
 
     private final ParametersTableModel parametersTableModel;
@@ -61,6 +62,7 @@ public class ParametersPanel extends JPanel
     private JScrollPane scrollPane;
 
     public ParametersPanel(MontoyaApi montoyaApi) {
+        this.montoyaApi = montoyaApi;
         this.suiteFrame = montoyaApi.userInterface().swingUtils().suiteFrame();
 
         this.parametersTableModel = new ParametersTableModel();
@@ -94,7 +96,7 @@ private void initComponents() {
         this.setLayout(new BorderLayout());
 
         TablePanel tablePanel = new TablePanel(parametersTableModel, new CustomTableCellRenderer());
-        ParametersContextMenu contextMenu = new ParametersContextMenu(tablePanel.getTable());
+        ParametersContextMenu contextMenu = new ParametersContextMenu(this.montoyaApi, tablePanel.getTable());
         tablePanel.setContextMenu(contextMenu);
 
         this.add(createNorthPanel(), BorderLayout.NORTH);