From dd89499e7629b9cb12b146857f5f31d589e0a7e6 Mon Sep 17 00:00:00 2001 From: Brendan Robert Date: Mon, 3 Jul 2023 20:30:14 -0500 Subject: [PATCH] Resolve code quality warnings --- .../tools/jace/src/main/java/jace/JaceUIController.java | 4 ---- .../jace/src/main/java/jace/config/Configuration.java | 4 ++-- .../Apple/tools/jace/src/main/java/jace/core/Utility.java | 3 +-- .../jace/src/main/java/jace/lawless/LawlessHacks.java | 7 ++++--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Platform/Apple/tools/jace/src/main/java/jace/JaceUIController.java b/Platform/Apple/tools/jace/src/main/java/jace/JaceUIController.java index 9359c049..7654da3e 100644 --- a/Platform/Apple/tools/jace/src/main/java/jace/JaceUIController.java +++ b/Platform/Apple/tools/jace/src/main/java/jace/JaceUIController.java @@ -3,7 +3,6 @@ package jace; import java.io.File; import java.io.IOException; import java.net.URI; -import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -68,9 +67,6 @@ import javafx.util.StringConverter; */ public class JaceUIController { - @FXML - private URL location; - @FXML private AnchorPane rootPane; diff --git a/Platform/Apple/tools/jace/src/main/java/jace/config/Configuration.java b/Platform/Apple/tools/jace/src/main/java/jace/config/Configuration.java index aa974ebc..6b7b8b70 100644 --- a/Platform/Apple/tools/jace/src/main/java/jace/config/Configuration.java +++ b/Platform/Apple/tools/jace/src/main/java/jace/config/Configuration.java @@ -126,7 +126,7 @@ public class Configuration implements Reconfigurable { public transient ConfigNode root; public transient ConfigNode parent; - private transient ObservableList children; + private final transient ObservableList children; public transient Reconfigurable subject; private transient boolean changed = true; @@ -147,7 +147,7 @@ public class Configuration implements Reconfigurable { private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException { if (children == null) { - children = getChildren(); + children.setAll(getChildren()); } children.setAll(super.getChildren()); id = (String) in.readObject(); diff --git a/Platform/Apple/tools/jace/src/main/java/jace/core/Utility.java b/Platform/Apple/tools/jace/src/main/java/jace/core/Utility.java index effe5de5..c0310c74 100644 --- a/Platform/Apple/tools/jace/src/main/java/jace/core/Utility.java +++ b/Platform/Apple/tools/jace/src/main/java/jace/core/Utility.java @@ -400,8 +400,7 @@ public class Utility { } public static Object setChild(Object object, String fieldName, String value, boolean hex) { - if (object instanceof Map) { - Map map = (Map) object; + if (object instanceof Map map) { for (Object key : map.entrySet()) { if (key.toString().equalsIgnoreCase(fieldName)) { map.put(key, value); diff --git a/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java b/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java index 3361f897..61ce39ad 100644 --- a/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java +++ b/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessHacks.java @@ -11,6 +11,8 @@ import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -139,7 +141,7 @@ public class LawlessHacks extends Cheats { try { return new Media(path.toURI().toString()); } catch (URISyntaxException e) { - e.printStackTrace(); + Logger.getLogger(getClass().getName()).log(Level.WARNING, "Unable to load audio track " + number + " from " + pathStr, e); return null; } } @@ -160,7 +162,7 @@ public class LawlessHacks extends Cheats { private void stopSongEffect() { if (playbackEffect != null && playbackEffect.isAlive()) { playbackEffect.interrupt(); - Thread.yield(); + Thread.onSpinWait(); } playbackEffect = null; } @@ -331,7 +333,6 @@ public class LawlessHacks extends Cheats { } if (COMMENT.matcher(line).matches() || line.trim().isEmpty()) { // System.out.println("Ignoring: "+line); - return; } else if (LABEL.matcher(line).matches()) { currentScore = line.toLowerCase(Locale.ROOT); scores.put(currentScore, new HashMap<>());