From 8181a36800a3215386b6ebae87f28e5c077fb501 Mon Sep 17 00:00:00 2001 From: Clisprail Date: Wed, 19 Feb 2014 00:04:57 +0100 Subject: [PATCH] Proper code style for core package TODO: environment package --- parabotv2/src/org/parabot/core/Core.java | 7 +++---- .../src/org/parabot/core/Directories.java | 5 ++--- .../org/parabot/core/classpath/ClassPath.java | 16 ++++++++------- .../parabot/core/desc/ScriptDescription.java | 18 ++++++++--------- .../parabot/core/desc/ServerDescription.java | 6 +++--- .../src/org/parabot/core/forum/Account.java | 4 ++-- .../parabot/core/forum/AccountManager.java | 4 ++-- .../org/parabot/core/io/SizeInputStream.java | 17 ++++++++-------- .../src/org/parabot/core/jython/Jython.java | 2 +- .../parabot/core/logging/LabelLogHandler.java | 6 +++--- .../parabot/core/logging/LogFormatter.java | 20 ++++++++++--------- .../parabot/core/logging/LogOutputStream.java | 2 +- .../org/parabot/core/paint/PaintDebugger.java | 9 +++++++-- .../parabot/core/parsers/JSONHookParser.java | 3 --- .../parsers/scripts/LocalPythonScripts.java | 10 +++++++--- .../core/parsers/scripts/SDNScripts.java | 2 +- .../org/parabot/core/spoofer/MacAddress.java | 3 --- parabotv2/src/org/parabot/core/ui/BotUI.java | 2 +- .../src/org/parabot/core/ui/LoginUI.java | 4 ++-- .../src/org/parabot/core/ui/NetworkUI.java | 4 ++-- .../org/parabot/core/ui/ScriptSelector.java | 13 ++++++------ .../org/parabot/core/ui/ServerSelector.java | 6 ++---- .../core/ui/components/BotToolbar.java | 10 ++++++---- .../parabot/core/ui/components/GamePanel.java | 4 ++-- .../parabot/core/ui/components/LogArea.java | 2 +- .../core/ui/components/ProgressBar.java | 19 ++++++++++-------- .../core/ui/components/VerboseLoader.java | 9 +++++---- .../org/parabot/core/ui/utils/AwtUtil.java | 3 +-- .../parabot/core/ui/widgets/ServerWidget.java | 7 +++---- 29 files changed, 113 insertions(+), 104 deletions(-) diff --git a/parabotv2/src/org/parabot/core/Core.java b/parabotv2/src/org/parabot/core/Core.java index 677d0f5..5950e11 100644 --- a/parabotv2/src/org/parabot/core/Core.java +++ b/parabotv2/src/org/parabot/core/Core.java @@ -11,10 +11,9 @@ import java.io.IOException; * @author Everel */ public class Core { - - private static boolean debug = false; - private static boolean verbose = false; - private static boolean loadLocal = false; //Loads both local and public scripts/servers + private static boolean debug; + private static boolean verbose; + private static boolean loadLocal; //Loads both local and public scripts/servers /** * Enabled loadLocal mode diff --git a/parabotv2/src/org/parabot/core/Directories.java b/parabotv2/src/org/parabot/core/Directories.java index b835945..e895dac 100644 --- a/parabotv2/src/org/parabot/core/Directories.java +++ b/parabotv2/src/org/parabot/core/Directories.java @@ -13,11 +13,10 @@ import java.util.*; * @author Matt */ public class Directories { - - private static Map cached = new HashMap(); + private static Map cached; static { - + cached = new HashMap(); switch (OperatingSystem.getOS()) { case WINDOWS: cached.put("Root", new JFileChooser().getFileSystemView().getDefaultDirectory()); diff --git a/parabotv2/src/org/parabot/core/classpath/ClassPath.java b/parabotv2/src/org/parabot/core/classpath/ClassPath.java index 099631c..b4fcc70 100644 --- a/parabotv2/src/org/parabot/core/classpath/ClassPath.java +++ b/parabotv2/src/org/parabot/core/classpath/ClassPath.java @@ -34,21 +34,23 @@ import org.parabot.core.ui.components.VerboseLoader; * @author Matt */ public class ClassPath { - public final HashMap classes = new HashMap(); - public final Map resources = new HashMap(); - - private boolean isJar = false; - private boolean parseJar = true; - private ArrayList jarFiles = new ArrayList(); + public final HashMap classes; + public final Map resources; + private boolean isJar; + private boolean parseJar; + private ArrayList jarFiles; public URL lastParsed = null; public ClassPath() { - + this(false); } public ClassPath(final boolean isJar) { this.isJar = isJar; + this.classes = new HashMap(); + this.resources = new HashMap(); + this.jarFiles = new ArrayList(); } public void addJar(final File file) { diff --git a/parabotv2/src/org/parabot/core/desc/ScriptDescription.java b/parabotv2/src/org/parabot/core/desc/ScriptDescription.java index e20c073..9bd1164 100644 --- a/parabotv2/src/org/parabot/core/desc/ScriptDescription.java +++ b/parabotv2/src/org/parabot/core/desc/ScriptDescription.java @@ -7,16 +7,16 @@ package org.parabot.core.desc; * */ public class ScriptDescription { - public String scriptName = null; - public String author = null; - public String category = null; - public double version = 0; - public String description = null; - public String[] servers = null; - public String isVip = null; - public String isPremium = null; + public String scriptName; + public String author; + public String category; + public double version; + public String description; + public String[] servers; + public String isVip; + public String isPremium; public int sdnId = -1; - public String jarName = null; + public String jarName; /** * The ScriptManifest diff --git a/parabotv2/src/org/parabot/core/desc/ServerDescription.java b/parabotv2/src/org/parabot/core/desc/ServerDescription.java index 5fb92b6..a364bb5 100644 --- a/parabotv2/src/org/parabot/core/desc/ServerDescription.java +++ b/parabotv2/src/org/parabot/core/desc/ServerDescription.java @@ -8,9 +8,9 @@ package org.parabot.core.desc; * */ public class ServerDescription { - private String serverName = null; - private String author = null; - private double revision = 0; + private String serverName; + private String author; + private double revision; public ServerDescription(final String serverName, final String author, final double revision) { diff --git a/parabotv2/src/org/parabot/core/forum/Account.java b/parabotv2/src/org/parabot/core/forum/Account.java index 298128b..eb52a04 100644 --- a/parabotv2/src/org/parabot/core/forum/Account.java +++ b/parabotv2/src/org/parabot/core/forum/Account.java @@ -10,8 +10,8 @@ package org.parabot.core.forum; * */ public class Account { - private String username = null; - private String password = null; + private String username; + private String password; /** * diff --git a/parabotv2/src/org/parabot/core/forum/AccountManager.java b/parabotv2/src/org/parabot/core/forum/AccountManager.java index 0ac9f8e..9c236be 100644 --- a/parabotv2/src/org/parabot/core/forum/AccountManager.java +++ b/parabotv2/src/org/parabot/core/forum/AccountManager.java @@ -17,8 +17,8 @@ import java.util.ArrayList; * */ public final class AccountManager { - private static boolean validated = false; - private static AccountManager instance = null; + private static boolean validated; + private static AccountManager instance; private Account account = null; diff --git a/parabotv2/src/org/parabot/core/io/SizeInputStream.java b/parabotv2/src/org/parabot/core/io/SizeInputStream.java index 4d6857a..d0fad56 100644 --- a/parabotv2/src/org/parabot/core/io/SizeInputStream.java +++ b/parabotv2/src/org/parabot/core/io/SizeInputStream.java @@ -3,16 +3,17 @@ package org.parabot.core.io; import java.io.IOException; import java.io.InputStream; +/** + * + * @author Everel + * + */ public class SizeInputStream extends InputStream { - private InputStream in = null; - - private double size = 0; - - public int bytesRead = 0; - + public int bytesRead; private ProgressListener l; - - private long startTime = 0L; + private InputStream in; + private long startTime; + private double size; public SizeInputStream(InputStream in, int size, ProgressListener l) { this.in = in; diff --git a/parabotv2/src/org/parabot/core/jython/Jython.java b/parabotv2/src/org/parabot/core/jython/Jython.java index 79e2b65..4f879bf 100644 --- a/parabotv2/src/org/parabot/core/jython/Jython.java +++ b/parabotv2/src/org/parabot/core/jython/Jython.java @@ -15,7 +15,7 @@ import org.parabot.core.build.BuildPath; * */ public class Jython { - private static boolean valid = false; + private static boolean valid; /** * Determines if jython jar has been downloaded. diff --git a/parabotv2/src/org/parabot/core/logging/LabelLogHandler.java b/parabotv2/src/org/parabot/core/logging/LabelLogHandler.java index 9788726..e7742b8 100644 --- a/parabotv2/src/org/parabot/core/logging/LabelLogHandler.java +++ b/parabotv2/src/org/parabot/core/logging/LabelLogHandler.java @@ -8,12 +8,12 @@ import java.util.logging.LogRecord; import javax.swing.JLabel; public class LabelLogHandler extends Handler { - public final JLabel label = new JLabel(); + public final JLabel label; private final Color defaultColor; public LabelLogHandler() { - super(); - defaultColor = label.getForeground(); + this.label = new JLabel(); + this.defaultColor = label.getForeground(); } @Override diff --git a/parabotv2/src/org/parabot/core/logging/LogFormatter.java b/parabotv2/src/org/parabot/core/logging/LogFormatter.java index b17a42f..d27ecd6 100644 --- a/parabotv2/src/org/parabot/core/logging/LogFormatter.java +++ b/parabotv2/src/org/parabot/core/logging/LogFormatter.java @@ -7,25 +7,27 @@ import java.util.Date; import java.util.logging.Formatter; import java.util.logging.LogRecord; -public class LogFormatter extends Formatter -{ - private static final String LINE_SEPARATOR = System.getProperty("line.separator"); - +public class LogFormatter extends Formatter { + private static final String LINE_SEPARATOR = System + .getProperty("line.separator"); private final boolean appendNewLine; - public LogFormatter() - { + public LogFormatter() { this(true); } - public LogFormatter(final boolean appendNewLine) - { + public LogFormatter(final boolean appendNewLine) { this.appendNewLine = appendNewLine; } @Override public String format(final LogRecord record) { - final StringBuilder result = new StringBuilder().append("[").append(record.getLevel().getName()).append("] ").append(new Date(record.getMillis())).append(": ").append(record.getLoggerName()).append(": ").append(record.getMessage()).append(throwableToString(record.getThrown())); + final StringBuilder result = new StringBuilder().append("[") + .append(record.getLevel().getName()).append("] ") + .append(new Date(record.getMillis())).append(": ") + .append(record.getLoggerName()).append(": ") + .append(record.getMessage()) + .append(throwableToString(record.getThrown())); if (appendNewLine) { result.append(LogFormatter.LINE_SEPARATOR); } diff --git a/parabotv2/src/org/parabot/core/logging/LogOutputStream.java b/parabotv2/src/org/parabot/core/logging/LogOutputStream.java index d929eff..60e7a9d 100644 --- a/parabotv2/src/org/parabot/core/logging/LogOutputStream.java +++ b/parabotv2/src/org/parabot/core/logging/LogOutputStream.java @@ -9,7 +9,7 @@ import java.util.logging.Logger; * @author Paris */ public class LogOutputStream extends OutputStream { - protected boolean hasBeenClosed = false; + protected boolean hasBeenClosed; protected Logger category; protected Level priority; protected StringBuilder buffer; diff --git a/parabotv2/src/org/parabot/core/paint/PaintDebugger.java b/parabotv2/src/org/parabot/core/paint/PaintDebugger.java index ef1cfb7..aecb538 100644 --- a/parabotv2/src/org/parabot/core/paint/PaintDebugger.java +++ b/parabotv2/src/org/parabot/core/paint/PaintDebugger.java @@ -16,8 +16,13 @@ import org.parabot.core.Context; * */ public class PaintDebugger { - private final HashMap debuggers = new HashMap(); - private final Queue stringDebug = new LinkedList(); + private final HashMap debuggers; + private final Queue stringDebug; + + public PaintDebugger() { + this.debuggers = new HashMap(); + this.stringDebug = new LinkedList(); + } public final void addDebugger(final String name, final AbstractDebugger debugger) { debuggers.put(name, debugger); diff --git a/parabotv2/src/org/parabot/core/parsers/JSONHookParser.java b/parabotv2/src/org/parabot/core/parsers/JSONHookParser.java index 3bd12f8..7333a2e 100644 --- a/parabotv2/src/org/parabot/core/parsers/JSONHookParser.java +++ b/parabotv2/src/org/parabot/core/parsers/JSONHookParser.java @@ -20,11 +20,8 @@ import org.parabot.core.asm.wrappers.Super; * * @author Dane * - * - * */ public class JSONHookParser extends HookParser { - private JSONObject root; private Map interfaces; private HashMap constants; diff --git a/parabotv2/src/org/parabot/core/parsers/scripts/LocalPythonScripts.java b/parabotv2/src/org/parabot/core/parsers/scripts/LocalPythonScripts.java index 91f2f7c..ccac87f 100644 --- a/parabotv2/src/org/parabot/core/parsers/scripts/LocalPythonScripts.java +++ b/parabotv2/src/org/parabot/core/parsers/scripts/LocalPythonScripts.java @@ -18,9 +18,7 @@ import java.io.FilenameFilter; * @author Everel */ public class LocalPythonScripts extends ScriptParser { - private PythonInterpreter interpreter = new PythonInterpreter(); - - private static final FilenameFilter PYTHON_SCRIPT_FILTER = new FilenameFilter() { + private static final FilenameFilter PYTHON_SCRIPT_FILTER = new FilenameFilter() { @Override public boolean accept(File dir, String name) { @@ -28,6 +26,12 @@ public class LocalPythonScripts extends ScriptParser { } }; + + private PythonInterpreter interpreter; + + public LocalPythonScripts() { + this.interpreter = new PythonInterpreter(); + } /** * @param name - local var name diff --git a/parabotv2/src/org/parabot/core/parsers/scripts/SDNScripts.java b/parabotv2/src/org/parabot/core/parsers/scripts/SDNScripts.java index 58cd329..9c72930 100644 --- a/parabotv2/src/org/parabot/core/parsers/scripts/SDNScripts.java +++ b/parabotv2/src/org/parabot/core/parsers/scripts/SDNScripts.java @@ -16,7 +16,7 @@ import java.net.URL; * @author Everel */ public class SDNScripts extends ScriptParser { - private static AccountManager manager = null; + private static AccountManager manager; public static final AccountManagerAccess MANAGER_FETCHER = new AccountManagerAccess() { diff --git a/parabotv2/src/org/parabot/core/spoofer/MacAddress.java b/parabotv2/src/org/parabot/core/spoofer/MacAddress.java index 5bad1c1..6e4abf5 100644 --- a/parabotv2/src/org/parabot/core/spoofer/MacAddress.java +++ b/parabotv2/src/org/parabot/core/spoofer/MacAddress.java @@ -5,11 +5,8 @@ import java.net.SocketException; import java.util.Enumeration; public class MacAddress { - public static byte[] mac = new byte[] { 11, 11, 11, 11, 11, 11 }; - private static byte[] realMac; - private static MacAddress cached; static { diff --git a/parabotv2/src/org/parabot/core/ui/BotUI.java b/parabotv2/src/org/parabot/core/ui/BotUI.java index f81f59c..c14c374 100644 --- a/parabotv2/src/org/parabot/core/ui/BotUI.java +++ b/parabotv2/src/org/parabot/core/ui/BotUI.java @@ -23,7 +23,7 @@ import java.awt.event.ActionListener; public class BotUI extends JFrame implements ActionListener { private static final long serialVersionUID = -2126184292879805519L; - private static BotUI instance = null; + private static BotUI instance; public static BotUI getInstance() { return instance == null ? instance = new BotUI() : instance; diff --git a/parabotv2/src/org/parabot/core/ui/LoginUI.java b/parabotv2/src/org/parabot/core/ui/LoginUI.java index 59287e4..d94ead4 100644 --- a/parabotv2/src/org/parabot/core/ui/LoginUI.java +++ b/parabotv2/src/org/parabot/core/ui/LoginUI.java @@ -34,12 +34,12 @@ import org.parabot.core.ui.utils.SwingUtil; public class LoginUI extends JFrame { private static final long serialVersionUID = 2032832552863466297L; - private static LoginUI instance = null; + private static LoginUI instance; private JTextField txtUsername; private JPasswordField txtPassword; private JButton cmdLogin; private JButton cmdRegister; - private static AccountManager manager = null; + private static AccountManager manager; public static final AccountManagerAccess MANAGER_FETCHER = new AccountManagerAccess() { diff --git a/parabotv2/src/org/parabot/core/ui/NetworkUI.java b/parabotv2/src/org/parabot/core/ui/NetworkUI.java index 0c9ed65..a0be541 100644 --- a/parabotv2/src/org/parabot/core/ui/NetworkUI.java +++ b/parabotv2/src/org/parabot/core/ui/NetworkUI.java @@ -7,15 +7,15 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.HashMap; - public class NetworkUI { public JFrame frame; private JTextField proxyHostField; private JTextField proxyPortField; - private HashMap socksVersions = new HashMap<>(); + private HashMap socksVersions; public NetworkUI() { + this.socksVersions = new HashMap(); initialize(); } diff --git a/parabotv2/src/org/parabot/core/ui/ScriptSelector.java b/parabotv2/src/org/parabot/core/ui/ScriptSelector.java index 472ff33..40aec75 100644 --- a/parabotv2/src/org/parabot/core/ui/ScriptSelector.java +++ b/parabotv2/src/org/parabot/core/ui/ScriptSelector.java @@ -25,18 +25,19 @@ import java.util.HashMap; * @author Everel */ public final class ScriptSelector extends JFrame { + public static ScriptParser parser; private static final long serialVersionUID = 1L; private HashMap categories = new HashMap(); private HashMap format = new HashMap(); private DefaultMutableTreeNode root = new DefaultMutableTreeNode("Scripts"); - private DefaultTreeModel model = null; - private final int WIDTH = 640; - private final int HEIGHT = 256 + 128; - - public static ScriptParser parser = null; + private DefaultTreeModel model; + private final int WIDTH; + private final int HEIGHT; public ScriptSelector() { - model = new DefaultTreeModel(root); + this.WIDTH = 640; + this.HEIGHT = 256 + 128; + this.model = new DefaultTreeModel(root); putScripts(); createUI(); } diff --git a/parabotv2/src/org/parabot/core/ui/ServerSelector.java b/parabotv2/src/org/parabot/core/ui/ServerSelector.java index 0d3b720..447a526 100644 --- a/parabotv2/src/org/parabot/core/ui/ServerSelector.java +++ b/parabotv2/src/org/parabot/core/ui/ServerSelector.java @@ -25,13 +25,11 @@ import org.parabot.environment.Environment; */ public class ServerSelector extends JFrame { - + public static String initServer; private static final long serialVersionUID = 5238720307271493899L; - private static ServerSelector instance = null; + private static ServerSelector instance; private JPanel panel; - public static String initServer = null; - public static ServerSelector getInstance() { if (instance == null) { instance = new ServerSelector(); diff --git a/parabotv2/src/org/parabot/core/ui/components/BotToolbar.java b/parabotv2/src/org/parabot/core/ui/components/BotToolbar.java index 124859a..99b9743 100644 --- a/parabotv2/src/org/parabot/core/ui/components/BotToolbar.java +++ b/parabotv2/src/org/parabot/core/ui/components/BotToolbar.java @@ -30,16 +30,18 @@ import org.parabot.environment.scripts.Script; */ public class BotToolbar extends JToolBar { private static final long serialVersionUID = 5373484845104212180L; - private static BotToolbar instance = null; - private JButton tab = null; - private final JButton run = new JButton(); - private final JButton stop = new JButton(); + private static BotToolbar instance; private static Map environments = new HashMap(); + private JButton tab; + private final JButton run; + private final JButton stop; private boolean runScript = false; private boolean pauseScript = false; public BotToolbar() { + this.run = new JButton(); + this.stop = new JButton(); setFloatable(false); tab = new JButton(); tab.addActionListener(new ActionListener() { diff --git a/parabotv2/src/org/parabot/core/ui/components/GamePanel.java b/parabotv2/src/org/parabot/core/ui/components/GamePanel.java index 4d2302c..5b57226 100644 --- a/parabotv2/src/org/parabot/core/ui/components/GamePanel.java +++ b/parabotv2/src/org/parabot/core/ui/components/GamePanel.java @@ -18,9 +18,9 @@ import org.parabot.core.Context; */ public class GamePanel extends JPanel { private static final long serialVersionUID = 1L; - private static GamePanel instance = null; + private static GamePanel instance; private static VerboseLoader loader = VerboseLoader.get(); - public Context context = null; + public Context context; private GamePanel() { setFocusable(true); diff --git a/parabotv2/src/org/parabot/core/ui/components/LogArea.java b/parabotv2/src/org/parabot/core/ui/components/LogArea.java index 4857aab..2412d50 100644 --- a/parabotv2/src/org/parabot/core/ui/components/LogArea.java +++ b/parabotv2/src/org/parabot/core/ui/components/LogArea.java @@ -26,8 +26,8 @@ import org.parabot.core.logging.TextAreaLogHandler; public class LogArea extends JScrollPane { private static final long serialVersionUID = 6571141103751675714L; - private static LogArea instance = null; private static LogTextArea logArea = new LogTextArea(); + private static LogArea instance; private LogArea() { super(TextAreaLogHandler.TEXT_AREA, diff --git a/parabotv2/src/org/parabot/core/ui/components/ProgressBar.java b/parabotv2/src/org/parabot/core/ui/components/ProgressBar.java index 75bcfa2..a0ed4be 100644 --- a/parabotv2/src/org/parabot/core/ui/components/ProgressBar.java +++ b/parabotv2/src/org/parabot/core/ui/components/ProgressBar.java @@ -14,18 +14,21 @@ import java.awt.geom.Rectangle2D; * */ public class ProgressBar { - private double value = 0; - private int width = 0; - private int height = 0; - private double locX = 0; - private Color progColor = new Color(255, 0, 0); - private Color backColor = new Color(74, 74, 72, 100); - private FontMetrics fontMetrics = null; - private String text = ""; + private double value; + private int width; + private int height; + private double locX; + private Color progColor; + private Color backColor; + private FontMetrics fontMetrics; + private String text; public ProgressBar(int width, int height) { + this.progColor = new Color(255, 0, 0); + this.backColor = new Color(74, 74, 72, 100); this.width = width; this.height = height; + this.text = ""; } public void setText(final String text) { diff --git a/parabotv2/src/org/parabot/core/ui/components/VerboseLoader.java b/parabotv2/src/org/parabot/core/ui/components/VerboseLoader.java index 4e27660..784326b 100644 --- a/parabotv2/src/org/parabot/core/ui/components/VerboseLoader.java +++ b/parabotv2/src/org/parabot/core/ui/components/VerboseLoader.java @@ -21,12 +21,13 @@ public class VerboseLoader extends JPanel implements ProgressListener { private static final long serialVersionUID = 7412412644921803896L; private static VerboseLoader current = null; private static String state = "Initializing loader..."; - private FontMetrics fontMetrics = null; - private BufferedImage bot_image = null; - private ProgressBar p = new ProgressBar(400, 20); + private FontMetrics fontMetrics; + private BufferedImage bot_image; + private ProgressBar p; public VerboseLoader() { - bot_image = Images.getResource("/org/parabot/core/ui/images/para.png"); + this.bot_image = Images.getResource("/org/parabot/core/ui/images/para.png"); + this.p = new ProgressBar(400, 20); setSize(775, 510); setBackground(Color.black); setDoubleBuffered(true); diff --git a/parabotv2/src/org/parabot/core/ui/utils/AwtUtil.java b/parabotv2/src/org/parabot/core/ui/utils/AwtUtil.java index fd2210f..f303d3f 100644 --- a/parabotv2/src/org/parabot/core/ui/utils/AwtUtil.java +++ b/parabotv2/src/org/parabot/core/ui/utils/AwtUtil.java @@ -8,10 +8,9 @@ import java.awt.Toolkit; * Holds various awt util based methods * * @author Dane - * + * */ public class AwtUtil { - private static Toolkit toolkit; public static Toolkit getToolkit() { diff --git a/parabotv2/src/org/parabot/core/ui/widgets/ServerWidget.java b/parabotv2/src/org/parabot/core/ui/widgets/ServerWidget.java index 55901d9..b891711 100644 --- a/parabotv2/src/org/parabot/core/ui/widgets/ServerWidget.java +++ b/parabotv2/src/org/parabot/core/ui/widgets/ServerWidget.java @@ -19,11 +19,10 @@ import java.awt.event.MouseMotionListener; */ public class ServerWidget extends JPanel implements MouseListener, MouseMotionListener { - + public ServerDescription desc; private static final long serialVersionUID = 1L; - private String name = null; - public ServerDescription desc = null; - private boolean hovered = false; + private String name; + private boolean hovered; public ServerWidget(final ServerDescription desc) { this.desc = desc;