Author: vhennebert
Date: Mon Mar 5 11:19:47 2012
New Revision: 1297008
URL: http://svn.apache.org/viewvc?rev=1297008&view=rev
Log:
Removed trailing whitespace and enabled corresponding RegexpSingleline
Checkstyle rule
Modified:
xmlgraphics/fop/trunk/checkstyle-5.5.xml
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiConstants.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.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/GlyphSubstitutionState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/UTF32.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/URIProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
Modified: xmlgraphics/fop/trunk/checkstyle-5.5.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-5.5.xml?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-5.5.xml (original)
+++ xmlgraphics/fop/trunk/checkstyle-5.5.xml Mon Mar 5 11:19:47 2012
@@ -22,12 +22,10 @@
<!--
=====================================================================================================
-->
<!--
=====================================================================================================
-->
- <!-- produces 46 new errors
<module name="RegexpSingleline">
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing spaces."/>
</module>
- -->
<!--
=====================================================================================================
-->
<!--
=====================================================================================================
-->
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=1297008&r1=1297007&r2=1297008&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
Mon Mar 5 11:19:47 2012
@@ -994,7 +994,7 @@ public final class GenerateBidiTestData
int[] la = new int [ levels.size() ];
int k = 0;
for ( Iterator it = levels.iterator(); it.hasNext(); ) {
- la [ k++ ] = ( (Integer) it.next() ).intValue();
+ la [ k++ ] = ( (Integer) it.next() ).intValue();
}
return la;
}
@@ -1050,7 +1050,7 @@ public final class GenerateBidiTestData
if ( it.hasNext() ) {
r = ( (Integer) it.next() ).intValue();
}
- }
+ }
ra [ i ] = r;
}
return ra;
@@ -1155,7 +1155,7 @@ public final class GenerateBidiTestData
int k = 0;
ta [ k++ ] = bitset;
for ( Iterator it = classes.iterator(); it.hasNext(); ) {
- ta [ k++ ] = ( (Integer) it.next() ).intValue();
+ ta [ k++ ] = ( (Integer) it.next() ).intValue();
}
return ta;
} else {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
Mon Mar 5 11:19:47 2012
@@ -212,7 +212,7 @@ public abstract class CharactersetEncode
/**
* The bytes
- *
+ *
* @return the bytes
*/
public byte[] getBytes() {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
Mon Mar 5 11:19:47 2012
@@ -84,7 +84,7 @@ public class GraphicsCharacterString ext
* @return the text string as an encoded byte array
* @throws UnsupportedEncodingException, CharacterCodingException
*/
- private byte[] getStringAsBytes() throws UnsupportedEncodingException,
+ private byte[] getStringAsBytes() throws UnsupportedEncodingException,
CharacterCodingException {
return charSet.encodeChars(str).getBytes();
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiConstants.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiConstants.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiConstants.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiConstants.java
Mon Mar 5 11:19:47 2012
@@ -83,7 +83,7 @@ public interface BidiConstants {
int SURROGATE = 20;
// other constants
- /** last
+ /** last
/** maximum bidirectional levels */
int MAX_LEVELS = 61;
/** override flag */
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java
Mon Mar 5 11:19:47 2012
@@ -140,7 +140,7 @@ public class GlyphDefinitionTable extend
/**
* Determine glyph class.
* @param gid a glyph identifier (index)
- * @return a pre-defined glyph class
(GLYPH_CLASS_BASE|GLYPH_CLASS_LIGATURE|GLYPH_CLASS_MARK|GLYPH_CLASS_COMPONENT).
+ * @return a pre-defined glyph class
(GLYPH_CLASS_BASE|GLYPH_CLASS_LIGATURE|GLYPH_CLASS_MARK|GLYPH_CLASS_COMPONENT).
*/
public int getGlyphClass ( int gid ) {
if ( gct != null ) {
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=1297008&r1=1297007&r2=1297008&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
Mon Mar 5 11:19:47 2012
@@ -162,7 +162,7 @@ public class GlyphMappingTable {
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 ) {
- mi = -1;
// precedes first range
+ mi = -1;
// precedes first range
} else if ( gid > ea [ --i ] ) {
mi = -1;
// follows preceding (or last) range
} else {
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=1297008&r1=1297007&r2=1297008&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
Mon Mar 5 11:19:47 2012
@@ -1749,7 +1749,7 @@ public class GlyphPositioningTable exten
/**
* Instantiate a DeviceTable.
- * @param startSize the
+ * @param startSize the
* @param endSize the ending (scaled) size
* @param deltas adjustments for each scaled size
*/
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
Mon Mar 5 11:19:47 2012
@@ -107,7 +107,7 @@ public class GlyphSubstitutionState exte
*/
public void putGlyph ( int glyph, GlyphSequence.CharAssociation a, Object
predication ) {
if ( ! ogb.hasRemaining() ) {
- ogb = growBuffer ( ogb );
+ ogb = growBuffer ( ogb );
}
ogb.put ( glyph );
if ( predications && ( predication != null ) ) {
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=1297008&r1=1297007&r2=1297008&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
Mon Mar 5 11:19:47 2012
@@ -562,7 +562,7 @@ public class GlyphSubstitutionTable exte
return false;
} else {
LigatureSet ls = getLigatureSetForCoverageIndex ( ci, gi );
- if ( ls != null ) {
+ if ( ls != null ) {
boolean reverse = false;
GlyphTester ignores = ss.getIgnoreDefault();
int[] counts = ss.getGlyphsAvailable ( 0, reverse, ignores
);
@@ -1334,7 +1334,7 @@ public class GlyphSubstitutionTable exte
*/
public static class Ligature {
- private final int ligature; // (resulting)
ligature glyph
+ private final int ligature; // (resulting)
ligature glyph
private final int[] components; // component glyph
codes (note that first component is implied)
/**
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
Mon Mar 5 11:19:47 2012
@@ -267,7 +267,7 @@ public class GlyphTable {
}
return (UseSpec[]) uss.toArray ( new UseSpec [ uss.size() ] );
}
-
+
/** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer(super.toString());
@@ -442,7 +442,7 @@ public class GlyphTable {
// frozen state
private GlyphSubtable[] subtablesArray;
private static GlyphSubtable[] subtablesArrayEmpty = new
GlyphSubtable[0];
-
+
/**
* Instantiate a LookupTable.
* @param id the lookup table's identifier
@@ -742,7 +742,7 @@ public class GlyphTable {
/**
* Construct a glyph lookup table use specification.
* @param lookupTable a glyph lookup table
- * @param feature a feature that caused lookup table selection
+ * @param feature a feature that caused lookup table selection
*/
public UseSpec ( LookupTable lookupTable, String feature ) {
this.lookupTable = lookupTable;
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=1297008&r1=1297007&r2=1297008&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
Mon Mar 5 11:19:47 2012
@@ -1995,7 +1995,7 @@ public final class OTFAdvancedTypographi
if (log.isDebugEnabled()) {
log.debug(tableTag + " pair set table value[" + i + "][" +
j + "]: " + pv);
}
- }
+ }
}
// store results
seMapping = ct;
@@ -2222,7 +2222,7 @@ public final class OTFAdvancedTypographi
if (log.isDebugEnabled()) {
log.debug(tableTag + " mark-to-base positioning base
anchor[" + i + "][" + j + "]: " + a);
}
- }
+ }
}
// store results
seMapping = mct;
@@ -2463,7 +2463,7 @@ public final class OTFAdvancedTypographi
if (log.isDebugEnabled()) {
log.debug(tableTag + " mark-to-mark positioning mark #2
anchor[" + i + "][" + j + "]: " + a);
}
- }
+ }
}
// store results
seMapping = mct1;
@@ -3113,7 +3113,7 @@ public final class OTFAdvancedTypographi
case GPOSLookupType.SINGLE:
subtableFormat = readSinglePosTable ( lookupType, lookupFlags,
subtableOffset );
break;
- case GPOSLookupType.PAIR:
+ case GPOSLookupType.PAIR:
subtableFormat = readPairPosTable ( lookupType, lookupFlags,
subtableOffset );
break;
case GPOSLookupType.CURSIVE:
@@ -3286,7 +3286,7 @@ public final class OTFAdvancedTypographi
for ( int i = 0; i < nl; i++ ) {
lgto [ i ] = in.readTTFUShort();
}
-
+
// dump info if debugging
if (log.isDebugEnabled()) {
log.debug(tableTag + " ligature caret coverage table offset: " +
co );
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
Mon Mar 5 11:19:47 2012
@@ -44,7 +44,7 @@ public final class CharScript {
// The following script codes are based on ISO 15924. Codes less than 1000
are
// official assignments from 15924; those equal to or greater than 1000
are FOP
// implementation specific.
- //
+ //
/** hebrew script constant */
public static final int SCRIPT_HEBREW = 125;
// 'hebr'
/** mongolian script constant */
@@ -557,17 +557,17 @@ public final class CharScript {
* @return true if character belongs to han (unified cjk) script
*/
public static boolean isHan ( int c ) {
- if ( ( c >= 0x3400 ) && ( c <= 0x4DBF ) ) {
+ if ( ( c >= 0x3400 ) && ( c <= 0x4DBF ) ) {
return true; // cjk unified ideographs extension a
- } else if ( ( c >= 0x4E00 ) && ( c <= 0x9FFF ) ) {
+ } else if ( ( c >= 0x4E00 ) && ( c <= 0x9FFF ) ) {
return true; // cjk unified ideographs
- } else if ( ( c >= 0xF900 ) && ( c <= 0xFAFF ) ) {
+ } else if ( ( c >= 0xF900 ) && ( c <= 0xFAFF ) ) {
return true; // cjk compatibility ideographs
- } else if ( ( c >= 0x20000 ) && ( c <= 0x2A6DF ) ) {
+ } else if ( ( c >= 0x20000 ) && ( c <= 0x2A6DF ) ) {
return true; // cjk unified ideographs extension b
- } else if ( ( c >= 0x2A700 ) && ( c <= 0x2B73F ) ) {
+ } else if ( ( c >= 0x2A700 ) && ( c <= 0x2B73F ) ) {
return true; // cjk unified ideographs extension c
- } else if ( ( c >= 0x2F800 ) && ( c <= 0x2FA1F ) ) {
+ } else if ( ( c >= 0x2F800 ) && ( c <= 0x2FA1F ) ) {
return true; // cjk compatibility ideographs supplement
} else {
return false;
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=1297008&r1=1297007&r2=1297008&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
Mon Mar 5 11:19:47 2012
@@ -842,7 +842,7 @@ public class GlyphSequence implements Cl
}
if ( predicationMergers != null ) {
predicationMergers.put ( key, pm );
- }
+ }
}
/**
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
Mon Mar 5 11:19:47 2012
@@ -397,7 +397,7 @@ public class NumberConverter {
/**
* Format NUMBER as word according to TYPE, which must be either
- * Character.UPPERCASE_LETTER, Character.LOWERCASE_LETTER, or
+ * Character.UPPERCASE_LETTER, Character.LOWERCASE_LETTER, or
* Character.TITLECASE_LETTER. Makes use of this.language to
* determine language of word.
* @param number to be formatted
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/UTF32.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/UTF32.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/UTF32.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/UTF32.java
Mon Mar 5 11:19:47 2012
@@ -36,7 +36,7 @@ public final class UTF32 {
* Convert Java string (UTF-16) to a Unicode scalar array (UTF-32).
* Note that if there are any non-BMP encoded characters present in the
* input, then the number of entries in the output array will be less
- * than the number of elements in the input string. Any
+ * than the number of elements in the input string. Any
* @param s input string
* @param substitution value to substitute for ill-formed surrogate
* @param errorOnSubstitution throw runtime exception
(IllegalArgumentException) in
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/URIProperty.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/URIProperty.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/URIProperty.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/URIProperty.java
Mon Mar 5 11:19:47 2012
@@ -144,5 +144,5 @@ public class URIProperty extends Propert
return p;
}
}
-
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java Mon Mar
5 11:19:47 2012
@@ -89,7 +89,7 @@ public class LazyFont extends Typeface i
sbuf.append(",advanced=" + useAdvanced);
sbuf.append('}');
return sbuf.toString();
- }
+ }
private void load(boolean fail) {
if (!isMetricsLoaded) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
Mon Mar 5 11:19:47 2012
@@ -49,7 +49,7 @@ public final class AreaAdditionUtil {
if (bslm != null) {
bslm.addId();
}
-
+
// "unwrap" the NonLeafPositions stored in parentIter
// and put them in a new list;
LinkedList<Position> positionList = new LinkedList<Position>();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
Mon Mar 5 11:19:47 2012
@@ -640,7 +640,7 @@ public abstract class BreakingAlgorithm
this.par.add(0, KnuthPenalty.DUMMY_ZERO_PENALTY);
}
}
-
+
// content would overflow, insert empty line/page and try again
return createNode(
lastTooLong.previous.position, lastTooLong.previous.line + 1,
1,
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
Mon Mar 5 11:19:47 2012
@@ -215,7 +215,7 @@ public class FlowLayoutManager extends B
protected List<ListElement> getNextChildElements(LayoutManager childLM,
LayoutContext context,
LayoutContext childLC, int alignment, Stack<LayoutManager> lmStack,
Position restartPosition, LayoutManager restartLM) {
-
+
List<ListElement> childElements;
if (lmStack == null) {
childElements = childLM.getNextKnuthElements(childLC, alignment);
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=1297008&r1=1297007&r2=1297008&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
Mon Mar 5 11:19:47 2012
@@ -1103,7 +1103,7 @@ public class TextLayoutManager extends L
for (int i = thisStart; i < lastIndex; i++) {
char currentChar = foText.charAt(i);
-
+
//character width
int charWidth = font.getCharWidth(currentChar);
wordIPD = wordIPD.plus(charWidth);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
Mon Mar 5 11:19:47 2012
@@ -85,10 +85,10 @@ public abstract class AbstractPathOrient
int level = block.getBidiLevel();
if ( ( level == -1 ) || ( ( level & 1 ) == 0 ) ) {
- startx += block.getStartIndent() / 1000f;
+ startx += block.getStartIndent() / 1000f;
startx -= borderPaddingStart;
} else {
- startx += block.getEndIndent() / 1000f;
+ startx += block.getEndIndent() / 1000f;
startx -= borderPaddingEnd;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
Mon Mar 5 11:19:47 2012
@@ -553,9 +553,9 @@ public abstract class AbstractRenderer
if ( parent != null ) {
int level = parent.getBidiLevel();
if ( ( level == -1 ) || ( ( level & 1 ) == 0 ) ) {
- currentIPPosition += parent.getStartIndent();
+ currentIPPosition += parent.getStartIndent();
} else {
- currentIPPosition += parent.getEndIndent();
+ currentIPPosition += parent.getEndIndent();
}
}
renderLineArea(line);
@@ -624,9 +624,9 @@ public abstract class AbstractRenderer
int bl = line.getBidiLevel();
if ( bl >= 0 ) {
if ( ( bl & 1 ) == 0 ) {
- currentIPPosition += line.getStartIndent();
+ currentIPPosition += line.getStartIndent();
} else {
- currentIPPosition += line.getEndIndent();
+ currentIPPosition += line.getEndIndent();
// if line's content overflows line area, then
// ensure that overflow is drawn (extends)
// outside of left side of line area
@@ -636,7 +636,7 @@ public abstract class AbstractRenderer
}
}
} else {
- currentIPPosition += line.getStartIndent();
+ currentIPPosition += line.getStartIndent();
}
for (int i = 0, l = children.size(); i < l; i++) {
InlineArea inline = (InlineArea) children.get(i);
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=1297008&r1=1297007&r2=1297008&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
Mon Mar 5 11:19:47 2012
@@ -962,7 +962,7 @@ public class IFRenderer extends Abstract
// warn if link trait found but not allowed, else create link
if (linkTraitFound) {
- StructureTreeElement structElem
+ StructureTreeElement structElem
= (StructureTreeElement)
ip.getTrait(Trait.STRUCTURE_TREE_ELEMENT);
action.setStructureTreeElement(structElem);
Link link = new Link(action, ipRect);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java
Mon Mar 5 11:19:47 2012
@@ -443,7 +443,7 @@ public class RtfTextrun extends RtfConta
if (e instanceof RtfParagraphBreak) {
//If the element before was a paragraph break or a bookmark
//they will be hidden and are therefore not considered as
visible
- if (!(aBefore instanceof RtfParagraphBreak)
+ if (!(aBefore instanceof RtfParagraphBreak)
&& !(aBefore instanceof RtfBookmark)) {
lastParagraphBreak = (RtfParagraphBreak)e;
}
@@ -467,7 +467,7 @@ public class RtfTextrun extends RtfConta
//write all children
boolean bPrevPar = false;
- boolean bBookmark = false;
+ boolean bBookmark = false;
boolean bFirst = true;
for (Iterator it = getChildren().iterator(); it.hasNext();) {
final RtfElement e = (RtfElement)it.next();
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
Mon Mar 5 11:19:47 2012
@@ -67,7 +67,7 @@ public class BidiAlgorithmTestCase {
0, -1 // all test sets
};
- // instrumentation
+ // instrumentation
private int includedSequences;
private int excludedSequences;
private int passedSequences;
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
Mon Mar 5 11:19:47 2012
@@ -3165,7 +3165,7 @@ public class GDEFTestCase {
private TTXFile findTTX ( String fid ) {
String pn = findTTXPath ( fid );
assertTrue ( pn != null );
- try {
+ try {
TTXFile tf = TTXFile.getFromCache ( pn );
return tf;
} catch ( Exception e ) {
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
Mon Mar 5 11:19:47 2012
@@ -422,7 +422,7 @@ public class GPOSTestCase implements Scr
private TTXFile findTTX ( String fid ) {
String pn = findTTXPath ( fid );
assertTrue ( pn != null );
- try {
+ try {
TTXFile tf = TTXFile.getFromCache ( pn );
return tf;
} catch ( Exception e ) {
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
Mon Mar 5 11:19:47 2012
@@ -2220,7 +2220,7 @@ public class GSUBTestCase implements Scr
private TTXFile findTTX ( String fid ) {
String pn = findTTXPath ( fid );
assertTrue ( pn != null );
- try {
+ try {
TTXFile tf = TTXFile.getFromCache ( pn );
return tf;
} catch ( Exception e ) {
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
Mon Mar 5 11:19:47 2012
@@ -3301,7 +3301,7 @@ public class TTXFile {
Integer gid = glyphIds.get ( glyph );
if ( gid != null ) {
if ( gmap != null ) {
- Integer cid = gmap.get ( gid );
+ Integer cid = gmap.get ( gid );
if ( cid != null ) {
return cid.intValue();
}
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
Mon Mar 5 11:19:47 2012
@@ -208,7 +208,7 @@ public class NumberConverterTestCase {
static private String[][] formatRomanUpper =
{
-
+
{ "I" },
{ "0", "0" },
{ "1", "I" },
@@ -477,7 +477,7 @@ public class NumberConverterTestCase {
{ "999999", "bdwgm" },
{ "1000000", "bdwgn" },
};
-
+
static private String[][] formatAlphabeticLatinUpper =
{
{ "A" },
@@ -498,7 +498,7 @@ public class NumberConverterTestCase {
{ "999999", "BDWGM" },
{ "1000000", "BDWGN" },
};
-
+
static private String[][] formatAlphabeticArabicHijai =
{
{ "\u0627", null, null, "alphabetic" },
@@ -539,7 +539,7 @@ public class NumberConverterTestCase {
{ "999999", "\u0623\u0638\u0636\u0635\u062E" },
{ "1000000", "\u0623\u0638\u0636\u0635\u062F" },
};
-
+
static private String[][] formatAlphabeticArabicAbjadi =
{
{ "\u0627", null, null, "traditional" },
@@ -580,7 +580,7 @@ public class NumberConverterTestCase {
{ "999999", "\u0623\u0641\u0633\u0646\u0632" },
{ "1000000", "\u0623\u0641\u0633\u0646\u062D" },
};
-
+
static private String[][] formatNumeralArabicAbjadi =
{
{ "\u0623", null, null, "traditional" },
@@ -628,7 +628,7 @@ public class NumberConverterTestCase {
{ "1999", "\u063A\u0638\u0635\u0637" },
{ "2000", "2000" },
};
-
+
static private String[][] formatAlphabeticHebrew =
{
{ "\u05D0", null, null, "alphabetic" },
@@ -668,7 +668,7 @@ public class NumberConverterTestCase {
{ "999999", "\u05D0\u05DA\u05E9\u05E7\u05E5" },
{ "1000000", "\u05D0\u05DA\u05E9\u05E8\u05D0" },
};
-
+
static private String[][] formatNumeralHebrewGematria =
{
{ "\u05D0", null, null, "traditional" },
@@ -716,7 +716,7 @@ public class NumberConverterTestCase {
{ "1999", "\u05D0\u05F3\u05EA\u05EA\u05F4\u05E7\u05E6\u05D8" },
{ "2000", "2000" },
};
-
+
static private String[][] formatAlphabeticThai =
{
{ "\u0E01", null, null, "alphabetic" },
@@ -737,7 +737,7 @@ public class NumberConverterTestCase {
{ "999999", "\u0E0B\u0E20\u0E17\u0E0B" },
{ "1000000", "\u0E0B\u0E20\u0E17\u0E0C" },
};
-
+
static private String[][] formatWordEnglishLower =
{
{ "w", null, null, null, null, "eng" },
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
Mon Mar 5 11:19:47 2012
@@ -61,7 +61,7 @@ public class AssertElement extends TestO
ResultCollector collector = ResultCollector.getInstance();
String propName = attlist.getValue("property");
- String expected = attlist.getValue("expected");
+ String expected = attlist.getValue("expected");
String component = null;
int dotIndex = propName.indexOf('.');
if (dotIndex >= 0) {
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java?rev=1297008&r1=1297007&r2=1297008&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
Mon Mar 5 11:19:47 2012
@@ -42,10 +42,10 @@ public class PDFDocumentTestCase {
StringBuilder textBuffer = new StringBuilder();
String testString = "This is a test string, just some arbitrary data.";
textBuffer.append(testString);
-
+
PDFDocument.flushTextBuffer(textBuffer, out);
assertEquals(testString, out.toString());
-
+
// Should reset the textBuffer
assertEquals(0, textBuffer.length());
assertEquals("", textBuffer.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
