From 83879f5cfed647e435d1c9a11569670697e58c68 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Mon, 9 Oct 2023 16:19:56 +0200 Subject: [PATCH] revert 8e9d54b & 6c5ee14 due to bug in JDK 21 see https://bugs.openjdk.org/browse/JDK-8313323 --- .../org/cryptomator/ipc/IpcMessageListener.java | 2 +- .../org/cryptomator/ui/health/StartController.java | 14 +++++++------- .../ui/traymenu/AwtTrayMenuController.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java index 284ed075b..756305cbe 100644 --- a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java +++ b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java @@ -6,7 +6,7 @@ public interface IpcMessageListener { default void handleMessage(IpcMessage message) { switch (message) { - case RevealRunningAppMessage _ -> revealRunningApp(); + case RevealRunningAppMessage m -> revealRunningApp(); // TODO: rename to _ with JEP 443 case HandleLaunchArgsMessage m -> handleLaunchArgs(m.args()); } } diff --git a/src/main/java/org/cryptomator/ui/health/StartController.java b/src/main/java/org/cryptomator/ui/health/StartController.java index 917ba8095..9ff2502da 100644 --- a/src/main/java/org/cryptomator/ui/health/StartController.java +++ b/src/main/java/org/cryptomator/ui/health/StartController.java @@ -101,16 +101,16 @@ public class StartController implements FxController { } } - private void loadingKeyFailed(Throwable e) { - switch (e) { - case UnlockCancelledException _ -> {} //ok - case VaultKeyInvalidException _ -> { - LOG.error("Invalid key"); //TODO: specific error screen + private void loadingKeyFailed(Throwable t) { + switch (t) { + case UnlockCancelledException e -> {} // ok // TODO: rename to _ with JEP 443 + case VaultKeyInvalidException e -> { // TODO: rename to _ with JEP 443 + LOG.error("Invalid key"); // TODO: specific error screen appWindows.showErrorWindow(e, window, null); } default -> { - LOG.error("Failed to load key.", e); - appWindows.showErrorWindow(e, window, null); + LOG.error("Failed to load key.", t); + appWindows.showErrorWindow(t, window, null); } } } diff --git a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java index ba6b2ef74..012097e33 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java +++ b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java @@ -109,7 +109,7 @@ public class AwtTrayMenuController implements TrayMenuController { menuItem.setEnabled(a.enabled()); menu.add(menuItem); } - case SeparatorItem _ -> menu.addSeparator(); + case SeparatorItem s -> menu.addSeparator(); // TODO: rename to _ with JEP 443 case SubMenuItem s -> { var submenu = new Menu(s.title()); addChildren(submenu, s.items());