Replaces the "Remove server" button with an (X) on the tab itself
All checks were successful
KnarCraft/Minecraft-Server-Launcher/pipeline/head This commit looks good
All checks were successful
KnarCraft/Minecraft-Server-Launcher/pipeline/head This commit looks good
This commit is contained in:
@ -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
|
||||
*/
|
||||
|
Reference in New Issue
Block a user