From 2fbdce26ea29ba44fcef6b2a3b8b3c1843d24d10 Mon Sep 17 00:00:00 2001 From: Ralph Plawetzki Date: Wed, 3 May 2023 09:50:44 +0200 Subject: [PATCH] Use JEP 433 pattern matching for switch --- .../ui/traymenu/AwtTrayMenuController.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java index 88551f886..46ed63550 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java +++ b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java @@ -88,18 +88,19 @@ public class AwtTrayMenuController implements TrayMenuController { private void addChildren(Menu menu, List items) { for (var item : items) { - // TODO: use Pattern Matching for switch, once available - if (item instanceof ActionItem a) { - var menuItem = new MenuItem(a.title()); - menuItem.addActionListener(evt -> a.action().run()); - menuItem.setEnabled(a.enabled()); - menu.add(menuItem); - } else if (item instanceof SeparatorItem) { - menu.addSeparator(); - } else if (item instanceof SubMenuItem s) { - var submenu = new Menu(s.title()); - addChildren(submenu, s.items()); - menu.add(submenu); + switch (item) { + case ActionItem a -> { + var menuItem = new MenuItem(a.title()); + menuItem.addActionListener(evt -> a.action().run()); + menuItem.setEnabled(a.enabled()); + menu.add(menuItem); + } + case SeparatorItem separatorItem -> menu.addSeparator(); + case SubMenuItem s -> { + var submenu = new Menu(s.title()); + addChildren(submenu, s.items()); + menu.add(submenu); + } } } }