You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2013/04/09 19:31:45 UTC
svn commit: r1466146 [16/20] - in /xmlgraphics/fop/trunk: ./
src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/
src/codegen/unicode/java/org/apache/fop/text/linebreak/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/modca/ src/java/o...
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=1466146&r1=1466145&r2=1466146&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 Tue Apr 9 17:31:41 2013
@@ -197,13 +197,13 @@ public class MultiByteFont extends CIDFo
* Add a private use mapping {PU,GI} to the existing character map.
* N.B. Does not insert in order, merely appends to end of existing map.
*/
- private synchronized void addPrivateUseMapping ( int pu, int gi ) {
- assert findGlyphIndex ( pu ) == SingleByteEncoding.NOT_FOUND_CODE_POINT;
+ private synchronized void addPrivateUseMapping (int pu, int gi) {
+ assert findGlyphIndex (pu) == SingleByteEncoding.NOT_FOUND_CODE_POINT;
CMapSegment[] oldCmap = cmap;
int cmapLength = oldCmap.length;
CMapSegment[] newCmap = new CMapSegment [ cmapLength + 1 ];
- System.arraycopy ( oldCmap, 0, newCmap, 0, cmapLength );
- newCmap [ cmapLength ] = new CMapSegment ( pu, pu, gi );
+ System.arraycopy (oldCmap, 0, newCmap, 0, cmapLength);
+ newCmap [ cmapLength ] = new CMapSegment (pu, pu, gi);
cmap = newCmap;
}
@@ -219,36 +219,36 @@ public class MultiByteFont extends CIDFo
* @param gi glyph index
* @returns unicode scalar value
*/
- private int createPrivateUseMapping ( int gi ) {
- while ( ( nextPrivateUse < 0xF900 )
- && ( findGlyphIndex(nextPrivateUse) != SingleByteEncoding.NOT_FOUND_CODE_POINT ) ) {
+ private int createPrivateUseMapping (int gi) {
+ while ((nextPrivateUse < 0xF900)
+ && (findGlyphIndex(nextPrivateUse) != SingleByteEncoding.NOT_FOUND_CODE_POINT)) {
nextPrivateUse++;
}
- if ( nextPrivateUse < 0xF900 ) {
+ if (nextPrivateUse < 0xF900) {
int pu = nextPrivateUse;
- addPrivateUseMapping ( pu, gi );
- if ( firstPrivate == 0 ) {
+ addPrivateUseMapping (pu, gi);
+ if (firstPrivate == 0) {
firstPrivate = pu;
}
lastPrivate = pu;
numMapped++;
if (log.isDebugEnabled()) {
- log.debug ( "Create private use mapping from "
- + CharUtilities.format ( pu )
+ log.debug ("Create private use mapping from "
+ + CharUtilities.format (pu)
+ " to glyph index " + gi
- + " in font '" + getFullName() + "'" );
+ + " in font '" + getFullName() + "'");
}
return pu;
} else {
- if ( firstUnmapped == 0 ) {
+ if (firstUnmapped == 0) {
firstUnmapped = gi;
}
lastUnmapped = gi;
numUnmapped++;
- log.warn ( "Exhausted private use area: unable to map "
+ log.warn ("Exhausted private use area: unable to map "
+ numUnmapped + " glyphs in glyph index range ["
+ firstUnmapped + "," + lastUnmapped
- + "] (inclusive) of font '" + getFullName() + "'" );
+ + "] (inclusive) of font '" + getFullName() + "'");
return 0;
}
}
@@ -260,25 +260,25 @@ public class MultiByteFont extends CIDFo
* @returns unicode scalar value
*/
// [TBD] - needs optimization, i.e., change from linear search to binary search
- private int findCharacterFromGlyphIndex ( int gi, boolean augment ) {
+ private int findCharacterFromGlyphIndex (int gi, boolean augment) {
int cc = 0;
- for ( int i = 0, n = cmap.length; i < n; i++ ) {
+ for (int i = 0, n = cmap.length; i < n; i++) {
CMapSegment segment = cmap [ i ];
int s = segment.getGlyphStartIndex();
- int e = s + ( segment.getUnicodeEnd() - segment.getUnicodeStart() );
- if ( ( gi >= s ) && ( gi <= e ) ) {
- cc = segment.getUnicodeStart() + ( gi - s );
+ int e = s + (segment.getUnicodeEnd() - segment.getUnicodeStart());
+ if ((gi >= s) && (gi <= e)) {
+ cc = segment.getUnicodeStart() + (gi - s);
break;
}
}
- if ( ( cc == 0 ) && augment ) {
- cc = createPrivateUseMapping ( gi );
+ if ((cc == 0) && augment) {
+ cc = createPrivateUseMapping (gi);
}
return cc;
}
- private int findCharacterFromGlyphIndex ( int gi ) {
- return findCharacterFromGlyphIndex ( gi, true );
+ private int findCharacterFromGlyphIndex (int gi) {
+ return findCharacterFromGlyphIndex (gi, true);
}
@@ -377,11 +377,11 @@ public class MultiByteFont extends CIDFo
* Establishes the glyph definition table.
* @param gdef the glyph definition table to be used by this font
*/
- public void setGDEF ( GlyphDefinitionTable gdef ) {
- if ( ( this.gdef == null ) || ( gdef == null ) ) {
+ public void setGDEF (GlyphDefinitionTable gdef) {
+ if ((this.gdef == null) || (gdef == null)) {
this.gdef = gdef;
} else {
- throw new IllegalStateException ( "font already associated with GDEF table" );
+ throw new IllegalStateException ("font already associated with GDEF table");
}
}
@@ -397,11 +397,11 @@ public class MultiByteFont extends CIDFo
* Establishes the glyph substitution table.
* @param gsub the glyph substitution table to be used by this font
*/
- public void setGSUB ( GlyphSubstitutionTable gsub ) {
- if ( ( this.gsub == null ) || ( gsub == null ) ) {
+ public void setGSUB (GlyphSubstitutionTable gsub) {
+ if ((this.gsub == null) || (gsub == null)) {
this.gsub = gsub;
} else {
- throw new IllegalStateException ( "font already associated with GSUB table" );
+ throw new IllegalStateException ("font already associated with GSUB table");
}
}
@@ -417,11 +417,11 @@ public class MultiByteFont extends CIDFo
* Establishes the glyph positioning table.
* @param gpos the glyph positioning table to be used by this font
*/
- public void setGPOS ( GlyphPositioningTable gpos ) {
- if ( ( this.gpos == null ) || ( gpos == null ) ) {
+ public void setGPOS (GlyphPositioningTable gpos) {
+ if ((this.gpos == null) || (gpos == null)) {
this.gpos = gpos;
} else {
- throw new IllegalStateException ( "font already associated with GPOS table" );
+ throw new IllegalStateException ("font already associated with GPOS table");
}
}
@@ -439,11 +439,11 @@ public class MultiByteFont extends CIDFo
}
/** {@inheritDoc} */
- public CharSequence performSubstitution ( CharSequence cs, String script, String language ) {
- if ( gsub != null ) {
- GlyphSequence igs = mapCharsToGlyphs ( cs );
- GlyphSequence ogs = gsub.substitute ( igs, script, language );
- CharSequence ocs = mapGlyphsToChars ( ogs );
+ public CharSequence performSubstitution (CharSequence cs, String script, String language) {
+ if (gsub != null) {
+ GlyphSequence igs = mapCharsToGlyphs (cs);
+ GlyphSequence ogs = gsub.substitute (igs, script, language);
+ CharSequence ocs = mapGlyphsToChars (ogs);
return ocs;
} else {
return cs;
@@ -452,11 +452,11 @@ public class MultiByteFont extends CIDFo
/** {@inheritDoc} */
public CharSequence reorderCombiningMarks
- ( CharSequence cs, int[][] gpa, String script, String language ) {
- if ( gdef != null ) {
- GlyphSequence igs = mapCharsToGlyphs ( cs );
- GlyphSequence ogs = gdef.reorderCombiningMarks ( igs, gpa, script, language );
- CharSequence ocs = mapGlyphsToChars ( ogs );
+ (CharSequence cs, int[][] gpa, String script, String language) {
+ if (gdef != null) {
+ GlyphSequence igs = mapCharsToGlyphs (cs);
+ GlyphSequence ogs = gdef.reorderCombiningMarks (igs, gpa, script, language);
+ CharSequence ocs = mapGlyphsToChars (ogs);
return ocs;
} else {
return cs;
@@ -470,12 +470,12 @@ public class MultiByteFont extends CIDFo
/** {@inheritDoc} */
public int[][]
- performPositioning ( CharSequence cs, String script, String language, int fontSize ) {
- if ( gpos != null ) {
- GlyphSequence gs = mapCharsToGlyphs ( cs );
+ performPositioning (CharSequence cs, String script, String language, int fontSize) {
+ if (gpos != null) {
+ GlyphSequence gs = mapCharsToGlyphs (cs);
int[][] adjustments = new int [ gs.getGlyphCount() ] [ 4 ];
- if ( gpos.position ( gs, script, language, fontSize, this.width, adjustments ) ) {
- return scaleAdjustments ( adjustments, fontSize );
+ if (gpos.position (gs, script, language, fontSize, this.width, adjustments)) {
+ return scaleAdjustments (adjustments, fontSize);
} else {
return null;
}
@@ -485,17 +485,17 @@ public class MultiByteFont extends CIDFo
}
/** {@inheritDoc} */
- public int[][] performPositioning ( CharSequence cs, String script, String language ) {
+ public int[][] performPositioning (CharSequence cs, String script, String language) {
throw new UnsupportedOperationException();
}
- private int[][] scaleAdjustments ( int[][] adjustments, int fontSize ) {
- if ( adjustments != null ) {
- for ( int i = 0, n = adjustments.length; i < n; i++ ) {
+ private int[][] scaleAdjustments (int[][] adjustments, int fontSize) {
+ if (adjustments != null) {
+ for (int i = 0, n = adjustments.length; i < n; i++) {
int[] gpa = adjustments [ i ];
- for ( int k = 0; k < 4; k++ ) {
- gpa [ k ] = ( gpa [ k ] * fontSize ) / 1000;
+ for (int k = 0; k < 4; k++) {
+ gpa [ k ] = (gpa [ k ] * fontSize) / 1000;
}
}
return adjustments;
@@ -511,46 +511,46 @@ public class MultiByteFont extends CIDFo
* @param cs a CharSequence containing UTF-16 encoded Unicode characters
* @returns a CharSequence containing glyph indices
*/
- private GlyphSequence mapCharsToGlyphs ( CharSequence cs ) {
- IntBuffer cb = IntBuffer.allocate ( cs.length() );
- IntBuffer gb = IntBuffer.allocate ( cs.length() );
+ private GlyphSequence mapCharsToGlyphs (CharSequence cs) {
+ IntBuffer cb = IntBuffer.allocate (cs.length());
+ IntBuffer gb = IntBuffer.allocate (cs.length());
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 ) ) {
- if ( ( i + 1 ) < n ) {
+ 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)) {
+ if ((i + 1) < n) {
int sh = cc;
- int sl = cs.charAt ( ++i );
- if ( ( sl >= 0xDC00 ) && ( sl < 0xE000 ) ) {
- cc = 0x10000 + ( ( sh - 0xD800 ) << 10 ) + ( ( sl - 0xDC00 ) << 0 );
+ int sl = cs.charAt (++i);
+ if ((sl >= 0xDC00) && (sl < 0xE000)) {
+ cc = 0x10000 + ((sh - 0xD800) << 10) + ((sl - 0xDC00) << 0);
} else {
throw new IllegalArgumentException
- ( "ill-formed UTF-16 sequence, "
- + "contains isolated high surrogate at index " + i );
+ ("ill-formed UTF-16 sequence, "
+ + "contains isolated high surrogate at index " + i);
}
} else {
throw new IllegalArgumentException
- ( "ill-formed UTF-16 sequence, "
- + "contains isolated high surrogate at end of sequence" );
+ ("ill-formed UTF-16 sequence, "
+ + "contains isolated high surrogate at end of sequence");
}
- } else if ( ( cc >= 0xDC00 ) && ( cc < 0xE000 ) ) {
+ } else if ((cc >= 0xDC00) && (cc < 0xE000)) {
throw new IllegalArgumentException
- ( "ill-formed UTF-16 sequence, "
- + "contains isolated low surrogate at index " + i );
+ ("ill-formed UTF-16 sequence, "
+ + "contains isolated low surrogate at index " + i);
}
notifyMapOperation();
- gi = findGlyphIndex ( cc );
- if ( gi == SingleByteEncoding.NOT_FOUND_CODE_POINT ) {
- warnMissingGlyph ( (char) cc );
+ gi = findGlyphIndex (cc);
+ if (gi == SingleByteEncoding.NOT_FOUND_CODE_POINT) {
+ warnMissingGlyph ((char) cc);
gi = giMissing;
}
- cb.put ( cc );
- gb.put ( gi );
+ cb.put (cc);
+ gb.put (gi);
}
cb.flip();
gb.flip();
- return new GlyphSequence ( cb, gb, null );
+ return new GlyphSequence (cb, gb, null);
}
/**
@@ -559,30 +559,30 @@ public class MultiByteFont extends CIDFo
* @param gs a GlyphSequence containing glyph indices
* @returns a CharSequence containing UTF-16 encoded Unicode characters
*/
- private CharSequence mapGlyphsToChars ( GlyphSequence gs ) {
+ private CharSequence mapGlyphsToChars (GlyphSequence gs) {
int ng = gs.getGlyphCount();
- CharBuffer cb = CharBuffer.allocate ( ng );
+ CharBuffer cb = CharBuffer.allocate (ng);
int ccMissing = Typeface.NOT_FOUND;
- for ( int i = 0, n = ng; i < n; i++ ) {
- int gi = gs.getGlyph ( i );
- int cc = findCharacterFromGlyphIndex ( gi );
- if ( ( cc == 0 ) || ( cc > 0x10FFFF ) ) {
+ for (int i = 0, n = ng; i < n; i++) {
+ int gi = gs.getGlyph (i);
+ int cc = findCharacterFromGlyphIndex (gi);
+ if ((cc == 0) || (cc > 0x10FFFF)) {
cc = ccMissing;
log.warn("Unable to map glyph index " + gi
+ " to Unicode scalar in font '"
+ getFullName() + "', substituting missing character '"
+ (char) cc + "'");
}
- if ( cc > 0x00FFFF ) {
+ if (cc > 0x00FFFF) {
int sh;
int sl;
cc -= 0x10000;
- sh = ( ( cc >> 10 ) & 0x3FF ) + 0xD800;
- sl = ( ( cc >> 0 ) & 0x3FF ) + 0xDC00;
- cb.put ( (char) sh );
- cb.put ( (char) sl );
+ sh = ((cc >> 10) & 0x3FF) + 0xD800;
+ sl = ((cc >> 0) & 0x3FF) + 0xDC00;
+ cb.put ((char) sh);
+ cb.put ((char) sl);
} else {
- cb.put ( (char) cc );
+ cb.put ((char) cc);
}
}
cb.flip();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java Tue Apr 9 17:31:41 2013
@@ -244,7 +244,7 @@ public class TTFFile {
* @param useKerning true if kerning data should be loaded
* @param useAdvanced true if advanced typographic tables should be loaded
*/
- public TTFFile ( boolean useKerning, boolean useAdvanced ) {
+ public TTFFile (boolean useKerning, boolean useAdvanced) {
this.useKerning = useKerning;
this.useAdvanced = useAdvanced;
}
@@ -284,18 +284,18 @@ public class TTFFile {
/** {@inheritDoc} */
public int hashCode() {
int hc = unicodeIndex;
- hc = 19 * hc + ( hc ^ glyphIndex );
+ hc = 19 * hc + (hc ^ glyphIndex);
return hc;
}
/** {@inheritDoc} */
- public boolean equals ( Object o ) {
- if ( o instanceof UnicodeMapping ) {
+ public boolean equals (Object o) {
+ if (o instanceof UnicodeMapping) {
UnicodeMapping m = (UnicodeMapping) o;
- if ( unicodeIndex != m.unicodeIndex ) {
+ if (unicodeIndex != m.unicodeIndex) {
return false;
} else {
- return ( glyphIndex == m.glyphIndex );
+ return (glyphIndex == m.glyphIndex);
}
} else {
return false;
@@ -303,12 +303,12 @@ public class TTFFile {
}
/** {@inheritDoc} */
- public int compareTo ( Object o ) {
- if ( o instanceof UnicodeMapping ) {
+ public int compareTo (Object o) {
+ if (o instanceof UnicodeMapping) {
UnicodeMapping m = (UnicodeMapping) o;
- if ( unicodeIndex > m.unicodeIndex ) {
+ if (unicodeIndex > m.unicodeIndex) {
return 1;
- } else if ( unicodeIndex < m.unicodeIndex ) {
+ } else if (unicodeIndex < m.unicodeIndex) {
return -1;
} else {
return 0;
@@ -729,18 +729,18 @@ public class TTFFile {
// Create cmaps for bfentries
createCMaps();
- if ( useKerning ) {
+ if (useKerning) {
readKerning();
}
// Read advanced typographic tables.
- if ( useAdvanced ) {
+ if (useAdvanced) {
try {
OTFAdvancedTypographicTableReader atr
- = new OTFAdvancedTypographicTableReader ( this, in );
+ = new OTFAdvancedTypographicTableReader (this, in);
atr.readAll();
this.advancedTableReader = atr;
- } catch ( AdvancedTypographicTableFormatException e ) {
+ } catch (AdvancedTypographicTableFormatException e) {
log.warn (
"Encountered format constraint violation in advanced (typographic) table (AT) "
+ "in font '" + getFullName() + "', ignoring AT data: "
@@ -1983,7 +1983,7 @@ public class TTFFile {
* @return true if advanced (typographic) table is present
*/
public boolean hasAdvancedTable() {
- if ( advancedTableReader != null ) {
+ if (advancedTableReader != null) {
return advancedTableReader.hasAdvancedTable();
} else {
return false;
@@ -1995,7 +1995,7 @@ public class TTFFile {
* @return the GDEF table
*/
public GlyphDefinitionTable getGDEF() {
- if ( advancedTableReader != null ) {
+ if (advancedTableReader != null) {
return advancedTableReader.getGDEF();
} else {
return null;
@@ -2007,7 +2007,7 @@ public class TTFFile {
* @return the GSUB table
*/
public GlyphSubstitutionTable getGSUB() {
- if ( advancedTableReader != null ) {
+ if (advancedTableReader != null) {
return advancedTableReader.getGSUB();
} else {
return null;
@@ -2019,7 +2019,7 @@ public class TTFFile {
* @return the GPOS table
*/
public GlyphPositioningTable getGPOS() {
- if ( advancedTableReader != null ) {
+ if (advancedTableReader != null) {
return advancedTableReader.getGPOS();
} else {
return null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java Tue Apr 9 17:31:41 2013
@@ -240,12 +240,12 @@ public class TTFFontLoader extends FontL
/**
* Copy advanced typographic information.
*/
- private void copyAdvanced ( TTFFile ttf ) {
- if ( returnFont instanceof MultiByteFont ) {
+ private void copyAdvanced (TTFFile ttf) {
+ if (returnFont instanceof MultiByteFont) {
MultiByteFont mbf = (MultiByteFont) returnFont;
- mbf.setGDEF ( ttf.getGDEF() );
- mbf.setGSUB ( ttf.getGSUB() );
- mbf.setGPOS ( ttf.getGPOS() );
+ mbf.setGDEF (ttf.getGDEF());
+ mbf.setGSUB (ttf.getGSUB());
+ mbf.setGPOS (ttf.getGPOS());
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java Tue Apr 9 17:31:41 2013
@@ -62,7 +62,7 @@ public class TTFSubSetFile extends TTFFi
* @param useKerning true if kerning data should be loaded
* @param useAdvanced true if advanced typographic tables should be loaded
*/
- public TTFSubSetFile ( boolean useKerning, boolean useAdvanced ) {
+ public TTFSubSetFile (boolean useKerning, boolean useAdvanced) {
super(useKerning, useAdvanced);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/AFMParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/AFMParser.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/AFMParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/AFMParser.java Tue Apr 9 17:31:41 2013
@@ -326,11 +326,11 @@ public class AFMParser {
try {
Method mth = c.getMethod(method, argType);
mth.invoke(target, value);
- } catch ( NoSuchMethodException e ) {
+ } catch (NoSuchMethodException e) {
throw new RuntimeException("Bean error: " + e.getMessage(), e);
- } catch ( IllegalAccessException e ) {
+ } catch (IllegalAccessException e) {
throw new RuntimeException("Bean error: " + e.getMessage(), e);
- } catch ( InvocationTargetException e ) {
+ } catch (InvocationTargetException e) {
throw new RuntimeException("Bean error: " + e.getMessage(), e);
}
}
@@ -452,11 +452,11 @@ public class AFMParser {
try {
Method mth = c.getMethod(method, boolean.class);
mth.invoke(target, b);
- } catch ( NoSuchMethodException e ) {
+ } catch (NoSuchMethodException e) {
throw new RuntimeException("Bean error: " + e.getMessage(), e);
- } catch ( IllegalAccessException e ) {
+ } catch (IllegalAccessException e) {
throw new RuntimeException("Bean error: " + e.getMessage(), e);
- } catch ( InvocationTargetException e ) {
+ } catch (InvocationTargetException e) {
throw new RuntimeException("Bean error: " + e.getMessage(), e);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java Tue Apr 9 17:31:41 2013
@@ -420,7 +420,7 @@ public abstract class AbstractBreaker {
alg.setConstantLineWidth(flowBPD);
int optimalPageCount = alg.findBreakingPoints(effectiveList, 1, true,
BreakingAlgorithm.ALL_BREAKS);
- if ( Math.abs ( alg.getIPDdifference() ) > 1 ) {
+ if (Math.abs (alg.getIPDdifference()) > 1) {
addAreas(alg, optimalPageCount, blockList, effectiveList);
// *** redo Phase 1 ***
log.trace("IPD changes after page " + optimalPageCount);
@@ -911,7 +911,7 @@ public abstract class AbstractBreaker {
KnuthElement firstElement;
while (sequenceIterator.hasNext()) {
firstElement = sequenceIterator.next();
- if ( !firstElement.isBox() ) {
+ if (!firstElement.isBox()) {
log.debug("PLM> ignoring glue or penalty element "
+ "at the beginning of the sequence");
if (firstElement.isGlue()) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java Tue Apr 9 17:31:41 2013
@@ -214,7 +214,7 @@ public abstract class AbstractLayoutMana
return null;
}
List<LayoutManager> newLMs = new ArrayList<LayoutManager>(size);
- while (fobjIter.hasNext() && newLMs.size() < size ) {
+ while (fobjIter.hasNext() && newLMs.size() < size) {
Object theobj = fobjIter.next();
if (theobj instanceof FONode) {
FONode foNode = (FONode) theobj;
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=1466146&r1=1466145&r2=1466146&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 Tue Apr 9 17:31:41 2013
@@ -351,7 +351,7 @@ public class BlockContainerLayoutManager
contentRectOffsetY = 0;
int level = fo.getBidiLevel();
- if ( ( level < 0 ) || ( ( level & 1 ) == 0 ) ) {
+ if ((level < 0) || ((level & 1) == 0)) {
contentRectOffsetX += fo.getCommonMarginBlock().startIndent.getValue(this);
} else {
contentRectOffsetX += fo.getCommonMarginBlock().endIndent.getValue(this);
@@ -855,8 +855,8 @@ public class BlockContainerLayoutManager
viewportBlockArea = new BlockViewport(allowBPDUpdate);
viewportBlockArea.addTrait(Trait.IS_VIEWPORT_AREA, Boolean.TRUE);
- if ( level >= 0 ) {
- viewportBlockArea.setBidiLevel ( level );
+ if (level >= 0) {
+ viewportBlockArea.setBidiLevel (level);
}
viewportBlockArea.setIPD(getContentAreaIPD());
if (allowBPDUpdate) {
@@ -892,8 +892,8 @@ public class BlockContainerLayoutManager
referenceArea = new Block();
referenceArea.addTrait(Trait.IS_REFERENCE_AREA, Boolean.TRUE);
- if ( level >= 0 ) {
- referenceArea.setBidiLevel ( level );
+ if (level >= 0) {
+ referenceArea.setBidiLevel (level);
}
TraitSetter.setProducerID(referenceArea, getBlockContainerFO().getId());
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java Tue Apr 9 17:31:41 2013
@@ -360,7 +360,7 @@ public class BlockLayoutManager extends
curBlockArea.setIPD(super.getContentAreaIPD());
- curBlockArea.setBidiLevel ( getBlockFO().getBidiLevel() );
+ curBlockArea.setBidiLevel (getBlockFO().getBidiLevel());
TraitSetter.addBreaks(curBlockArea,
getBlockFO().getBreakBefore(), getBlockFO().getBreakAfter());
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=1466146&r1=1466145&r2=1466146&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 Tue Apr 9 17:31:41 2013
@@ -285,8 +285,7 @@ public abstract class BreakingAlgorithm
* @param totalDemerits a real number
* @param previous a node
*/
- public KnuthNode( // CSOK: ParameterNumber
- int position, int line, int fitness,
+ public KnuthNode(int position, int line, int fitness,
int totalWidth, int totalStretch, int totalShrink,
double adjustRatio, int availableShrink, int availableStretch,
int difference, double totalDemerits, KnuthNode previous) {
@@ -686,8 +685,7 @@ public abstract class BreakingAlgorithm
* @param previous active node for the preceding breakpoint
* @return a new node
*/
- protected KnuthNode createNode( // CSOK: ParameterNumber
- int position, int line, int fitness,
+ protected KnuthNode createNode(int position, int line, int fitness,
int totalWidth, int totalStretch, int totalShrink,
double adjustRatio, int availableShrink, int availableStretch,
int difference, double totalDemerits, KnuthNode previous) {
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=1466146&r1=1466145&r2=1466146&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 Tue Apr 9 17:31:41 2013
@@ -141,7 +141,7 @@ public class InlineKnuthSequence extends
.addALetterSpaceTo(oldList));
// prevBox may not be a KnuthInlineBox;
// this may happen if it is a padding box; see bug 39571.
- if ( prevBox instanceof KnuthInlineBox && ((KnuthInlineBox) prevBox).isAnchor()) {
+ if (prevBox instanceof KnuthInlineBox && ((KnuthInlineBox) prevBox).isAnchor()) {
// prevBox represents a footnote citation: copy footnote info
// from prevBox to the new box
KnuthInlineBox newBox = (KnuthInlineBox) getLast();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java Tue Apr 9 17:31:41 2013
@@ -248,7 +248,7 @@ public class LayoutManagerMapping implem
public static class BidiOverrideLayoutManagerMaker extends Maker {
/** {@inheritDoc} */
public void make(FONode node, List lms) {
- if ( node instanceof BidiOverride ) {
+ if (node instanceof BidiOverride) {
lms.add(new BidiLayoutManager((BidiOverride) node));
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java Tue Apr 9 17:31:41 2013
@@ -80,7 +80,7 @@ public class PageSequenceLayoutManager e
initialize();
// perform step 5.8 of refinement process (Unicode BIDI Processing)
- if ( areaTreeHandler.isComplexScriptFeaturesEnabled() ) {
+ if (areaTreeHandler.isComplexScriptFeaturesEnabled()) {
BidiResolver.resolveInlineDirectionality(getPageSequence());
}
@@ -198,13 +198,13 @@ public class PageSequenceLayoutManager e
*/
protected int getForcedLastPageNum(final int lastPageNum) {
int forcedLastPageNum = lastPageNum;
- if ( lastPageNum % 2 != 0
- && ( getPageSequence().getForcePageCount() == Constants.EN_EVEN
- || getPageSequence().getForcePageCount() == Constants.EN_END_ON_EVEN )) {
+ if (lastPageNum % 2 != 0
+ && (getPageSequence().getForcePageCount() == Constants.EN_EVEN
+ || getPageSequence().getForcePageCount() == Constants.EN_END_ON_EVEN)) {
forcedLastPageNum++;
- } else if ( lastPageNum % 2 == 0 && (
+ } else if (lastPageNum % 2 == 0 && (
getPageSequence().getForcePageCount() == Constants.EN_ODD
- || getPageSequence().getForcePageCount() == Constants.EN_END_ON_ODD )) {
+ || getPageSequence().getForcePageCount() == Constants.EN_END_ON_ODD)) {
forcedLastPageNum++;
}
return forcedLastPageNum;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java Tue Apr 9 17:31:41 2013
@@ -78,7 +78,7 @@ public abstract class AbstractGraphicsLa
placement.y += beforeBPD;
//Determine extra IPD from borders and padding
- if ( ( bidiLevel == -1 ) || ( ( bidiLevel & 1 ) == 0 ) ) {
+ if ((bidiLevel == -1) || ((bidiLevel & 1) == 0)) {
int startIPD = borderProps.getPadding(CommonBorderPaddingBackground.START, false, this);
startIPD += borderProps.getBorderWidth(CommonBorderPaddingBackground.START, false);
placement.x += startIPD;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java Tue Apr 9 17:31:41 2013
@@ -69,7 +69,7 @@ public class BasicLinkLayoutManager exte
res.resolveIDRef(idref, pslm.getFirstPVWithID(idref));
if (!res.isResolved()) {
pslm.addUnresolvedArea(idref, res);
- if ( area instanceof BasicLinkArea ) {
+ if (area instanceof BasicLinkArea) {
// establish back-pointer from BasicLinkArea to LinkResolver to
// handle inline area unflattening during line bidi reordering;
// needed to create internal link trait on synthesized basic link area
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java Tue Apr 9 17:31:41 2013
@@ -86,7 +86,7 @@ public class CharacterLayoutManager exte
blockProgressionOffset, level);
}
} else {
- int[] levels = ( level >= 0 ) ? new int[] {level} : null;
+ int[] levels = (level >= 0) ? new int[] {level} : null;
text.addWord(String.valueOf(ch), ipd, null, levels, null, blockProgressionOffset);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java Tue Apr 9 17:31:41 2013
@@ -183,8 +183,8 @@ public abstract class InlineStackingLayo
Space ls = new Space();
ls.setIPD(iAdjust);
int level = parentArea.getBidiLevel();
- if ( level >= 0 ) {
- ls.setBidiLevel ( level );
+ if (level >= 0) {
+ ls.setBidiLevel (level);
}
parentArea.addChildArea(ls);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java Tue Apr 9 17:31:41 2013
@@ -125,26 +125,26 @@ public class LeaderLayoutManager extends
leaderArea = leader;
} else {
leaderArea = new Space();
- if ( level >= 0 ) {
- leaderArea.setBidiLevel ( level );
+ if (level >= 0) {
+ leaderArea.setBidiLevel (level);
}
}
leaderArea.setBPD(fobj.getRuleThickness().getValue(this));
leaderArea.addTrait(Trait.COLOR, fobj.getColor());
- if ( level >= 0 ) {
- leaderArea.setBidiLevel ( level );
+ if (level >= 0) {
+ leaderArea.setBidiLevel (level);
}
} else if (fobj.getLeaderPattern() == EN_SPACE) {
leaderArea = new Space();
leaderArea.setBPD(fobj.getRuleThickness().getValue(this));
- if ( level >= 0 ) {
- leaderArea.setBidiLevel ( level );
+ if (level >= 0) {
+ leaderArea.setBidiLevel (level);
}
} else if (fobj.getLeaderPattern() == EN_DOTS) {
TextArea t = new TextArea();
char dot = '.'; // userAgent.getLeaderDotCharacter();
int width = font.getCharWidth(dot);
- int[] levels = ( level < 0 ) ? null : new int[] {level};
+ int[] levels = (level < 0) ? null : new int[] {level};
t.addWord("" + dot, width, null, levels, null, 0);
t.setIPD(width);
t.setBPD(width);
@@ -156,8 +156,8 @@ public class LeaderLayoutManager extends
if (widthLeaderPattern > width) {
spacer = new Space();
spacer.setIPD(widthLeaderPattern - width);
- if ( level >= 0 ) {
- spacer.setBidiLevel ( level );
+ if (level >= 0) {
+ spacer.setBidiLevel (level);
}
width = widthLeaderPattern;
}
@@ -200,8 +200,8 @@ public class LeaderLayoutManager extends
if (fobj.getLeaderPatternWidth().getValue(this) > width) {
spacer = new Space();
spacer.setIPD(fobj.getLeaderPatternWidth().getValue(this) - width);
- if ( level >= 0 ) {
- spacer.setBidiLevel ( level );
+ if (level >= 0) {
+ spacer.setBidiLevel (level);
}
width = fobj.getLeaderPatternWidth().getValue(this);
}
@@ -214,7 +214,7 @@ public class LeaderLayoutManager extends
//Content collapsed to nothing, so use a space
leaderArea = new Space();
leaderArea.setBPD(fobj.getRuleThickness().getValue(this));
- leaderArea.setBidiLevel ( fobj.getBidiLevelRecursive() );
+ leaderArea.setBidiLevel (fobj.getBidiLevelRecursive());
}
}
TraitSetter.setProducerID(leaderArea, fobj.getId());
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=1466146&r1=1466145&r2=1466146&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 Tue Apr 9 17:31:41 2013
@@ -120,8 +120,7 @@ public class LineLayoutManager extends I
private final int spaceAfter;
private final int baseline;
- LineBreakPosition( // CSOK: ParameterNumber
- LayoutManager lm, int index, int startIndex, int breakIndex,
+ LineBreakPosition(LayoutManager lm, int index, int startIndex, int breakIndex,
int shrink, int stretch, int diff, double ipdA, double adjust, int si,
int ei, int lh, int lw, int sb, int sa, int bl) {
super(lm, breakIndex);
@@ -311,8 +310,7 @@ public class LineLayoutManager extends I
private final int follow;
private static final double MAX_DEMERITS = 10e6;
- public LineBreakingAlgorithm( // CSOK: ParameterNumber
- int pageAlign, int textAlign, int textAlignLast, int indent, int fillerWidth,
+ public LineBreakingAlgorithm(int pageAlign, int textAlign, int textAlignLast, int indent, int fillerWidth,
int lh, int ld, int fl, boolean first, int maxFlagCount, LineLayoutManager llm) {
super(textAlign, textAlignLast, first, false, maxFlagCount);
pageAlignment = pageAlign;
@@ -343,7 +341,7 @@ public class LineLayoutManager extends I
int difference = bestActiveNode.difference;
int textAlign = (bestActiveNode.line < total) ? alignment : alignmentLast;
- switch ( textAlign ) {
+ switch (textAlign) {
case Constants.EN_START:
startIndent = 0;
endIndent = difference > 0 ? difference : 0;
@@ -425,10 +423,9 @@ public class LineLayoutManager extends I
activePossibility = -1;
}
- private LineBreakPosition makeLineBreakPosition( // CSOK: ParameterNumber
- KnuthSequence par, int firstElementIndex, int lastElementIndex, int availableShrink,
- int availableStretch, int difference, double ratio, int startIndent,
- int endIndent) {
+ private LineBreakPosition makeLineBreakPosition(KnuthSequence par, int firstElementIndex, int lastElementIndex,
+ int availableShrink, int availableStretch, int difference, double ratio,
+ int startIndent, int endIndent) {
// line height calculation - spaceBefore may differ from spaceAfter
// by 1mpt due to rounding
int spaceBefore = (lineHeight - lead - follow) / 2;
@@ -453,7 +450,7 @@ public class LineLayoutManager extends I
j <= lastElementIndex;
j++) {
KnuthElement element = (KnuthElement) inlineIterator.next();
- if (element instanceof KnuthInlineBox ) {
+ if (element instanceof KnuthInlineBox) {
AlignmentContext ac = ((KnuthInlineBox) element).getAlignmentContext();
if (ac != null && lastAC != ac) {
if (!ac.usesInitialBaselineTable()
@@ -1555,8 +1552,8 @@ public class LineLayoutManager extends I
lineArea.setBPD(lineArea.getBPD() + context.getSpaceAfter());
}
lineArea.finish();
- if ( lineArea.getBidiLevel() >= 0 ) {
- BidiResolver.reorder ( lineArea );
+ if (lineArea.getBidiLevel() >= 0) {
+ BidiResolver.reorder (lineArea);
}
parentLayoutManager.addChildArea(lineArea);
}
@@ -1607,8 +1604,8 @@ public class LineLayoutManager extends I
blocklc.setTrailingSpace(new SpaceSpecifier(false));
}
lineArea.updateExtentsFromChildren();
- if ( lineArea.getBidiLevel() >= 0 ) {
- BidiResolver.reorder ( lineArea );
+ if (lineArea.getBidiLevel() >= 0) {
+ BidiResolver.reorder (lineArea);
}
parentLayoutManager.addChildArea(lineArea);
}
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=1466146&r1=1466145&r2=1466146&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 Tue Apr 9 17:31:41 2013
@@ -111,9 +111,9 @@ public class TextLayoutManager extends L
* memoize thius length upon first invocation of this method.
*/
private int getWordLength() {
- if ( wordCharLength == -1 ) {
- if ( foText.hasMapping ( startIndex, breakIndex ) ) {
- wordCharLength = foText.getMapping ( startIndex, breakIndex ).length();
+ if (wordCharLength == -1) {
+ if (foText.hasMapping (startIndex, breakIndex)) {
+ wordCharLength = foText.getMapping (startIndex, breakIndex).length();
} else {
assert breakIndex >= startIndex;
wordCharLength = breakIndex - startIndex;
@@ -293,8 +293,8 @@ public class TextLayoutManager extends L
if (tbpNext.getLeafPos() != -1) {
areaInfo = (AreaInfo) areaInfos.get(tbpNext.getLeafPos());
if (lastAreaInfo == null
- || ( areaInfo.font != lastAreaInfo.font )
- || ( areaInfo.level != lastAreaInfo.level ) ) {
+ || (areaInfo.font != lastAreaInfo.font)
+ || (areaInfo.level != lastAreaInfo.level)) {
if (lastAreaInfo != null) {
addAreaInfoAreas(lastAreaInfo, wordSpaceCount,
letterSpaceCount, firstAreaInfoIndex,
@@ -567,7 +567,7 @@ public class TextLayoutManager extends L
AreaInfo wordAreaInfo = getAreaInfo(i);
addWordChars(wordAreaInfo);
addLetterAdjust(wordAreaInfo);
- if ( addGlyphPositionAdjustments(wordAreaInfo) ) {
+ if (addGlyphPositionAdjustments(wordAreaInfo)) {
gposAdjusted = true;
}
}
@@ -575,7 +575,7 @@ public class TextLayoutManager extends L
// TODO may be problematic in some I18N contexts [GA]
addHyphenationChar();
}
- if ( !gposAdjusted ) {
+ if (!gposAdjusted) {
gposAdjustments = null;
}
textArea.addWord(wordChars.toString(), wordIPD, letterSpaceAdjust,
@@ -583,11 +583,11 @@ public class TextLayoutManager extends L
}
private int[] getNonEmptyLevels() {
- if ( wordLevels != null ) {
+ if (wordLevels != null) {
assert wordLevelsIndex <= wordLevels.length;
boolean empty = true;
- for ( int i = 0, n = wordLevelsIndex; i < n; i++ ) {
- if ( wordLevels [ i ] >= 0 ) {
+ for (int i = 0, n = wordLevelsIndex; i < n; i++) {
+ if (wordLevels [ i ] >= 0) {
empty = false;
break;
}
@@ -610,7 +610,7 @@ public class TextLayoutManager extends L
letterSpaceAdjustIndex = 0;
wordLevels = new int[wordLength];
wordLevelsIndex = 0;
- Arrays.fill ( wordLevels, -1 );
+ Arrays.fill (wordLevels, -1);
gposAdjustments = new int[wordLength][4];
gposAdjustmentsIndex = 0;
wordIPD = 0;
@@ -637,14 +637,14 @@ public class TextLayoutManager extends L
private void addWordChars(AreaInfo wordAreaInfo) {
int s = wordAreaInfo.startIndex;
int e = wordAreaInfo.breakIndex;
- if ( foText.hasMapping ( s, e ) ) {
- wordChars.append ( foText.getMapping ( s, e ) );
- addWordLevels ( foText.getMappingBidiLevels ( s, e ) );
+ if (foText.hasMapping (s, e)) {
+ wordChars.append (foText.getMapping (s, e));
+ addWordLevels (foText.getMappingBidiLevels (s, e));
} else {
for (int i = s; i < e; i++) {
wordChars.append(foText.charAt(i));
}
- addWordLevels ( foText.getBidiLevels ( s, e ) );
+ addWordLevels (foText.getBidiLevels (s, e));
}
wordIPD += wordAreaInfo.areaIPD.getOpt();
}
@@ -654,16 +654,16 @@ public class TextLayoutManager extends L
* concatenante (possibly mapped) word bidi levels to levels buffer.
* @param levels bidi levels array or null
*/
- private void addWordLevels ( int[] levels ) {
- int numLevels = ( levels != null ) ? levels.length : 0;
- if ( numLevels > 0 ) {
+ private void addWordLevels (int[] levels) {
+ int numLevels = (levels != null) ? levels.length : 0;
+ if (numLevels > 0) {
int need = wordLevelsIndex + numLevels;
- if ( need <= wordLevels.length ) {
- System.arraycopy ( levels, 0, wordLevels, wordLevelsIndex, numLevels );
+ if (need <= wordLevels.length) {
+ System.arraycopy (levels, 0, wordLevels, wordLevelsIndex, numLevels);
} else {
throw new IllegalStateException
- ( "word levels array too short: expect at least "
- + need + " entries, but has only " + wordLevels.length + " entries" );
+ ("word levels array too short: expect at least "
+ + need + " entries, but has only " + wordLevels.length + " entries");
}
}
wordLevelsIndex += numLevels;
@@ -678,15 +678,15 @@ public class TextLayoutManager extends L
int letterSpaceCount = wordAreaInfo.letterSpaceCount;
int wordLength = wordAreaInfo.getWordLength();
int taAdjust = textArea.getTextLetterSpaceAdjust();
- for ( int i = 0, n = wordLength; i < n; i++ ) {
+ for (int i = 0, n = wordLength; i < n; i++) {
int j = letterSpaceAdjustIndex + i;
- if ( j > 0 ) {
+ if (j > 0) {
int k = wordAreaInfo.startIndex + i;
- MinOptMax adj = ( k < letterSpaceAdjustArray.length )
+ MinOptMax adj = (k < letterSpaceAdjustArray.length)
? letterSpaceAdjustArray [ k ] : null;
- letterSpaceAdjust [ j ] = ( adj == null ) ? 0 : adj.getOpt();
+ letterSpaceAdjust [ j ] = (adj == null) ? 0 : adj.getOpt();
}
- if ( letterSpaceCount > 0 ) {
+ if (letterSpaceCount > 0) {
letterSpaceAdjust [ j ] += taAdjust;
letterSpaceCount--;
}
@@ -703,18 +703,18 @@ public class TextLayoutManager extends L
private boolean addGlyphPositionAdjustments(AreaInfo wordAreaInfo) {
boolean adjusted = false;
int[][] gpa = wordAreaInfo.gposAdjustments;
- int numAdjusts = ( gpa != null ) ? gpa.length : 0;
+ int numAdjusts = (gpa != null) ? gpa.length : 0;
int wordLength = wordAreaInfo.getWordLength();
- if ( numAdjusts > 0 ) {
+ if (numAdjusts > 0) {
int need = gposAdjustmentsIndex + numAdjusts;
- if ( need <= gposAdjustments.length ) {
- for ( int i = 0, n = wordLength, j = 0; i < n; i++ ) {
- if ( i < numAdjusts ) {
+ if (need <= gposAdjustments.length) {
+ for (int i = 0, n = wordLength, j = 0; i < n; i++) {
+ if (i < numAdjusts) {
int[] wpa1 = gposAdjustments [ gposAdjustmentsIndex + i ];
int[] wpa2 = gpa [ j++ ];
- for ( int k = 0; k < 4; k++ ) {
+ for (int k = 0; k < 4; k++) {
int a = wpa2 [ k ];
- if ( a != 0 ) {
+ if (a != 0) {
wpa1 [ k ] += a;
adjusted = true;
}
@@ -723,9 +723,9 @@ public class TextLayoutManager extends L
}
} else {
throw new IllegalStateException
- ( "gpos adjustments array too short: expect at least "
+ ("gpos adjustments array too short: expect at least "
+ need + " entries, but has only " + gposAdjustments.length
- + " entries" );
+ + " entries");
}
}
gposAdjustmentsIndex += wordLength;
@@ -750,32 +750,32 @@ public class TextLayoutManager extends L
}
}
int numSpaces = areaInfo.breakIndex - areaInfo.startIndex - numZeroWidthSpaces;
- int spaceIPD = areaInfo.areaIPD.getOpt() / ( ( numSpaces > 0 ) ? numSpaces : 1 );
+ int spaceIPD = areaInfo.areaIPD.getOpt() / ((numSpaces > 0) ? numSpaces : 1);
// add space area children, one for each non-zero-width space character
for (int i = areaInfo.startIndex; i < areaInfo.breakIndex; i++) {
char spaceChar = foText.charAt(i);
int level = foText.bidiLevelAt(i);
if (!CharUtilities.isZeroWidthSpace(spaceChar)) {
textArea.addSpace
- ( spaceChar, spaceIPD,
+ (spaceChar, spaceIPD,
CharUtilities.isAdjustableSpace(spaceChar),
- blockProgressionOffset, level );
+ blockProgressionOffset, level);
}
}
}
}
- private void addAreaInfo ( AreaInfo ai ) {
- addAreaInfo ( areaInfos.size(), ai );
+ private void addAreaInfo (AreaInfo ai) {
+ addAreaInfo (areaInfos.size(), ai);
}
- private void addAreaInfo ( int index, AreaInfo ai ) {
- areaInfos.add ( index, ai );
+ private void addAreaInfo (int index, AreaInfo ai) {
+ areaInfos.add (index, ai);
}
- private void removeAreaInfo ( int index ) {
- areaInfos.remove ( index );
+ private void removeAreaInfo (int index) {
+ areaInfos.remove (index);
}
private AreaInfo getAreaInfo(int index) {
@@ -815,7 +815,7 @@ public class TextLayoutManager extends L
returnList.add(sequence);
if (LOG.isDebugEnabled()) {
- LOG.debug ( "GK: [" + nextStart + "," + foText.length() + "]" );
+ LOG.debug ("GK: [" + nextStart + "," + foText.length() + "]");
}
LineBreakStatus lineBreakStatus = new LineBreakStatus();
thisStart = nextStart;
@@ -846,20 +846,20 @@ public class TextLayoutManager extends L
TextLayoutManager.LOG.error("Unexpected breakAction: " + breakAction);
}
if (LOG.isDebugEnabled()) {
- LOG.debug ( "GK: {"
+ LOG.debug ("GK: {"
+ " index = " + nextStart
- + ", char = " + CharUtilities.charToNCRef ( ch )
+ + ", char = " + CharUtilities.charToNCRef (ch)
+ ", level = " + level
+ ", levelPrev = " + prevLevel
+ ", inWord = " + inWord
+ ", inSpace = " + inWhitespace
- + "}" );
+ + "}");
}
if (inWord) {
- if ( breakOpportunity
+ if (breakOpportunity
|| TextLayoutManager.isSpace(ch)
|| CharUtilities.isExplicitBreak(ch)
- || ( ( prevLevel != -1 ) && ( level != prevLevel ) ) ) {
+ || ((prevLevel != -1) && (level != prevLevel))) {
// this.foText.charAt(lastIndex) == CharUtilities.SOFT_HYPHEN
prevAreaInfo = processWord(alignment, sequence, prevAreaInfo, ch,
breakOpportunity, true, prevLevel);
@@ -960,16 +960,16 @@ public class TextLayoutManager extends L
final KnuthSequence sequence, final boolean breakOpportunity, int level) {
if (LOG.isDebugEnabled()) {
- LOG.debug ( "PS: [" + thisStart + "," + nextStart + "]" );
+ LOG.debug ("PS: [" + thisStart + "," + nextStart + "]");
}
// End of whitespace
// create the AreaInfo object
assert nextStart >= thisStart;
AreaInfo areaInfo = new AreaInfo
- ( thisStart, nextStart, nextStart - thisStart, 0,
+ (thisStart, nextStart, nextStart - thisStart, 0,
wordSpaceIPD.mult(nextStart - thisStart),
- false, true, breakOpportunity, spaceFont, level, null );
+ false, true, breakOpportunity, spaceFont, level, null);
addAreaInfo(areaInfo);
@@ -981,8 +981,8 @@ public class TextLayoutManager extends L
}
private AreaInfo processWordMapping
- ( int lastIndex, final Font font, AreaInfo prevAreaInfo, final char breakOpportunityChar,
- final boolean endsWithHyphen, int level ) {
+ (int lastIndex, final Font font, AreaInfo prevAreaInfo, final char breakOpportunityChar,
+ final boolean endsWithHyphen, int level) {
int s = this.thisStart; // start index of word in FOText character buffer
int e = lastIndex; // end index of word in FOText character buffer
int nLS = 0; // # of letter spaces
@@ -990,68 +990,68 @@ public class TextLayoutManager extends L
String language = foText.getLanguage();
if (LOG.isDebugEnabled()) {
- LOG.debug ( "PW: [" + thisStart + "," + lastIndex + "]: {"
+ LOG.debug ("PW: [" + thisStart + "," + lastIndex + "]: {"
+ " +M"
+ ", level = " + level
- + " }" );
+ + " }");
}
// 1. extract unmapped character sequence
- CharSequence ics = foText.subSequence ( s, e );
+ CharSequence ics = foText.subSequence (s, e);
// 2. if script is not specified (by FO property) or it is specified as 'auto',
// then compute dominant script
- if ( ( script == null ) || "auto".equals(script) ) {
- script = CharScript.scriptTagFromCode ( CharScript.dominantScript ( ics ) );
+ if ((script == null) || "auto".equals(script)) {
+ script = CharScript.scriptTagFromCode (CharScript.dominantScript (ics));
}
- if ( ( language == null ) || "none".equals(language) ) {
+ if ((language == null) || "none".equals(language)) {
language = "dflt";
}
// 3. perform mapping of chars to glyphs ... to glyphs ... to chars
- CharSequence mcs = font.performSubstitution ( ics, script, language );
+ CharSequence mcs = font.performSubstitution (ics, script, language);
// 4. compute glyph position adjustments on (substituted) characters
int[][] gpa;
- if ( font.performsPositioning() ) {
+ if (font.performsPositioning()) {
// handle GPOS adjustments
- gpa = font.performPositioning ( mcs, script, language );
- } else if ( font.hasKerning() ) {
+ gpa = font.performPositioning (mcs, script, language);
+ } else if (font.hasKerning()) {
// handle standard (non-GPOS) kerning adjustments
- gpa = getKerningAdjustments ( mcs, font );
+ gpa = getKerningAdjustments (mcs, font);
} else {
gpa = null;
}
// 5. reorder combining marks so that they precede (within the mapped char sequence) the
// base to which they are applied; N.B. position adjustments (gpa) are reordered in place
- mcs = font.reorderCombiningMarks ( mcs, gpa, script, language );
+ mcs = font.reorderCombiningMarks (mcs, gpa, script, language);
// 6. if mapped sequence differs from input sequence, then memoize mapped sequence
- if ( !CharUtilities.isSameSequence ( mcs, ics ) ) {
- foText.addMapping ( s, e, mcs );
+ if (!CharUtilities.isSameSequence (mcs, ics)) {
+ foText.addMapping (s, e, mcs);
}
// 7. compute word ipd based on final position adjustments
MinOptMax ipd = MinOptMax.ZERO;
- for ( int i = 0, n = mcs.length(); i < n; i++ ) {
- int c = mcs.charAt ( i );
+ for (int i = 0, n = mcs.length(); i < n; i++) {
+ int c = mcs.charAt (i);
// TODO !BMP
- int w = font.getCharWidth ( c );
- if ( w < 0 ) {
+ int w = font.getCharWidth (c);
+ if (w < 0) {
w = 0;
}
- if ( gpa != null ) {
+ if (gpa != null) {
w += gpa [ i ] [ GlyphPositioningTable.Value.IDX_X_ADVANCE ];
}
- ipd = ipd.plus ( w );
+ ipd = ipd.plus (w);
}
// [TBD] - handle letter spacing
return new AreaInfo
- ( s, e, 0, nLS, ipd, endsWithHyphen, false,
- breakOpportunityChar != 0, font, level, gpa );
+ (s, e, 0, nLS, ipd, endsWithHyphen, false,
+ breakOpportunityChar != 0, font, level, gpa);
}
/**
@@ -1061,31 +1061,31 @@ public class TextLayoutManager extends L
* @param font applicable font
* @return glyph position adjustments (or null if no kerning)
*/
- private int[][] getKerningAdjustments ( CharSequence mcs, final Font font ) {
+ private int[][] getKerningAdjustments (CharSequence mcs, final Font font) {
int nc = mcs.length();
// extract kerning array
int[] ka = new int [ nc ]; // kerning array
- for ( int i = 0, n = nc, cPrev = -1; i < n; i++ ) {
- int c = mcs.charAt ( i );
+ for (int i = 0, n = nc, cPrev = -1; i < n; i++) {
+ int c = mcs.charAt (i);
// TODO !BMP
- if ( cPrev >= 0 ) {
- ka[i] = font.getKernValue ( cPrev, c );
+ if (cPrev >= 0) {
+ ka[i] = font.getKernValue (cPrev, c);
}
cPrev = c;
}
// was there a non-zero kerning?
boolean hasKerning = false;
- for ( int i = 0, n = nc; i < n; i++ ) {
- if ( ka[i] != 0 ) {
+ for (int i = 0, n = nc; i < n; i++) {
+ if (ka[i] != 0) {
hasKerning = true;
break;
}
}
// if non-zero kerning, then create and return glyph position adjustment array
- if ( hasKerning ) {
+ if (hasKerning) {
int[][] gpa = new int [ nc ] [ 4 ];
- for ( int i = 0, n = nc; i < n; i++ ) {
- if ( i > 0 ) {
+ for (int i = 0, n = nc; i < n; i++) {
+ if (i > 0) {
gpa [ i - 1 ] [ GlyphPositioningTable.Value.IDX_X_ADVANCE ] = ka [ i ];
}
}
@@ -1101,10 +1101,10 @@ public class TextLayoutManager extends L
MinOptMax wordIPD = MinOptMax.ZERO;
if (LOG.isDebugEnabled()) {
- LOG.debug ( "PW: [" + thisStart + "," + lastIndex + "]: {"
+ LOG.debug ("PW: [" + thisStart + "," + lastIndex + "]: {"
+ " -M"
+ ", level = " + level
- + " }" );
+ + " }");
}
for (int i = thisStart; i < lastIndex; i++) {
@@ -1132,7 +1132,7 @@ public class TextLayoutManager extends L
}
}
if (kerning
- && ( breakOpportunityChar != 0 )
+ && (breakOpportunityChar != 0)
&& !TextLayoutManager.isSpace(breakOpportunityChar)
&& lastIndex > 0
&& endsWithHyphen) {
@@ -1151,7 +1151,7 @@ public class TextLayoutManager extends L
// if there is a break opportunity and the next one (break character)
// is not a space, it could be used as a line end;
// add one more letter space, in case other text follows
- if (( breakOpportunityChar != 0 ) && !TextLayoutManager.isSpace(breakOpportunityChar)) {
+ if ((breakOpportunityChar != 0) && !TextLayoutManager.isSpace(breakOpportunityChar)) {
letterSpaces++;
}
}
@@ -1177,14 +1177,14 @@ public class TextLayoutManager extends L
final boolean endsWithHyphen = checkEndsWithHyphen
&& foText.charAt(lastIndex) == CharUtilities.SOFT_HYPHEN;
Font font = FontSelector.selectFontForCharactersInText
- ( foText, thisStart, lastIndex, foText, this );
+ (foText, thisStart, lastIndex, foText, this);
AreaInfo areaInfo;
- if ( font.performsSubstitution() || font.performsPositioning() ) {
+ if (font.performsSubstitution() || font.performsPositioning()) {
areaInfo = processWordMapping
- ( lastIndex, font, prevAreaInfo, breakOpportunity ? ch : 0, endsWithHyphen, level );
+ (lastIndex, font, prevAreaInfo, breakOpportunity ? ch : 0, endsWithHyphen, level);
} else {
areaInfo = processWordNoMapping
- ( lastIndex, font, prevAreaInfo, breakOpportunity ? ch : 0, endsWithHyphen, level );
+ (lastIndex, font, prevAreaInfo, breakOpportunity ? ch : 0, endsWithHyphen, level);
}
prevAreaInfo = areaInfo;
addAreaInfo(areaInfo);
@@ -1296,8 +1296,8 @@ public class TextLayoutManager extends L
if (!(nothingChanged && stopIndex == areaInfo.breakIndex && !hyphenFollows)) {
// the new AreaInfo object is not equal to the old one
changeList.add
- ( new PendingChange
- ( new AreaInfo(startIndex, stopIndex, 0,
+ (new PendingChange
+ (new AreaInfo(startIndex, stopIndex, 0,
letterSpaceCount, newIPD, hyphenFollows,
false, false, font, -1, null),
((LeafPosition) pos).getLeafPos() + changeOffset));
@@ -1704,7 +1704,7 @@ public class TextLayoutManager extends L
public String toString() {
return super.toString() + "{"
+ "chars = \'"
- + CharUtilities.toNCRefs ( foText.getCharSequence().toString() )
+ + CharUtilities.toNCRefs (foText.getCharSequence().toString())
+ "\'"
+ ", len = " + foText.length()
+ "}";
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CellPart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CellPart.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CellPart.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CellPart.java Tue Apr 9 17:31:41 2013
@@ -61,8 +61,7 @@ class CellPart {
* @param bpAfterLast width of (possibly optional) border- and padding-after if this
* part will be the last one on the page
*/
- protected CellPart( // CSOK: ParameterNumber
- PrimaryGridUnit pgu, int start, int end, boolean last,
+ protected CellPart(PrimaryGridUnit pgu, int start, int end, boolean last,
int condBeforeContentLength, int length, int condAfterContentLength,
int bpBeforeNormal, int bpBeforeFirst,
int bpAfterNormal, int bpAfterLast) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java Tue Apr 9 17:31:41 2013
@@ -63,7 +63,7 @@ public abstract class CollapsingBorderMo
}
return collapse;
case Constants.EN_COLLAPSE_WITH_PRECEDENCE:
- throw new UnsupportedOperationException ( "collapse-with-precedence not yet supported" );
+ throw new UnsupportedOperationException ("collapse-with-precedence not yet supported");
default:
throw new IllegalArgumentException("Illegal border-collapse mode.");
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java Tue Apr 9 17:31:41 2013
@@ -59,7 +59,7 @@ public class ColumnSetup {
public ColumnSetup(Table table) {
assert table != null;
this.table = table;
- this.wmTraits = WritingModeTraits.getWritingModeTraitsGetter ( table );
+ this.wmTraits = WritingModeTraits.getWritingModeTraitsGetter (table);
prepareColumns();
initializeColumnWidths();
}
@@ -251,7 +251,7 @@ public class ColumnSetup {
*/
public int getXOffset(int col, int nrColSpan, PercentBaseContext context) {
// TODO handle vertical WMs [GA]
- if ( (wmTraits != null) && (wmTraits.getColumnProgressionDirection() == Direction.RL) ) {
+ if ((wmTraits != null) && (wmTraits.getColumnProgressionDirection() == Direction.RL)) {
return getXOffsetRTL(col, nrColSpan, context);
} else {
return getXOffsetLTR(col, context);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java Tue Apr 9 17:31:41 2013
@@ -390,8 +390,7 @@ public class TableCellLayoutManager exte
* this row is placed on a previous page). Used to calculate the placement of the
* row's background image if any
*/
- public void addAreas( // CSOK: ParameterNumber
- PositionIterator parentIter, LayoutContext layoutContext, int[] spannedGridRowHeights,
+ public void addAreas(PositionIterator parentIter, LayoutContext layoutContext, int[] spannedGridRowHeights,
int startRow, int endRow, int borderBeforeWhich, int borderAfterWhich,
boolean firstOnPage, boolean lastOnPage, RowPainter painter, int firstRowHeight) {
getParentArea(null);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java Tue Apr 9 17:31:41 2013
@@ -56,8 +56,7 @@ public class PDFCIDFont extends PDFObjec
* @param supplement Supplement number
* @param descriptor CID font descriptor
*/
- public PDFCIDFont( // CSOK: ParameterNumber
- String basefont, CIDFontType cidtype, int dw,
+ public PDFCIDFont(String basefont, CIDFontType cidtype, int dw,
int[] w, String registry, String ordering,
int supplement, PDFCIDFontDescriptor descriptor) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java Tue Apr 9 17:31:41 2013
@@ -40,7 +40,6 @@ import org.apache.commons.logging.LogFac
import org.apache.xmlgraphics.java2d.color.ColorUtil;
import org.apache.xmlgraphics.java2d.color.NamedColorSpace;
-
import org.apache.xmlgraphics.xmp.Metadata;
import org.apache.fop.fonts.CIDFont;
@@ -295,8 +294,7 @@ public class PDFFactory {
* It should be 0 as this is the constructor for sampled functions.
* @return the PDF function that was created
*/
- public PDFFunction makeFunction( // CSOK: ParameterNumber
- int theFunctionType, List theDomain,
+ public PDFFunction makeFunction(int theFunctionType, List theDomain,
List theRange, List theSize,
int theBitsPerSample, int theOrder,
List theEncode, List theDecode,
@@ -469,8 +467,7 @@ public class PDFFactory {
* @param theFunction The PDF Function that maps an (x,y) location to a color
* @return the PDF shading that was created
*/
- public PDFShading makeShading( // CSOK: ParameterNumber
- PDFResourceContext res, int theShadingType,
+ public PDFShading makeShading(PDFResourceContext res, int theShadingType,
PDFDeviceColorSpace theColorSpace,
List theBackground, List theBBox,
boolean theAntiAlias, List theDomain,
@@ -522,8 +519,7 @@ public class PDFFactory {
* The default is [false, false]
* @return the PDF shading that was created
*/
- public PDFShading makeShading( // CSOK: ParameterNumber
- PDFResourceContext res, int theShadingType,
+ public PDFShading makeShading(PDFResourceContext res, int theShadingType,
PDFDeviceColorSpace theColorSpace,
List theBackground, List theBBox,
boolean theAntiAlias, List theCoords,
@@ -576,8 +572,7 @@ public class PDFFactory {
* @param theFunction the PDFFunction
* @return the PDF shading that was created
*/
- public PDFShading makeShading( // CSOK: ParameterNumber
- PDFResourceContext res, int theShadingType,
+ public PDFShading makeShading(PDFResourceContext res, int theShadingType,
PDFDeviceColorSpace theColorSpace,
List theBackground, List theBBox,
boolean theAntiAlias,
@@ -632,8 +627,7 @@ public class PDFFactory {
* @param theFunction The PDFFunction that's mapped on to this shape
* @return the PDF shading that was created
*/
- public PDFShading makeShading( // CSOK: ParameterNumber
- PDFResourceContext res, int theShadingType,
+ public PDFShading makeShading(PDFResourceContext res, int theShadingType,
PDFDeviceColorSpace theColorSpace,
List theBackground, List theBBox,
boolean theAntiAlias,
@@ -683,8 +677,7 @@ public class PDFFactory {
* @param thePatternDataStream The stream of pattern data to be tiled.
* @return the PDF pattern that was created
*/
- public PDFPattern makePattern( // CSOK: ParameterNumber
- PDFResourceContext res, int thePatternType, // 1
+ public PDFPattern makePattern(PDFResourceContext res, int thePatternType,
PDFResources theResources, int thePaintType, int theTilingType,
List theBBox, double theXStep,
double theYStep, List theMatrix,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFontDescriptor.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFontDescriptor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFontDescriptor.java Tue Apr 9 17:31:41 2013
@@ -40,8 +40,7 @@ public class PDFFontDescriptor extends P
* @param italicAngle the angle of the vertical dominant strokes
* @param stemV the width of the dominant vertical stems of glyphs
*/
- public PDFFontDescriptor( // CSOK: ParameterNumber
- String basefont, int ascent,
+ public PDFFontDescriptor(String basefont, int ascent,
int descent, int capHeight, int flags,
PDFRectangle fontBBox, int italicAngle,
int stemV) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java Tue Apr 9 17:31:41 2013
@@ -211,8 +211,7 @@ public class PDFFunction extends PDFObje
* @param theFunctionType This is the type of function (0,2,3, or 4).
* It should be 0 as this is the constructor for sampled functions.
*/
- public PDFFunction( // CSOK: ParameterNumber
- int theFunctionType, List theDomain,
+ public PDFFunction(int theFunctionType, List theDomain,
List theRange, List theSize, int theBitsPerSample,
int theOrder, List theEncode, List theDecode,
StringBuffer theFunctionDataStream, List theFilter) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java Tue Apr 9 17:31:41 2013
@@ -116,8 +116,7 @@ public class PDFPattern extends PDFPathP
* @param theXUID Optional vector of Integers that uniquely identify the pattern
* @param thePatternDataStream The stream of pattern data to be tiled.
*/
- public PDFPattern( // CSOK: ParameterNumber
- PDFResources theResources, int thePatternType, // 1
+ public PDFPattern(PDFResources theResources, int thePatternType,
int thePaintType, int theTilingType, List theBBox,
double theXStep, double theYStep,
List theMatrix, List theXUID,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java Tue Apr 9 17:31:41 2013
@@ -164,8 +164,7 @@ public class PDFShading extends PDFObjec
* It's optional, the default is the identity matrix
* @param theFunction The PDF Function that maps an (x,y) location to a color
*/
- public PDFShading( // CSOK: ParameterNumber
- int theShadingType, PDFDeviceColorSpace theColorSpace,
+ public PDFShading(int theShadingType, PDFDeviceColorSpace theColorSpace,
List theBackground, List theBBox,
boolean theAntiAlias, List theDomain,
List theMatrix, PDFFunction theFunction) {
@@ -203,8 +202,7 @@ public class PDFShading extends PDFObjec
* and end colors past the start and end points
* The default is [false, false]
*/
- public PDFShading( // CSOK: ParameterNumber
- int theShadingType, PDFDeviceColorSpace theColorSpace,
+ public PDFShading(int theShadingType, PDFDeviceColorSpace theColorSpace,
List theBackground, List theBBox,
boolean theAntiAlias, List theCoords,
List theDomain, PDFFunction theFunction,
@@ -244,8 +242,7 @@ public class PDFShading extends PDFObjec
* @param theDecode List of Doubles see PDF 1.3 spec pages 303 to 312.
* @param theFunction the PDFFunction
*/
- public PDFShading( // CSOK: ParameterNumber
- int theShadingType, PDFDeviceColorSpace theColorSpace,
+ public PDFShading(int theShadingType, PDFDeviceColorSpace theColorSpace,
List theBackground, List theBBox,
boolean theAntiAlias, int theBitsPerCoordinate,
int theBitsPerComponent, int theBitsPerFlag,
@@ -284,8 +281,7 @@ public class PDFShading extends PDFObjec
* @param theVerticesPerRow number of vertices in each "row" of the lattice.
* @param theFunction The PDFFunction that's mapped on to this shape
*/
- public PDFShading( // CSOK: ParameterNumber
- int theShadingType, PDFDeviceColorSpace theColorSpace,
+ public PDFShading(int theShadingType, PDFDeviceColorSpace theColorSpace,
List theBackground, List theBBox,
boolean theAntiAlias, int theBitsPerCoordinate,
int theBitsPerComponent, List theDecode,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java Tue Apr 9 17:31:41 2013
@@ -113,7 +113,7 @@ public abstract class PDFTextUtil {
}
private void writeChar(char ch, StringBuffer sb) {
- writeChar ( ch, sb, useMultiByte );
+ writeChar (ch, sb, useMultiByte);
}
private void checkInTextObject() {
@@ -325,7 +325,7 @@ public abstract class PDFTextUtil {
* @param x coordinate
* @param y coordinate
*/
- public void writeTd ( double x, double y ) {
+ public void writeTd (double x, double y) {
StringBuffer sb = new StringBuffer();
PDFNumber.doubleOut(x, DEC, sb);
sb.append(' ');
@@ -338,7 +338,7 @@ public abstract class PDFTextUtil {
* Writes a "Tj" command with specified character code.
* @param ch character code to write
*/
- public void writeTj ( char ch ) {
+ public void writeTj (char ch) {
StringBuffer sb = new StringBuffer();
sb.append('<');
writeChar(ch, sb, true);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org