fixes checkstyles issues from revisions 1391502 and 1400536

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1405526 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/area/PageViewport.java b/src/java/org/apache/fop/area/PageViewport.java
index d1250238ab7ca94c1ab5e686ab1f6307481c0627..8165864ddacb6215c68bcd8d6ab21d144091a705 100644 (file)
--- a/src/java/org/apache/fop/area/PageViewport.java
+++ b/src/java/org/apache/fop/area/PageViewport.java
@@ -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;
 
 /**

diff --git a/src/java/org/apache/fop/fo/Constants.java b/src/java/org/apache/fop/fo/Constants.java
index 7a83a12f885be3e3fbe4e3243a7f785b986dc3ea..28f02a7628d480c30cc438840b8899a3e72c496a 100644 (file)
--- a/src/java/org/apache/fop/fo/Constants.java
+++ b/src/java/org/apache/fop/fo/Constants.java
@@ -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

diff --git a/src/java/org/apache/fop/fo/FOValidationEventProducer.java b/src/java/org/apache/fop/fo/FOValidationEventProducer.java
index ee6b078b52a27092425cd40327d8e8d57f33fb38..98b118952e307dd7d3581ac87b9694395a37bb90 100644 (file)
--- a/src/java/org/apache/fop/fo/FOValidationEventProducer.java
+++ b/src/java/org/apache/fop/fo/FOValidationEventProducer.java
@@ -91,7 +91,7 @@ public interface FOValidationEventProducer extends EventProducer {
 
     /**
      * 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

diff --git a/src/java/org/apache/fop/fo/flow/Markers.java b/src/java/org/apache/fop/fo/flow/Markers.java
index 392a1576ebdff5a464004d83a3800b54fa4cf59f..d2c9aa8633934c8bc0f6acfa8568bdf1164af3e2 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Markers.java
+++ b/src/java/org/apache/fop/fo/flow/Markers.java
@@ -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
      */

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index 3d64c436c55bfa0a800e77a6d20dba886224e2b9..5233bcd77fce08bd333e7eeaca44f2fc47406488 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -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.

diff --git a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
index 47195f90fe5d9bbec9bd049885dea0cd57c30f41..89bc339bc7f74675db08ceb2a73f4ba6dd345181 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
+++ b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
@@ -891,9 +891,8 @@ class PageBreakingAlgorithm extends BreakingAlgorithm {
                 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;

diff --git a/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
index 058b022706525178ea22fd934260804947978a73..f7f563ea89874cd43b0c829fbaa778f13fefbe01 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
@@ -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.

diff --git a/src/java/org/apache/fop/layoutmgr/TraitSetter.java b/src/java/org/apache/fop/layoutmgr/TraitSetter.java
index c4aac1d8c751a0b7ab7973bfaa46de432557b64e..739d535ca321f457ff93503beec5a4b3aec74f92 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/TraitSetter.java
+++ b/src/java/org/apache/fop/layoutmgr/TraitSetter.java
@@ -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));
-                    
         }
     }
 

diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
index 7d4c2654662e3659e8ad1795bef008e23d07c6b3..7f1754064f7f5dfbefd842d1118bd3224aff1cf3 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
@@ -575,7 +575,7 @@ public class TableLayoutManager extends BlockStackingLayoutManager
 
     /**
      * Saves a TableCellLayoutManager for later use.
-     * 
+     *
      * @param tclm a TableCellLayoutManager that has a RetrieveTableMarker
      */
     protected void saveTableHeaderTableCellLayoutManagers(TableCellLayoutManager tclm) {

diff --git a/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java b/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
index 405d720c25b57e92ca9b605bebdb79d1a043819a..40e5225d2b0c325196c106c5f0036abc9f1952f3 100644 (file)
--- a/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
+++ b/src/java/org/apache/fop/render/pdf/AbstractImageAdapter.java
@@ -121,7 +121,7 @@ public abstract class AbstractImageAdapter implements PDFImage {
         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")) {