Author: lbernardo
Date: Sun Nov 4 10:59:29 2012
New Revision: 1405526
URL: http://svn.apache.org/viewvc?rev=1405526&view=rev
Log:
fixes checkstyles issues from revisions 1391502 and 1400536
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/Constants.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Markers.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java?rev=1405526&r1=1405525&r2=1405526&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java Sun
Nov 4 10:59:29 2012
@@ -33,18 +33,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.flow.Marker;
-import org.apache.fop.fo.Constants;
import org.apache.fop.fo.flow.AbstractRetrieveMarker;
import org.apache.fop.fo.flow.Marker;
import org.apache.fop.fo.flow.Markers;
import org.apache.fop.fo.pagination.SimplePageMaster;
import org.apache.fop.traits.WritingModeTraitsGetter;
-import static org.apache.fop.fo.Constants.EN_FIC;
-import static org.apache.fop.fo.Constants.EN_FSWP;
-import static org.apache.fop.fo.Constants.EN_LEWP;
-import static org.apache.fop.fo.Constants.EN_LSWP;
import static org.apache.fop.fo.Constants.FO_REGION_BODY;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/Constants.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/Constants.java?rev=1405526&r1=1405525&r2=1405526&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/Constants.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/Constants.java Sun Nov 4
10:59:29 2012
@@ -805,7 +805,7 @@ public interface Constants {
int PR_X_BORDER_AFTER_START_RADIUS = 287;
/** Property constant FOP proprietary*/
int PR_X_BORDER_AFTER_END_RADIUS = 288;
-
+
/**
* Property constant - FOP proprietary extension (see NumberConverter) used
* to perform additional control over number conversion when generating
page
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java?rev=1405526&r1=1405525&r2=1405526&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOValidationEventProducer.java
Sun Nov 4 10:59:29 2012
@@ -91,7 +91,7 @@ public interface FOValidationEventProduc
/**
* A valid but not yet supported child was encountered.
- *
+ *
* @param source the event source
* @param elementName the name of the context node
* @param offendingNode the offending node
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Markers.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Markers.java?rev=1405526&r1=1405525&r2=1405526&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Markers.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Markers.java Sun Nov
4 10:59:29 2012
@@ -56,7 +56,7 @@ public final class Markers {
* are ending, replacing earlier markers.
*
* @param marks a map of markers to register
- * @param starting whether the registration happens at the start (true) or
end (false) the the area
+ * @param starting whether the registration happens at the start (true) or
end (false) the the area
* @param isfirst whether it is the first area of the parent LM
* @param islast whether it is the last area of the parent LM
*/
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java?rev=1405526&r1=1405525&r2=1405526&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Sun Nov 4 10:59:29 2012
@@ -37,7 +37,6 @@ import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.flow.Marker;
import org.apache.fop.fo.flow.RetrieveMarker;
-import org.apache.fop.layoutmgr.table.TableLayoutManager;
/**
* The base class for most LayoutManagers.
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=1405526&r1=1405525&r2=1405526&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
Sun Nov 4 10:59:29 2012
@@ -891,9 +891,8 @@ class PageBreakingAlgorithm extends Brea
footnoteListIndex++;
footnoteElementIndex
= getFootnoteList(footnoteListIndex).size() - 1;
- }
- // try adding some more content
- else if ((tmpLength - insertedFootnotesLength) <= availableBPD) {
+ } else if ((tmpLength - insertedFootnotesLength) <= availableBPD) {
+ // try adding some more content
// add a whole footnote
availableBPD -= tmpLength - insertedFootnotesLength;
insertedFootnotesLength = tmpLength;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java?rev=1405526&r1=1405525&r2=1405526&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
Sun Nov 4 10:59:29 2012
@@ -19,19 +19,15 @@
package org.apache.fop.layoutmgr;
-import java.util.LinkedList;
import java.util.List;
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
import org.apache.fop.area.RegionReference;
import org.apache.fop.fo.Constants;
-import org.apache.fop.fo.FObj;
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fo.pagination.SideRegion;
import org.apache.fop.fo.pagination.StaticContent;
-import
org.apache.fop.layoutmgr.PageBreakingAlgorithm.PageBreakingLayoutListener;
-import org.apache.fop.layoutmgr.inline.TextLayoutManager;
/**
* LayoutManager for an fo:flow object.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java?rev=1405526&r1=1405525&r2=1405526&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
Sun Nov 4 10:59:29 2012
@@ -113,7 +113,6 @@ public final class TraitSetter {
if (width > 0 || radiusStart > 0 || radiusEnd > 0) {
area.addTrait(traitCode, new
BorderProps(bpProps.getBorderStyle(side), width, radiusStart,
radiusEnd, bpProps.getBorderColor(side), mode));
-
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=1405526&r1=1405525&r2=1405526&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Sun Nov 4 10:59:29 2012
@@ -575,7 +575,7 @@ public class TableLayoutManager extends
/**
* Saves a TableCellLayoutManager for later use.
- *
+ *
* @param tclm a TableCellLayoutManager that has a RetrieveTableMarker
*/
protected void
saveTableHeaderTableCellLayoutManagers(TableCellLayoutManager tclm) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java?rev=1405526&r1=1405525&r2=1405526&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
Sun Nov 4 10:59:29 2012
@@ -121,7 +121,7 @@ public abstract class AbstractImageAdapt
return false;
}
- private static PDFICCStream getDefaultsRGBICCStream(PDFICCBasedColorSpace
cs, PDFDocument doc,
+ private static PDFICCStream getDefaultsRGBICCStream(PDFICCBasedColorSpace
cs, PDFDocument doc,
String profileDesc) {
if (cs == null) {
if (profileDesc == null || !profileDesc.startsWith("sRGB")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
