diff options
| author | Glenn Adams <gadams@apache.org> | 2012-03-02 21:34:30 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-03-02 21:34:30 +0000 |
| commit | 9826acf1e8c3552abc295ba34384292ae6db51b3 (patch) | |
| tree | fcca84f17d36fa77846b3d5313a73820cae01366 /src/java/org/apache/fop/fonts | |
| parent | 5494cc056a64aa2c66727087435cad880a896486 (diff) | |
| download | xmlgraphics-fop-9826acf1e8c3552abc295ba34384292ae6db51b3.tar.gz xmlgraphics-fop-9826acf1e8c3552abc295ba34384292ae6db51b3.zip | |
enable MultipleVariableDeclarations rule; fix violations
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1296483 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fonts')
3 files changed, 8 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java b/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java index cc9909135..903fe56ec 100644 --- a/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java +++ b/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java @@ -125,7 +125,8 @@ public class AbstractCodePointMapping implements SingleByteEncoding { return latin1; } } - int bot = 0, top = characters.length - 1; + int bot = 0; + int top = characters.length - 1; while (top >= bot) { int mid = (bot + top) / 2; char mc = characters[mid]; diff --git a/src/java/org/apache/fop/fonts/MultiByteFont.java b/src/java/org/apache/fop/fonts/MultiByteFont.java index 3b15662dc..73ef7c228 100644 --- a/src/java/org/apache/fop/fonts/MultiByteFont.java +++ b/src/java/org/apache/fop/fonts/MultiByteFont.java @@ -489,7 +489,8 @@ public class MultiByteFont extends CIDFont implements Substitutable, Positionabl private GlyphSequence mapCharsToGlyphs ( CharSequence cs ) { IntBuffer cb = IntBuffer.allocate ( cs.length() ); IntBuffer gb = IntBuffer.allocate ( cs.length() ); - int gi, giMissing = findGlyphIndex ( Typeface.NOT_FOUND ); + int gi; + int giMissing = findGlyphIndex ( Typeface.NOT_FOUND ); for ( int i = 0, n = cs.length(); i < n; i++ ) { int cc = cs.charAt ( i ); if ( ( cc >= 0xD800 ) && ( cc < 0xDC00 ) ) { @@ -548,7 +549,8 @@ public class MultiByteFont extends CIDFont implements Substitutable, Positionabl + (char) cc + "'"); } if ( cc > 0x00FFFF ) { - int sh, sl; + int sh; + int sl; cc -= 0x10000; sh = ( ( cc >> 10 ) & 0x3FF ) + 0xD800; sl = ( ( cc >> 0 ) & 0x3FF ) + 0xDC00; diff --git a/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java b/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java index d9773a026..53b076073 100644 --- a/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java +++ b/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java @@ -67,7 +67,8 @@ public class WindowsFontDirFinder implements FontDirFinder { // should continue if this fails } } - File osFontsDir = null, psFontsDir = null; + File osFontsDir = null; + File psFontsDir = null; if (windir != null) { // remove any trailing '/' if (windir.endsWith("/")) { |