Index: src/main/java/common/org/apache/harmony/awt/gl/font/FontFinder.java =================================================================== --- src/main/java/common/org/apache/harmony/awt/gl/font/FontFinder.java (revision 554868) +++ src/main/java/common/org/apache/harmony/awt/gl/font/FontFinder.java (working copy) @@ -103,7 +103,7 @@ * @param fonts - mapping of the font run starts to the fonts */ static void findFonts(char text[], int runStart, int runLimit, List runStarts, - Map fonts) { + Map fonts) { Font prevFont = null; Font currFont; for (int i = runStart; i < runLimit; i++) { Index: src/main/java/common/org/apache/harmony/awt/gl/font/TextMetricsCalculator.java =================================================================== --- src/main/java/common/org/apache/harmony/awt/gl/font/TextMetricsCalculator.java (revision 554868) +++ src/main/java/common/org/apache/harmony/awt/gl/font/TextMetricsCalculator.java (working copy) @@ -86,7 +86,7 @@ */ public void checkBaselines() { // Take baseline offsets of the first font and normalize them - HashMap fonts = breaker.fonts; + HashMap fonts = breaker.fonts; Object val = fonts.get(new Integer(0)); Index: src/main/java/common/org/apache/harmony/awt/gl/font/TextRunBreaker.java =================================================================== --- src/main/java/common/org/apache/harmony/awt/gl/font/TextRunBreaker.java (revision 554868) +++ src/main/java/common/org/apache/harmony/awt/gl/font/TextRunBreaker.java (working copy) @@ -53,7 +53,7 @@ byte[] levels; - HashMap fonts; + HashMap fonts; HashMap decorations; // Related to default font substitution @@ -193,7 +193,7 @@ */ void createStyleRuns() { // TODO - implement fast and simple case - fonts = new HashMap(); + fonts = new HashMap(); decorations = new HashMap(); //// @@ -221,7 +221,8 @@ // Find appropriate font or place GraphicAttribute there // 1. Try to pick up CHAR_REPLACEMENT (compatibility) - Font value = (Font)attributes.get(TextAttribute.CHAR_REPLACEMENT); + Object value = (GraphicAttribute) + attributes.get(TextAttribute.CHAR_REPLACEMENT); if (value == null) { // 2. Try to Get FONT