diff options
| author | Sven Gothel <[email protected]> | 2023-05-20 14:34:33 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-05-20 14:34:33 +0200 |
| commit | 07da0949aae6d13c7cca12bc4728e98b161dbf42 (patch) | |
| tree | aaa398357f5d12ed9d49331cb776ce72aa2e51f4 /src | |
| parent | 77dc88ce6aa36673af46a296a15fb438154d3a0a (diff) | |
Relocate 'jar/atomic/jogl-fonts-p0.jar' -> 'jar/jogl-fonts-p0.jar' to simplify inclusion in distribution; UbuntuFontLoader's Uri is patched accordingly.
This font jar file is actually not an atomic in the sense it being aggregated to e.g. jogl-all.jar or even a fat jar.
Hence it is more suitable to have it all visible in the top-dir next to the main jars.
Diffstat (limited to 'src')
| -rw-r--r-- | src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java index 71d18b17e..46cd4cfab 100644 --- a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java +++ b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java @@ -49,7 +49,6 @@ public class UbuntuFontLoader implements FontSet { // FIXME: Add cache size to limit memory usage private static final IntObjectHashMap fontMap = new IntObjectHashMap(); - private static final Uri.Encoded jarSubDir = Uri.Encoded.cast("atomic/"); private static final Uri.Encoded jarName = Uri.Encoded.cast("jogl-fonts-p0.jar"); private static final String absFontPath = "jogamp/graph/font/fonts/ubuntu/" ; @@ -138,7 +137,7 @@ public class UbuntuFontLoader implements FontSet { Platform.initSingleton(); if( TempJarCache.isInitialized(false) ) { try { - final Uri uri = JarUtil.getRelativeOf(UbuntuFontLoader.class, jarSubDir, jarName); + final Uri uri = JarUtil.getRelativeOf(UbuntuFontLoader.class, null, jarName); final Exception e0 = SecurityUtil.doPrivileged(new PrivilegedAction<Exception>() { @Override public Exception run() { |