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 [15/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/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Tue Apr 9 17:31:41 2013
@@ -1503,32 +1503,32 @@ public final class FOPropertyMapping imp
addPropertyMaker("fox:block-progression-unit", l);
}
- private Property calcWritingModeDependent ( int pv, int wm ) {
- if ( pv == EN_LEFT ) {
- if ( wm == Constants.EN_LR_TB ) {
+ private Property calcWritingModeDependent (int pv, int wm) {
+ if (pv == EN_LEFT) {
+ if (wm == Constants.EN_LR_TB) {
pv = EN_START;
- } else if ( wm == Constants.EN_RL_TB ) {
+ } else if (wm == Constants.EN_RL_TB) {
pv = EN_END;
} else {
pv = EN_START;
}
- } else if ( pv == EN_RIGHT ) {
- if ( wm == Constants.EN_LR_TB ) {
+ } else if (pv == EN_RIGHT) {
+ if (wm == Constants.EN_LR_TB) {
pv = EN_END;
- } else if ( wm == Constants.EN_RL_TB ) {
+ } else if (wm == Constants.EN_RL_TB) {
pv = EN_START;
} else {
pv = EN_END;
}
}
- return makeWritingModeDependentEnum ( pv );
+ return makeWritingModeDependentEnum (pv);
}
- private Property makeWritingModeDependentEnum ( int pv ) {
- if ( pv == EN_START ) {
- return getEnumProperty ( EN_START, "START" );
- } else if ( pv == EN_END ) {
- return getEnumProperty ( EN_END, "END" );
+ private Property makeWritingModeDependentEnum (int pv) {
+ if (pv == EN_START) {
+ return getEnumProperty (EN_START, "START");
+ } else if (pv == EN_END) {
+ return getEnumProperty (EN_END, "END");
} else {
return null;
}
@@ -1623,11 +1623,11 @@ public final class FOPropertyMapping imp
public Property get(int subpropId, PropertyList propertyList,
boolean bTryInherit, boolean bTryDefault) throws PropertyException {
Property p = super.get(subpropId, propertyList, bTryInherit, bTryDefault);
- if ( p != null ) {
+ if (p != null) {
int pv = p.getEnum();
- if ( ( pv == EN_LEFT ) || ( pv == EN_RIGHT ) ) {
+ if ((pv == EN_LEFT) || (pv == EN_RIGHT)) {
p = calcWritingModeDependent
- ( pv, propertyList.get(Constants.PR_WRITING_MODE).getEnum() );
+ (pv, propertyList.get(Constants.PR_WRITING_MODE).getEnum());
}
}
return p;
@@ -1677,10 +1677,10 @@ public final class FOPropertyMapping imp
return getEnumProperty(EN_CENTER, "CENTER");
} else if (correspondingValue == EN_LEFT) {
return calcWritingModeDependent
- ( EN_LEFT, propertyList.get(Constants.PR_WRITING_MODE).getEnum() );
+ (EN_LEFT, propertyList.get(Constants.PR_WRITING_MODE).getEnum());
} else if (correspondingValue == EN_RIGHT) {
return calcWritingModeDependent
- ( EN_RIGHT, propertyList.get(Constants.PR_WRITING_MODE).getEnum() );
+ (EN_RIGHT, propertyList.get(Constants.PR_WRITING_MODE).getEnum());
} else {
return null;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java Tue Apr 9 17:31:41 2013
@@ -114,15 +114,15 @@ public class FOText extends FONode imple
PropertyList list, Locator locator) throws FOPException {
if (charBuffer == null) {
// buffer not yet initialized, do so now
- int newLength = ( length < 16 ) ? 16 : length;
+ int newLength = (length < 16) ? 16 : length;
charBuffer = CharBuffer.allocate(newLength);
} else {
// allocate a larger buffer, and transfer contents
int requires = charBuffer.position() + length;
int capacity = charBuffer.capacity();
- if ( requires > capacity ) {
+ if (requires > capacity) {
int newCapacity = capacity * 2;
- if ( requires > newCapacity ) {
+ if (requires > newCapacity) {
newCapacity = requires;
}
CharBuffer newBuffer = CharBuffer.allocate(newCapacity);
@@ -194,7 +194,7 @@ public class FOText extends FONode imple
/** {@inheritDoc} */
public void endOfNode() throws FOPException {
- if ( charBuffer != null ) {
+ if (charBuffer != null) {
charBuffer.rewind();
}
super.endOfNode();
@@ -664,7 +664,7 @@ public class FOText extends FONode imple
/** {@inheritDoc} */
public String toString() {
- if ( charBuffer == null ) {
+ if (charBuffer == null) {
return "";
} else {
CharBuffer cb = charBuffer.duplicate();
@@ -717,7 +717,7 @@ public class FOText extends FONode imple
}
@Override
- public boolean isDelimitedTextRangeBoundary ( int boundary ) {
+ public boolean isDelimitedTextRangeBoundary (int boundary) {
return false;
}
@@ -737,16 +737,16 @@ public class FOText extends FONode imple
* @param start the starting index of interval
* @param end the ending index of interval
*/
- public void setBidiLevel ( int level, int start, int end ) {
- if ( start < end ) {
- if ( bidiLevels == null ) {
+ public void setBidiLevel (int level, int start, int end) {
+ if (start < end) {
+ if (bidiLevels == null) {
bidiLevels = new int [ length() ];
}
- for ( int i = start, n = end; i < n; i++ ) {
+ for (int i = start, n = end; i < n; i++) {
bidiLevels [ i ] = level;
}
- if ( parent != null ) {
- ( (FObj) parent ).setBidiLevel ( level );
+ if (parent != null) {
+ ((FObj) parent).setBidiLevel (level);
}
} else {
assert start < end;
@@ -771,12 +771,12 @@ public class FOText extends FONode imple
* @return a (possibly empty) array of bidi levels or null
* in case no bidi levels have been assigned
*/
- public int[] getBidiLevels ( int start, int end ) {
- if ( this.bidiLevels != null ) {
+ public int[] getBidiLevels (int start, int end) {
+ if (this.bidiLevels != null) {
assert start <= end;
int n = end - start;
int[] bidiLevels = new int [ n ];
- for ( int i = 0; i < n; i++ ) {
+ for (int i = 0; i < n; i++) {
bidiLevels[i] = this.bidiLevels [ start + i ];
}
return bidiLevels;
@@ -794,10 +794,10 @@ public class FOText extends FONode imple
* @throws IndexOutOfBoundsException if position is not non-negative integer
* or is greater than or equal to length
*/
- public int bidiLevelAt ( int position ) throws IndexOutOfBoundsException {
- if ( ( position < 0 ) || ( position >= length() ) ) {
+ public int bidiLevelAt (int position) throws IndexOutOfBoundsException {
+ if ((position < 0) || (position >= length())) {
throw new IndexOutOfBoundsException();
- } else if ( bidiLevels != null ) {
+ } else if (bidiLevels != null) {
return bidiLevels [ position ];
} else {
return -1;
@@ -810,11 +810,11 @@ public class FOText extends FONode imple
* @param end index in character buffer
* @param mappedChars sequence of character codes denoting substituted characters
*/
- public void addMapping ( int start, int end, CharSequence mappedChars ) {
- if ( mappings == null ) {
+ public void addMapping (int start, int end, CharSequence mappedChars) {
+ if (mappings == null) {
mappings = new java.util.HashMap();
}
- mappings.put ( new MapRange ( start, end ), mappedChars.toString() );
+ mappings.put (new MapRange (start, end), mappedChars.toString());
}
/**
@@ -824,8 +824,8 @@ public class FOText extends FONode imple
* @return true if a mapping exist such that the mapping's interval is coincident to
* [start,end)
*/
- public boolean hasMapping ( int start, int end ) {
- return ( mappings != null ) && ( mappings.containsKey ( new MapRange ( start, end ) ) );
+ public boolean hasMapping (int start, int end) {
+ return (mappings != null) && (mappings.containsKey (new MapRange (start, end)));
}
/**
@@ -835,9 +835,9 @@ public class FOText extends FONode imple
* @return a string of characters representing the mapping over the interval
* [start,end)
*/
- public String getMapping ( int start, int end ) {
- if ( mappings != null ) {
- return (String) mappings.get ( new MapRange ( start, end ) );
+ public String getMapping (int start, int end) {
+ if (mappings != null) {
+ return (String) mappings.get (new MapRange (start, end));
} else {
return null;
}
@@ -849,9 +849,9 @@ public class FOText extends FONode imple
* @param end index in character buffer
* @return the length of the mapping (if present) or zero
*/
- public int getMappingLength ( int start, int end ) {
- if ( mappings != null ) {
- return ( (String) mappings.get ( new MapRange ( start, end ) ) ) .length();
+ public int getMappingLength (int start, int end) {
+ if (mappings != null) {
+ return ((String) mappings.get (new MapRange (start, end))) .length();
} else {
return 0;
}
@@ -864,37 +864,37 @@ public class FOText extends FONode imple
* @return a (possibly empty) array of bidi levels or null
* in case no bidi levels have been assigned
*/
- public int[] getMappingBidiLevels ( int start, int end ) {
- if ( hasMapping ( start, end ) ) {
+ public int[] getMappingBidiLevels (int start, int end) {
+ if (hasMapping (start, end)) {
int nc = end - start;
- int nm = getMappingLength ( start, end );
- int[] la = getBidiLevels ( start, end );
- if ( la == null ) {
+ int nm = getMappingLength (start, end);
+ int[] la = getBidiLevels (start, end);
+ if (la == null) {
return null;
- } else if ( nm == nc ) { // mapping is same length as mapped range
+ } else if (nm == nc) { // mapping is same length as mapped range
return la;
- } else if ( nm > nc ) { // mapping is longer than mapped range
+ } else if (nm > nc) { // mapping is longer than mapped range
int[] ma = new int [ nm ];
- System.arraycopy ( la, 0, ma, 0, la.length );
- for ( int i = la.length,
- n = ma.length, l = ( i > 0 ) ? la [ i - 1 ] : 0; i < n; i++ ) {
+ System.arraycopy (la, 0, ma, 0, la.length);
+ for (int i = la.length,
+ n = ma.length, l = (i > 0) ? la [ i - 1 ] : 0; i < n; i++) {
ma [ i ] = l;
}
return ma;
} else { // mapping is shorter than mapped range
int[] ma = new int [ nm ];
- System.arraycopy ( la, 0, ma, 0, ma.length );
+ System.arraycopy (la, 0, ma, 0, ma.length);
return ma;
}
} else {
- return getBidiLevels ( start, end );
+ return getBidiLevels (start, end);
}
}
@Override
- protected Stack collectDelimitedTextRanges ( Stack ranges, DelimitedTextRange currentRange ) {
- if ( currentRange != null ) {
- currentRange.append ( charIterator(), this );
+ protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
+ if (currentRange != null) {
+ currentRange.append (charIterator(), this);
}
return ranges;
}
@@ -907,12 +907,12 @@ public class FOText extends FONode imple
this.end = end;
}
public int hashCode() {
- return ( start * 31 ) + end;
+ return (start * 31) + end;
}
- public boolean equals ( Object o ) {
- if ( o instanceof MapRange ) {
+ public boolean equals (Object o) {
+ if (o instanceof MapRange) {
MapRange r = (MapRange) o;
- return ( r.start == start ) && ( r.end == end );
+ return (r.start == start) && (r.end == end);
} else {
return false;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Tue Apr 9 17:31:41 2013
@@ -608,14 +608,14 @@ public abstract class FObj extends FONod
*/
public void setBidiLevel(int bidiLevel) {
assert bidiLevel >= 0;
- if ( bidiLevel >= 0 ) {
- if ( ( this.bidiLevel < 0 ) || ( bidiLevel < this.bidiLevel ) ) {
+ if (bidiLevel >= 0) {
+ if ((this.bidiLevel < 0) || (bidiLevel < this.bidiLevel)) {
this.bidiLevel = bidiLevel;
- if ( parent != null ) {
+ if (parent != null) {
FObj foParent = (FObj) parent;
int parentBidiLevel = foParent.getBidiLevel();
- if ( ( parentBidiLevel < 0 ) || ( bidiLevel < parentBidiLevel ) ) {
- foParent.setBidiLevel ( bidiLevel );
+ if ((parentBidiLevel < 0) || (bidiLevel < parentBidiLevel)) {
+ foParent.setBidiLevel (bidiLevel);
}
}
}
@@ -639,10 +639,10 @@ public abstract class FObj extends FONod
* any ancestor
*/
public int getBidiLevelRecursive() {
- for ( FONode fn = this; fn != null; fn = fn.getParent() ) {
- if ( fn instanceof FObj ) {
- int level = ( (FObj) fn).getBidiLevel();
- if ( level >= 0 ) {
+ for (FONode fn = this; fn != null; fn = fn.getParent()) {
+ if (fn instanceof FObj) {
+ int level = ((FObj) fn).getBidiLevel();
+ if (level >= 0) {
return level;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyList.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyList.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyList.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyList.java Tue Apr 9 17:31:41 2013
@@ -302,7 +302,7 @@ public abstract class PropertyList {
propID = -1;
break;
}
- } catch ( PropertyException e ) {
+ } catch (PropertyException e) {
propID = -1;
}
return propID;
@@ -311,7 +311,7 @@ public abstract class PropertyList {
private String addAttributeToList(Attributes attributes,
String attributeName) throws ValidationException {
String attributeValue = attributes.getValue(attributeName);
- if ( attributeValue != null ) {
+ if (attributeValue != null) {
convertAttributeToProperty(attributes, attributeName, attributeValue);
}
return attributeValue;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java Tue Apr 9 17:31:41 2013
@@ -42,10 +42,10 @@ public class FromNearestSpecifiedValueFu
@Override
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
- if ( index == 0 ) {
- return getPropertyName ( pi );
+ if (index == 0) {
+ return getPropertyName (pi);
} else {
- return super.getOptionalArgDefault ( index, pi );
+ return super.getOptionalArgDefault (index, pi);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java Tue Apr 9 17:31:41 2013
@@ -43,10 +43,10 @@ public class FromParentFunction extends
@Override
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
- if ( index == 0 ) {
- return getPropertyName ( pi );
+ if (index == 0) {
+ return getPropertyName (pi);
} else {
- return super.getOptionalArgDefault ( index, pi );
+ return super.getOptionalArgDefault (index, pi);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java Tue Apr 9 17:31:41 2013
@@ -51,10 +51,10 @@ public class FromTableColumnFunction ext
@Override
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
- if ( index == 0 ) {
- return getPropertyName ( pi );
+ if (index == 0) {
+ return getPropertyName (pi);
} else {
- return super.getOptionalArgDefault ( index, pi );
+ return super.getOptionalArgDefault (index, pi);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java Tue Apr 9 17:31:41 2013
@@ -35,9 +35,9 @@ public abstract class FunctionBase imple
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
- if ( index >= getOptionalArgsCount() ) {
- PropertyException e = new PropertyException ( new IndexOutOfBoundsException ( "illegal optional argument index" ) );
- e.setPropertyInfo ( pi );
+ if (index >= getOptionalArgsCount()) {
+ PropertyException e = new PropertyException (new IndexOutOfBoundsException ("illegal optional argument index"));
+ e.setPropertyInfo (pi);
throw e;
} else {
return null;
@@ -58,7 +58,7 @@ public abstract class FunctionBase imple
* @param pi property information instance that applies to property being evaluated
* @return string property whose value is name of property being evaluated
*/
- protected final Property getPropertyName ( PropertyInfo pi ) {
- return StringProperty.getInstance ( pi.getPropertyMaker().getName() );
+ protected final Property getPropertyName (PropertyInfo pi) {
+ return StringProperty.getInstance (pi.getPropertyMaker().getName());
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java Tue Apr 9 17:31:41 2013
@@ -42,10 +42,10 @@ public class InheritedPropFunction exten
@Override
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws PropertyException {
- if ( index == 0 ) {
- return getPropertyName ( pi );
+ if (index == 0) {
+ return getPropertyName (pi);
} else {
- return super.getOptionalArgDefault ( index, pi );
+ return super.getOptionalArgDefault (index, pi);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java Tue Apr 9 17:31:41 2013
@@ -370,10 +370,10 @@ public final class PropertyParser extend
while (true) {
Property p = parseAdditiveExpr();
int i = args.size();
- if ( ( i < numReq ) || ( ( i - numReq ) < numOpt ) || hasVar ) {
- args.add ( p );
+ if ((i < numReq) || ((i - numReq) < numOpt) || hasVar) {
+ args.add (p);
} else {
- throw new PropertyException ( "Unexpected function argument at index " + i );
+ throw new PropertyException ("Unexpected function argument at index " + i);
}
// ignore extra args
if (currentToken != TOK_COMMA) {
@@ -384,16 +384,16 @@ public final class PropertyParser extend
expectRpar();
}
int numArgs = args.size();
- if ( numArgs < numReq ) {
+ if (numArgs < numReq) {
throw new PropertyException("Expected " + numReq + " required arguments, but only " + numArgs + " specified");
} else {
- for ( int i = 0; i < numOpt; i++ ) {
- if ( args.size() < ( numReq + i + 1 ) ) {
- args.add ( function.getOptionalArgDefault ( i, propInfo ) );
+ for (int i = 0; i < numOpt; i++) {
+ if (args.size() < (numReq + i + 1)) {
+ args.add (function.getOptionalArgDefault (i, propInfo));
}
}
}
- return (Property[]) args.toArray ( new Property [ args.size() ] );
+ return (Property[]) args.toArray (new Property [ args.size() ]);
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java Tue Apr 9 17:31:41 2013
@@ -79,7 +79,7 @@ class PropertyTokenizer {
currentTokenValue = null;
currentTokenStartIndex = exprIndex;
boolean bSawDecimal;
- while ( true ) {
+ while (true) {
if (exprIndex >= exprLength) {
currentToken = TOK_EOF;
return;
@@ -254,8 +254,8 @@ class PropertyTokenizer {
}
private void scanRestOfName() {
- while ( ++exprIndex < exprLength ) {
- if ( !isNameChar ( expr.charAt ( exprIndex ) ) ) {
+ while (++exprIndex < exprLength) {
+ if (!isNameChar (expr.charAt (exprIndex))) {
break;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractGraphics.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractGraphics.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractGraphics.java Tue Apr 9 17:31:41 2013
@@ -254,14 +254,14 @@ public abstract class AbstractGraphics e
public abstract Length getIntrinsicAlignmentAdjust();
@Override
- public boolean isDelimitedTextRangeBoundary ( int boundary ) {
+ public boolean isDelimitedTextRangeBoundary (int boundary) {
return false;
}
@Override
- protected Stack collectDelimitedTextRanges ( Stack ranges, DelimitedTextRange currentRange ) {
- if ( currentRange != null ) {
- currentRange.append ( CharUtilities.OBJECT_REPLACEMENT_CHARACTER, this );
+ protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
+ if (currentRange != null) {
+ currentRange.append (CharUtilities.OBJECT_REPLACEMENT_CHARACTER, this);
}
return ranges;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java Tue Apr 9 17:31:41 2013
@@ -201,14 +201,14 @@ public abstract class AbstractPageNumber
}
@Override
- public boolean isDelimitedTextRangeBoundary ( int boundary ) {
+ public boolean isDelimitedTextRangeBoundary (int boundary) {
return false;
}
@Override
- protected Stack collectDelimitedTextRanges ( Stack ranges, DelimitedTextRange currentRange ) {
- if ( currentRange != null ) {
- currentRange.append ( CharUtilities.OBJECT_REPLACEMENT_CHARACTER, this );
+ protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
+ if (currentRange != null) {
+ currentRange.append (CharUtilities.OBJECT_REPLACEMENT_CHARACTER, this);
}
return ranges;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java Tue Apr 9 17:31:41 2013
@@ -122,7 +122,7 @@ public abstract class AbstractRetrieveMa
newPropertyList);
addChildTo(newChild, newParent);
newChild.startOfNode();
- switch ( newChild.getNameId() ) {
+ switch (newChild.getNameId()) {
case FO_TABLE:
Table t = (Table) child;
cloneSubtree(t.getColumns().iterator(),
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java Tue Apr 9 17:31:41 2013
@@ -97,27 +97,27 @@ public class BidiOverride extends Inline
}
@Override
- protected Stack collectDelimitedTextRanges ( Stack ranges, DelimitedTextRange currentRange ) {
+ protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
char pfx = 0;
char sfx = 0;
int unicodeBidi = getUnicodeBidi();
int direction = getDirection();
- if ( unicodeBidi == Constants.EN_BIDI_OVERRIDE ) {
- pfx = ( direction == Constants.EN_RTL ) ? CharUtilities.RLO : CharUtilities.LRO;
+ if (unicodeBidi == Constants.EN_BIDI_OVERRIDE) {
+ pfx = (direction == Constants.EN_RTL) ? CharUtilities.RLO : CharUtilities.LRO;
sfx = CharUtilities.PDF;
- } else if ( unicodeBidi == Constants.EN_EMBED ) {
- pfx = ( direction == Constants.EN_RTL ) ? CharUtilities.RLE : CharUtilities.LRE;
+ } else if (unicodeBidi == Constants.EN_EMBED) {
+ pfx = (direction == Constants.EN_RTL) ? CharUtilities.RLE : CharUtilities.LRE;
sfx = CharUtilities.PDF;
}
- if ( currentRange != null ) {
- if ( pfx != 0 ) {
- currentRange.append ( pfx, this );
+ if (currentRange != null) {
+ if (pfx != 0) {
+ currentRange.append (pfx, this);
}
- for ( Iterator it = getChildNodes(); ( it != null ) && it.hasNext();) {
- ranges = ( (FONode) it.next() ).collectDelimitedTextRanges ( ranges );
+ for (Iterator it = getChildNodes(); (it != null) && it.hasNext();) {
+ ranges = ((FONode) it.next()).collectDelimitedTextRanges (ranges);
}
- if ( sfx != 0 ) {
- currentRange.append ( sfx, this );
+ if (sfx != 0) {
+ currentRange.append (sfx, this);
}
}
return ranges;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java Tue Apr 9 17:31:41 2013
@@ -98,7 +98,7 @@ public class BlockContainer extends FObj
referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
span = pList.get(PR_SPAN).getEnum();
writingModeTraits = new WritingModeTraits
- ( WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()) );
+ (WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()));
disableColumnBalancing = pList.get(PR_X_DISABLE_COLUMN_BALANCING).getEnum();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Character.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Character.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Character.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Character.java Tue Apr 9 17:31:41 2013
@@ -236,14 +236,14 @@ public class Character extends FObj impl
}
@Override
- public boolean isDelimitedTextRangeBoundary ( int boundary ) {
+ public boolean isDelimitedTextRangeBoundary (int boundary) {
return false;
}
@Override
- protected Stack collectDelimitedTextRanges ( Stack ranges, DelimitedTextRange currentRange ) {
- if ( currentRange != null ) {
- currentRange.append ( charIterator(), this );
+ protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
+ if (currentRange != null) {
+ currentRange.append (charIterator(), this);
}
return ranges;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java Tue Apr 9 17:31:41 2013
@@ -96,7 +96,7 @@ public class InlineContainer extends FOb
overflow = pList.get(PR_OVERFLOW).getEnum();
referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
writingModeTraits = new WritingModeTraits
- ( WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()) );
+ (WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()));
}
/**
@@ -252,7 +252,7 @@ public class InlineContainer extends FOb
}
@Override
- public boolean isDelimitedTextRangeBoundary ( int boundary ) {
+ public boolean isDelimitedTextRangeBoundary (int boundary) {
return false;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java Tue Apr 9 17:31:41 2013
@@ -113,7 +113,7 @@ public abstract class InlineLevel extend
}
@Override
- public boolean isDelimitedTextRangeBoundary ( int boundary ) {
+ public boolean isDelimitedTextRangeBoundary (int boundary) {
return false;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java Tue Apr 9 17:31:41 2013
@@ -116,12 +116,12 @@ public class Leader extends InlineLevel
protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
- if ( localName.equals("leader")
+ if (localName.equals("leader")
|| localName.equals("inline-container")
|| localName.equals("block-container")
|| localName.equals("float")
|| localName.equals("marker")
- || !isInlineItem(nsURI, localName) ) {
+ || !isInlineItem(nsURI, localName)) {
invalidChildError(loc, nsURI, localName);
}
}
@@ -203,12 +203,12 @@ public class Leader extends InlineLevel
}
@Override
- protected Stack collectDelimitedTextRanges ( Stack ranges, DelimitedTextRange currentRange ) {
- if ( currentRange != null ) {
- if ( leaderPattern == EN_USECONTENT ) {
- ranges = super.collectDelimitedTextRanges ( ranges, currentRange );
+ protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
+ if (currentRange != null) {
+ if (leaderPattern == EN_USECONTENT) {
+ ranges = super.collectDelimitedTextRanges (ranges, currentRange);
} else {
- currentRange.append ( CharUtilities.OBJECT_REPLACEMENT_CHARACTER, this );
+ currentRange.append (CharUtilities.OBJECT_REPLACEMENT_CHARACTER, this);
}
}
return ranges;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java Tue Apr 9 17:31:41 2013
@@ -206,14 +206,14 @@ public class ListItem extends FObj imple
}
@Override
- protected Stack collectDelimitedTextRanges ( Stack ranges, DelimitedTextRange currentRange ) {
+ protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
ListItemLabel label = getLabel();
- if ( label != null ) {
- ranges = label.collectDelimitedTextRanges ( ranges );
+ if (label != null) {
+ ranges = label.collectDelimitedTextRanges (ranges);
}
ListItemBody body = getBody();
- if ( body != null ) {
- ranges = body.collectDelimitedTextRanges ( ranges );
+ if (body != null) {
+ ranges = body.collectDelimitedTextRanges (ranges);
}
return ranges;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumber.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumber.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumber.java Tue Apr 9 17:31:41 2013
@@ -201,7 +201,7 @@ public class PageNumber extends FObj
}
@Override
- public boolean isDelimitedTextRangeBoundary ( int boundary ) {
+ public boolean isDelimitedTextRangeBoundary (int boundary) {
return false;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java Tue Apr 9 17:31:41 2013
@@ -150,7 +150,7 @@ public class Wrapper extends FObjMixed i
}
@Override
- public boolean isDelimitedTextRangeBoundary ( int boundary ) {
+ public boolean isDelimitedTextRangeBoundary (int boundary) {
return false;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java Tue Apr 9 17:31:41 2013
@@ -77,7 +77,7 @@ public class ColumnNumberManager {
for (int i = 0; i < pendingSpans.size(); i++) {
pSpan = (PendingSpan) pendingSpans.get(i);
if (pSpan != null) {
- if ( pSpan.decrRowsLeft() == 0 ) {
+ if (pSpan.decrRowsLeft() == 0) {
pendingSpans.set(i, null);
} else {
usedColumnIndices.set(i);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java Tue Apr 9 17:31:41 2013
@@ -75,10 +75,10 @@ public class ConditionalBorder {
*/
ConditionalBorder(BorderSpecification borderSpecification,
CollapsingBorderModel collapsingBorderModel) {
- this ( borderSpecification, borderSpecification,
+ this (borderSpecification, borderSpecification,
borderSpecification.getBorderInfo().getWidth().isDiscard()
? BorderSpecification.getDefaultBorder() : borderSpecification,
- collapsingBorderModel );
+ collapsingBorderModel);
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PendingSpan.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PendingSpan.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PendingSpan.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PendingSpan.java Tue Apr 9 17:31:41 2013
@@ -48,7 +48,7 @@ class PendingSpan {
* @return number of rows spanned after decrementing
*/
public int decrRowsLeft() {
- if ( rowsLeft > 0 ) {
+ if (rowsLeft > 0) {
return --rowsLeft;
} else {
return 0;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java Tue Apr 9 17:31:41 2013
@@ -139,7 +139,7 @@ public class Table extends TableFObj imp
tableOmitFooterAtBreak = pList.get(PR_TABLE_OMIT_FOOTER_AT_BREAK).getEnum();
tableOmitHeaderAtBreak = pList.get(PR_TABLE_OMIT_HEADER_AT_BREAK).getEnum();
writingModeTraits = new WritingModeTraits
- ( WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()) );
+ (WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()));
//Bind extension properties
widowContentLimit = pList.get(PR_X_WIDOW_CONTENT_LIMIT).getLength();
@@ -602,20 +602,20 @@ public class Table extends TableFObj imp
}
@Override
- protected Stack collectDelimitedTextRanges ( Stack ranges, DelimitedTextRange currentRange ) {
+ protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
// header sub-tree
TableHeader header = getTableHeader();
- if ( header != null ) {
- ranges = header.collectDelimitedTextRanges ( ranges );
+ if (header != null) {
+ ranges = header.collectDelimitedTextRanges (ranges);
}
// footer sub-tree
TableFooter footer = getTableFooter();
- if ( footer != null ) {
- ranges = footer.collectDelimitedTextRanges ( ranges );
+ if (footer != null) {
+ ranges = footer.collectDelimitedTextRanges (ranges);
}
// body sub-tree
- for ( Iterator it = getChildNodes(); ( it != null ) && it.hasNext();) {
- ranges = ( (FONode) it.next() ).collectDelimitedTextRanges ( ranges );
+ for (Iterator it = getChildNodes(); (it != null) && it.hasNext();) {
+ ranges = ((FONode) it.next()).collectDelimitedTextRanges (ranges);
}
return ranges;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCell.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCell.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCell.java Tue Apr 9 17:31:41 2013
@@ -118,7 +118,7 @@ public class TableCell extends TableFObj
missingChildElementError("marker* (%block;)+", true);
}
if ((startsRow() || endsRow())
- && getParent().getNameId() == FO_TABLE_ROW ) {
+ && getParent().getNameId() == FO_TABLE_ROW) {
TableEventProducer eventProducer = TableEventProducer.Provider.get(
getUserAgent().getEventBroadcaster());
eventProducer.startEndRowUnderTableRowWarning(this, getLocator());
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java Tue Apr 9 17:31:41 2013
@@ -49,8 +49,8 @@ public class PageNumberGenerator {
* @param language (may be null or empty, which is treated as null)
* @param country (may be null or empty, which is treated as null)
*/
- public PageNumberGenerator ( String format, int groupingSeparator, int groupingSize, int letterValue, String features, String language, String country ) {
- this.converter = new NumberConverter ( format, groupingSeparator, groupingSize, letterValue, features, language, country );
+ public PageNumberGenerator (String format, int groupingSeparator, int groupingSize, int letterValue, String features, String language, String country) {
+ this.converter = new NumberConverter (format, groupingSeparator, groupingSize, letterValue, features, language, country);
}
/**
@@ -58,8 +58,8 @@ public class PageNumberGenerator {
* @param number page number to format
* @return the formatted page number as a String
*/
- public String makeFormattedPageNumber ( int number ) {
- return converter.convert ( number );
+ public String makeFormattedPageNumber (int number) {
+ return converter.convert (number);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java Tue Apr 9 17:31:41 2013
@@ -96,7 +96,7 @@ public class PageSequence extends Abstra
masterReference = pList.get(PR_MASTER_REFERENCE).getString();
referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
writingModeTraits = new WritingModeTraits
- ( WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()) );
+ (WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()));
if (masterReference == null || masterReference.equals("")) {
missingPropertyError("master-reference");
}
@@ -330,7 +330,7 @@ public class PageSequence extends Abstra
* @return the reference orientation trait value
*/
public int getReferenceOrientation() {
- if ( referenceOrientation != null ) {
+ if (referenceOrientation != null) {
return referenceOrientation.getValue();
} else {
return 0;
@@ -341,7 +341,7 @@ public class PageSequence extends Abstra
* {@inheritDoc}
*/
public Direction getInlineProgressionDirection() {
- if ( writingModeTraits != null ) {
+ if (writingModeTraits != null) {
return writingModeTraits.getInlineProgressionDirection();
} else {
return Direction.LR;
@@ -352,7 +352,7 @@ public class PageSequence extends Abstra
* {@inheritDoc}
*/
public Direction getBlockProgressionDirection() {
- if ( writingModeTraits != null ) {
+ if (writingModeTraits != null) {
return writingModeTraits.getBlockProgressionDirection();
} else {
return Direction.TB;
@@ -363,7 +363,7 @@ public class PageSequence extends Abstra
* {@inheritDoc}
*/
public Direction getColumnProgressionDirection() {
- if ( writingModeTraits != null ) {
+ if (writingModeTraits != null) {
return writingModeTraits.getColumnProgressionDirection();
} else {
return Direction.LR;
@@ -374,7 +374,7 @@ public class PageSequence extends Abstra
* {@inheritDoc}
*/
public Direction getRowProgressionDirection() {
- if ( writingModeTraits != null ) {
+ if (writingModeTraits != null) {
return writingModeTraits.getRowProgressionDirection();
} else {
return Direction.TB;
@@ -385,7 +385,7 @@ public class PageSequence extends Abstra
* {@inheritDoc}
*/
public Direction getShiftDirection() {
- if ( writingModeTraits != null ) {
+ if (writingModeTraits != null) {
return writingModeTraits.getShiftDirection();
} else {
return Direction.TB;
@@ -396,7 +396,7 @@ public class PageSequence extends Abstra
* {@inheritDoc}
*/
public WritingMode getWritingMode() {
- if ( writingModeTraits != null ) {
+ if (writingModeTraits != null) {
return writingModeTraits.getWritingMode();
} else {
return WritingMode.LR_TB;
@@ -405,20 +405,20 @@ public class PageSequence extends Abstra
@Override
- protected Stack collectDelimitedTextRanges ( Stack ranges, DelimitedTextRange currentRange ) {
+ protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
// collect ranges from static content flows
Map<String, FONode> flows = getFlowMap();
- if ( flows != null ) {
- for ( FONode fn : flows.values() ) {
- if ( fn instanceof StaticContent ) {
- ranges = ( (StaticContent) fn ).collectDelimitedTextRanges ( ranges );
+ if (flows != null) {
+ for (FONode fn : flows.values()) {
+ if (fn instanceof StaticContent) {
+ ranges = ((StaticContent) fn).collectDelimitedTextRanges (ranges);
}
}
}
// collect ranges in main flow
Flow main = getMainFlow();
- if ( main != null ) {
- ranges = main.collectDelimitedTextRanges ( ranges );
+ if (main != null) {
+ ranges = main.collectDelimitedTextRanges (ranges);
}
return ranges;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java Tue Apr 9 17:31:41 2013
@@ -53,7 +53,7 @@ public class RegionAfter extends RegionB
Rectangle vpRect;
// [TBD] WRITING MODE ALERT
- switch ( getWritingMode().getEnumValue() ) {
+ switch (getWritingMode().getEnumValue()) {
case Constants.EN_TB_LR:
case Constants.EN_TB_RL:
neighbourContext = pageHeightContext;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBA.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBA.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBA.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBA.java Tue Apr 9 17:31:41 2013
@@ -72,7 +72,7 @@ public abstract class RegionBA extends S
* @param siblingContext the context to use to resolve extent on siblings
*/
protected void adjustIPD
- ( Rectangle vpRefRect, WritingMode wm, PercentBaseContext siblingContext ) {
+ (Rectangle vpRefRect, WritingMode wm, PercentBaseContext siblingContext) {
int offset = 0;
RegionStart start = (RegionStart) getSiblingRegion(FO_REGION_START);
if (start != null) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java Tue Apr 9 17:31:41 2013
@@ -57,7 +57,7 @@ public class RegionBefore extends Region
PercentBaseContext neighbourContext;
Rectangle vpRect;
// [TBD] WRITING MODE ALERT
- switch ( getWritingMode().getEnumValue() ) {
+ switch (getWritingMode().getEnumValue()) {
case Constants.EN_TB_LR:
case Constants.EN_TB_RL:
neighbourContext = pageHeightContext;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java Tue Apr 9 17:31:41 2013
@@ -115,7 +115,7 @@ public class RegionBody extends Region {
int start;
int end;
// [TBD] WRITING MODE ALERT
- switch ( getWritingMode().getEnumValue() ) {
+ switch (getWritingMode().getEnumValue()) {
case Constants.EN_RL_TB:
start = commonMarginBlock.marginRight.getValue(pageWidthContext);
end = commonMarginBlock.marginLeft.getValue(pageWidthContext);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java Tue Apr 9 17:31:41 2013
@@ -52,7 +52,7 @@ public class RegionEnd extends RegionSE
PercentBaseContext neighbourContext;
Rectangle vpRect;
// [TBD] WRITING MODE ALERT
- switch ( getWritingMode().getEnumValue() ) {
+ switch (getWritingMode().getEnumValue()) {
case Constants.EN_RL_TB:
neighbourContext = pageHeightContext;
vpRect = new Rectangle(0, 0, getExtent().getValue(pageWidthContext), reldims.bpd);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionSE.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionSE.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionSE.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionSE.java Tue Apr 9 17:31:41 2013
@@ -63,7 +63,7 @@ public abstract class RegionSE extends S
* @param siblingContext the context to use to resolve extent on siblings
*/
protected void adjustIPD
- ( Rectangle vpRefRect, WritingMode wm, PercentBaseContext siblingContext ) {
+ (Rectangle vpRefRect, WritingMode wm, PercentBaseContext siblingContext) {
int offset = 0;
RegionBefore before = (RegionBefore) getSiblingRegion(FO_REGION_BEFORE);
if (before != null && before.getPrecedence() == EN_TRUE) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java Tue Apr 9 17:31:41 2013
@@ -52,7 +52,7 @@ public class RegionStart extends RegionS
PercentBaseContext neighbourContext;
Rectangle vpRect;
// [TBD] WRITING MODE ALERT
- switch ( getWritingMode().getEnumValue() ) {
+ switch (getWritingMode().getEnumValue()) {
case Constants.EN_RL_TB:
neighbourContext = pageHeightContext;
vpRect = new Rectangle(reldims.ipd - getExtent().getValue(pageWidthContext), 0,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java Tue Apr 9 17:31:41 2013
@@ -43,13 +43,13 @@ public class DimensionPropertyMaker exte
* @param extraCorresponding an array of four element integer arrays
*/
public void setExtraCorresponding(int[][] extraCorresponding) {
- if ( extraCorresponding == null ) {
+ if (extraCorresponding == null) {
throw new NullPointerException();
}
- for ( int i = 0; i < extraCorresponding.length; i++ ) {
+ for (int i = 0; i < extraCorresponding.length; i++) {
int[] eca = extraCorresponding[i];
- if ( ( eca == null ) || ( eca.length != 4 ) ) {
- throw new IllegalArgumentException ( "bad sub-array @ [" + i + "]" );
+ if ((eca == null) || (eca.length != 4)) {
+ throw new IllegalArgumentException ("bad sub-array @ [" + i + "]");
}
}
this.extraCorresponding = extraCorresponding;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontWeightPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontWeightPropertyMaker.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontWeightPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontWeightPropertyMaker.java Tue Apr 9 17:31:41 2013
@@ -49,7 +49,7 @@ public class FontWeightPropertyMaker ext
} else {
String pValue = checkValueKeywords(value);
Property newProp = checkEnumValues(pValue);
- int enumValue = ( newProp != null ) ? newProp.getEnum() : -1;
+ int enumValue = (newProp != null) ? newProp.getEnum() : -1;
if (enumValue == Constants.EN_BOLDER || enumValue == Constants.EN_LIGHTER) {
/* check for relative enum values, compute in relation to parent */
Property parentProp = pList.getInherited(Constants.PR_FONT_WEIGHT);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java Tue Apr 9 17:31:41 2013
@@ -55,7 +55,7 @@ public class IndentPropertyMaker extends
* @param paddingCorresponding the corresping propids.
*/
public void setPaddingCorresponding(int[] paddingCorresponding) {
- if ( ( paddingCorresponding == null ) || ( paddingCorresponding.length != 4 ) ) {
+ if ((paddingCorresponding == null) || (paddingCorresponding.length != 4)) {
throw new IllegalArgumentException();
}
this.paddingCorresponding = paddingCorresponding;
@@ -66,7 +66,7 @@ public class IndentPropertyMaker extends
* @param borderWidthCorresponding the corresping propids.
*/
public void setBorderWidthCorresponding(int[] borderWidthCorresponding) {
- if ( ( borderWidthCorresponding == null ) || ( borderWidthCorresponding.length != 4 ) ) {
+ if ((borderWidthCorresponding == null) || (borderWidthCorresponding.length != 4)) {
throw new IllegalArgumentException();
}
this.borderWidthCorresponding = borderWidthCorresponding;
@@ -215,7 +215,7 @@ public class IndentPropertyMaker extends
PropertyList pList = getWMPropertyList(propertyList);
if (pList != null) {
int wmcorr = pList.selectFromWritingMode
- ( corresponding[0], corresponding[1], corresponding[2], corresponding[3] );
+ (corresponding[0], corresponding[1], corresponding[2], corresponding[3]);
return propertyList.get(wmcorr);
} else {
return null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java Tue Apr 9 17:31:41 2013
@@ -81,12 +81,12 @@ public final class PropertyCache<T> {
useCache = Boolean.valueOf(
System.getProperty("org.apache.fop.fo.properties.use-cache", "true"))
.booleanValue();
- } catch ( SecurityException e ) {
+ } catch (SecurityException e) {
useCache = true;
LOG.info("Unable to access org.apache.fop.fo.properties.use-cache"
+ " due to security restriction; defaulting to 'true'.");
}
- if ( useCache ) {
+ if (useCache) {
this.map = new ConcurrentHashMap<Integer, WeakReference<T>>();
this.putCounter = new AtomicInteger();
this.cleanupLock = new ReentrantLock();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CMapSegment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CMapSegment.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CMapSegment.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CMapSegment.java Tue Apr 9 17:31:41 2013
@@ -91,15 +91,15 @@ public final class CMapSegment {
@Override
public String toString() {
StringBuilder sb = new StringBuilder("CMapSegment: ");
- sb.append ( "{ UC[" );
- sb.append ( unicodeStart );
- sb.append ( ',' );
- sb.append ( unicodeEnd );
- sb.append ( "]: GC[" );
- sb.append ( glyphStartIndex );
- sb.append ( ',' );
- sb.append ( glyphStartIndex + ( unicodeEnd - unicodeStart ) );
- sb.append ( "] }" );
+ sb.append ("{ UC[");
+ sb.append (unicodeStart);
+ sb.append (',');
+ sb.append (unicodeEnd);
+ sb.append ("]: GC[");
+ sb.append (glyphStartIndex);
+ sb.append (',');
+ sb.append (glyphStartIndex + (unicodeEnd - unicodeStart));
+ sb.append ("] }");
return sb.toString();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Font.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Font.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Font.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Font.java Tue Apr 9 17:31:41 2013
@@ -204,16 +204,16 @@ public class Font implements Substitutab
*/
public int getKernValue(int ch1, int ch2) {
// TODO !BMP
- if ( ch1 > 0x10000 ) {
+ if (ch1 > 0x10000) {
return 0;
- } else if ( ( ch1 >= 0xD800 ) && ( ch1 <= 0xE000 ) ) {
+ } else if ((ch1 >= 0xD800) && (ch1 <= 0xE000)) {
return 0;
- } else if ( ch2 > 0x10000 ) {
+ } else if (ch2 > 0x10000) {
return 0;
- } else if ( ( ch2 >= 0xD800 ) && ( ch2 <= 0xE000 ) ) {
+ } else if ((ch2 >= 0xD800) && (ch2 <= 0xE000)) {
return 0;
} else {
- return getKernValue ( (char) ch1, (char) ch2 );
+ return getKernValue ((char) ch1, (char) ch2);
}
}
@@ -366,8 +366,8 @@ public class Font implements Substitutab
* @return the width of the character or -1 if no width available
*/
public int getCharWidth(int c) {
- if ( c < 0x10000 ) {
- return getCharWidth ( (char) c );
+ if (c < 0x10000) {
+ return getCharWidth ((char) c);
} else {
// TODO !BMP
return -1;
@@ -395,7 +395,7 @@ public class Font implements Substitutab
/** {@inheritDoc} */
public boolean performsSubstitution() {
- if ( metric instanceof Substitutable ) {
+ if (metric instanceof Substitutable) {
Substitutable s = (Substitutable) metric;
return s.performsSubstitution();
} else {
@@ -404,20 +404,20 @@ public class Font implements Substitutab
}
/** {@inheritDoc} */
- public CharSequence performSubstitution ( CharSequence cs, String script, String language ) {
- if ( metric instanceof Substitutable ) {
+ public CharSequence performSubstitution (CharSequence cs, String script, String language) {
+ if (metric instanceof Substitutable) {
Substitutable s = (Substitutable) metric;
- return s.performSubstitution ( cs, script, language );
+ return s.performSubstitution (cs, script, language);
} else {
throw new UnsupportedOperationException();
}
}
/** {@inheritDoc} */
- public CharSequence reorderCombiningMarks ( CharSequence cs, int[][] gpa, String script, String language ) {
- if ( metric instanceof Substitutable ) {
+ public CharSequence reorderCombiningMarks (CharSequence cs, int[][] gpa, String script, String language) {
+ if (metric instanceof Substitutable) {
Substitutable s = (Substitutable) metric;
- return s.reorderCombiningMarks ( cs, gpa, script, language );
+ return s.reorderCombiningMarks (cs, gpa, script, language);
} else {
throw new UnsupportedOperationException();
}
@@ -425,7 +425,7 @@ public class Font implements Substitutab
/** {@inheritDoc} */
public boolean performsPositioning() {
- if ( metric instanceof Positionable ) {
+ if (metric instanceof Positionable) {
Positionable p = (Positionable) metric;
return p.performsPositioning();
} else {
@@ -434,18 +434,18 @@ public class Font implements Substitutab
}
/** {@inheritDoc} */
- public int[][] performPositioning ( CharSequence cs, String script, String language, int fontSize ) {
- if ( metric instanceof Positionable ) {
+ public int[][] performPositioning (CharSequence cs, String script, String language, int fontSize) {
+ if (metric instanceof Positionable) {
Positionable p = (Positionable) metric;
- return p.performPositioning ( cs, script, language, fontSize );
+ return p.performPositioning (cs, script, language, fontSize);
} else {
throw new UnsupportedOperationException();
}
}
/** {@inheritDoc} */
- public int[][] performPositioning ( CharSequence cs, String script, String language ) {
- return performPositioning ( cs, script, language, fontSize );
+ public int[][] performPositioning (CharSequence cs, String script, String language) {
+ return performPositioning (cs, script, language, fontSize);
}
}
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=1466146&r1=1466145&r2=1466146&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 Tue Apr 9 17:31:41 2013
@@ -153,7 +153,7 @@ public class LazyFont extends Typeface i
* {@inheritDoc}
*/
public char mapChar(char c) {
- if ( !isMetricsLoaded ) {
+ if (!isMetricsLoaded) {
load(true);
}
return realFont.mapChar(c);
@@ -171,7 +171,7 @@ public class LazyFont extends Typeface i
* {@inheritDoc}
*/
public boolean hasChar(char c) {
- if ( !isMetricsLoaded ) {
+ if (!isMetricsLoaded) {
load(true);
}
return realFont.hasChar(c);
@@ -254,7 +254,7 @@ public class LazyFont extends Typeface i
* {@inheritDoc}
*/
public int getWidth(int i, int size) {
- if ( !isMetricsLoaded ) {
+ if (!isMetricsLoaded) {
load(true);
}
return realFont.getWidth(i, size);
@@ -366,7 +366,7 @@ public class LazyFont extends Typeface i
*/
public boolean performsSubstitution() {
load(true);
- if ( realFontDescriptor instanceof Substitutable ) {
+ if (realFontDescriptor instanceof Substitutable) {
return ((Substitutable)realFontDescriptor).performsSubstitution();
} else {
return false;
@@ -376,9 +376,9 @@ public class LazyFont extends Typeface i
/**
* {@inheritDoc}
*/
- public CharSequence performSubstitution ( CharSequence cs, String script, String language ) {
+ public CharSequence performSubstitution (CharSequence cs, String script, String language) {
load(true);
- if ( realFontDescriptor instanceof Substitutable ) {
+ if (realFontDescriptor instanceof Substitutable) {
return ((Substitutable)realFontDescriptor).performSubstitution(cs, script, language);
} else {
return cs;
@@ -389,11 +389,11 @@ public class LazyFont extends Typeface i
* {@inheritDoc}
*/
public CharSequence reorderCombiningMarks
- ( CharSequence cs, int[][] gpa, String script, String language ) {
- if ( !isMetricsLoaded ) {
+ (CharSequence cs, int[][] gpa, String script, String language) {
+ if (!isMetricsLoaded) {
load(true);
}
- if ( realFontDescriptor instanceof Substitutable ) {
+ if (realFontDescriptor instanceof Substitutable) {
return ((Substitutable)realFontDescriptor)
.reorderCombiningMarks(cs, gpa, script, language);
} else {
@@ -405,10 +405,10 @@ public class LazyFont extends Typeface i
* {@inheritDoc}
*/
public boolean performsPositioning() {
- if ( !isMetricsLoaded ) {
+ if (!isMetricsLoaded) {
load(true);
}
- if ( realFontDescriptor instanceof Positionable ) {
+ if (realFontDescriptor instanceof Positionable) {
return ((Positionable)realFontDescriptor).performsPositioning();
} else {
return false;
@@ -419,11 +419,11 @@ public class LazyFont extends Typeface i
* {@inheritDoc}
*/
public int[][]
- performPositioning ( CharSequence cs, String script, String language, int fontSize ) {
- if ( !isMetricsLoaded ) {
+ performPositioning (CharSequence cs, String script, String language, int fontSize) {
+ if (!isMetricsLoaded) {
load(true);
}
- if ( realFontDescriptor instanceof Positionable ) {
+ if (realFontDescriptor instanceof Positionable) {
return ((Positionable)realFontDescriptor)
.performPositioning(cs, script, language, fontSize);
} else {
@@ -435,11 +435,11 @@ public class LazyFont extends Typeface i
* {@inheritDoc}
*/
public int[][]
- performPositioning ( CharSequence cs, String script, String language ) {
- if ( !isMetricsLoaded ) {
+ performPositioning (CharSequence cs, String script, String language) {
+ if (!isMetricsLoaded) {
load(true);
}
- if ( realFontDescriptor instanceof Positionable ) {
+ if (realFontDescriptor instanceof Positionable) {
return ((Positionable)realFontDescriptor)
.performPositioning(cs, script, language);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org