angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-13 07:17:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

merged PR #61 into master (with minor modifications)

Browse Source 
Bug #60 Illegal reflective access operation on mac
This commit is contained in:
Karl Tauber
2020-02-13 16:23:17 +01:00
parent fd48582a9f f2ddfadc9d
commit 7f9f22df3e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -17,6 +17,8 @@ FlatLaf Change Log
is "..." or a single character. is "..." or a single character.
- ToolBar: No longer use special rollover border for buttons in toolbar. (issue - ToolBar: No longer use special rollover border for buttons in toolbar. (issue
#36) #36)
- Fixed "illegal reflective access operation" warning on macOS when using Java
12 or later. (issue #60, PR #61)
## 0.26 ## 0.26

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

@@ -29,6 +29,7 @@ import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.logging.Level; import java.util.logging.Level;
@@ -194,7 +195,11 @@ public abstract class FlatLaf
// use Mac Aqua LaF as base // use Mac Aqua LaF as base
String aquaLafClassName = "com.apple.laf.AquaLookAndFeel"; String aquaLafClassName = "com.apple.laf.AquaLookAndFeel";
try { try {
base = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance(); if( SystemInfo.IS_JAVA_9_OR_LATER ) {
Method m = UIManager.class.getMethod( "createLookAndFeel", String.class );
base = (BasicLookAndFeel) m.invoke( null, "Mac OS X" );
} else
base = (BasicLookAndFeel) Class.forName( aquaLafClassName ).newInstance();
} catch( Exception ex ) { } catch( Exception ex ) {
LOG.log( Level.SEVERE, "FlatLaf: Failed to initialize base look and feel '" + aquaLafClassName + "'.", ex ); LOG.log( Level.SEVERE, "FlatLaf: Failed to initialize base look and feel '" + aquaLafClassName + "'.", ex );
throw new IllegalStateException(); throw new IllegalStateException();