Skip to content

Commit dd48989

Browse files
committed
Remove unneeded dependency on sun.awt.Mutex
1 parent 4731749 commit dd48989

3 files changed

Lines changed: 2 additions & 6 deletions

File tree

build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
mkdir ./out
22
find -name "*.java" > sources.txt
3-
BUILD_COMMAND="javac -d ./out @sources.txt"
4-
${BUILD_COMMAND} --add-exports=java.desktop/sun.awt=ALL-UNNAMED || \
5-
echo "Command failed, retrying assuming older Java build" && ${BUILD_COMMAND}
3+
javac -d ./out @sources.txt
64
cd ./out
75
find ../src -name "*.png" -exec cp '{}' ./com/modsim/res/ \;
86
jar cfm ../ModuleSim-Test.jar ../src/META-INF/MANIFEST.MF ./

src/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
Manifest-Version: 1.0
22
Main-Class: com.modsim.Main
3-
Add-Exports: java.desktop/sun.awt

src/com/modsim/simulator/Sim.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
import com.modsim.modules.*;
1313
import static com.modsim.modules.BaseModule.AvailableModules;
1414
import com.modsim.modules.parts.Port;
15-
import sun.awt.Mutex;
1615

1716
import com.modsim.util.BinData;
1817
import com.modsim.util.CtrlPt;
1918

2019
public class Sim implements Runnable {
2120

2221
private Thread thread;
23-
public final Mutex lock = new Mutex();
22+
public final Object lock = new Object();
2423

2524
private int lastLinkInd = 0;
2625

0 commit comments

Comments
 (0)