Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-08 15:00:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed some deprecation warnings when compiling with Java 11

Browse Source
This commit is contained in:
Karl Tauber
2021-04-22 15:53:02 +02:00
parent 89c5a0c57b
commit e6f72bf343
5 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
View File

@@ -326,7 +326,7 @@ public abstract class FlatLaf
Method m = UIManager.class.getMethod( "createLookAndFeel", String.class ); Method m = UIManager.class.getMethod( "createLookAndFeel", String.class );
aquaLaf = (BasicLookAndFeel) m.invoke( null, "Mac OS X" ); aquaLaf = (BasicLookAndFeel) m.invoke( null, "Mac OS X" );
} else } else
aquaLaf = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance(); aquaLaf = (BasicLookAndFeel) Class.forName( aquaLafClassName ).getDeclaredConstructor().newInstance();
} catch( Exception ex ) { } catch( Exception ex ) {
LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to initialize Aqua look and feel '" + aquaLafClassName + "'.", ex ); LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to initialize Aqua look and feel '" + aquaLafClassName + "'.", ex );
throw new IllegalStateException(); throw new IllegalStateException();

4
flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
View File

@@ -442,8 +442,8 @@ class UIDefaultsLoader
private static Object parseInstance( String value, List<ClassLoader> addonClassLoaders ) { private static Object parseInstance( String value, List<ClassLoader> addonClassLoaders ) {
return (LazyValue) t -> { return (LazyValue) t -> {
try { try {
return findClass( value, addonClassLoaders ).newInstance(); return findClass( value, addonClassLoaders ).getDeclaredConstructor().newInstance();
} catch( InstantiationException | IllegalAccessException | ClassNotFoundException ex ) { } catch( Exception ex ) {
LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to instantiate '" + value + "'.", ex ); LoggingFacade.INSTANCE.logSevere( "FlatLaf: Failed to instantiate '" + value + "'.", ex );
return null; return null;
} }

2
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java
View File

@@ -327,7 +327,7 @@ public class FlatTabbedPaneUI
// the default also includes Ctrl+TAB/Ctrl+Shift+TAB, which we need to switch tabs // the default also includes Ctrl+TAB/Ctrl+Shift+TAB, which we need to switch tabs
if( focusForwardTraversalKeys == null ) { if( focusForwardTraversalKeys == null ) {
focusForwardTraversalKeys = Collections.singleton( KeyStroke.getKeyStroke( KeyEvent.VK_TAB, 0 ) ); 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 // Ideally we should use `LookAndFeel.installProperty( tabPane, "focusTraversalKeysForward", keys )` here
// instead of `tabPane.setFocusTraversalKeys()`, but WindowsTabbedPaneUI also uses later method // instead of `tabPane.setFocusTraversalKeys()`, but WindowsTabbedPaneUI also uses later method

5
flatlaf-core/src/main/java/com/formdev/flatlaf/util/Graphics2DProxy.java
View File

@@ -256,11 +256,6 @@ public class Graphics2DProxy
delegate.dispose(); delegate.dispose();
} }
@Override
public void finalize() {
delegate.finalize();
}
@Override @Override
public String toString() { public String toString() {
return delegate.toString(); return delegate.toString();

6
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java
View File

@@ -124,11 +124,11 @@ public class FlatMenusTest
private int randomKeyStrokeIndex = 0; private int randomKeyStrokeIndex = 0;
private final KeyStroke[] randomKeyStrokes = { private final KeyStroke[] randomKeyStrokes = {
KeyStroke.getKeyStroke( KeyEvent.VK_F2, 0 ), KeyStroke.getKeyStroke( KeyEvent.VK_F2, 0 ),
KeyStroke.getKeyStroke( KeyEvent.VK_A, KeyEvent.CTRL_MASK ), KeyStroke.getKeyStroke( KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK ),
KeyStroke.getKeyStroke( KeyEvent.VK_B, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_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_BACK_SPACE, 0 ),
KeyStroke.getKeyStroke( KeyEvent.VK_PAGE_UP, 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_ENTER, 0 ),
KeyStroke.getKeyStroke( KeyEvent.VK_F10, 0 ), KeyStroke.getKeyStroke( KeyEvent.VK_F10, 0 ),
KeyStroke.getKeyStroke( KeyEvent.VK_0, 0 ), KeyStroke.getKeyStroke( KeyEvent.VK_0, 0 ),