From f92e5baaea9c15d655f19a3b8dc9101876991995 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 31 Oct 2012 19:43:55 +0100 Subject: *FontLoader: Order fields in init-order, make private. --- src/jogl/classes/jogamp/graph/font/JavaFontLoader.java | 8 ++++---- src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/jogl/classes/jogamp/graph/font/JavaFontLoader.java b/src/jogl/classes/jogamp/graph/font/JavaFontLoader.java index a00e9579c..3736c5f13 100644 --- a/src/jogl/classes/jogamp/graph/font/JavaFontLoader.java +++ b/src/jogl/classes/jogamp/graph/font/JavaFontLoader.java @@ -41,7 +41,10 @@ import com.jogamp.graph.font.FontFactory; public class JavaFontLoader implements FontSet { - final static FontSet fontLoader = new JavaFontLoader(); + // FIXME: Add cache size to limit memory usage + private static final IntObjectHashMap fontMap = new IntObjectHashMap(); + + private static final FontSet fontLoader = new JavaFontLoader(); public static FontSet get() { return fontLoader; @@ -74,9 +77,6 @@ public class JavaFontLoader implements FontSet { } } - // FIXME: Add cache size to limit memory usage - static final IntObjectHashMap fontMap = new IntObjectHashMap(); - static boolean is(int bits, int bit) { return 0 != ( bits & bit ) ; } diff --git a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java index 0772cc47f..c4c580290 100644 --- a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java +++ b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java @@ -40,9 +40,14 @@ import java.net.URLConnection; public class UbuntuFontLoader implements FontSet { - final static FontSet fontLoader = new UbuntuFontLoader(); + // FIXME: Add cache size to limit memory usage + private static final IntObjectHashMap fontMap = new IntObjectHashMap(); + + private static final String relPath = "fonts/ubuntu/" ; + + private static final FontSet fontLoader = new UbuntuFontLoader(); - public static FontSet get() { + public static final FontSet get() { return fontLoader; } @@ -59,14 +64,9 @@ public class UbuntuFontLoader implements FontSet { }; - final static String relPath = "fonts/ubuntu/" ; - private UbuntuFontLoader() { } - // FIXME: Add cache size to limit memory usage - static final IntObjectHashMap fontMap = new IntObjectHashMap(); - static boolean is(int bits, int bit) { return 0 != ( bits & bit ) ; } -- cgit v1.2.3