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/05/07 18:23:17 UTC
svn commit: r1479969 [12/16] - in /xmlgraphics/fop/trunk: ./
src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/
src/codegen/unicode/java/org/apache/fop/hyphenation/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/modca/
src/java/org/...
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -255,7 +255,7 @@ class PropertyTokenizer {
private void scanRestOfName() {
while (++exprIndex < exprLength) {
- if (!isNameChar (expr.charAt (exprIndex))) {
+ if (!isNameChar(expr.charAt(exprIndex))) {
break;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java Tue May 7 16:23:13 2013
@@ -164,15 +164,15 @@ public class SVGElement extends SVGObj {
if (str.length() == 0) {
str = "100%";
}
- float width = UnitProcessor.svgHorizontalLengthToUserSpace
- (str, SVGConstants.SVG_WIDTH_ATTRIBUTE, ctx);
+ float width = UnitProcessor.svgHorizontalLengthToUserSpace(
+ str, SVGConstants.SVG_WIDTH_ATTRIBUTE, ctx);
str = svgRoot.getAttributeNS(null, SVGConstants.SVG_HEIGHT_ATTRIBUTE);
if (str.length() == 0) {
str = "100%";
}
- float height = UnitProcessor.svgVerticalLengthToUserSpace
- (str, SVGConstants.SVG_HEIGHT_ATTRIBUTE, ctx);
+ float height = UnitProcessor.svgVerticalLengthToUserSpace(
+ str, SVGConstants.SVG_HEIGHT_ATTRIBUTE, ctx);
return new Point2D.Float(width, height);
}
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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) {
+ protected Stack collectDelimitedTextRanges(Stack ranges, DelimitedTextRange currentRange) {
if (currentRange != null) {
- 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/AbstractPageNumberCitation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java?rev=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -115,8 +115,8 @@ public abstract class AbstractPageNumber
}
/** {@inheritDoc} */
- public void processNode
- (String elementName, Locator locator, Attributes attlist, PropertyList pList)
+ public void processNode(
+ String elementName, Locator locator, Attributes attlist, PropertyList pList)
throws FOPException {
super.processNode(elementName, locator, attlist, pList);
if (!inMarker() && (refId == null || "".equals(refId))) {
@@ -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) {
+ protected Stack collectDelimitedTextRanges(Stack ranges, DelimitedTextRange currentRange) {
if (currentRange != null) {
- 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/BidiOverride.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java?rev=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -97,7 +97,7 @@ 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();
@@ -111,13 +111,13 @@ public class BidiOverride extends Inline
}
if (currentRange != null) {
if (pfx != 0) {
- currentRange.append (pfx, this);
+ currentRange.append(pfx, this);
}
for (Iterator it = getChildNodes(); (it != null) && it.hasNext();) {
- ranges = ((FONode) it.next()).collectDelimitedTextRanges (ranges);
+ ranges = ((FONode) it.next()).collectDelimitedTextRanges(ranges);
}
if (sfx != 0) {
- currentRange.append (sfx, this);
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -97,8 +97,8 @@ public class BlockContainer extends FObj
overflow = pList.get(PR_OVERFLOW).getEnum();
referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
span = pList.get(PR_SPAN).getEnum();
- writingModeTraits = new WritingModeTraits
- (WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()));
+ writingModeTraits = new WritingModeTraits(
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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) {
+ protected Stack collectDelimitedTextRanges(Stack ranges, DelimitedTextRange currentRange) {
if (currentRange != null) {
- currentRange.append (charIterator(), this);
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -95,8 +95,8 @@ public class InlineContainer extends FOb
lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
overflow = pList.get(PR_OVERFLOW).getEnum();
referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
- writingModeTraits = new WritingModeTraits
- (WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()));
+ writingModeTraits = new WritingModeTraits(
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -203,12 +203,12 @@ public class Leader extends InlineLevel
}
@Override
- protected Stack collectDelimitedTextRanges (Stack ranges, DelimitedTextRange currentRange) {
+ protected Stack collectDelimitedTextRanges(Stack ranges, DelimitedTextRange currentRange) {
if (currentRange != null) {
if (leaderPattern == EN_USECONTENT) {
- ranges = super.collectDelimitedTextRanges (ranges, currentRange);
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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);
+ ranges = label.collectDelimitedTextRanges(ranges);
}
ListItemBody body = getBody();
if (body != null) {
- ranges = body.collectDelimitedTextRanges (ranges);
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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/RetrieveTableMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/RetrieveTableMarker.java Tue May 7 16:23:13 2013
@@ -47,8 +47,8 @@ public class RetrieveTableMarker extends
* <i>NOTE: An <code>fo:retrieve-table-marker</code> is only permitted as a descendant
* of an <code>fo:table-header</code> or an <code>fo:table-footer</code>.</i>
*/
- public void processNode
- (String elementName, Locator locator, Attributes attlist, PropertyList pList)
+ public void processNode(
+ String elementName, Locator locator, Attributes attlist, PropertyList pList)
throws FOPException {
if (findAncestor(FO_TABLE_HEADER) < 0
&& findAncestor(FO_TABLE_FOOTER) < 0) {
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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/Table.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java?rev=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -138,8 +138,8 @@ public class Table extends TableFObj imp
tableLayout = pList.get(PR_TABLE_LAYOUT).getEnum();
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()));
+ writingModeTraits = new WritingModeTraits(
+ 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);
+ ranges = header.collectDelimitedTextRanges(ranges);
}
// footer sub-tree
TableFooter footer = getTableFooter();
if (footer != null) {
- ranges = footer.collectDelimitedTextRanges (ranges);
+ ranges = footer.collectDelimitedTextRanges(ranges);
}
// body sub-tree
for (Iterator it = getChildNodes(); (it != null) && it.hasNext();) {
- ranges = ((FONode) it.next()).collectDelimitedTextRanges (ranges);
+ ranges = ((FONode) it.next()).collectDelimitedTextRanges(ranges);
}
return ranges;
}
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -95,8 +95,8 @@ public class PageSequence extends Abstra
locale = CommonHyphenation.toLocale(language, country);
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()));
+ writingModeTraits = new WritingModeTraits(
+ WritingMode.valueOf(pList.get(PR_WRITING_MODE).getEnum()));
if (masterReference == null || masterReference.equals("")) {
missingPropertyError("master-reference");
}
@@ -263,8 +263,8 @@ public class PageSequence extends Abstra
* @return the SimplePageMaster to use for this page
* @throws PageProductionException if there's a problem determining the page master
*/
- public SimplePageMaster getNextSimplePageMaster
- (int page, boolean isFirstPage, boolean isLastPage, boolean isBlank)
+ public SimplePageMaster getNextSimplePageMaster(
+ int page, boolean isFirstPage, boolean isLastPage, boolean isBlank)
throws PageProductionException {
if (pageSequenceMaster == null) {
@@ -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);
+ ranges = ((StaticContent) fn).collectDelimitedTextRanges(ranges);
}
}
}
// collect ranges in main flow
Flow main = getMainFlow();
if (main != null) {
- ranges = main.collectDelimitedTextRanges (ranges);
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -43,7 +43,7 @@ public class RegionAfter extends RegionB
}
/** {@inheritDoc} */
- public Rectangle getViewportRectangle (FODimension reldims) {
+ public Rectangle getViewportRectangle(FODimension reldims) {
/* Special rules apply to resolving extent as values are resolved relative
* to the page size and reference orientation.
*/
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -71,8 +71,8 @@ public abstract class RegionBA extends S
* @param wm writing mode
* @param siblingContext the context to use to resolve extent on siblings
*/
- protected void adjustIPD
- (Rectangle vpRefRect, WritingMode wm, PercentBaseContext siblingContext) {
+ protected void adjustIPD(
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -48,7 +48,7 @@ public class RegionBefore extends Region
}
/** {@inheritDoc} */
- public Rectangle getViewportRectangle (FODimension reldims) {
+ public Rectangle getViewportRectangle(FODimension reldims) {
/* Special rules apply to resolving extent as values are resolved relative
* to the page size and reference orientation.
*/
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -97,7 +97,7 @@ public class RegionBody extends Region {
}
/** {@inheritDoc} */
- public Rectangle getViewportRectangle (FODimension reldims) {
+ public Rectangle getViewportRectangle(FODimension reldims) {
/* Special rules apply to resolving margins in the page context.
* Contrary to normal margins in this case top and bottom margin
* are resolved relative to the height. In the property subsystem
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -43,7 +43,7 @@ public class RegionEnd extends RegionSE
}
/** {@inheritDoc} */
- public Rectangle getViewportRectangle (FODimension reldims) {
+ public Rectangle getViewportRectangle(FODimension reldims) {
/* Special rules apply to resolving extent as values are resolved relative
* to the page size and reference orientation.
*/
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -62,8 +62,8 @@ public abstract class RegionSE extends S
* @param wm writing mode
* @param siblingContext the context to use to resolve extent on siblings
*/
- protected void adjustIPD
- (Rectangle vpRefRect, WritingMode wm, PercentBaseContext siblingContext) {
+ protected void adjustIPD(
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -43,7 +43,7 @@ public class RegionStart extends RegionS
}
/** {@inheritDoc} */
- public Rectangle getViewportRectangle (FODimension reldims) {
+ public Rectangle getViewportRectangle(FODimension reldims) {
/* Special rules apply to resolving extent as values are resolved relative
* to the page size and reference orientation.
*/
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -49,7 +49,7 @@ public class DimensionPropertyMaker exte
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 + "]");
+ throw new IllegalArgumentException("bad sub-array @ [" + i + "]");
}
}
this.extraCorresponding = extraCorresponding;
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -214,8 +214,8 @@ public class IndentPropertyMaker extends
throws PropertyException {
PropertyList pList = getWMPropertyList(propertyList);
if (pList != null) {
- int wmcorr = pList.selectFromWritingMode
- (corresponding[0], corresponding[1], corresponding[2], corresponding[3]);
+ int wmcorr = pList.selectFromWritingMode(
+ 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/TextDecorationMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TextDecorationMaker.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TextDecorationMaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/TextDecorationMaker.java Tue May 7 16:23:13 2013
@@ -85,8 +85,8 @@ public class TextDecorationMaker extends
case Constants.EN_BLINK:
case Constants.EN_NO_BLINK:
if (none) {
- throw new PropertyException
- ("'none' specified, no additional values allowed");
+ throw new PropertyException(
+ "'none' specified, no additional values allowed");
}
switch (enumValue) {
case Constants.EN_UNDERLINE:
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -213,7 +213,7 @@ public class Font implements Substitutab
} else if ((ch2 >= 0xD800) && (ch2 <= 0xE000)) {
return 0;
} else {
- return getKernValue ((char) ch1, (char) ch2);
+ return getKernValue((char) ch1, (char) ch2);
}
}
@@ -367,7 +367,7 @@ public class Font implements Substitutab
*/
public int getCharWidth(int c) {
if (c < 0x10000) {
- return getCharWidth ((char) c);
+ return getCharWidth((char) c);
} else {
// TODO !BMP
return -1;
@@ -404,20 +404,20 @@ public class Font implements Substitutab
}
/** {@inheritDoc} */
- public CharSequence performSubstitution (CharSequence cs, String script, String language) {
+ 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) {
+ 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();
}
@@ -434,18 +434,18 @@ public class Font implements Substitutab
}
/** {@inheritDoc} */
- public int[][] performPositioning (CharSequence cs, String script, String language, int fontSize) {
+ 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/FontInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfo.java Tue May 7 16:23:13 2013
@@ -590,7 +590,7 @@ public class FontInfo {
* @return A list of matching font triplets
*/
public List<FontTriplet> getTripletsFor(String fontName) {
- List<FontTriplet> foundTriplets = new ArrayList<FontTriplet> ();
+ List<FontTriplet> foundTriplets = new ArrayList<FontTriplet>();
for (Map.Entry<FontTriplet, String> tripletEntry : triplets.entrySet()) {
if (fontName.equals((tripletEntry.getValue()))) {
foundTriplets.add(tripletEntry.getKey());
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -376,7 +376,7 @@ 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) {
return ((Substitutable)realFontDescriptor).performSubstitution(cs, script, language);
@@ -388,8 +388,8 @@ public class LazyFont extends Typeface i
/**
* {@inheritDoc}
*/
- public CharSequence reorderCombiningMarks
- (CharSequence cs, int[][] gpa, String script, String language) {
+ public CharSequence reorderCombiningMarks(
+ CharSequence cs, int[][] gpa, String script, String language) {
if (!isMetricsLoaded) {
load(true);
}
@@ -419,7 +419,7 @@ public class LazyFont extends Typeface i
* {@inheritDoc}
*/
public int[][]
- performPositioning (CharSequence cs, String script, String language, int fontSize) {
+ performPositioning(CharSequence cs, String script, String language, int fontSize) {
if (!isMetricsLoaded) {
load(true);
}
@@ -435,7 +435,7 @@ public class LazyFont extends Typeface i
* {@inheritDoc}
*/
public int[][]
- performPositioning (CharSequence cs, String script, String language) {
+ performPositioning(CharSequence cs, String script, String language) {
if (!isMetricsLoaded) {
load(true);
}
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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,22 +219,22 @@ public class MultiByteFont extends CIDFo
* @param gi glyph index
* @returns unicode scalar value
*/
- private int createPrivateUseMapping (int gi) {
+ private int createPrivateUseMapping(int gi) {
while ((nextPrivateUse < 0xF900)
&& (findGlyphIndex(nextPrivateUse) != SingleByteEncoding.NOT_FOUND_CODE_POINT)) {
nextPrivateUse++;
}
if (nextPrivateUse < 0xF900) {
int pu = nextPrivateUse;
- addPrivateUseMapping (pu, gi);
+ 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() + "'");
}
@@ -245,7 +245,7 @@ public class MultiByteFont extends CIDFo
}
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() + "'");
@@ -260,7 +260,7 @@ 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++) {
CMapSegment segment = cmap [ i ];
@@ -272,13 +272,13 @@ public class MultiByteFont extends CIDFo
}
}
if ((cc == 0) && augment) {
- cc = createPrivateUseMapping (gi);
+ 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) {
+ 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) {
+ 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) {
+ 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) {
+ 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);
+ GlyphSequence igs = mapCharsToGlyphs(cs);
+ GlyphSequence ogs = gsub.substitute(igs, script, language);
+ CharSequence ocs = mapGlyphsToChars(ogs);
return ocs;
} else {
return cs;
@@ -451,12 +451,12 @@ public class MultiByteFont extends CIDFo
}
/** {@inheritDoc} */
- public CharSequence reorderCombiningMarks
- (CharSequence cs, int[][] gpa, String script, String language) {
+ 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);
+ 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) {
+ performPositioning(CharSequence cs, String script, String language, int fontSize) {
if (gpos != null) {
- GlyphSequence gs = mapCharsToGlyphs (cs);
+ 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,12 +485,12 @@ 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) {
+ private int[][] scaleAdjustments(int[][] adjustments, int fontSize) {
if (adjustments != null) {
for (int i = 0, n = adjustments.length; i < n; i++) {
int[] gpa = adjustments [ i ];
@@ -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);
+ int giMissing = findGlyphIndex(Typeface.NOT_FOUND);
for (int i = 0, n = cs.length(); i < n; i++) {
- int cc = cs.charAt (i);
+ int cc = cs.charAt(i);
if ((cc >= 0xD800) && (cc < 0xDC00)) {
if ((i + 1) < n) {
int sh = cc;
- int sl = cs.charAt (++i);
+ 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, "
+ throw new IllegalArgumentException(
+ "ill-formed UTF-16 sequence, "
+ "contains isolated high surrogate at index " + i);
}
} else {
- throw new IllegalArgumentException
- ("ill-formed UTF-16 sequence, "
+ throw new IllegalArgumentException(
+ "ill-formed UTF-16 sequence, "
+ "contains isolated high surrogate at end of sequence");
}
} else if ((cc >= 0xDC00) && (cc < 0xE000)) {
- throw new IllegalArgumentException
- ("ill-formed UTF-16 sequence, "
+ throw new IllegalArgumentException(
+ "ill-formed UTF-16 sequence, "
+ "contains isolated low surrogate at index " + i);
}
notifyMapOperation();
- gi = findGlyphIndex (cc);
+ gi = findGlyphIndex(cc);
if (gi == SingleByteEncoding.NOT_FOUND_CODE_POINT) {
- warnMissingGlyph ((char) cc);
+ 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,13 +559,13 @@ 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);
+ int gi = gs.getGlyph(i);
+ int cc = findCharacterFromGlyphIndex(gi);
if ((cc == 0) || (cc > 0x10FFFF)) {
cc = ccMissing;
log.warn("Unable to map glyph index " + gi
@@ -579,10 +579,10 @@ public class MultiByteFont extends CIDFo
cc -= 0x10000;
sh = ((cc >> 10) & 0x3FF) + 0xD800;
sl = ((cc >> 0) & 0x3FF) + 0xDC00;
- cb.put ((char) sh);
- cb.put ((char) sl);
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -219,8 +219,8 @@ public class TTFFile {
// internal mapping of glyph indexes to unicode indexes
// used for quick mappings in this class
- private final Map<Integer, Integer> glyphToUnicodeMap = new HashMap<Integer, Integer> ();
- private final Map<Integer, Integer> unicodeToGlyphMap = new HashMap<Integer, Integer> ();
+ private final Map<Integer, Integer> glyphToUnicodeMap = new HashMap<Integer, Integer>();
+ private final Map<Integer, Integer> unicodeToGlyphMap = new HashMap<Integer, Integer>();
private TTFDirTabEntry currentDirTab;
@@ -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;
}
@@ -289,7 +289,7 @@ public class TTFFile {
}
/** {@inheritDoc} */
- public boolean equals (Object o) {
+ public boolean equals(Object o) {
if (o instanceof UnicodeMapping) {
UnicodeMapping m = (UnicodeMapping) o;
if (unicodeIndex != m.unicodeIndex) {
@@ -303,7 +303,7 @@ public class TTFFile {
}
/** {@inheritDoc} */
- public int compareTo (Object o) {
+ public int compareTo(Object o) {
if (o instanceof UnicodeMapping) {
UnicodeMapping m = (UnicodeMapping) o;
if (unicodeIndex > m.unicodeIndex) {
@@ -433,8 +433,8 @@ public class TTFFile {
}
}
- private boolean readUnicodeCmap // CSOK: MethodLength
- (long cmapUniOffset, int encodingID)
+ private boolean readUnicodeCmap(
+ long cmapUniOffset, int encodingID)
throws IOException {
//Read CMAP table and correct mtxTab.index
int mtxPtr = 0;
@@ -737,11 +737,11 @@ public class TTFFile {
if (useAdvanced) {
try {
OTFAdvancedTypographicTableReader atr
- = new OTFAdvancedTypographicTableReader (this, in);
+ = new OTFAdvancedTypographicTableReader(this, in);
atr.readAll();
this.advancedTableReader = atr;
} catch (AdvancedTypographicTableFormatException e) {
- log.warn (
+ log.warn(
"Encountered format constraint violation in advanced (typographic) table (AT) "
+ "in font '" + getFullName() + "', ignoring AT data: "
+ e.getMessage()
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -240,12 +240,12 @@ public class TTFFontLoader extends FontL
/**
* Copy advanced typographic information.
*/
- private void copyAdvanced (TTFFile ttf) {
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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/hyphenation/SerializeHyphPattern.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/SerializeHyphPattern.java Tue May 7 16:23:13 2013
@@ -130,7 +130,7 @@ public class SerializeHyphPattern {
* Entry point for ant java task
* @param args sourceDir, targetDir
*/
- public static void main (String[] args) {
+ public static void main(String[] args) {
SerializeHyphPattern ser = new SerializeHyphPattern();
ser.serializeDir(new File(args[0]), new File(args[1]));
}
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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);
@@ -878,8 +878,8 @@ public abstract class AbstractBreaker {
* @param availableBPD the available BPD
* @return the effective list
*/
- private BlockSequence justifyBoxes // CSOK: MethodLength
- (BlockSequence blockList, PageBreakingAlgorithm alg, int availableBPD) {
+ private BlockSequence justifyBoxes(
+ BlockSequence blockList, PageBreakingAlgorithm alg, int availableBPD) {
int optimalPageCount;
alg.setConstantLineWidth(availableBPD);
optimalPageCount = alg.findBreakingPoints(blockList, /*availableBPD,*/
@@ -1061,8 +1061,8 @@ public abstract class AbstractBreaker {
+ " / " + difference);
}
int newAdjust = ((BlockLevelLayoutManager) blockSpace.getLayoutManager())
- .negotiateBPDAdjustment
- (((int) ((float) partial * difference / total)) - adjustedDiff, blockSpace);
+ .negotiateBPDAdjustment(
+ ((int) ((float) partial * difference / total)) - adjustedDiff, blockSpace);
adjustedDiff += newAdjust;
}
return adjustedDiff;
@@ -1086,8 +1086,8 @@ public abstract class AbstractBreaker {
KnuthGlue line = lineListIterator.next();
partial += (difference > 0 ? line.getStretch() : line.getShrink());
int newAdjust = ((BlockLevelLayoutManager) line.getLayoutManager())
- .negotiateBPDAdjustment
- (((int) ((float) partial * difference / total)) - adjustedDiff, line);
+ .negotiateBPDAdjustment(
+ ((int) ((float) partial * difference / total)) - adjustedDiff, line);
adjustedDiff += newAdjust;
}
return adjustedDiff;
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -856,7 +856,7 @@ public class BlockContainerLayoutManager
viewportBlockArea = new BlockViewport(allowBPDUpdate);
viewportBlockArea.addTrait(Trait.IS_VIEWPORT_AREA, Boolean.TRUE);
if (level >= 0) {
- viewportBlockArea.setBidiLevel (level);
+ viewportBlockArea.setBidiLevel(level);
}
viewportBlockArea.setIPD(getContentAreaIPD());
if (allowBPDUpdate) {
@@ -893,7 +893,7 @@ public class BlockContainerLayoutManager
referenceArea = new Block();
referenceArea.addTrait(Trait.IS_REFERENCE_AREA, Boolean.TRUE);
if (level >= 0) {
- referenceArea.setBidiLevel (level);
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 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/KnuthSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthSequence.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/KnuthSequence.java Tue May 7 16:23:13 2013
@@ -126,8 +126,8 @@ public abstract class KnuthSequence exte
ListElement element;
while (listIter.hasNext()) {
element = (ListElement) listIter.next();
- element.setPosition
- (lm.notifyPos(new NonLeafPosition(lm, element.getPosition())));
+ element.setPosition(
+ lm.notifyPos(new NonLeafPosition(lm, element.getPosition())));
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java Tue May 7 16:23:13 2013
@@ -515,11 +515,11 @@ class PageBreakingAlgorithm extends Brea
footnoteListIndex = footnotesList.size() - 1;
footnoteElementIndex
= getFootnoteList(footnoteListIndex).size() - 1;
- } else if (((canDeferOldFN = canDeferOldFootnotes // CSOK: InnerAssignment
- (pageNode, elementIndex))
+ } else if (((canDeferOldFN = canDeferOldFootnotes(// CSOK: InnerAssignment
+ pageNode, elementIndex))
|| newFootnotes)
- && (footnoteSplit = getFootnoteSplit // CSOK: InnerAssignment
- (pageNode, getLineWidth(activeNode.line) - actualWidth,
+ && (footnoteSplit = getFootnoteSplit(// CSOK: InnerAssignment
+ pageNode, getLineWidth(activeNode.line) - actualWidth,
canDeferOldFN)) > 0) {
// it is allowed to break or even defer footnotes if either:
// - there are new footnotes in the last piece of content, and
@@ -890,8 +890,8 @@ class PageBreakingAlgorithm extends Brea
insertedFootnotesLength = totalFootnotesLength;
footnoteListIndex = lengthList.size() - 1;
footnoteElementIndex = getFootnoteList(footnoteListIndex).size() - 1;
- } else if ((split = getFootnoteSplit // CSOK: InnerAssignment
- (footnoteListIndex, footnoteElementIndex,
+ } else if ((split = getFootnoteSplit(// CSOK: InnerAssignment
+ footnoteListIndex, footnoteElementIndex,
insertedFootnotesLength, availableBPD, true)) > 0) {
// add a piece of a footnote
availableBPD -= split;
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -214,7 +214,7 @@ public class CharacterLayoutManager exte
new LeafPosition(this, -1), true));
returnList.add(new KnuthGlue(letterSpaceIPD.mult(areaInfo.letterSpaces),
new LeafPosition(this, -1), true));
- returnList.add (
+ returnList.add(
new KnuthInlineBox(0, null, notifyPos(new LeafPosition(this, -1)), true));
if (areaInfo.isHyphenated) {
returnList.add(new KnuthPenalty(hyphIPD, KnuthPenalty.FLAGGED_PENALTY, true,
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java Tue May 7 16:23:13 2013
@@ -288,7 +288,7 @@ public class ImageLayout implements Cons
* @param cwidth the calculated content width of the object
* @return the X offset
*/
- public int computeXOffset (int ipd, int cwidth) {
+ public int computeXOffset(int ipd, int cwidth) {
int xoffset = 0;
switch (props.getTextAlign()) {
case EN_CENTER:
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java Tue May 7 16:23:13 2013
@@ -257,8 +257,8 @@ public class InlineLayoutManager extends
/** {@inheritDoc} */
@Override // CSOK: MethodLength
- public List getNextKnuthElements
- (LayoutContext context, int alignment) {
+ public List getNextKnuthElements(
+ LayoutContext context, int alignment) {
LayoutManager curLM;
// the list returned by child LM
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -184,7 +184,7 @@ public abstract class InlineStackingLayo
ls.setIPD(iAdjust);
int level = parentArea.getBidiLevel();
if (level >= 0) {
- ls.setBidiLevel (level);
+ ls.setBidiLevel(level);
}
parentArea.addChildArea(ls);
}
@@ -349,26 +349,26 @@ public abstract class InlineStackingLayo
if (currLM != prevLM || !oldListIterator.hasNext()) {
if (oldListIterator.hasNext()) {
- returnedList.addAll
- (prevLM.getChangedKnuthElements
- (oldList.subList(fromIndex, oldListIterator.previousIndex()),
+ returnedList.addAll(
+ prevLM.getChangedKnuthElements(
+ oldList.subList(fromIndex, oldListIterator.previousIndex()),
alignment, depth));
prevLM = currLM;
fromIndex = oldListIterator.previousIndex();
} else if (currLM == prevLM) {
- returnedList.addAll
- (prevLM.getChangedKnuthElements
- (oldList.subList(fromIndex, oldList.size()),
+ returnedList.addAll(
+ prevLM.getChangedKnuthElements(
+ oldList.subList(fromIndex, oldList.size()),
alignment, depth));
} else {
- returnedList.addAll
- (prevLM.getChangedKnuthElements
- (oldList.subList(fromIndex, oldListIterator.previousIndex()),
+ returnedList.addAll(
+ prevLM.getChangedKnuthElements(
+ oldList.subList(fromIndex, oldListIterator.previousIndex()),
alignment, depth));
if (currLM != null) {
- returnedList.addAll
- (currLM.getChangedKnuthElements
- (oldList.subList(oldListIterator.previousIndex(), oldList.size()),
+ returnedList.addAll(
+ currLM.getChangedKnuthElements(
+ oldList.subList(oldListIterator.previousIndex(), oldList.size()),
alignment, depth));
}
}
@@ -380,8 +380,8 @@ public abstract class InlineStackingLayo
ListIterator listIter = returnedList.listIterator();
while (listIter.hasNext()) {
returnedElement = (KnuthElement) listIter.next();
- returnedElement.setPosition
- (notifyPos(new NonLeafPosition(this, returnedElement.getPosition())));
+ returnedElement.setPosition(
+ notifyPos(new NonLeafPosition(this, returnedElement.getPosition())));
returnList.add(returnedElement);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java?rev=1479969&r1=1479968&r2=1479969&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java Tue May 7 16:23:13 2013
@@ -39,8 +39,8 @@ public class KnuthInlineBox extends Knut
* @param pos the Position stored in this box
* @param auxiliary is this box auxiliary?
*/
- public KnuthInlineBox
- (int width, AlignmentContext alignmentContext, Position pos, boolean auxiliary) {
+ public KnuthInlineBox(
+ int width, AlignmentContext alignmentContext, Position pos, boolean auxiliary) {
super(width, pos, auxiliary);
this.alignmentContext = alignmentContext;
}
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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -126,19 +126,19 @@ public class LeaderLayoutManager extends
} else {
leaderArea = new Space();
if (level >= 0) {
- leaderArea.setBidiLevel (level);
+ leaderArea.setBidiLevel(level);
}
}
leaderArea.setBPD(fobj.getRuleThickness().getValue(this));
leaderArea.addTrait(Trait.COLOR, fobj.getColor());
if (level >= 0) {
- leaderArea.setBidiLevel (level);
+ leaderArea.setBidiLevel(level);
}
} else if (fobj.getLeaderPattern() == EN_SPACE) {
leaderArea = new Space();
leaderArea.setBPD(fobj.getRuleThickness().getValue(this));
if (level >= 0) {
- leaderArea.setBidiLevel (level);
+ leaderArea.setBidiLevel(level);
}
} else if (fobj.getLeaderPattern() == EN_DOTS) {
TextArea t = new TextArea();
@@ -157,7 +157,7 @@ public class LeaderLayoutManager extends
spacer = new Space();
spacer.setIPD(widthLeaderPattern - width);
if (level >= 0) {
- spacer.setBidiLevel (level);
+ spacer.setBidiLevel(level);
}
width = widthLeaderPattern;
}
@@ -201,7 +201,7 @@ public class LeaderLayoutManager extends
spacer = new Space();
spacer.setIPD(fobj.getLeaderPatternWidth().getValue(this) - width);
if (level >= 0) {
- spacer.setBidiLevel (level);
+ 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=1479969&r1=1479968&r2=1479969&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 May 7 16:23:13 2013
@@ -987,8 +987,8 @@ public class LineLayoutManager extends I
}
startIndex = endIndex + 1;
LineBreakPosition lbp = (LineBreakPosition) llPoss.getChosenPosition(i);
- returnList.add(new KnuthBlockBox
- (lbp.lineHeight + lbp.spaceBefore + lbp.spaceAfter,
+ returnList.add(new KnuthBlockBox(
+ lbp.lineHeight + lbp.spaceBefore + lbp.spaceAfter,
footnoteList, lbp, false));
}
}
@@ -1353,8 +1353,8 @@ public class LineLayoutManager extends I
.applyChanges(par.subList(fromIndex + elementsAdded,
toIndex + elementsAdded))) {
// insert the new KnuthElements
- List newElements = currUpdate.inlineLM.getChangedKnuthElements
- (par.subList(fromIndex + elementsAdded,
+ List newElements = currUpdate.inlineLM.getChangedKnuthElements(
+ par.subList(fromIndex + elementsAdded,
toIndex + elementsAdded),
/*flaggedPenalty,*/ effectiveAlignment);
// remove the old elements
@@ -1553,7 +1553,7 @@ public class LineLayoutManager extends I
}
lineArea.finish();
if (lineArea.getBidiLevel() >= 0) {
- BidiResolver.reorder (lineArea);
+ BidiResolver.reorder(lineArea);
}
parentLayoutManager.addChildArea(lineArea);
}
@@ -1605,7 +1605,7 @@ public class LineLayoutManager extends I
}
lineArea.updateExtentsFromChildren();
if (lineArea.getBidiLevel() >= 0) {
- BidiResolver.reorder (lineArea);
+ BidiResolver.reorder(lineArea);
}
parentLayoutManager.addChildArea(lineArea);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org