1 files changed, 30 insertions, 45 deletions

diff --git a/src/main/ui/BrowserBar.java b/src/main/ui/BrowserBar.java
index e9db3c3..131fe19 100644
--- a/src/main/ui/BrowserBar.java
+++ b/src/main/ui/BrowserBar.java
@@ -2,19 +2,17 @@ package ui;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.event.*;
 import java.util.*;
 
-// BrowserBar
 public class BrowserBar extends JToolBar {
-    private BrowserWindow parent;
+    private final BrowserWindow parent;
 
-    private JPopupMenu tabMenu;
-    private JToggleButton tabButton;
-    private JTextField uriInput;
-//    private JButton saveTabsButton;
-    private JButton openUriButton;
+    private final JPopupMenu tabMenu;
+    private final JToggleButton tabButton;
+    private final JTextField uriInput;
+//    private final JButton saveTabsButton;
+    private final JButton openUriButton;
 
     public BrowserBar(BrowserWindow parent) {
         this.parent = parent;
@@ -34,36 +32,28 @@ public class BrowserBar extends JToolBar {
 
     }
 
-    // EFFECTS: opens the content of the text field in the current tab
     private ActionListener openTab() {
-        return new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                String uri = uriInput.getText();
-                parent.render(uri);
-                addTab(uri);
-            }
+        return actionEvent -> {
+            String uri = uriInput.getText();
+            parent.render(uri);
+            addTab(uri);
         };
     }
 
-    // EFFECTS: adds a new tab pointing to URI in the background
     public void addTab(String tab) {
         JToggleButton tabButton = new JToggleButton(tab);
 
-        tabButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                int action = JOptionPane.showOptionDialog(null,
-                        "Open or close this tab?", "apus",
-                        JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE,
-                        null, new String[]{"Open", "Close"}, "Open");
-                if (action == 0) {
-                    parent.render(tab);
-                } else {
-                    tabMenu.remove(tabButton);
-                    tabMenu.setVisible(false);
-                    parent.getBrowserState().removeTab(tab);
-                }
+        tabButton.addActionListener(actionEvent -> {
+            int action = JOptionPane.showOptionDialog(null,
+                    "Open or close this tab?", "apus",
+                    JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE,
+                    null, new String[]{"Open", "Close"}, "Open");
+            if (action == 0) {
+                parent.render(tab);
+            } else {
+                tabMenu.remove(tabButton);
+                tabMenu.setVisible(false);
+                parent.getBrowserState().removeTab(tab);
             }
         });
 
@@ -71,20 +61,15 @@ public class BrowserBar extends JToolBar {
         parent.getBrowserState().addTab(tab);
     }
 
-    // MODIFIES: this
-    // EFFECTS: toggles the tab menu
     private ActionListener toggleTabMenu() {
-        return new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                if (tabButton.isSelected()) {
-                    Point location = tabButton.getLocationOnScreen();
-                    location.translate(0, 30); // fuck this method lol
-                    tabMenu.setLocation(location);
-                    tabMenu.setVisible(true);
-                } else {
-                    tabMenu.setVisible(false);
-                }
+        return actionEvent -> {
+            if (tabButton.isSelected()) {
+                Point location = tabButton.getLocationOnScreen();
+                location.translate(0, 30); // fuck this method lol
+                tabMenu.setLocation(location);
+                tabMenu.setVisible(true);
+            } else {
+                tabMenu.setVisible(false);
             }
         };
     }