diff options
| author | Simon Pepping <spepping@apache.org> | 2011-09-29 08:58:12 +0000 |
|---|---|---|
| committer | Simon Pepping <spepping@apache.org> | 2011-09-29 08:58:12 +0000 |
| commit | 0a4a0fdf2e28fd2f685104efcde2cde6b7b57124 (patch) | |
| tree | 3f946943302f262934aeb356b3782c092611d742 /src/java/org/apache/fop/render | |
| parent | eebad9b8a3ea400539a8408cbc6dcb2386c18379 (diff) | |
| download | xmlgraphics-fop-0a4a0fdf2e28fd2f685104efcde2cde6b7b57124.tar.gz xmlgraphics-fop-0a4a0fdf2e28fd2f685104efcde2cde6b7b57124.zip | |
Various small fixes
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1177228 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/render')
| -rw-r--r-- | src/java/org/apache/fop/render/java2d/InstalledFontCollection.java | 6 | ||||
| -rw-r--r-- | src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/render/java2d/InstalledFontCollection.java b/src/java/org/apache/fop/render/java2d/InstalledFontCollection.java index 7526c540d..f41dd4d92 100644 --- a/src/java/org/apache/fop/render/java2d/InstalledFontCollection.java +++ b/src/java/org/apache/fop/render/java2d/InstalledFontCollection.java @@ -38,10 +38,10 @@ public class InstalledFontCollection implements FontCollection { private static Log log = LogFactory.getLog(InstalledFontCollection.class); - private static final Set HARDCODED_FONT_NAMES; + private static final Set<String> HARDCODED_FONT_NAMES; static { - HARDCODED_FONT_NAMES = new java.util.HashSet(); + HARDCODED_FONT_NAMES = new java.util.HashSet<String>(); HARDCODED_FONT_NAMES.add("any"); HARDCODED_FONT_NAMES.add("sans-serif"); HARDCODED_FONT_NAMES.add("serif"); @@ -58,7 +58,7 @@ public class InstalledFontCollection implements FontCollection { } /** Required by new instances of FontMetricsMapper */ - final private Java2DFontMetrics java2DFontMetrics; + private final Java2DFontMetrics java2DFontMetrics; /** * Main constructor diff --git a/src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java b/src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java index 682d9286e..9bbd3e62b 100644 --- a/src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java +++ b/src/java/org/apache/fop/render/ps/PSImageHandlerGraphics2D.java @@ -168,7 +168,7 @@ public class PSImageHandlerGraphics2D implements PSImageHandler { return formGen; } - private static abstract class EPSFormGenerator extends FormGenerator { + private abstract static class EPSFormGenerator extends FormGenerator { EPSFormGenerator(String formName, String title, Dimension2D dimensions) { super(formName, title, dimensions); |