Author: gadams
Date: Fri Mar 2 21:34:30 2012
New Revision: 1296483
URL: http://svn.apache.org/viewvc?rev=1296483&view=rev
Log:
enable MultipleVariableDeclarations rule; fix violations
Modified:
xmlgraphics/fop/trunk/checkstyle-5.5.xml
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NamedColorFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/XMLResourceBundle.java
Modified: xmlgraphics/fop/trunk/checkstyle-5.5.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-5.5.xml?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-5.5.xml (original)
+++ xmlgraphics/fop/trunk/checkstyle-5.5.xml Fri Mar 2 21:34:30 2012
@@ -169,7 +169,7 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
- <!-- <module name="MultipleVariableDeclarations"/> produces 78 new errors
-->
+ <module name="MultipleVariableDeclarations"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
Modified:
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java
(original)
+++
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java
Fri Mar 2 21:34:30 2012
@@ -211,7 +211,8 @@ public final class GenerateBidiClass {
}
}
// compile interval search data
- int ivIndex = 0, niv = intervals.size();
+ int ivIndex = 0;
+ int niv = intervals.size();
bcS1 = new int [ niv ];
bcE1 = new int [ niv ];
bcC1 = new byte [ niv ];
@@ -226,7 +227,8 @@ public final class GenerateBidiClass {
}
private static int[] parseInterval ( String interval ) throws Exception {
- int s, e;
+ int s;
+ int e;
String[] fa = interval.split("\\.\\.");
if ( fa.length == 1 ) {
s = Integer.parseInt ( fa[0], 16 );
Modified:
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
(original)
+++
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
Fri Mar 2 21:34:30 2012
@@ -715,7 +715,9 @@ public final class GenerateBidiTestData
rm.put ( Integer.valueOf ( r[0] ), Integer.valueOf ( r[1] ) );
}
// add complement ranges save last
- int s, e, cs = 0;
+ int s;
+ int e;
+ int cs = 0;
List compRanges = new ArrayList ( rm.size() + 1 );
for ( Iterator it = rm.entrySet().iterator(); it.hasNext(); ) {
Map.Entry/*<Integer,Integer>*/ me =
(Map.Entry/*<Integer,Integer>*/) it.next();
Modified:
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
(original)
+++
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
Fri Mar 2 21:34:30 2012
@@ -258,7 +258,8 @@ public final class UnicodeClasses {
continue;
}
- int uppercode = -1, titlecode = -1;
+ int uppercode = -1;
+ int titlecode = -1;
if (!"".equals(fields[SIMPLE_UPPERCASE_MAPPING])) {
uppercode =
Integer.parseInt(fields[SIMPLE_UPPERCASE_MAPPING], 16);
}
@@ -355,7 +356,10 @@ public final class UnicodeClasses {
* @throws URISyntaxException if the input URI is incorrect
*/
public static void main(String[] args) throws IOException,
URISyntaxException {
- String type = "ucd", prefix = "--", infile = null, outfile = null;
+ String type = "ucd";
+ String prefix = "--";
+ String infile = null;
+ String outfile = null;
boolean hexcode = false;
int i;
for (i = 0; i < args.length && args[i].startsWith(prefix); ++i) {
Modified:
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
(original)
+++
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
Fri Mar 2 21:34:30 2012
@@ -558,7 +558,8 @@ public final class GenerateLineBreakUtil
throw new Exception(lineBreakFileName + ':' + lineNumber +
": Unknown property value in " + line);
}
String codepoint = line.substring(0, idx);
- int low, high;
+ int low;
+ int high;
idx = codepoint.indexOf("..");
try {
if (idx >= 0) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOURIResolver.java Fri
Mar 2 21:34:30 2012
@@ -183,7 +183,8 @@ public class FOURIResolver implements ja
if (source == null) {
URL absoluteURL = null;
int hashPos = href.indexOf('#');
- String fileURL, fragment;
+ String fileURL;
+ String fragment;
if (hashPos >= 0) {
fileURL = href.substring(0, hashPos);
fragment = href.substring(hashPos);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
Fri Mar 2 21:34:30 2012
@@ -168,7 +168,9 @@ public class FopFactoryConfigurator {
if (hyphPatConfig.length != 0) {
Map/*<String,String>*/ hyphPatNames = new
HashMap/*<String,String>*/();
for (int i = 0; i < hyphPatConfig.length; ++i) {
- String lang, country, filename;
+ String lang;
+ String country;
+ String filename;
StringBuffer error = new StringBuffer();
String location = hyphPatConfig[i].getLocation();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java Fri Mar 2
21:34:30 2012
@@ -41,7 +41,12 @@ public class CTM implements Serializable
private static final long serialVersionUID = -8743287485623778341L;
- private double a, b, c, d, e, f;
+ private double a;
+ private double b;
+ private double c;
+ private double d;
+ private double e;
+ private double f;
private static final CTM CTM_LRTB = new CTM(1, 0, 0, 1, 0, 0);
private static final CTM CTM_RLTB = new CTM(1, 0, 0, 1, 0, 0);
@@ -175,7 +180,8 @@ public class CTM implements Serializable
* @return CTM The result of rotating this CTM.
*/
public CTM rotate(double angle) {
- double cos, sin;
+ double cos;
+ double sin;
if (angle == 90.0 || angle == -270.0) {
cos = 0.0;
sin = 1.0;
@@ -286,7 +292,8 @@ public class CTM implements Serializable
WritingMode writingMode,
Rectangle2D absVPrect,
FODimension reldims) {
- int width, height;
+ int width;
+ int height;
// We will use the absolute reference-orientation to set up the CTM.
// The value here is relative to its ancestor reference area.
if (absRefOrient % 180 == 0) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java
Fri Mar 2 21:34:30 2012
@@ -203,7 +203,9 @@ public final class GlyphClassTable exten
}
}
// extract glyph class array
- int i = 0, n = entries.size() - 1, gcMax = -1;
+ int i = 0;
+ int n = entries.size() - 1;
+ int gcMax = -1;
int[] gca = new int [ n ];
while ( it.hasNext() ) {
Object o = it.next();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
Fri Mar 2 21:34:30 2012
@@ -174,7 +174,9 @@ public final class GlyphCoverageTable ex
return getMappedIndex ( gid );
}
private void populate ( List entries ) {
- int i = 0, n = entries.size(), gidMax = -1;
+ int i = 0;
+ int n = entries.size();
+ int gidMax = -1;
int[] map = new int [ n ];
for ( Iterator it = entries.iterator(); it.hasNext();) {
Object o = it.next();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
Fri Mar 2 21:34:30 2012
@@ -157,7 +157,8 @@ public class GlyphMappingTable {
}
/** {@inheritDoc} */
public int getMappedIndex ( int gid ) {
- int i, mi;
+ int i;
+ int mi;
if ( ( i = Arrays.binarySearch ( sa, gid ) ) >= 0 ) {
mi = getMappedIndex ( gid, sa [ i ], ma [ i ] );
// matches start of (some) range
} else if ( ( i = - ( i + 1 ) ) == 0 ) {
@@ -179,7 +180,10 @@ public class GlyphMappingTable {
*/
public abstract int getMappedIndex ( int gid, int s, int m );
private void populate ( List entries ) {
- int i = 0, n = entries.size(), gidMax = -1, miMax = -1;
+ int i = 0;
+ int n = entries.size();
+ int gidMax = -1;
+ int miMax = -1;
int[] sa = new int [ n ];
int[] ea = new int [ n ];
int[] ma = new int [ n ];
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
Fri Mar 2 21:34:30 2012
@@ -258,7 +258,8 @@ public class GlyphPositioningTable exten
}
/** {@inheritDoc} */
public boolean position ( GlyphPositioningState ps ) {
- int gi = ps.getGlyph(), ci;
+ int gi = ps.getGlyph();
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) < 0 ) {
return false;
} else {
@@ -396,7 +397,8 @@ public class GlyphPositioningTable exten
/** {@inheritDoc} */
public boolean position ( GlyphPositioningState ps ) {
boolean applied = false;
- int gi = ps.getGlyph(0), ci;
+ int gi = ps.getGlyph(0);
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) >= 0 ) {
int[] counts = ps.getGlyphsAvailable ( 0 );
int nga = counts[0];
@@ -587,7 +589,8 @@ public class GlyphPositioningTable exten
/** {@inheritDoc} */
public boolean position ( GlyphPositioningState ps ) {
boolean applied = false;
- int gi = ps.getGlyph(0), ci;
+ int gi = ps.getGlyph(0);
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) >= 0 ) {
int[] counts = ps.getGlyphsAvailable ( 0 );
int nga = counts[0];
@@ -703,7 +706,8 @@ public class GlyphPositioningTable exten
/** {@inheritDoc} */
public boolean position ( GlyphPositioningState ps ) {
boolean applied = false;
- int giMark = ps.getGlyph(), ciMark;
+ int giMark = ps.getGlyph();
+ int ciMark;
if ( ( ciMark = getCoverageIndex ( giMark ) ) >= 0 ) {
MarkAnchor ma = getMarkAnchor ( ciMark, giMark );
if ( ma != null ) {
@@ -846,7 +850,8 @@ public class GlyphPositioningTable exten
/** {@inheritDoc} */
public boolean position ( GlyphPositioningState ps ) {
boolean applied = false;
- int giMark = ps.getGlyph(), ciMark;
+ int giMark = ps.getGlyph();
+ int ciMark;
if ( ( ciMark = getCoverageIndex ( giMark ) ) >= 0 ) {
MarkAnchor ma = getMarkAnchor ( ciMark, giMark );
int mxc = getMaxComponentCount();
@@ -1004,7 +1009,8 @@ public class GlyphPositioningTable exten
/** {@inheritDoc} */
public boolean position ( GlyphPositioningState ps ) {
boolean applied = false;
- int giMark1 = ps.getGlyph(), ciMark1;
+ int giMark1 = ps.getGlyph();
+ int ciMark1;
if ( ( ciMark1 = getCoverageIndex ( giMark1 ) ) >= 0 ) {
MarkAnchor ma = getMark1Anchor ( ciMark1, giMark1 );
if ( ma != null ) {
@@ -1134,7 +1140,8 @@ public class GlyphPositioningTable exten
/** {@inheritDoc} */
public boolean position ( GlyphPositioningState ps ) {
boolean applied = false;
- int gi = ps.getGlyph(), ci;
+ int gi = ps.getGlyph();
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) >= 0 ) {
int[] rv = new int[1];
RuleLookup[] la = getLookups ( ci, gi, ps, rv );
@@ -1460,7 +1467,8 @@ public class GlyphPositioningTable exten
/** {@inheritDoc} */
public boolean position ( GlyphPositioningState ps ) {
boolean applied = false;
- int gi = ps.getGlyph(), ci;
+ int gi = ps.getGlyph();
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) >= 0 ) {
int[] rv = new int[1];
RuleLookup[] la = getLookups ( ci, gi, ps, rv );
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
Fri Mar 2 21:34:30 2012
@@ -246,7 +246,8 @@ public class GlyphSubstitutionTable exte
}
/** {@inheritDoc} */
public boolean substitute ( GlyphSubstitutionState ss ) {
- int gi = ss.getGlyph(), ci;
+ int gi = ss.getGlyph();
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) < 0 ) {
return false;
} else {
@@ -341,7 +342,8 @@ public class GlyphSubstitutionTable exte
}
}
private void populate ( List entries ) {
- int i = 0, n = entries.size();
+ int i = 0;
+ int n = entries.size();
int[] glyphs = new int [ n ];
for ( Iterator it = entries.iterator(); it.hasNext();) {
Object o = it.next();
@@ -376,7 +378,8 @@ public class GlyphSubstitutionTable exte
}
/** {@inheritDoc} */
public boolean substitute ( GlyphSubstitutionState ss ) {
- int gi = ss.getGlyph(), ci;
+ int gi = ss.getGlyph();
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) < 0 ) {
return false;
} else {
@@ -461,7 +464,8 @@ public class GlyphSubstitutionTable exte
}
/** {@inheritDoc} */
public boolean substitute ( GlyphSubstitutionState ss ) {
- int gi = ss.getGlyph(), ci;
+ int gi = ss.getGlyph();
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) < 0 ) {
return false;
} else {
@@ -523,7 +527,8 @@ public class GlyphSubstitutionTable exte
}
}
private void populate ( List entries ) {
- int i = 0, n = entries.size();
+ int i = 0;
+ int n = entries.size();
int[][] gaa = new int [ n ][];
for ( Iterator it = entries.iterator(); it.hasNext();) {
Object o = it.next();
@@ -553,7 +558,8 @@ public class GlyphSubstitutionTable exte
}
/** {@inheritDoc} */
public boolean substitute ( GlyphSubstitutionState ss ) {
- int gi = ss.getGlyph(), ci;
+ int gi = ss.getGlyph();
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) < 0 ) {
return false;
} else {
@@ -562,7 +568,8 @@ public class GlyphSubstitutionTable exte
boolean reverse = false;
GlyphTester ignores = ss.getIgnoreDefault();
int[] counts = ss.getGlyphsAvailable ( 0, reverse, ignores
);
- int nga = counts[0], ngi;
+ int nga = counts[0];
+ int ngi;
if ( nga > 1 ) {
int[] iga = ss.getGlyphs ( 0, nga, reverse, ignores,
null, counts );
Ligature l = findLigature ( ls, iga );
@@ -653,7 +660,8 @@ public class GlyphSubstitutionTable exte
}
}
private void populate ( List entries ) {
- int i = 0, n = entries.size();
+ int i = 0;
+ int n = entries.size();
LigatureSet[] ligatureSets = new LigatureSet [ n ];
for ( Iterator it = entries.iterator(); it.hasNext();) {
Object o = it.next();
@@ -683,7 +691,8 @@ public class GlyphSubstitutionTable exte
}
/** {@inheritDoc} */
public boolean substitute ( GlyphSubstitutionState ss ) {
- int gi = ss.getGlyph(), ci;
+ int gi = ss.getGlyph();
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) < 0 ) {
return false;
} else {
@@ -1009,7 +1018,8 @@ public class GlyphSubstitutionTable exte
}
/** {@inheritDoc} */
public boolean substitute ( GlyphSubstitutionState ss ) {
- int gi = ss.getGlyph(), ci;
+ int gi = ss.getGlyph();
+ int ci;
if ( ( ci = getCoverageIndex ( gi ) ) < 0 ) {
return false;
} else {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
Fri Mar 2 21:34:30 2012
@@ -1678,7 +1678,11 @@ public final class OTFAdvancedTypographi
int es = in.readTTFUShort();
// read delta format
int df = in.readTTFUShort();
- int s1, m1, dm, dd, s2;
+ int s1;
+ int m1;
+ int dm;
+ int dd;
+ int s2;
if ( df == 1 ) {
s1 = 14;
m1 = 0x3;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
Fri Mar 2 21:34:30 2012
@@ -238,8 +238,10 @@ public class DevanagariScriptProcessor e
if ( s < 0 ) {
return -1;
} else {
- int c, i = 0;
- int nc = 0, nh = 0;
+ int c;
+ int i = 0;
+ int nc = 0;
+ int nh = 0;
do {
// C
if ( ( s + i ) < e ) {
@@ -277,8 +279,11 @@ public class DevanagariScriptProcessor e
if ( s < 0 ) {
return -1;
} else {
- int c, i = 0;
- int nc = 0, nv = 0, nx = 0;
+ int c;
+ int i = 0;
+ int nc = 0;
+ int nv = 0;
+ int nx = 0;
do {
// C
if ( ( s + i ) < e ) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
Fri Mar 2 21:34:30 2012
@@ -238,8 +238,10 @@ public class GujaratiScriptProcessor ext
if ( s < 0 ) {
return -1;
} else {
- int c, i = 0;
- int nc = 0, nh = 0;
+ int c;
+ int i = 0;
+ int nc = 0;
+ int nh = 0;
do {
// C
if ( ( s + i ) < e ) {
@@ -277,8 +279,11 @@ public class GujaratiScriptProcessor ext
if ( s < 0 ) {
return -1;
} else {
- int c, i = 0;
- int nc = 0, nv = 0, nx = 0;
+ int c;
+ int i = 0;
+ int nc = 0;
+ int nv = 0;
+ int nx = 0;
do {
// C
if ( ( s + i ) < e ) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
Fri Mar 2 21:34:30 2012
@@ -239,8 +239,10 @@ public class GurmukhiScriptProcessor ext
if ( s < 0 ) {
return -1;
} else {
- int c, i = 0;
- int nc = 0, nh = 0;
+ int c;
+ int i = 0;
+ int nc = 0;
+ int nh = 0;
do {
// C
if ( ( s + i ) < e ) {
@@ -278,8 +280,11 @@ public class GurmukhiScriptProcessor ext
if ( s < 0 ) {
return -1;
} else {
- int c, i = 0;
- int nc = 0, nv = 0, nx = 0;
+ int c;
+ int i = 0;
+ int nc = 0;
+ int nv = 0;
+ int nx = 0;
do {
// C
if ( ( s + i ) < e ) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
Fri Mar 2 21:34:30 2012
@@ -1033,7 +1033,11 @@ public class GlyphSequence implements Cl
*/
private static int[] mergeIntervals ( int[] ia ) {
int ni = ia.length;
- int i, n, nm, is, ie;
+ int i;
+ int n;
+ int nm;
+ int is;
+ int ie;
// count merged sub-intervals
for ( i = 0, n = ni, nm = 0, is = ie = -1; i < n; i += 2 ) {
int s = ia [ i + 0 ];
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
Fri Mar 2 21:34:30 2012
@@ -79,7 +79,9 @@ class ICCColorFunction extends FunctionB
}
String src = (cp != null ? cp.getSrc() : "");
- float red = 0, green = 0, blue = 0;
+ float red = 0;
+ float green = 0;
+ float blue = 0;
red = args[0].getNumber().floatValue();
green = args[1].getNumber().floatValue();
blue = args[2].getNumber().floatValue();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NamedColorFunction.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NamedColorFunction.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NamedColorFunction.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/NamedColorFunction.java
Fri Mar 2 21:34:30 2012
@@ -66,7 +66,9 @@ class NamedColorFunction extends Functio
throw pe;
}
- float red = 0, green = 0, blue = 0;
+ float red = 0;
+ float green = 0;
+ float blue = 0;
red = args[0].getNumber().floatValue();
green = args[1].getNumber().floatValue();
blue = args[2].getNumber().floatValue();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java
Fri Mar 2 21:34:30 2012
@@ -223,7 +223,8 @@ public class RelativeNumericProperty ext
* specification.
*/
public double getTableUnits() {
- double tu1 = 0.0, tu2 = 0.0;
+ double tu1 = 0.0;
+ double tu2 = 0.0;
if (op1 instanceof RelativeNumericProperty) {
tu1 = ((RelativeNumericProperty) op1).getTableUnits();
} else if (op1 instanceof TableColLength) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java
Fri Mar 2 21:34:30 2012
@@ -263,7 +263,8 @@ public final class PropertyCache {
CacheEntry[] newTable = new CacheEntry[newLength];
- int hash, idx;
+ int hash;
+ int idx;
Object o;
newLength--;
for (int i = table.length; --i >= 0;) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/AbstractCodePointMapping.java
Fri Mar 2 21:34:30 2012
@@ -125,7 +125,8 @@ public class AbstractCodePointMapping im
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];
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java Fri
Mar 2 21:34:30 2012
@@ -489,7 +489,8 @@ public class MultiByteFont extends CIDFo
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 CIDFo
+ (char) cc + "'");
}
if ( cc > 0x00FFFF ) {
- int sh, sl;
+ int sh;
+ int sl;
cc -= 0x10000;
sh = ( ( cc >> 10 ) & 0x3FF ) + 0xD800;
sl = ( ( cc >> 0 ) & 0x3FF ) + 0xDC00;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
Fri Mar 2 21:34:30 2012
@@ -67,7 +67,8 @@ public class WindowsFontDirFinder implem
// 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("/")) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTree.java
Fri Mar 2 21:34:30 2012
@@ -84,7 +84,8 @@ public class HyphenationTree extends Ter
* are stored.
*/
protected int packValues(String values) {
- int i, n = values.length();
+ int i;
+ int n = values.length();
int m = (n & 1) == 1 ? (n >> 1) + 2 : (n >> 1) + 1;
int offset = vspace.alloc(m);
byte[] va = vspace.getArray();
@@ -247,7 +248,8 @@ public class HyphenationTree extends Ter
protected void searchPatterns(char[] word, int index, byte[] il) {
byte[] values;
int i = index;
- char p, q;
+ char p;
+ char q;
char sp = word[i];
p = root;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/TernaryTree.java
Fri Mar 2 21:34:30 2012
@@ -271,7 +271,9 @@ public class TernaryTree implements Clon
* @return an integer
*/
public static int strcmp(String str, char[] a, int start) {
- int i, d, len = str.length();
+ int i;
+ int d;
+ int len = str.length();
for (i = 0; i < len; i++) {
d = (int)str.charAt(i) - a[start + i];
if (d != 0) {
@@ -448,7 +450,8 @@ public class TernaryTree implements Clon
public void balance() {
// System.out.print("Before root splitchar = ");
System.out.println(sc[root]);
- int i = 0, n = length;
+ int i = 0;
+ int n = length;
String[] k = new String[n];
char[] v = new char[n];
Iterator iter = new Iterator();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Fri Mar 2 21:34:30 2012
@@ -423,7 +423,8 @@ public class BlockContainerLayoutManager
boolean bpDirectionChanges = blockProgressionDirectionChanges();
Point offset = getAbsOffset();
- int allocBPD, allocIPD;
+ int allocBPD;
+ int allocIPD;
if (height.getEnum() == EN_AUTO
|| (!height.isAbsolute() && getAncestorBlockAreaBPD() <= 0)) {
//auto height when height="auto" or "if that dimension is not
specified explicitly
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
Fri Mar 2 21:34:30 2012
@@ -70,7 +70,8 @@ public class InlineKnuthSequence extends
return false;
}
// does the first element of the first paragraph add to an existing
word?
- ListElement lastOldElement, firstNewElement;
+ ListElement lastOldElement;
+ ListElement firstNewElement;
lastOldElement = getLast();
firstNewElement = sequence.getElement(0);
if (firstNewElement.isBox() && !((KnuthElement)
firstNewElement).isAuxiliary()
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
Fri Mar 2 21:34:30 2012
@@ -1231,7 +1231,8 @@ public class LineLayoutManager extends I
ListIterator currParIterator =
currPar.listIterator(currPar.ignoreAtStart);
// list of TLM involved in hyphenation
List updateList = new LinkedList();
- KnuthElement firstElement, nextElement;
+ KnuthElement firstElement;
+ KnuthElement nextElement;
// current InlineLevelLayoutManager
InlineLevelLayoutManager currLM = null;
// number of KnuthBox elements containing word fragments
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
Fri Mar 2 21:34:30 2012
@@ -1320,7 +1320,8 @@ public class TextLayoutManager extends L
// Find the first and last positions in oldList that point to an
AreaInfo
// (i.e. getLeafPos() != -1)
- LeafPosition startPos = null, endPos = null;
+ LeafPosition startPos = null;
+ LeafPosition endPos = null;
ListIterator oldListIter;
for (oldListIter = oldList.listIterator(); oldListIter.hasNext();) {
Position pos = ((KnuthElement) oldListIter.next()).getPosition();
@@ -1346,7 +1347,8 @@ public class TextLayoutManager extends L
int areaInfosRemoved = 0;
if (!changeList.isEmpty()) {
- int oldIndex = -1, changeIndex;
+ int oldIndex = -1;
+ int changeIndex;
PendingChange currChange;
ListIterator changeListIterator = changeList.listIterator();
while (changeListIterator.hasNext()) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java Fri Mar
2 21:34:30 2012
@@ -1025,7 +1025,8 @@ public class PDFDocument {
pdf.append(this.objectcount + 1);
pdf.append("\n0000000000 65535 f \n");
- String s, loc;
+ String s;
+ String loc;
for (int count = 0; count < this.location.size(); count++) {
final String padding = "0000000000";
s = this.location.get(count).toString();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
Fri Mar 2 21:34:30 2012
@@ -1146,8 +1146,10 @@ public class IFRenderer extends Abstract
private int[][] dp = new int[INITIAL_BUFFER_SIZE][4];
// private int lastDPPos = 0; // TBD - not yet used
private final StringBuffer text = new StringBuffer();
- private int startx, starty;
- private int tls, tws;
+ private int startx;
+ private int starty;
+ private int tls;
+ private int tws;
private final boolean combined = false;
void addChar(char ch) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
Fri Mar 2 21:34:30 2012
@@ -508,7 +508,8 @@ public class TXTRenderer extends Abstrac
int borderStartX = bm.getStartX();
int borderStartY = bm.getStartY();
- int x, y;
+ int x;
+ int y;
if (horz && startOrBefore) { // BEFORE
x = borderStartX;
y = borderStartY;
@@ -523,7 +524,11 @@ public class TXTRenderer extends Abstrac
y = borderStartY;
}
- int dx, dy, length, startType, endType;
+ int dx;
+ int dy;
+ int length;
+ int startType;
+ int endType;
if (horz) {
length = borderWidth;
dx = 1;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java Fri
Mar 2 21:34:30 2012
@@ -1064,7 +1064,8 @@ public class PDFGraphics2D extends Abstr
preparePainting();
Shape clip = getClip();
- Rectangle2D usrClipBounds, usrBounds;
+ Rectangle2D usrClipBounds;
+ Rectangle2D usrBounds;
usrBounds = shape.getBounds2D();
if (clip != null) {
usrClipBounds = clip.getBounds2D();
@@ -1078,7 +1079,9 @@ public class PDFGraphics2D extends Abstr
double usrW = usrBounds.getWidth();
double usrH = usrBounds.getHeight();
- Rectangle devShapeBounds, devClipBounds, devBounds;
+ Rectangle devShapeBounds;
+ Rectangle devClipBounds;
+ Rectangle devBounds;
AffineTransform at = getTransform();
devShapeBounds = at.createTransformedShape(shape).getBounds();
if (clip != null) {
@@ -1117,7 +1120,10 @@ public class PDFGraphics2D extends Abstr
final byte[] rgb = new byte[devW * devH * 3];
final int[] line = new int[devW];
final byte[] mask;
- int x, y, val, rgbIdx = 0;
+ int x;
+ int y;
+ int val;
+ int rgbIdx = 0;
if (pcm.hasAlpha()) {
mask = new byte[devW * devH];
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java
Fri Mar 2 21:34:30 2012
@@ -38,7 +38,8 @@ import java.text.DateFormat;
public class FileCompare {
- private String referenceDirectory, testDirectory;
+ private String referenceDirectory;
+ private String testDirectory;
private String[] filenameList;
private String filenames;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java Fri Mar
2 21:34:30 2012
@@ -183,7 +183,9 @@ public final class ColorUtil {
*/
private static Color parseAsJavaAWTColor(String value)
throws PropertyException {
- float red = 0.0f, green = 0.0f, blue = 0.0f;
+ float red = 0.0f;
+ float green = 0.0f;
+ float blue = 0.0f;
int poss = value.indexOf("[");
int pose = value.indexOf("]");
try {
@@ -315,7 +317,9 @@ public final class ColorUtil {
} else {
alpha = 0xFF;
}
- int red = 0, green = 0, blue = 0;
+ int red = 0;
+ int green = 0;
+ int blue = 0;
if ((len == 4) || (len == 5)) {
//multiply by 0x11 = 17 = 255/15
red = Integer.parseInt(value.substring(1, 2), 16) * 0x11;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/XMLResourceBundle.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/XMLResourceBundle.java?rev=1296483&r1=1296482&r2=1296483&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/XMLResourceBundle.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/XMLResourceBundle.java
Fri Mar 2 21:34:30 2012
@@ -227,7 +227,9 @@ public class XMLResourceBundle extends R
}
private void setLocale(String name) {
- String language = "", country = "", variant = "";
+ String language = "";
+ String country = "";
+ String variant = "";
if (name.length() > 1) {
int nextIndex = name.indexOf('_', 1);
if (nextIndex == -1) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
