Improved layout and code

This commit is contained in:
JKetelaar
2014-07-20 17:43:05 +02:00
parent 2e459e27f4
commit 28a77f9b54
3 changed files with 17 additions and 39 deletions
@@ -1,18 +1,15 @@
package org.parabot.core.ui; package org.parabot.core.ui;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.util.LinkedList;
import java.util.Queue;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import org.parabot.core.desc.ServerDescription; import org.parabot.core.desc.ServerDescription;
import org.parabot.core.parsers.servers.ServerParser; import org.parabot.core.parsers.servers.ServerParser;
import org.parabot.core.ui.components.ServerComponent; import org.parabot.core.ui.components.ServerComponent;
import org.parabot.environment.Environment; import org.parabot.environment.Environment;
import javax.swing.*;
import java.awt.*;
import java.util.LinkedList;
import java.util.Queue;
/** /**
* *
* Shows a list of every supported server which can be started * Shows a list of every supported server which can be started
@@ -42,7 +39,7 @@ public class ServerSelector extends JPanel {
return; return;
} }
} }
setLayout(new BorderLayout()); setLayout(new BorderLayout());
setPreferredSize(new Dimension(600, 400)); setPreferredSize(new Dimension(600, 400));
@@ -99,7 +96,7 @@ public class ServerSelector extends JPanel {
* @return widgets array * @return widgets array
*/ */
public Queue<ServerComponent> getServers() { public Queue<ServerComponent> getServers() {
final Queue<ServerComponent> widgets = new LinkedList<ServerComponent>(); final Queue<ServerComponent> widgets = new LinkedList<>();
ServerDescription[] servers = ServerParser.getDescriptions(); ServerDescription[] servers = ServerParser.getDescriptions();
if (servers != null) { if (servers != null) {
for (ServerDescription desc : servers) { for (ServerDescription desc : servers) {
@@ -1,14 +1,10 @@
package org.parabot.core.ui.components; package org.parabot.core.ui.components;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import javax.swing.GroupLayout;
import javax.swing.JPanel;
import org.parabot.core.Context; import org.parabot.core.Context;
import javax.swing.*;
import java.awt.*;
/** /**
* *
* Main panel where applets are added. * Main panel where applets are added.
@@ -37,7 +33,7 @@ public class GamePanel extends JPanel {
/** /**
* Updates context of this panel and adds a different Applet to the panel * Updates context of this panel and adds a different Applet to the panel
* *
* @param context * @param c
*/ */
public void setContext(final Context c) { public void setContext(final Context c) {
add(c.getApplet(), BorderLayout.CENTER); add(c.getApplet(), BorderLayout.CENTER);
@@ -1,26 +1,5 @@
package org.parabot.core.ui.components; package org.parabot.core.ui.components;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.RenderingHints;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
import javax.swing.JTextField;
import org.parabot.core.Core; import org.parabot.core.Core;
import org.parabot.core.forum.AccountManager; import org.parabot.core.forum.AccountManager;
import org.parabot.core.forum.AccountManagerAccess; import org.parabot.core.forum.AccountManagerAccess;
@@ -28,6 +7,12 @@ import org.parabot.core.io.ProgressListener;
import org.parabot.core.ui.ServerSelector; import org.parabot.core.ui.ServerSelector;
import org.parabot.core.ui.images.Images; import org.parabot.core.ui.images.Images;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
/** /**
* An informative JPanel which tells the user what bot is doing * An informative JPanel which tells the user what bot is doing
* *