tidy up abstract client stuff -> ClientUtil

client/src/main/java/EntropyMain.java

@@ -5,7 +5,6 @@
 import javax.swing.WindowConstants;
 
 import logging.LoggerUncaughtExceptionHandler;
-import online.util.DesktopEntropyClient;
 import screen.MainScreen;
 import screen.ScreenCache;
 import util.*;
@@ -24,14 +23,13 @@ public static void main(String[] args)
 		Debug.initialise(new DebugOutputSystemOut());
 		Thread.setDefaultUncaughtExceptionHandler(new LoggerUncaughtExceptionHandler());
 		MainUtilKt.configureLogging();
-		AbstractClient.setInstance(new DesktopEntropyClient());
 
 		//Dev mode
-		AbstractClient.parseProgramArguments(args);
+		ClientUtil.parseProgramArguments(args);
 
 		setLookAndFeel();
 
-		if (AbstractClient.devMode)
+		if (ClientUtil.devMode)
 		{
 			setInstanceNumber();
 		}
@@ -56,13 +54,13 @@ else if (!bindOnPort(BIND_PORT_NUMBER))
 
 	private static void setLookAndFeel()
 	{
-		logger.info("laf.init", "Initialising Look & Feel - Operating System: " + AbstractClient.operatingSystem);
+		logger.info("laf.init", "Initialising Look & Feel - Operating System: " + ClientUtil.operatingSystem);
 
 		String lookAndFeel = null;
 		try 
 		{
 			lookAndFeel = prefs.get(PREFERENCES_STRING_LOOK_AND_FEEL, "Metal");
-			if (AbstractClient.isAppleOs()
+			if (ClientUtil.isAppleOs()
 			  && lookAndFeel.equals("Metal"))
 			{
 				//This doesn't seem to work on macs...
@@ -94,11 +92,11 @@ private static void setInstanceNumber()
 		while (!boundSuccessfully)
 		{
 			startingPortNumber++;
-			AbstractClient.instanceNumber++;
+			ClientUtil.instanceNumber++;
 			boundSuccessfully = bindOnPort(startingPortNumber);
 		}
 
-		logger.info("instanceCheck", "I am instance number " + AbstractClient.instanceNumber);
+		logger.info("instanceCheck", "I am instance number " + ClientUtil.instanceNumber);
 	}
 
 	private static boolean bindOnPort(int portNumber)
@@ -120,12 +118,12 @@ private static void checkForUpdatesIfRequired()
 	{
 		boolean checkForUpdates = Registry.prefs.getBoolean(PREFERENCES_BOOLEAN_CHECK_FOR_UPDATES, true);
 		if (!checkForUpdates
-		  || AbstractClient.devMode)
+		  || ClientUtil.devMode)
 		{
 			logger.info("updateCheck", "Not checking for updates as preference is disabled or I'm in dev mode");
 			return;
 		}
 
-		AbstractClient.getInstance().checkForUpdatesIfRequired();
+		ClientUtil.checkForUpdatesIfRequired();
 	}
 }

client/src/main/java/online/screen/EntropyLobby.java

@@ -164,7 +164,7 @@ public void run()
 		AchievementsUtil.unlockConnected();
 
 		//Start the notification thread, this is how the server will send us unsolicited messages
-		AbstractClient.getInstance().startNotificationThreads();
+		ClientUtil.startNotificationThreads();
 
 		AchievementsDialog achievementsDialog = ScreenCache.getAchievementsDialog();
 		achievementsDialog.refresh(false);

client/src/main/java/online/util/HeartbeatRunnable.java

@@ -4,7 +4,7 @@
 
 import org.w3c.dom.Document;
 
-import util.AbstractClient;
+import util.ClientUtil;
 import util.MessageUtil;
 
 import static utils.CoreGlobals.logger;
@@ -26,7 +26,7 @@ public void run()
 	{
 		while (lobby.isVisible())
 		{
-			long lastSentMessageMillis = AbstractClient.getInstance().getLastSentMessageMillis();
+			long lastSentMessageMillis = ClientUtil.getLastSentMessageMillis();
 			long currentMillis = System.currentTimeMillis();
 			long difference = currentMillis - lastSentMessageMillis;
 			if (difference >= HEARTBEAT_THREADHOLD)

client/src/main/java/online/util/XmlBuilderClient.java

@@ -1,18 +1,10 @@
 package online.util;
 
-import javax.crypto.SecretKey;
-
 import object.Bid;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import util.AbstractClient;
-import util.Debug;
-import util.EncryptionUtil;
-import util.KeyGeneratorUtil;
-import util.MessageUtil;
-import util.OnlineConstants;
 import util.XmlConstants;
 import util.XmlUtil;
 

client/src/main/java/screen/MainScreen.java

@@ -9,7 +9,6 @@
 import online.util.XmlBuilderDesktop;
 import org.w3c.dom.Document;
 import util.*;
-import utils.CoreGlobals;
 
 import javax.swing.*;
 import javax.swing.border.BevelBorder;
@@ -659,15 +658,15 @@ private void selectGameScreen(int gameMode)
 	@Override
 	public boolean commandsEnabled()
 	{
-		return AbstractClient.devMode
+		return ClientUtil.devMode
 		  || rewards.getBoolean(Registry.REWARDS_BOOLEAN_CHEATS, false);
 	}
 
 	@Override
 	public String processCommand(String command)
 	{
 		String textToShow = "";
-		if (AbstractClient.devMode)
+		if (ClientUtil.devMode)
 		{
 			boolean processed = processDevModeCommand(command);
 			if (processed)
@@ -748,7 +747,7 @@ public void onStart()
 		leftPanel.add(gamePanel, BorderLayout.CENTER);
 
 		//If we've just updated, show the change log automatically
-		if (AbstractClient.justUpdated)
+		if (ClientUtil.justUpdated)
 		{
 			ChangeLog dialog = new ChangeLog();
 			dialog.setLocationRelativeTo(null);

client/src/main/java/util/ClientNotificationRunnable.java

@@ -8,11 +8,9 @@ public class ClientNotificationRunnable implements Runnable
 	private static final int SO_TIMEOUT_MILLIS = 120000; //2 minutes
 
 	private String socketType = null;
-	private AbstractClient client = null;
 
-	public ClientNotificationRunnable(AbstractClient client, String socketType)
+	public ClientNotificationRunnable(String socketType)
 	{
-		this.client = client;
 		this.socketType = socketType;
 	}
 
@@ -23,16 +21,16 @@ public void run()
 		String messageStr = null;
 		String response = null;
 
-		while (client.isOnline())
+		while (ClientUtil.isOnline())
 		{
 			try
 			{
-				String username = client.getUsername();
+				String username = ClientUtil.getUsername();
 				Document notificationXml = XmlUtil.factorySimpleMessage(username, socketType);
 				messageStr = XmlUtil.getStringFromDocument(notificationXml);
 
 				//Send encrypted, with a 1 minute timeout
-				response = client.sendSync(notificationXml, true, SO_TIMEOUT_MILLIS, true);
+				response = ClientUtil.sendSync(notificationXml, true, SO_TIMEOUT_MILLIS, true);
 
 				//If the thread has stopped due to a d/c, we'll get a null response.
 				if (response == null)