Adds unfinished code showing the idea of how dockable tabs are supposed to be implemented

Also makes the control servers tab hidden if the servers are not running

src/main/java/net/knarcraft/minecraftserverlauncher/profile/Profile.java

@@ -141,14 +141,16 @@ public class Profile {
      * @param name <p>The name of the collection and its elements</p>
      */
     public void addCollection(String name) throws ConfigurationException {
-        if (name == null) { //If a user cancels or crosses out window
+        //Skip if no name was given
+        if (name == null) {
             return;
         }
         if (getCollection(name) == null && !name.equals("All") && CommonFunctions.nameIsValid(name)) {
             collections.add(new Collection(name));
         } else {
-            serverLauncherGui.showError("A server name must my unique and not empty or \"All\"." +
-                    "It can't contain any of the characters \"!\", \"?\" or \";\".");
+            serverLauncherGui.showError("A server name must be unique and not empty. " +
+                    "In addition, a server cannot be named: \"All\". " +
+                    "It cannot contain any of the characters \"!\", \"?\" or \";\".");
         }
     }
 

src/main/java/net/knarcraft/minecraftserverlauncher/profile/ServerLauncherController.java

@@ -379,7 +379,7 @@ public class ServerLauncherController {
      * Updates the GUI as necessary to display loaded data
      */
     private void executeGUILoadingTasks() {
-        this.serverLauncherGUI.updateProfiles();
+        this.serverLauncherGUI.getControlPanelTab().updateProfiles();
         this.serverLauncherGUI.updateWithSavedProfileData();
         this.currentProfile.updateConsoles();
         if (this.downloadAllJars) {

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/BackupGUI.java

@@ -2,10 +2,14 @@ package net.knarcraft.minecraftserverlauncher.userinterface;
 
 import net.knarcraft.minecraftserverlauncher.utility.BackupUtil;
 
+import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.IOException;
+
+import static net.knarcraft.minecraftserverlauncher.utility.CommonFunctions.getResourceAsStream;
 
 /**
  * The Backup GUI is used to display backup progress
@@ -33,6 +37,13 @@ public class BackupGUI implements ActionListener {
         frame = new JFrame("Running backup...");
         frame.setBounds(100, 100, 500, 140);
         frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+        ImageIcon img;
+        try {
+            img = new ImageIcon(ImageIO.read(getResourceAsStream("GUIIcon.png")));
+            frame.setIconImage(img.getImage());
+        } catch (IOException ignored) {
+        }
+
         progressTextArea = new JTextArea();
         progressTextArea.setEditable(false);
         progressBar = new JProgressBar();

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/CloseTabActionListener.java

@@ -0,0 +1,47 @@
+package net.knarcraft.minecraftserverlauncher.userinterface;
+
+import net.knarcraft.minecraftserverlauncher.Main;
+import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Listener for clicking the close button of a server tab
+ */
+public class CloseTabActionListener implements ActionListener {
+
+    private final String tabName;
+    private final JTabbedPane tabPane;
+
+    /**
+     * Instantiates a new close tab action listener
+     * @param tabPane <p>The tab pane containing all tabs</p>
+     * @param tabName <p>The name of the tab connected to this action listener</p>
+     */
+    public CloseTabActionListener(JTabbedPane tabPane, String tabName) {
+        this.tabName = tabName;
+        this.tabPane = tabPane;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent evt) {
+        int index = tabPane.indexOfTab(tabName);
+        if (index >= 0) {
+            //Abort if the user just mis-clicked
+            int answer = JOptionPane.showConfirmDialog(null,
+                    String.format("Do you really want to remove the server %s?", tabName), "Remove server",
+                    JOptionPane.YES_NO_OPTION
+            );
+            if (answer == JOptionPane.YES_NO_OPTION) {
+                //Remove the server
+                ServerLauncherController controller = Main.getController();
+                controller.getCurrentProfile().removeCollection(tabName);
+                controller.getGUI().updateWithSavedProfileData();
+                controller.getCurrentProfile().updateConsoles();
+            }
+        }
+    }
+
+}

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/ControlPanelTab.java

@@ -0,0 +1,217 @@
+package net.knarcraft.minecraftserverlauncher.userinterface;
+
+import net.knarcraft.minecraftserverlauncher.Main;
+import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
+import net.knarcraft.minecraftserverlauncher.server.ServerHandler;
+import net.knarcraft.minecraftserverlauncher.utility.BackupUtil;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.util.concurrent.Executors;
+
+public class ControlPanelTab implements ActionListener {
+
+    private JButton startServerButton;
+    private JButton stopServerButton;
+    private JButton backupButton;
+    private JButton addProfileButton;
+    private JButton showConsolesButton;
+    private JButton deleteProfileButton;
+    private JComboBox<String> profiles;
+    private final JPanel controlPanelPanel;
+    private final ServerLauncherController controller;
+    private final JLabel statusLabel = new JLabel("Servers are stopped");
+
+    public ControlPanelTab(JPanel controlPanelPanel) {
+        this.controlPanelPanel = controlPanelPanel;
+        this.controller = Main.getController();
+        initialize();
+    }
+
+    /**
+     * Sets the text of the status label
+     * @param text <p>The new text of the status label</p>
+     */
+    public void setStatusText(String text) {
+        this.statusLabel.setText(text);
+    }
+
+    /**
+     * Updates the ServerLauncherGUI components to block a user from doing illegal actions
+     *
+     * @param running <p>Whether the servers are currently running</p>
+     */
+    public void updateGUIElementsWhenServersStartOrStop(boolean running) {
+        boolean stopped = !running; //Most gui is only enabled when the server is stopped rather than running.
+        profiles.setEnabled(stopped);
+        addProfileButton.setEnabled(stopped);
+        deleteProfileButton.setEnabled(stopped);
+        startServerButton.setEnabled(stopped);
+        stopServerButton.setEnabled(running);
+    }
+
+    /**
+     * Stops all servers
+     */
+    public void stopServers() {
+        GUI gui = Main.getController().getGUI();
+        try {
+            gui.setStatus("Servers are stopping...");
+            ServerHandler.stop();
+        } catch (IOException e1) {
+            gui.showError("Could not stop server.");
+            e1.printStackTrace();
+        } catch (InterruptedException e) {
+            gui.showError("Could not kill server.");
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Gets the currently selected profile
+     *
+     * @return <p>The currently selected profile or null</p>
+     */
+    public String getSelectedProfile() {
+        Object selectedProfile = profiles.getSelectedItem();
+        if (selectedProfile != null) {
+            return selectedProfile.toString();
+        } else {
+            return null;
+        }
+
+    }
+
+    /**
+     * Updates the profiles combo
+     */
+    public void updateProfiles() {
+        String selectedProfile = Main.getController().getCurrentProfile().getName();
+        this.profiles.removeAllItems();
+        for (String profile : Main.getController().getProfileNames()) {
+            this.profiles.addItem(profile);
+        }
+        this.profiles.setSelectedItem(selectedProfile);
+    }
+
+    /**
+     * Deletes the selected profile
+     */
+    private void deleteProfile() {
+        Object selected = profiles.getSelectedItem();
+        int answer = JOptionPane.showConfirmDialog(null,
+                String.format("Do you really want to remove the profile %s?", selected), "Remove profile",
+                JOptionPane.YES_NO_OPTION
+        );
+        if (answer == JOptionPane.YES_NO_OPTION) {
+            if (selected != null) {
+                controller.removeProfile(selected.toString());
+                updateProfiles();
+            }
+        }
+    }
+
+    /**
+     * Saves the previous profile and loads data from the new profile
+     */
+    private void changeProfile() {
+        controller.saveState();
+        Object current = this.profiles.getSelectedItem();
+        if (current != null) {
+            controller.setCurrentProfile(current.toString());
+        }
+        controller.getGUI().updateWithSavedProfileData();
+        controller.getCurrentProfile().updateConsoles();
+    }
+
+    private void initialize() {
+        SpringLayout springLayout = new SpringLayout();
+        controlPanelPanel.setLayout(springLayout);
+
+        JLabel lblBasicControls = new JLabel("Basic controls");
+        springLayout.putConstraint(SpringLayout.NORTH, lblBasicControls, 10, SpringLayout.NORTH, controlPanelPanel);
+        controlPanelPanel.add(lblBasicControls);
+
+        startServerButton = new JButton("Start servers");
+        springLayout.putConstraint(SpringLayout.WEST, lblBasicControls, 0, SpringLayout.WEST, startServerButton);
+        springLayout.putConstraint(SpringLayout.NORTH, startServerButton, 6, SpringLayout.SOUTH, lblBasicControls);
+        springLayout.putConstraint(SpringLayout.WEST, startServerButton, 10, SpringLayout.WEST, controlPanelPanel);
+        controlPanelPanel.add(startServerButton);
+        startServerButton.addActionListener(this);
+
+        stopServerButton = new JButton("Stop servers");
+        springLayout.putConstraint(SpringLayout.NORTH, stopServerButton, 0, SpringLayout.NORTH, startServerButton);
+        springLayout.putConstraint(SpringLayout.WEST, stopServerButton, 6, SpringLayout.EAST, startServerButton);
+        controlPanelPanel.add(stopServerButton);
+        stopServerButton.addActionListener(this);
+
+        showConsolesButton = new JButton("View server consoles");
+        springLayout.putConstraint(SpringLayout.NORTH, showConsolesButton, 0, SpringLayout.NORTH, stopServerButton);
+        springLayout.putConstraint(SpringLayout.WEST, showConsolesButton, 6, SpringLayout.EAST, stopServerButton);
+        controlPanelPanel.add(showConsolesButton);
+        showConsolesButton.addActionListener(this);
+
+        backupButton = new JButton("Backup");
+        springLayout.putConstraint(SpringLayout.NORTH, backupButton, 0, SpringLayout.NORTH, showConsolesButton);
+        springLayout.putConstraint(SpringLayout.WEST, backupButton, 6, SpringLayout.EAST, showConsolesButton);
+        controlPanelPanel.add(backupButton);
+        backupButton.addActionListener(this);
+
+        JLabel profileLabel = new JLabel("Profile");
+        springLayout.putConstraint(SpringLayout.NORTH, profileLabel, 6, SpringLayout.SOUTH, startServerButton);
+        springLayout.putConstraint(SpringLayout.WEST, profileLabel, 10, SpringLayout.WEST, controlPanelPanel);
+        controlPanelPanel.add(profileLabel);
+
+        addProfileButton = new JButton("+");
+        springLayout.putConstraint(SpringLayout.NORTH, addProfileButton, 6, SpringLayout.SOUTH, profileLabel);
+        springLayout.putConstraint(SpringLayout.WEST, addProfileButton, 10, SpringLayout.WEST, controlPanelPanel);
+        controlPanelPanel.add(addProfileButton);
+        addProfileButton.addActionListener(this);
+
+        deleteProfileButton = new JButton("-");
+        springLayout.putConstraint(SpringLayout.NORTH, deleteProfileButton, 0, SpringLayout.NORTH, addProfileButton);
+        springLayout.putConstraint(SpringLayout.WEST, deleteProfileButton, 6, SpringLayout.EAST, addProfileButton);
+        controlPanelPanel.add(deleteProfileButton);
+        deleteProfileButton.addActionListener(this);
+
+        profiles = new JComboBox<>();
+        springLayout.putConstraint(SpringLayout.NORTH, profiles, 0, SpringLayout.NORTH, addProfileButton);
+        springLayout.putConstraint(SpringLayout.WEST, profiles, 6, SpringLayout.EAST, deleteProfileButton);
+        springLayout.putConstraint(SpringLayout.EAST, profiles, 124, SpringLayout.EAST, deleteProfileButton);
+        controlPanelPanel.add(profiles);
+        profiles.addActionListener(this);
+
+        springLayout.putConstraint(SpringLayout.NORTH, statusLabel, 6, SpringLayout.SOUTH, addProfileButton);
+        springLayout.putConstraint(SpringLayout.SOUTH, statusLabel, -10, SpringLayout.SOUTH, controlPanelPanel);
+        springLayout.putConstraint(SpringLayout.WEST, statusLabel, 10, SpringLayout.WEST, controlPanelPanel);
+        springLayout.putConstraint(SpringLayout.EAST, statusLabel, -10, SpringLayout.EAST, controlPanelPanel);
+        statusLabel.setFont(new Font("", Font.BOLD, 12));
+        controlPanelPanel.add(statusLabel);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent actionEvent) {
+        Object actionSource = actionEvent.getSource();
+        if (actionSource == startServerButton) {
+            controller.saveState();
+            Executors.newSingleThreadExecutor().execute(ServerHandler::startServers);
+        } else if (actionSource == stopServerButton) {
+            stopServers();
+        } else if (actionSource == backupButton) {
+            //Run backup in its own thread to prevent locking up
+            Executors.newSingleThreadExecutor().execute(() -> BackupUtil.backup(controller.getGUI()));
+        } else if (actionSource == addProfileButton) {
+            controller.addProfile(JOptionPane.showInputDialog("Profile name: "));
+            updateProfiles();
+        } else if (actionSource == deleteProfileButton) {
+            deleteProfile();
+        } else if (actionSource == profiles) {
+            changeProfile();
+        } else if (actionSource == showConsolesButton) {
+            ServerConsoles.setAsVisible();
+        }
+    }
+}

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/JDockableTabbedPane.java

@@ -0,0 +1,35 @@
+package net.knarcraft.minecraftserverlauncher.userinterface;
+
+import javax.swing.*;
+
+/**
+ * An extended JTabbedPane with dockable tabs
+ */
+public class JDockableTabbedPane extends JTabbedPane {
+
+    private String tabbedPaneId;
+
+    public JDockableTabbedPane(String tabbedPaneId) {
+        super();
+        this.tabbedPaneId = tabbedPaneId;
+    }
+
+    public JDockableTabbedPane(String tabbedPaneId, int tabPlacement) {
+        super(tabPlacement);
+        this.tabbedPaneId = tabbedPaneId;
+    }
+
+    public JDockableTabbedPane(String tabbedPaneId, int tabPlacement, int tabLayoutPolicy) {
+        super(tabPlacement, tabLayoutPolicy);
+        this.tabbedPaneId = tabbedPaneId;
+    }
+
+    /**
+     * Gets the id of this tabbed pane
+     * @return <p>The id of this tabbed pane</p>
+     */
+    public String getTabbedPaneId() {
+        return tabbedPaneId;
+    }
+
+}

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/ServerConsoles.java

@@ -1,7 +1,11 @@
 package net.knarcraft.minecraftserverlauncher.userinterface;
 
+import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
+import java.io.IOException;
+
+import static net.knarcraft.minecraftserverlauncher.utility.CommonFunctions.getResourceAsStream;
 
 /**
  * This class keeps track of all consoles
@@ -31,6 +35,12 @@ public class ServerConsoles {
             frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
             consolesTabbedPane = new JTabbedPane(JTabbedPane.TOP);
             frame.getContentPane().add(consolesTabbedPane, BorderLayout.CENTER);
+            ImageIcon img;
+            try {
+                img = new ImageIcon(ImageIO.read(getResourceAsStream("GUIIcon.png")));
+                frame.setIconImage(img.getImage());
+            } catch (IOException ignored) {
+            }
         }
     }
 

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/ServerControlTab.java

@@ -22,7 +22,6 @@ public class ServerControlTab implements ActionListener {
     private JButton customCommandButton;
     private JButton saveServerButton;
     private JButton reloadButton;
-    private JButton showConsolesButton;
     private JTextField customCommandTextField;
 
     private final ServerLauncherController controller = ServerLauncherController.getInstance();
@@ -134,13 +133,6 @@ public class ServerControlTab implements ActionListener {
         springLayout.putConstraint(SpringLayout.EAST, reloadButton, 0, SpringLayout.EAST, opButton);
         controlServers.add(reloadButton);
         reloadButton.addActionListener(this);
-
-        showConsolesButton = new JButton("View server consoles");
-        springLayout.putConstraint(SpringLayout.NORTH, showConsolesButton, 0, SpringLayout.NORTH, saveServerButton);
-        springLayout.putConstraint(SpringLayout.WEST, showConsolesButton, 0, SpringLayout.WEST, lblTargetServer);
-        springLayout.putConstraint(SpringLayout.EAST, showConsolesButton, 0, SpringLayout.EAST, targetServerCombo);
-        controlServers.add(showConsolesButton);
-        showConsolesButton.addActionListener(this);
     }
 
     /**
@@ -181,9 +173,7 @@ public class ServerControlTab implements ActionListener {
         //Registers actions on all commands executed on a specific server
         handleServerCommands(actionSource, selectedServerValue);
 
-        if (actionSource == showConsolesButton) {
-            ServerConsoles.setAsVisible();
-        } else if (actionSource == targetServerCombo) {
+        if (actionSource == targetServerCombo) {
             updatePlayers();
         }
     }

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/ServerLauncherGUI.java

@@ -3,12 +3,11 @@ package net.knarcraft.minecraftserverlauncher.userinterface;
 import net.knarcraft.minecraftserverlauncher.Main;
 import net.knarcraft.minecraftserverlauncher.profile.Collection;
 import net.knarcraft.minecraftserverlauncher.profile.ServerLauncherController;
-import net.knarcraft.minecraftserverlauncher.server.ServerHandler;
-import net.knarcraft.minecraftserverlauncher.utility.BackupUtil;
 
 import javax.imageio.ImageIO;
 import javax.naming.ConfigurationException;
 import javax.swing.*;
+import javax.swing.plaf.basic.BasicButtonUI;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -18,7 +17,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Scanner;
-import java.util.concurrent.Executors;
 
 import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE;
 import static net.knarcraft.minecraftserverlauncher.utility.CommonFunctions.getResourceAsScanner;
@@ -33,25 +31,19 @@ import static net.knarcraft.minecraftserverlauncher.utility.CommonFunctions.getR
  */
 public class ServerLauncherGUI extends MessageHandler implements ActionListener, GUI {
 
-    private final JLabel lblStatusLabel = new JLabel("Servers are stopped");
     private final ServerLauncherController controller;
     private Map<String, String> textStrings;
     private Tray applicationTray;
 
     private JFrame frame;
-    private JTabbedPane tabbedPane;
+    private JTabbedPane mainTabbedPane;
     private JTabbedPane serversPane;
     private ServerControlTab serverControlTab;
+    private ControlPanelTab controlPanelTab;
     private ServerLauncherMenu serverLauncherMenu;
 
-    //Basic controls
-    private JButton startServerButton;
-    private JButton stopServerButton;
-    private JButton addServerButton;
-    private JButton backupButton;
-    private JButton addProfileButton;
-    private JButton deleteProfileButton;
-    private JComboBox<String> profiles;
+    private JButton addServerTabButton;
+    private JButton addServerPaneButton;
 
     /**
      * Creates the application window
@@ -99,9 +91,17 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
         return this.serversPane;
     }
 
+    /**
+     * Gets this GUI's control panel tab
+     * @return <p>The control panel tab for this GUI</p>
+     */
+    public ControlPanelTab getControlPanelTab() {
+        return this.controlPanelTab;
+    }
+
     @Override
     public void setStatus(String text) {
-        this.lblStatusLabel.setText(text);
+        controlPanelTab.setStatusText(text);
         this.logMessage(text);
     }
 
@@ -120,18 +120,6 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
         return chooser.getSelectedFile();
     }
 
-    /**
-     * Updates the profiles combo
-     */
-    public void updateProfiles() {
-        String selectedProfile = Main.getController().getCurrentProfile().getName();
-        this.profiles.removeAllItems();
-        for (String profile : Main.getController().getProfileNames()) {
-            this.profiles.addItem(profile);
-        }
-        this.profiles.setSelectedItem(selectedProfile);
-    }
-
     /**
      * Gets the server control tab used by this GUI
      *
@@ -160,7 +148,82 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
         serverControlTab.update();
         for (Collection collection : controller.getCurrentProfile().getCollections()) {
             serversPane.addTab(collection.getName(), collection.getServerTab().getPanel());
+            addCloseButtonToServerTab(collection.getName());
         }
+        addAddButtonToServerTab();
+    }
+
+    /**
+     * Adds an add button to the servers tab's tabs
+     */
+    private void addAddButtonToServerTab() {
+        JPanel tabPanel = new JPanel();
+        tabPanel.setLayout(new GridLayout());
+        tabPanel.setOpaque(false);
+
+        JPanel tabContentsPanel = new JPanel(new SpringLayout());
+        serversPane.addTab("Add tab", tabContentsPanel);
+
+        addServerTabButton = getAddServerButton(true);
+        addServerTabButton.addActionListener(this);
+        addServerPaneButton = getAddServerButton(false);
+        addServerPaneButton.addActionListener(this);
+        
+        tabContentsPanel.add(addServerTabButton);
+        tabPanel.add(addServerPaneButton);
+        serversPane.setTabComponentAt(serversPane.getTabCount() - 1, tabPanel);
+    }
+
+    /**
+     * Gets a button for adding a new server
+     * @param displayButtonStyle <p>Whether to show or hide the button's style</p>
+     * @return <p>A new add server button</p>
+     */
+    private JButton getAddServerButton(boolean displayButtonStyle) {
+        JButton addButton = new JButton("+ Add server");
+        if (!displayButtonStyle) {
+            addButton.setBorder(BorderFactory.createEtchedBorder());
+            addButton.setFocusable(false);
+            addButton.setBorderPainted(false);
+            addButton.setContentAreaFilled(false);
+            addButton.setRolloverEnabled(true);
+            addButton.setUI(new BasicButtonUI());
+        }
+        return addButton;
+    }
+
+    /**
+     *
+     * @param serverName <p>The name of the server/tab to add a close button to</p>
+     */
+    private void addCloseButtonToServerTab(String serverName) {
+        int index = serversPane.indexOfTab(serverName);
+        JPanel tabPanel = new JPanel(new GridBagLayout());
+        tabPanel.setOpaque(false);
+        JLabel serverTitleLabel = new JLabel(serverName);
+        JButton removeServerButton = new JButton("(X)");
+        removeServerButton.setBorder(BorderFactory.createEtchedBorder());
+        removeServerButton.setFocusable(false);
+        removeServerButton.setBorderPainted(false);
+        removeServerButton.setContentAreaFilled(false);
+        removeServerButton.setRolloverEnabled(true);
+        removeServerButton.setPreferredSize(new Dimension(18, 17));
+        removeServerButton.setUI(new BasicButtonUI());
+
+        GridBagConstraints gridBagConstraints = new GridBagConstraints();
+        gridBagConstraints.gridx = 0;
+        gridBagConstraints.gridy = 0;
+        gridBagConstraints.weightx = 1;
+
+        tabPanel.add(serverTitleLabel, gridBagConstraints);
+
+        gridBagConstraints.gridx++;
+        gridBagConstraints.weightx = 0;
+        tabPanel.add(removeServerButton, gridBagConstraints);
+
+        serversPane.setTabComponentAt(index, tabPanel);
+
+        removeServerButton.addActionListener(new CloseTabActionListener(serversPane, serverName));
     }
 
     /**
@@ -194,93 +257,30 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
 
         this.serverLauncherMenu = new ServerLauncherMenu(menuBar, this);
 
-        tabbedPane = new JTabbedPane(JTabbedPane.TOP);
-        frame.getContentPane().add(tabbedPane);
+        mainTabbedPane = new JTabbedPane(JTabbedPane.TOP);
+        frame.getContentPane().add(mainTabbedPane);
 
-        JPanel panelBasic = new JPanel();
-        tabbedPane.addTab("Control panel", null, panelBasic, null);
-        SpringLayout sl_panel = new SpringLayout();
-        panelBasic.setLayout(sl_panel);
+        JPanel controlPanelPanel = new JPanel();
+        mainTabbedPane.addTab("Control panel", null, controlPanelPanel, null);
+        controlPanelTab = new ControlPanelTab(controlPanelPanel);
 
-        JLabel lblBasicControls = new JLabel("Basic controls");
-        sl_panel.putConstraint(SpringLayout.NORTH, lblBasicControls, 10, SpringLayout.NORTH, panelBasic);
-        panelBasic.add(lblBasicControls);
+        JPanel controlServersPanel = new JPanel();
+        mainTabbedPane.addTab("Control servers", null, controlServersPanel, null);
+        serverControlTab = new ServerControlTab(frame, controlServersPanel);
 
-        startServerButton = new JButton("Start servers");
-        sl_panel.putConstraint(SpringLayout.WEST, lblBasicControls, 0, SpringLayout.WEST, startServerButton);
-        sl_panel.putConstraint(SpringLayout.NORTH, startServerButton, 6, SpringLayout.SOUTH, lblBasicControls);
-        sl_panel.putConstraint(SpringLayout.WEST, startServerButton, 10, SpringLayout.WEST, panelBasic);
-        panelBasic.add(startServerButton);
-        startServerButton.addActionListener(this);
+        JPanel serversPanel = new JPanel();
+        mainTabbedPane.addTab("Servers", null, serversPanel, null);
+        SpringLayout serversPanelSpringLayout = new SpringLayout();
+        serversPanel.setLayout(serversPanelSpringLayout);
 
-        stopServerButton = new JButton("Stop servers");
-        sl_panel.putConstraint(SpringLayout.NORTH, stopServerButton, 0, SpringLayout.NORTH, startServerButton);
-        sl_panel.putConstraint(SpringLayout.WEST, stopServerButton, 6, SpringLayout.EAST, startServerButton);
-        panelBasic.add(stopServerButton);
-        stopServerButton.addActionListener(this);
+        serversPane = new JTabbedPane(JTabbedPane.TOP);
+        serversPanelSpringLayout.putConstraint(SpringLayout.NORTH, serversPane, 0, SpringLayout.NORTH, serversPanel);
+        serversPanelSpringLayout.putConstraint(SpringLayout.WEST, serversPane, 0, SpringLayout.WEST, serversPanel);
+        serversPanelSpringLayout.putConstraint(SpringLayout.SOUTH, serversPane, 0, SpringLayout.SOUTH, serversPanel);
+        serversPanelSpringLayout.putConstraint(SpringLayout.EAST, serversPane, 0, SpringLayout.EAST, serversPanel);
+        serversPanel.add(serversPane);
 
-        JLabel lblProfile = new JLabel("Profile");
-        sl_panel.putConstraint(SpringLayout.NORTH, lblProfile, 6, SpringLayout.SOUTH, startServerButton);
-        sl_panel.putConstraint(SpringLayout.WEST, lblProfile, 10, SpringLayout.WEST, panelBasic);
-        panelBasic.add(lblProfile);
-
-        addProfileButton = new JButton("+");
-        sl_panel.putConstraint(SpringLayout.NORTH, addProfileButton, 6, SpringLayout.SOUTH, lblProfile);
-        sl_panel.putConstraint(SpringLayout.WEST, addProfileButton, 10, SpringLayout.WEST, panelBasic);
-        panelBasic.add(addProfileButton);
-        addProfileButton.addActionListener(this);
-
-        deleteProfileButton = new JButton("-");
-        sl_panel.putConstraint(SpringLayout.NORTH, deleteProfileButton, 0, SpringLayout.NORTH, addProfileButton);
-        sl_panel.putConstraint(SpringLayout.WEST, deleteProfileButton, 6, SpringLayout.EAST, addProfileButton);
-        panelBasic.add(deleteProfileButton);
-        deleteProfileButton.addActionListener(this);
-
-        profiles = new JComboBox<>();
-        sl_panel.putConstraint(SpringLayout.NORTH, profiles, 0, SpringLayout.NORTH, addProfileButton);
-        sl_panel.putConstraint(SpringLayout.WEST, profiles, 6, SpringLayout.EAST, deleteProfileButton);
-        sl_panel.putConstraint(SpringLayout.EAST, profiles, 124, SpringLayout.EAST, deleteProfileButton);
-        panelBasic.add(profiles);
-        profiles.addActionListener(this);
-
-        sl_panel.putConstraint(SpringLayout.NORTH, lblStatusLabel, 6, SpringLayout.SOUTH, addProfileButton);
-        sl_panel.putConstraint(SpringLayout.SOUTH, lblStatusLabel, -10, SpringLayout.SOUTH, panelBasic);
-        sl_panel.putConstraint(SpringLayout.WEST, lblStatusLabel, 10, SpringLayout.WEST, panelBasic);
-        sl_panel.putConstraint(SpringLayout.EAST, lblStatusLabel, -10, SpringLayout.EAST, panelBasic);
-        panelBasic.add(lblStatusLabel);
-
-        addServerButton = new JButton("Add server");
-        sl_panel.putConstraint(SpringLayout.NORTH, addServerButton, 0, SpringLayout.NORTH, startServerButton);
-        sl_panel.putConstraint(SpringLayout.WEST, addServerButton, 6, SpringLayout.EAST, stopServerButton);
-        panelBasic.add(addServerButton);
-        addServerButton.addActionListener(this);
-
-        backupButton = new JButton("Backup");
-        sl_panel.putConstraint(SpringLayout.NORTH, backupButton, 0, SpringLayout.NORTH, startServerButton);
-        sl_panel.putConstraint(SpringLayout.WEST, backupButton, 6, SpringLayout.EAST, addServerButton);
-        panelBasic.add(backupButton);
-        backupButton.addActionListener(this);
-
-        JPanel controlServers = new JPanel();
-        tabbedPane.addTab("Control servers", null, controlServers, null);
-
-        serverControlTab = new ServerControlTab(frame, controlServers);
-
-
-        JPanel panel_2 = new JPanel();
-        tabbedPane.addTab("Servers", null, panel_2, null);
-        SpringLayout sl_panel_2 = new SpringLayout();
-        panel_2.setLayout(sl_panel_2);
-
-        JTabbedPane tabbedPane_1 = new JTabbedPane(JTabbedPane.TOP);
-        sl_panel_2.putConstraint(SpringLayout.NORTH, tabbedPane_1, 0, SpringLayout.NORTH, panel_2);
-        sl_panel_2.putConstraint(SpringLayout.WEST, tabbedPane_1, 0, SpringLayout.WEST, panel_2);
-        sl_panel_2.putConstraint(SpringLayout.SOUTH, tabbedPane_1, 0, SpringLayout.SOUTH, panel_2);
-        sl_panel_2.putConstraint(SpringLayout.EAST, tabbedPane_1, 0, SpringLayout.EAST, panel_2);
-        panel_2.add(tabbedPane_1);
-
-        this.serversPane = tabbedPane_1;
-        tabbedPane_1.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
+        serversPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
 
         frame.validate();
         frame.pack();
@@ -296,21 +296,6 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
         applicationTray.hideToTray();
     }
 
-    /**
-     * Gets the currently selected profile
-     *
-     * @return <p>The currently selected profile or null</p>
-     */
-    public String getSelectedProfile() {
-        Object selectedProfile = profiles.getSelectedItem();
-        if (selectedProfile != null) {
-            return selectedProfile.toString();
-        } else {
-            return null;
-        }
-
-    }
-
     @Override
     public void actionPerformed(ActionEvent e) {
         Object actionSource = e.getSource();
@@ -325,34 +310,8 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
      * @param actionSource <p>The object being interacted with</p>
      */
     private void handleMainTabButtons(Object actionSource) {
-        if (actionSource == startServerButton) {
-            controller.saveState();
-            Executors.newSingleThreadExecutor().execute(ServerHandler::startServers);
-        } else if (actionSource == stopServerButton) {
-            stopServers();
-        } else if (actionSource == addServerButton) {
+        if (actionSource == addServerTabButton || actionSource == addServerPaneButton) {
             addServer();
-        } else if (actionSource == backupButton) {
-            //Run backup in its own thread to prevent locking up
-            Executors.newSingleThreadExecutor().execute(() -> BackupUtil.backup(this));
-        } else if (actionSource == addProfileButton) {
-            controller.addProfile(JOptionPane.showInputDialog("Profile name: "));
-            updateProfiles();
-        } else if (actionSource == deleteProfileButton) {
-            deleteProfile();
-        } else if (actionSource == profiles) {
-            changeProfile();
-        }
-    }
-
-    /**
-     * Deletes the selected profile
-     */
-    private void deleteProfile() {
-        Object selected = profiles.getSelectedItem();
-        if (selected != null) {
-            controller.removeProfile(selected.toString());
-            updateProfiles();
         }
     }
 
@@ -377,42 +336,9 @@ public class ServerLauncherGUI extends MessageHandler implements ActionListener,
      */
     public void updateGUIElementsWhenServersStartOrStop(boolean running) {
         boolean stopped = !running; //Most gui is only enabled when the server is stopped rather than running.
-        profiles.setEnabled(stopped);
-        addProfileButton.setEnabled(stopped);
-        deleteProfileButton.setEnabled(stopped);
-        startServerButton.setEnabled(stopped);
-        addServerButton.setEnabled(stopped);
-        tabbedPane.setEnabledAt(2, stopped);
-        stopServerButton.setEnabled(running);
-    }
-
-    /**
-     * Saves the previous profile and loads data from the new profile
-     */
-    private void changeProfile() {
-        controller.saveState();
-        Object current = this.profiles.getSelectedItem();
-        if (current != null) {
-            controller.setCurrentProfile(current.toString());
-        }
-        this.updateWithSavedProfileData();
-        controller.getCurrentProfile().updateConsoles();
-    }
-
-    /**
-     * Stops all servers
-     */
-    public void stopServers() {
-        try {
-            setStatus("Servers are stopping...");
-            ServerHandler.stop();
-        } catch (IOException e1) {
-            showError("Could not stop server.");
-            e1.printStackTrace();
-        } catch (InterruptedException e) {
-            showError("Could not kill server.");
-            e.printStackTrace();
-        }
+        mainTabbedPane.setEnabledAt(1, !stopped);
+        mainTabbedPane.setEnabledAt(2, stopped);
+        controlPanelTab.updateGUIElementsWhenServersStartOrStop(running);
     }
 
     /**

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/ServerLauncherMenu.java

@@ -237,7 +237,7 @@ public class ServerLauncherMenu implements ActionListener {
      * Asks the user for a delay if checked, and sets the value to the current profile
      */
     private void delay() {
-        String selectedProfile = serverLauncherGUI.getSelectedProfile();
+        String selectedProfile = serverLauncherGUI.getControlPanelTab().getSelectedProfile();
         if (selectedProfile != null) {
             Profile profile = controller.getProfileByName(selectedProfile);
             if (delayStartupCheckBoxMenuItem.isSelected()) {
@@ -260,7 +260,7 @@ public class ServerLauncherMenu implements ActionListener {
      * Saves the runInBackground setting to the current profile
      */
     private void background() {
-        String selectedProfile = serverLauncherGUI.getSelectedProfile();
+        String selectedProfile = serverLauncherGUI.getControlPanelTab().getSelectedProfile();
         if (selectedProfile != null) {
             Profile profile = controller.getProfileByName(selectedProfile);
             Objects.requireNonNull(profile).setRunInBackground(runInBackgroundCheckBoxMenuItem.isSelected());
@@ -273,7 +273,7 @@ public class ServerLauncherMenu implements ActionListener {
      * Saves the downloadJars setting to the current profile
      */
     private void downloadJars() {
-        String selectedProfile = serverLauncherGUI.getSelectedProfile();
+        String selectedProfile = serverLauncherGUI.getControlPanelTab().getSelectedProfile();
         if (selectedProfile != null) {
             controller.setDownloadAllJars(downloadJarsCheckBoxMenuItem.isSelected());
         } else {

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/ServerTab.java

@@ -23,11 +23,9 @@ public class ServerTab implements ActionListener {
     private final JComboBox<String> serverVersions;
     private final JComboBox<String> maxRam;
     private final JCheckBox enabledCheckbox;
-    private final JButton removeServerButton;
     private final JButton browseButton;
     private final JTextField directory;
     private final JPanel panel;
-    private final String name;
 
     /**
      * Initializes a new server tab with the given name
@@ -36,7 +34,6 @@ public class ServerTab implements ActionListener {
      * @throws ConfigurationException <p>If unable to create the new tab</p>
      */
     public ServerTab(String name) throws ConfigurationException {
-        this.name = name;
         panel = new JPanel();
         Main.getController().getGUI().getPane().addTab(name, null, panel, null);
         SpringLayout sl_panel_3 = new SpringLayout();
@@ -88,14 +85,6 @@ public class ServerTab implements ActionListener {
         panel.add(enabledCheckbox);
         enabledCheckbox.addActionListener(this);
 
-        removeServerButton = new JButton("Remove server");
-        sl_panel_3.putConstraint(SpringLayout.NORTH, removeServerButton, 0, SpringLayout.NORTH, serverVersions);
-        sl_panel_3.putConstraint(SpringLayout.SOUTH, removeServerButton, 0, SpringLayout.SOUTH, serverVersions);
-        sl_panel_3.putConstraint(SpringLayout.WEST, removeServerButton, 6, SpringLayout.EAST, serverVersions);
-        sl_panel_3.putConstraint(SpringLayout.EAST, removeServerButton, -10, SpringLayout.EAST, panel);
-        panel.add(removeServerButton);
-        removeServerButton.addActionListener(this);
-
         JLabel lblDirectory = new JLabel("Directory");
         sl_panel_3.putConstraint(SpringLayout.WEST, lblDirectory, 6, SpringLayout.EAST, enabledCheckbox);
         panel.add(lblDirectory);
@@ -112,7 +101,7 @@ public class ServerTab implements ActionListener {
 
         browseButton = new JButton("Browse");
         sl_panel_3.putConstraint(SpringLayout.EAST, directory, -6, SpringLayout.WEST, browseButton);
-        sl_panel_3.putConstraint(SpringLayout.NORTH, browseButton, 3, SpringLayout.SOUTH, removeServerButton);
+        sl_panel_3.putConstraint(SpringLayout.NORTH, browseButton, 3, SpringLayout.SOUTH, serverVersions);
         sl_panel_3.putConstraint(SpringLayout.EAST, browseButton, -10, SpringLayout.EAST, panel);
         sl_panel_3.putConstraint(SpringLayout.SOUTH, directory, 0, SpringLayout.SOUTH, browseButton);
         sl_panel_3.putConstraint(SpringLayout.NORTH, directory, 0, SpringLayout.NORTH, browseButton);
@@ -209,9 +198,7 @@ public class ServerTab implements ActionListener {
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (e.getSource() == removeServerButton) {
-            remove();
-        } else if (e.getSource() == browseButton) {
+        if (e.getSource() == browseButton) {
             browse();
         } else if (e.getSource() == serverTypes) {
             try {
@@ -222,15 +209,6 @@ public class ServerTab implements ActionListener {
         }
     }
 
-    /**
-     * Removes the collection containing this ServerTab, and updates everything necessary
-     */
-    private void remove() {
-        Main.getController().getCurrentProfile().removeCollection(this.name);
-        Main.getController().getGUI().updateWithSavedProfileData();
-        Main.getController().getCurrentProfile().updateConsoles();
-    }
-
     /**
      * Asks the user for server location and updates the GUI if given a valid value
      */

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/TabDragListener.java

@@ -0,0 +1,61 @@
+package net.knarcraft.minecraftserverlauncher.userinterface;
+
+import javax.swing.event.MouseInputAdapter;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+
+/**
+ * A listener for detecting the dragging of a tab to make it dock or undock
+ */
+public class TabDragListener extends MouseInputAdapter {
+
+    Point dragStartPoint;
+    Component draggedComponent;
+    String draggedTabTitle;
+    JDockableTabbedPane tabbedPaneToListenTo;
+
+    public TabDragListener(JDockableTabbedPane tabbedPaneToListenTo) {
+        this.tabbedPaneToListenTo = tabbedPaneToListenTo;
+    }
+
+    @Override
+    public void mousePressed(MouseEvent e) {
+        dragStartPoint = e.getPoint();
+
+        //Loop through tabbed panes to find the dragged one
+        for (int i = 0; i < tabbedPaneToListenTo.getTabCount(); i++) {
+            Rectangle bounds = tabbedPaneToListenTo.getBoundsAt(i);
+            if (bounds.contains(dragStartPoint)) {
+                draggedComponent = tabbedPaneToListenTo.getComponentAt(i);
+                draggedTabTitle = tabbedPaneToListenTo.getTitleAt(i);
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void mouseDragged(MouseEvent e) {
+        Point dragEndPoint = e.getPoint();
+        if (draggedComponent != null) {
+            // check for a significant  drag
+            //TODO: Check if tab is dragged onto another JDockableTabbedPane with the same id
+            if (Math.abs(dragEndPoint.getY() - dragStartPoint.getY()) > 30) {
+
+                //TODO: Undock by creating a new JDockableTabbedPane with the same id
+                //TODO: If dragging onto another JDockableTabbedPane with the same id, combine
+                //TODO: Make the listener keep track of all its created windows
+                //TODO: If a child window is closed, dock its tab to the main window
+                //TODO: Keep track of the original window vs. the child window
+                //undock(draggedComponent, draggedTabTitle);
+                draggedComponent = null;
+            }
+        }
+    }
+
+    @Override
+    public void mouseReleased(MouseEvent arg0) {
+        draggedComponent = null;
+        draggedTabTitle = null;
+    }
+
+}

src/main/java/net/knarcraft/minecraftserverlauncher/userinterface/Tray.java

@@ -59,7 +59,7 @@ public class Tray {
             trayIcon = new TrayIcon(trayImage, "Minecraft Server Launcher", popup);
             trayIcon.setImageAutoSize(true);
             ActionListener exitListener = e -> {
-                serverLauncherGUI.stopServers();
+                serverLauncherGUI.getControlPanelTab().stopServers();
                 controller.saveState();
                 System.exit(0);
             };
@@ -92,7 +92,7 @@ public class Tray {
                             e1.printStackTrace();
                         }
                     } else {
-                        serverLauncherGUI.stopServers();
+                        serverLauncherGUI.getControlPanelTab().stopServers();
                         controller.saveState();
                         System.exit(0);
                     }
@@ -114,7 +114,7 @@ public class Tray {
                 @Override
                 public void windowClosing(WindowEvent e) {
                     controller.saveState();
-                    serverLauncherGUI.stopServers();
+                    serverLauncherGUI.getControlPanelTab().stopServers();
                     System.exit(0);
                 }
             });