Remove checking for Burp capabilities.

src/main/java/Extension.java

@@ -1,6 +1,5 @@
 import bcheck.BCheckImporter;
-import bcheck.BCheckImporterFactory;
-import burp.Burp;
+import bcheck.BCheckImporter.DefaultBCheckImporter;
 import burp.api.montoya.BurpExtension;
 import burp.api.montoya.MontoyaApi;
 import burp.api.montoya.persistence.Persistence;
@@ -32,8 +31,7 @@ public void initialize(MontoyaApi api) {
         SettingsController settingsController = new SettingsController(persistence.preferences());
         Logger logger = new Logger(api.logging(), settingsController.debugSettings());
 
-        Burp burp = new Burp(api.burpSuite().version());
-        Repository repository = RepositoryFacadeFactory.from(logger, api.http(), settingsController, burp);
+        Repository repository = RepositoryFacadeFactory.from(logger, api.http(), settingsController);
         CloseablePooledExecutor executor = new CloseablePooledExecutor();
 
         IconFactory iconFactory = new IconFactory(api.userInterface());
@@ -42,7 +40,7 @@ public void initialize(MontoyaApi api) {
 
         AtomicReference<StorefrontModel> modelReference = new AtomicReference<>();
         StorefrontModel lateInitializationStorefrontModel = new LateInitializationStorefrontModel(modelReference::get);
-        BCheckImporter bCheckImporter = BCheckImporterFactory.from(api, burp, logger);
+        BCheckImporter bCheckImporter = new DefaultBCheckImporter(api.scanner().bChecks(), logger);
 
         StoreController storeController = new StoreController(
                 lateInitializationStorefrontModel,
@@ -60,7 +58,6 @@ public void initialize(MontoyaApi api) {
         Storefront storefront = new Storefront(
                 storeController,
                 storefrontModel,
-                burp,
                 settingsController.defaultSaveLocationSettings(),
                 executor,
                 iconFactory,

src/main/java/bcheck/BCheckImporter.java

@@ -7,12 +7,6 @@
 public interface BCheckImporter {
     void importBCheck(BCheck bCheck);
 
-    class NullBCheckImporter implements BCheckImporter {
-        @Override
-        public void importBCheck(BCheck bCheck) {
-        }
-    }
-
     class DefaultBCheckImporter implements BCheckImporter {
         private final BChecks bChecks;
         private final Logger logger;

src/main/java/network/RequestSender.java

@@ -1,27 +1,23 @@
 package network;
 
-import burp.Burp;
 import burp.api.montoya.http.Http;
 import burp.api.montoya.http.message.requests.HttpRequest;
 import burp.api.montoya.http.message.responses.HttpResponse;
 import logging.Logger;
 
 import java.util.Map;
 
-import static burp.Burp.Capability.TLS_VERIFICATION;
 import static burp.api.montoya.http.RequestOptions.requestOptions;
 import static burp.api.montoya.http.message.StatusCodeClass.*;
 import static burp.api.montoya.http.message.requests.HttpRequest.httpRequestFromUrl;
 
 public class RequestSender {
     private final Http http;
     private final Logger logger;
-    private final Burp burp;
 
-    public RequestSender(Http http, Logger logger, Burp burp) {
+    public RequestSender(Http http, Logger logger) {
         this.http = http;
         this.logger = logger;
-        this.burp = burp;
     }
 
     public HttpResponse sendRequest(String url, Map<String, String> headers) {
@@ -33,9 +29,7 @@ public HttpResponse sendRequest(String url, Map<String, String> headers) {
 
         logger.logDebug("Requesting " + url);
 
-        HttpResponse response = burp.hasCapability(TLS_VERIFICATION)
-                ? http.sendRequest(request, requestOptions().withUpstreamTLSVerification()).response()
-                : http.sendRequest(request).response();
+        HttpResponse response = http.sendRequest(request, requestOptions().withUpstreamTLSVerification()).response();
 
         if (response.isStatusCodeClass(CLASS_4XX_CLIENT_ERRORS) || response.isStatusCodeClass(CLASS_5XX_SERVER_ERRORS)) {
             String responseBody = response.bodyToString();

src/main/java/repository/RepositoryFacadeFactory.java

@@ -1,7 +1,6 @@
 package repository;
 
 import bcheck.BCheckFactory;
-import burp.Burp;
 import burp.api.montoya.http.Http;
 import client.GitHubClient;
 import file.finder.BCheckFileFinder;
@@ -13,8 +12,8 @@
 
 public class RepositoryFacadeFactory {
 
-    public static Repository from(Logger logger, Http http, SettingsController settingsController, Burp burp) {
-        RequestSender requestSender = new RequestSender(http, logger, burp);
+    public static Repository from(Logger logger, Http http, SettingsController settingsController) {
+        RequestSender requestSender = new RequestSender(http, logger);
         BCheckFactory bCheckFactory = new BCheckFactory(logger);
         GitHubClient gitHubClient = new GitHubClient(requestSender);
         TempFileCreator tempFileCreator = new TempFileCreator(logger);

src/main/java/ui/view/pane/storefront/BCheckPopupMenu.java

@@ -1,19 +1,13 @@
 package ui.view.pane.storefront;
 
-import burp.Burp;
-
 import javax.swing.*;
 
-import static burp.Burp.Capability.BCHECK_IMPORT;
-
 class BCheckPopupMenu extends JPopupMenu {
 
-    BCheckPopupMenu(ActionController actionController, Burp burp) {
-        if (burp.hasCapability(BCHECK_IMPORT)) {
-            JMenuItem importBCheckMenuItem = new JMenuItem("Import BCheck");
-            importBCheckMenuItem.addActionListener(l -> actionController.importSelectedBCheck());
-            add(importBCheckMenuItem);
-        }
+    BCheckPopupMenu(ActionController actionController) {
+        JMenuItem importBCheckMenuItem = new JMenuItem("Import BCheck");
+        importBCheckMenuItem.addActionListener(l -> actionController.importSelectedBCheck());
+        add(importBCheckMenuItem);
 
         JMenuItem copyBCheckMenuItem = new JMenuItem("Copy BCheck");
         copyBCheckMenuItem.addActionListener(l -> actionController.copySelectedBCheck());

src/main/java/ui/view/pane/storefront/PreviewPanel.java

@@ -1,14 +1,12 @@
 package ui.view.pane.storefront;
 
 import bcheck.BCheck;
-import burp.Burp;
 import ui.model.StorefrontModel;
 import ui.view.pane.storefront.ActionCallbacks.ButtonTogglingActionCallbacks;
 
 import javax.swing.*;
 import java.awt.*;
 
-import static burp.Burp.Capability.BCHECK_IMPORT;
 import static java.awt.BorderLayout.CENTER;
 import static java.awt.BorderLayout.SOUTH;
 import static java.awt.FlowLayout.LEADING;
@@ -18,19 +16,17 @@
 class PreviewPanel extends JPanel {
     private final StorefrontModel model;
     private final ActionController actionController;
-    private final Burp burp;
     private final JLabel statusLabel;
     private final JButton importButton;
     private final JButton copyButton;
     private final JButton saveButton;
     private final JButton saveAllButton;
 
-    PreviewPanel(StorefrontModel storefrontModel, ActionController actionController, Burp burp) {
+    PreviewPanel(StorefrontModel storefrontModel, ActionController actionController) {
         super(new BorderLayout());
 
         this.model = storefrontModel;
         this.actionController = actionController;
-        this.burp = burp;
 
         this.statusLabel = new JLabel();
         this.importButton = new JButton("Import");
@@ -77,7 +73,7 @@ private JTextArea buildCodePreview() {
         codePreview.setEditable(false);
         codePreview.setFont(monospacedFont);
         codePreview.setWrapStyleWord(true);
-        codePreview.setComponentPopupMenu(new BCheckPopupMenu(actionController, burp));
+        codePreview.setComponentPopupMenu(new BCheckPopupMenu(actionController));
 
         return codePreview;
     }
@@ -90,10 +86,7 @@ private JComponent buildActionPanel() {
         saveButton.addActionListener(e -> actionController.saveSelectedBCheck(new ButtonTogglingActionCallbacks(saveButton)));
         saveAllButton.addActionListener(e -> actionController.saveAllVisibleBChecks(new ButtonTogglingActionCallbacks(saveAllButton)));
 
-        if (burp.hasCapability(BCHECK_IMPORT)) {
-            actionPanel.add(importButton);
-        }
-
+        actionPanel.add(importButton);
         actionPanel.add(copyButton);
         actionPanel.add(saveButton);
         actionPanel.add(new JSeparator(VERTICAL));

src/main/java/ui/view/pane/storefront/Storefront.java

@@ -1,6 +1,5 @@
 package ui.view.pane.storefront;
 
-import burp.Burp;
 import logging.Logger;
 import settings.defaultsavelocation.DefaultSaveLocationSettingsReader;
 import ui.controller.StoreController;
@@ -21,7 +20,6 @@
 public class Storefront extends JPanel {
     public Storefront(StoreController storeController,
                       StorefrontModel storefrontModel,
-                      Burp burp,
                       DefaultSaveLocationSettingsReader saveLocationSettingsReader,
                       Executor executor,
                       IconFactory iconFactory,
@@ -37,13 +35,12 @@ public Storefront(StoreController storeController,
                 logger
         );
 
-        JPanel previewPanel = new PreviewPanel(storefrontModel, actionController, burp);
+        JPanel previewPanel = new PreviewPanel(storefrontModel, actionController);
 
         TablePanelController panelController = new DefaultTablePanelController(storeController);
         JPanel tablePanel = new TablePanel(
                 panelController,
                 storefrontModel,
-                burp,
                 executor,
                 iconFactory,
                 actionController,

src/main/java/ui/view/pane/storefront/TablePanel.java

@@ -2,7 +2,6 @@
 
 import bcheck.BCheck;
 import bcheck.BCheck.Tags;
-import burp.Burp;
 import settings.tags.TagColors;
 import ui.controller.TablePanelController;
 import ui.icons.IconFactory;
@@ -32,7 +31,6 @@ class TablePanel extends JPanel {
     private final JTable bCheckTable = new JTable();
     private final BCheckTableModel tableModel = new BCheckTableModel();
     private final JButton refreshButton = new JButton("Refresh");
-    private final Burp burp;
     private final Executor executor;
     private final JComponent searchBar;
     private final StorefrontModel model;
@@ -41,15 +39,13 @@ class TablePanel extends JPanel {
 
     TablePanel(TablePanelController panelController,
                StorefrontModel storefrontModel,
-               Burp burp,
                Executor executor,
                IconFactory iconFactory,
                ActionController actionController,
                Supplier<Font> fontSupplier) {
         super(new BorderLayout());
 
         this.panelController = panelController;
-        this.burp = burp;
         this.executor = executor;
         this.model = storefrontModel;
         this.actionController = actionController;
@@ -84,7 +80,7 @@ private void setupTablePanel() {
         model.setSearchFilter("");
         tableModel.setBChecks(model.getFilteredBChecks());
 
-        JPopupMenu popupMenu = new BCheckPopupMenu(actionController, burp);
+        JPopupMenu popupMenu = new BCheckPopupMenu(actionController);
         popupMenu.addPopupMenuListener(new InertPopupMenuListener()
         {
             @Override