Skip to content

Commit 973dd3d

Browse files
committed
Add FontConfiguration reflection and resource configuration
1 parent 3dda4c9 commit 973dd3d

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

core/esmf-native-support/src/main/java/org/eclipse/esmf/nativefeatures/DiagramFeature.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,7 @@ private void setupFontConfiguration() {
363363
Native.forClass( "sun.font.CompositeFontDescriptor" )
364364
.registerEverythingForReflection();
365365
Native.forClass( "sun.font.FontDesignMetrics" )
366-
.registerEverythingForReflection();
367-
Native.forClass( "sun.font.FontDesignMetrics" )
366+
.registerEverythingForReflection()
368367
.registerEverythingForJni();
369368
Native.forClass( java.awt.FontMetrics.class )
370369
.registerFieldsForJni( "font" )
@@ -400,6 +399,8 @@ private void setupFontConfiguration() {
400399
.registerMethodForJni( "readFile", java.nio.ByteBuffer.class );
401400

402401
if ( isWindows() ) {
402+
Native.forClass( "sun.awt.FontConfiguration" )
403+
.registerEverythingForReflection();
403404
Native.addResource( "fontconfig.bfc" );
404405
}
405406
}

core/esmf-native-support/src/main/java/org/eclipse/esmf/substitution/Target_sun_awt_FontConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
public final class Target_sun_awt_FontConfiguration {
4141
@Substitute
4242
private void readFontConfigFile( final File f ) {
43-
try ( final InputStream inputStream = Object.class.getResourceAsStream( "/fontconfig.bfc" ) ) {
43+
try ( final InputStream inputStream = getClass().getResourceAsStream( "/fontconfig.bfc" ) ) {
4444
loadBinary( inputStream );
45-
} catch ( final IOException e ) {
46-
throw new RuntimeException( e );
45+
} catch ( final IOException exception ) {
46+
throw new RuntimeException( exception );
4747
}
4848
}
4949

0 commit comments

Comments
 (0)