From 509e8d8bedaced92a6a135f88f2ed90cf3f68d2d Mon Sep 17 00:00:00 2001 From: Alyssa Date: Wed, 22 Nov 2023 19:09:57 +0000 Subject: [PATCH] revert some format churn, port more stuff to logger --- client/build.gradle.kts | 10 ++ client/src/main/java/EntropyMain.java | 1 - .../src/main/java/bean/AbstractDevScreen.java | 2 +- client/src/main/java/bean/FileUploader.java | 4 +- client/src/main/java/object/ReplayTable.java | 82 +++++----- .../src/main/java/screen/ApiTestHarness.java | 146 ------------------ client/src/main/java/screen/MainScreen.java | 13 +- client/src/main/java/util/DialogUtil.java | 34 +++- core/src/main/java/util/AbstractClient.java | 13 +- core/src/main/kotlin/logging/LogRecord.kt | 4 +- core/src/test/kotlin/helper/TestUtils.kt | 2 +- .../logging/LogDestinationSystemOutTest.kt | 2 +- 12 files changed, 92 insertions(+), 221 deletions(-) delete mode 100644 client/src/main/java/screen/ApiTestHarness.java diff --git a/client/build.gradle.kts b/client/build.gradle.kts index b6f6d29..5389925 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -15,3 +15,13 @@ application { // Define the main class for the application. mainClass.set("EntropyMain") } + +task("runDev") { + configure( + closureOf { + group = "run" + classpath = project.the()["main"].runtimeClasspath + args = listOf("devMode") + }, + ) +} diff --git a/client/src/main/java/EntropyMain.java b/client/src/main/java/EntropyMain.java index 284925f..8b02cc4 100644 --- a/client/src/main/java/EntropyMain.java +++ b/client/src/main/java/EntropyMain.java @@ -57,7 +57,6 @@ else if (!bindOnPort(BIND_PORT_NUMBER)) private static void setLookAndFeel() { - AbstractClient.setOs(); logger.info("laf.init", "Initialising Look & Feel - Operating System: " + AbstractClient.operatingSystem); String lookAndFeel = null; diff --git a/client/src/main/java/bean/AbstractDevScreen.java b/client/src/main/java/bean/AbstractDevScreen.java index 7d30832..5eff038 100644 --- a/client/src/main/java/bean/AbstractDevScreen.java +++ b/client/src/main/java/bean/AbstractDevScreen.java @@ -8,7 +8,7 @@ import util.Debug; -public abstract class AbstractDevScreen extends JFrame +public abstract class AbstractDevScreen extends FocusableWindow { public AbstractDevScreen() { diff --git a/client/src/main/java/bean/FileUploader.java b/client/src/main/java/bean/FileUploader.java index 115b7be..029b0b5 100644 --- a/client/src/main/java/bean/FileUploader.java +++ b/client/src/main/java/bean/FileUploader.java @@ -17,6 +17,8 @@ import util.Debug; import util.DialogUtil; +import static utils.InjectedThings.logger; + public class FileUploader extends JPanel implements ActionListener { @@ -79,7 +81,7 @@ private void selectFile() selectedFile = fc.getSelectedFile(); textField.setText(selectedFile.getPath()); - Debug.append("Selected " + selectedFile.getName()); + logger.info("fileSelected", "Selected " + selectedFile.getName()); } } diff --git a/client/src/main/java/object/ReplayTable.java b/client/src/main/java/object/ReplayTable.java index eeb7441..fc284c9 100644 --- a/client/src/main/java/object/ReplayTable.java +++ b/client/src/main/java/object/ReplayTable.java @@ -41,6 +41,8 @@ import util.ReplayRowWrapper; import util.TableUtil; +import static utils.InjectedThings.logger; + public class ReplayTable extends JTable implements MouseListener, Registry @@ -198,8 +200,8 @@ private void stripOutHiddenAndRemovedColumns() private void fillReplayList() { - Debug.append("Filling " + folder + " replay list"); - + logger.info("initReplayList", "Filling " + folder + " replay list"); + String replayDirectory = ReplayFileUtil.getDirectoryFromPreferences(); String directoryStr = replayDirectory + "//Replays//" + folder; @@ -207,7 +209,7 @@ private void fillReplayList() File directory = new File(directoryStr); if (!directory.isDirectory()) { - Debug.append("Directory " + directory + " does not exist."); + logger.info("initReplayList", "Directory " + directory + " does not exist."); return; } @@ -230,8 +232,8 @@ else if (!fileName.equals(FILE_NAME_INDEX)) corruptFiles.add(file); } } - - Debug.append("Finished filling " + folder + " replay list [size: " + replayFilenames.size() + "]"); + + logger.info("initReplayList", "Finished filling " + folder + " replay list [size: " + replayFilenames.size() + "]"); if (!corruptReplayMessage.isEmpty() ) { promptToDeleteCorruptReplays(corruptReplayMessage); @@ -269,14 +271,14 @@ private void initialiseCacheFromIndexFile() { if (!rowWrapperByFileName.isEmpty()) { - Debug.append("Not reading index file as rows are already cached."); + logger.info("replayListIndex", "Not reading index file as rows are already cached."); return; } File indexFile = getIndexFileIfExists(); if (indexFile == null) { - Debug.append("No index file for " + folder + " replays"); + logger.info("replayListIndex", "No index file for " + folder + " replays"); return; } @@ -287,7 +289,7 @@ private void initialiseCacheFromIndexFile() } String[] lines = contents.split("\n"); - Debug.append("Found " + lines.length + " lines in index file."); + logger.info("replayListIndex", "Found " + lines.length + " lines in index file."); for (int i=0; i 0) - { - Element handElement = (Element)handElements.item(0); - String[] playerHand = ResponseHandler.getHandFromElement(handElement); - opponent.setHand(playerHand); - } - - ArrayList cardsOnShow = XmlUtil.getListFromElement(root, "PlayerCardsOnShow", "Card"); - opponent.setRevealedCards(cardsOnShow); - - Bid bid = CpuStrategies.processOpponentTurn(parms, opponent); - - Document response = factoryResponse(bid); - String responseStr = XmlUtil.getStringFromDocument(response); - - osw.write(responseStr); - osw.flush(); - - Debug.append("OUT: " + responseStr, LOGGING); - } - } - } - } - catch (Throwable t) - { - Debug.stackTrace(t); - } - } - } - - private static Document factoryResponse(Bid bid) - { - if (bid.isChallenge()) - { - return XmlUtil.factorySimpleMessage("Challenge"); - } - - if (bid.isIllegal()) - { - return XmlUtil.factorySimpleMessage("Illegal"); - } - - Document response = XmlUtil.factoryNewDocument(); - Element rootElement = response.createElement("Bid"); - bid.populateXmlTag(rootElement); - - String cardToReveal = bid.getCardToReveal(); - if (!cardToReveal.isEmpty()) - { - rootElement.setAttribute("CardToShow", cardToReveal); - } - - response.appendChild(rootElement); - return response; - } - - @Override - public void uncaughtException(Thread arg0, Throwable arg1) - { - Debug.append("UNCAUGHT EXCEPTION"); - Debug.stackTrace(arg1); - } -} diff --git a/client/src/main/java/screen/MainScreen.java b/client/src/main/java/screen/MainScreen.java index 8530c50..132473f 100644 --- a/client/src/main/java/screen/MainScreen.java +++ b/client/src/main/java/screen/MainScreen.java @@ -51,6 +51,7 @@ import online.screen.TestHarness; import online.util.XmlBuilderDesktop; +import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import util.AbstractClient; @@ -91,6 +92,11 @@ public final class MainScreen extends AbstractDevScreen private int gameMode = -1; private ArrayList lastTenKeys = new ArrayList<>(); + @Override + public String getWindowName() { + return "Entropy"; + } + public MainScreen() { super(); @@ -846,11 +852,8 @@ private void cleanUpReplayNodes() private void setViewLogsVisibility() { - if (AbstractClient.devMode) - { - mntmViewLogs.setAccelerator(KeyStroke.getKeyStroke('L', InputEvent.CTRL_DOWN_MASK)); - mnHelp.add(mntmViewLogs); - } + mntmViewLogs.setAccelerator(KeyStroke.getKeyStroke('L', InputEvent.CTRL_DOWN_MASK)); + mnHelp.add(mntmViewLogs); } public void exitApplication() diff --git a/client/src/main/java/util/DialogUtil.java b/client/src/main/java/util/DialogUtil.java index 183e26d..9639ebe 100644 --- a/client/src/main/java/util/DialogUtil.java +++ b/client/src/main/java/util/DialogUtil.java @@ -5,6 +5,8 @@ import screen.LoadingDialog; +import static utils.InjectedThings.logger; + public class DialogUtil { private static LoadingDialog loadingDialog = new LoadingDialog(); @@ -12,11 +14,13 @@ public class DialogUtil public static void showInfo(String infoText) { + logger.info("infoShown", infoText); JOptionPane.showMessageDialog(null, infoText, "Information", JOptionPane.INFORMATION_MESSAGE); } public static void showError(String errorText) { + logger.info("errorShown", errorText); JOptionPane.showMessageDialog(null, errorText, "Error", JOptionPane.ERROR_MESSAGE); } @@ -47,7 +51,7 @@ public void run() } catch (Throwable t) { - Debug.stackTrace(t, "Failed to invokeAndWait for info message: " + infoText); + logger.error("showInfo", "Failed to invokeAndWait for info message: " + infoText); } } @@ -70,8 +74,26 @@ public static int showQuestion(String message, boolean allowCancel) { option = JOptionPane.YES_NO_CANCEL_OPTION; } - - return JOptionPane.showConfirmDialog(null, message, "Question", option, JOptionPane.QUESTION_MESSAGE); + + logger.info("questionShown", message); + int choice = JOptionPane.showConfirmDialog(null, message, "Question", option, JOptionPane.QUESTION_MESSAGE); + logger.info("questionAnswered", "Answered " + translateOption(choice)); + return choice; + } + + private static String translateOption(int option) + { + switch (option) + { + case JOptionPane.YES_OPTION: + return "Yes"; + case JOptionPane.NO_OPTION: + return "No"; + case JOptionPane.CANCEL_OPTION: + return "Cancel"; + default: + return "Unknown"; + } } public static void showConnectionLost() @@ -85,15 +107,11 @@ public static void showConnectionLost() public static void showLoadingDialog(String text) { + logger.info("loaderShown", text); loadingDialog.showDialog(text); } public static void dismissLoadingDialog() { loadingDialog.dismissDialog(); } - - public static void showDemoDialog() - { - showInfo("DEMO VERSION - This functionality isn't written yet."); - } } diff --git a/core/src/main/java/util/AbstractClient.java b/core/src/main/java/util/AbstractClient.java index d1d1845..1df08de 100644 --- a/core/src/main/java/util/AbstractClient.java +++ b/core/src/main/java/util/AbstractClient.java @@ -16,9 +16,7 @@ public abstract class AbstractClient implements OnlineConstants { public static boolean devMode = false; - public static boolean traceReadSql = true; - public static boolean traceWriteSql = false; - public static String operatingSystem = ""; + public static String operatingSystem = System.getProperty("os.name").toLowerCase(Locale.ENGLISH); public static boolean justUpdated = false; public static int instanceNumber = 1; @@ -70,22 +68,13 @@ private static void parseProgramArgument(String arg) else if (arg.equals("devMode")) { devMode = true; - traceWriteSql = true; Debug.appendBanner("Running in dev mode"); } - else if (arg.equals("traceSql")) - { - traceWriteSql = true; - } else { Debug.append("Unexpected program argument: " + arg); } } - public static void setOs() - { - operatingSystem = System.getProperty("os.name").toLowerCase(Locale.ENGLISH); - } public static boolean isAppleOs() { return operatingSystem.contains("mac") || operatingSystem.contains("darwin"); diff --git a/core/src/main/kotlin/logging/LogRecord.kt b/core/src/main/kotlin/logging/LogRecord.kt index 83bbd98..f2144c5 100644 --- a/core/src/main/kotlin/logging/LogRecord.kt +++ b/core/src/main/kotlin/logging/LogRecord.kt @@ -8,7 +8,7 @@ import java.util.* enum class Severity { INFO, WARN, - ERROR, + ERROR } data class LogRecord( @@ -17,7 +17,7 @@ data class LogRecord( val loggingCode: String, val message: String, val errorObject: Throwable?, - val keyValuePairs: Map, + val keyValuePairs: Map ) { private val dateStr = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss") .withLocale(Locale.UK) diff --git a/core/src/test/kotlin/helper/TestUtils.kt b/core/src/test/kotlin/helper/TestUtils.kt index e9063ba..e8d7a4f 100644 --- a/core/src/test/kotlin/helper/TestUtils.kt +++ b/core/src/test/kotlin/helper/TestUtils.kt @@ -18,7 +18,7 @@ fun makeLogRecord( loggingCode: String = "log", message: String = "A thing happened", errorObject: Throwable? = null, - keyValuePairs: Map = mapOf(), + keyValuePairs: Map = mapOf() ) = LogRecord(timestamp, severity, loggingCode, message, errorObject, keyValuePairs) diff --git a/core/src/test/kotlin/logging/LogDestinationSystemOutTest.kt b/core/src/test/kotlin/logging/LogDestinationSystemOutTest.kt index 1e33d75..679622e 100644 --- a/core/src/test/kotlin/logging/LogDestinationSystemOutTest.kt +++ b/core/src/test/kotlin/logging/LogDestinationSystemOutTest.kt @@ -57,7 +57,7 @@ class LogDestinationSystemOutTest : AbstractTest() { severity = Severity.INFO, loggingCode = "some.event", message = "blah", - keyValuePairs = mapOf(KEY_STACK to "at Something.blah"), + keyValuePairs = mapOf(KEY_STACK to "at Something.blah") ) dest.log(record)