From 2534dc70603011406ae0d43c9cf2ab719d45b004 Mon Sep 17 00:00:00 2001 From: Cmd-GZ Date: Wed, 1 Jul 2026 00:13:55 +0800 Subject: [PATCH] Fix: makefile error and compile warnings 1. Remove -source 1.6 -target 1.6 to fix `error: Source/Target option 6 is no longer supported. Use 7 or later.` 2. Modify the jdk source in Dockerfile from java:openjdk-7-jdk to amazoncorretto:8 3. Modify `src/Graphwar/GameData.java:369` from `new Integer(level)` to `level` to fix src/Graphwar/GameData.java:369: warning: [removal] Integer(int) in Integer has been deprecated and marked for removal nextPCs.add(new Integer(level)); 4. Replace `Toolkit.getDefaultToolkit()` with `this` in `GlobalScreen.java:236` and `MainMenuScreen.java:298` to fix warning: [deprecation] getFontMetrics(Font) in Toolkit has been deprecated --- Dockerfile | 4 ++-- makefile | 2 +- src/Graphwar/GameData.java | 2 +- src/Graphwar/GlobalScreen.java | 2 +- src/Graphwar/MainMenuScreen.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index dabadb6..e2b78d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM java:openjdk-7-jdk +FROM amazoncorretto:8 RUN mkdir /compile WORKDIR /compile -CMD [ "./compile.sh" ] +CMD [ "./compile.sh" ] \ No newline at end of file diff --git a/makefile b/makefile index e4f27ab..d0a647d 100644 --- a/makefile +++ b/makefile @@ -1,7 +1,7 @@ all: mkdir -p bin - javac -Xlint:deprecation -source 1.6 -target 1.6 -d bin/ -sourcepath src/ -classpath bin/ src/Graphwar/*.java src/GraphServer/*.java src/GlobalServer/*.java src/RoomServer/*.java + javac -Xlint:deprecation -d bin/ -sourcepath src/ -classpath bin/ src/Graphwar/*.java src/GraphServer/*.java src/GlobalServer/*.java src/RoomServer/*.java cp -r bin/Graphwar Graphwar cp -r bin/GraphServer GraphServer cp -r bin/GlobalServer GlobalServer diff --git a/src/Graphwar/GameData.java b/src/Graphwar/GameData.java index 9b59423..c9a6447 100644 --- a/src/Graphwar/GameData.java +++ b/src/Graphwar/GameData.java @@ -366,7 +366,7 @@ public void addPC(String name, int level) { if(players.size() < Constants.MAX_PLAYERS) { - nextPCs.add(new Integer(level)); + nextPCs.add(level); addPlayer(name); } diff --git a/src/Graphwar/GlobalScreen.java b/src/Graphwar/GlobalScreen.java index bb09271..f88f6c1 100644 --- a/src/Graphwar/GlobalScreen.java +++ b/src/Graphwar/GlobalScreen.java @@ -233,7 +233,7 @@ public void showMessage(String message) showMessage = true; this.message = message; - FontMetrics fontMetrics = Toolkit.getDefaultToolkit().getFontMetrics (Constants.NAME_FONT); + FontMetrics fontMetrics = this.getFontMetrics(Constants.NAME_FONT); int messageLength = fontMetrics.stringWidth(message); this.messageX = (Constants.WIDTH - messageLength)/2; diff --git a/src/Graphwar/MainMenuScreen.java b/src/Graphwar/MainMenuScreen.java index 4802801..4133408 100644 --- a/src/Graphwar/MainMenuScreen.java +++ b/src/Graphwar/MainMenuScreen.java @@ -295,7 +295,7 @@ public void showMessage(String message) showMessage = true; this.message = message; - FontMetrics fontMetrics = Toolkit.getDefaultToolkit().getFontMetrics (Constants.NAME_FONT); + FontMetrics fontMetrics = this.getFontMetrics(Constants.NAME_FONT); int messageLength = fontMetrics.stringWidth(message); this.messageX = (Constants.WIDTH - messageLength)/2;