diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java index 2989f6d1..c7d85a5f 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java @@ -326,7 +326,7 @@ public abstract class FlatLaf Method m = UIManager.class.getMethod( "createLookAndFeel", String.class ); aquaLaf = (BasicLookAndFeel) m.invoke( null, "Mac OS X" ); } else - aquaLaf = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance(); + aquaLaf = (BasicLookAndFeel) Class.forName( aquaLafClassName ).getDeclaredConstructor().newInstance(); } catch( Exception ex ) { LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to initialize Aqua look and feel '" + aquaLafClassName + "'.", ex ); throw new IllegalStateException(); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java index f490e6a3..7ef295a0 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java @@ -442,8 +442,8 @@ class UIDefaultsLoader private static Object parseInstance( String value, List addonClassLoaders ) { return (LazyValue) t -> { try { - return findClass( value, addonClassLoaders ).newInstance(); - } catch( InstantiationException | IllegalAccessException | ClassNotFoundException ex ) { + return findClass( value, addonClassLoaders ).getDeclaredConstructor().newInstance(); + } catch( Exception ex ) { LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to instantiate '" + value + "'.", ex ); return null; } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java index 7bec8d33..c4f79435 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java @@ -327,7 +327,7 @@ public class FlatTabbedPaneUI // the default also includes Ctrl+TAB/Ctrl+Shift+TAB, which we need to switch tabs if( focusForwardTraversalKeys == null ) { focusForwardTraversalKeys = Collections.singleton( KeyStroke.getKeyStroke( KeyEvent.VK_TAB, 0 ) ); - focusBackwardTraversalKeys = Collections.singleton( KeyStroke.getKeyStroke( KeyEvent.VK_TAB, InputEvent.SHIFT_MASK ) ); + focusBackwardTraversalKeys = Collections.singleton( KeyStroke.getKeyStroke( KeyEvent.VK_TAB, InputEvent.SHIFT_DOWN_MASK ) ); } // Ideally we should use `LookAndFeel.installProperty( tabPane, "focusTraversalKeysForward", keys )` here // instead of `tabPane.setFocusTraversalKeys()`, but WindowsTabbedPaneUI also uses later method diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/Graphics2DProxy.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/Graphics2DProxy.java index b68d2c69..2bc42296 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/Graphics2DProxy.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/Graphics2DProxy.java @@ -256,11 +256,6 @@ public class Graphics2DProxy delegate.dispose(); } - @Override - public void finalize() { - delegate.finalize(); - } - @Override public String toString() { return delegate.toString(); diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java index abfdb288..eafcceda 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java @@ -124,11 +124,11 @@ public class FlatMenusTest private int randomKeyStrokeIndex = 0; private final KeyStroke[] randomKeyStrokes = { KeyStroke.getKeyStroke( KeyEvent.VK_F2, 0 ), - KeyStroke.getKeyStroke( KeyEvent.VK_A, KeyEvent.CTRL_MASK ), - KeyStroke.getKeyStroke( KeyEvent.VK_B, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK ), + KeyStroke.getKeyStroke( KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK ), + KeyStroke.getKeyStroke( KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK ), KeyStroke.getKeyStroke( KeyEvent.VK_BACK_SPACE, 0 ), KeyStroke.getKeyStroke( KeyEvent.VK_PAGE_UP, 0 ), - KeyStroke.getKeyStroke( KeyEvent.VK_C, KeyEvent.ALT_MASK ), + KeyStroke.getKeyStroke( KeyEvent.VK_C, KeyEvent.ALT_DOWN_MASK ), KeyStroke.getKeyStroke( KeyEvent.VK_ENTER, 0 ), KeyStroke.getKeyStroke( KeyEvent.VK_F10, 0 ), KeyStroke.getKeyStroke( KeyEvent.VK_0, 0 ),