From dd48989b037037f848315614b3dcf03a8a18f21c Mon Sep 17 00:00:00 2001 From: Foxinatel Date: Fri, 20 Oct 2023 12:08:44 +0100 Subject: [PATCH 1/3] Remove unneeded dependency on sun.awt.Mutex --- build.sh | 4 +--- src/META-INF/MANIFEST.MF | 1 - src/com/modsim/simulator/Sim.java | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index eb33a38..5a12258 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,6 @@ mkdir ./out find -name "*.java" > sources.txt -BUILD_COMMAND="javac -d ./out @sources.txt" -${BUILD_COMMAND} --add-exports=java.desktop/sun.awt=ALL-UNNAMED || \ - echo "Command failed, retrying assuming older Java build" && ${BUILD_COMMAND} +javac -d ./out @sources.txt cd ./out find ../src -name "*.png" -exec cp '{}' ./com/modsim/res/ \; jar cfm ../ModuleSim-Test.jar ../src/META-INF/MANIFEST.MF ./ diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF index fbda7f5..acd89d2 100644 --- a/src/META-INF/MANIFEST.MF +++ b/src/META-INF/MANIFEST.MF @@ -1,3 +1,2 @@ Manifest-Version: 1.0 Main-Class: com.modsim.Main -Add-Exports: java.desktop/sun.awt diff --git a/src/com/modsim/simulator/Sim.java b/src/com/modsim/simulator/Sim.java index 11eb01b..5a1fbbf 100644 --- a/src/com/modsim/simulator/Sim.java +++ b/src/com/modsim/simulator/Sim.java @@ -12,7 +12,6 @@ import com.modsim.modules.*; import static com.modsim.modules.BaseModule.AvailableModules; import com.modsim.modules.parts.Port; -import sun.awt.Mutex; import com.modsim.util.BinData; import com.modsim.util.CtrlPt; @@ -20,7 +19,7 @@ public class Sim implements Runnable { private Thread thread; - public final Mutex lock = new Mutex(); + public final Object lock = new Object(); private int lastLinkInd = 0; From aad093b230cb65f92c02d798d30c24f153c7c1e8 Mon Sep 17 00:00:00 2001 From: Foxinatel Date: Fri, 27 Oct 2023 11:30:38 +0100 Subject: [PATCH 2/3] Make build script not crash if ./out already exists --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 5a12258..047970d 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -mkdir ./out +[ -d ./out ] || mkdir ./out find -name "*.java" > sources.txt javac -d ./out @sources.txt cd ./out From 5d66d3c23f5c74bd0ea05beac2983c3a7b0ca310 Mon Sep 17 00:00:00 2001 From: Foxinatel Date: Fri, 27 Oct 2023 11:47:41 +0100 Subject: [PATCH 3/3] Suppress warning from safe unchecked cast --- src/com/modsim/util/ModuleClipboard.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/modsim/util/ModuleClipboard.java b/src/com/modsim/util/ModuleClipboard.java index 4017e72..ce47ec1 100644 --- a/src/com/modsim/util/ModuleClipboard.java +++ b/src/com/modsim/util/ModuleClipboard.java @@ -185,6 +185,7 @@ public String getClipboardContents() { if (hasTransferableFiles) { try { + @SuppressWarnings("unchecked") List files = (List) contents.getTransferData(DataFlavor.javaFileListFlavor); if (files.size() == 1) { File file = files.get(0);