Skip to content

Commit ec1cc67

Browse files
authored
FOP-3281: upgrade the maven checkstyle plugin from 2.14 to 3.6.0
1 parent fb908e1 commit ec1cc67

File tree

314 files changed

+906
-1087
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

314 files changed

+906
-1087
lines changed

fop-core/src/main/codegen/fonts/font-file.xsl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,8 @@
5252
package org.apache.fop.fonts.base14;
5353

5454
import java.awt.Rectangle;
55-
import java.net.URI;
56-
<xsl:if test="count(kerning) &gt; 0">
57-
import java.util.Map;
58-
</xsl:if>
55+
import java.net.URI;<xsl:if test="count(kerning) &gt; 0">
56+
import java.util.Map;</xsl:if>
5957
import java.util.Set;
6058

6159
import org.apache.fop.fonts.Base14Font;

fop-core/src/main/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void writeToStream(OutputStream os) throws IOException {
107107
/** {@inheritDoc} */
108108
public String toString() {
109109
return "GraphicsSetPatternSymbol(fill="
110-
+ (pattern == SOLID_FILL ? true : false) + ")";
110+
+ (pattern == SOLID_FILL) + ")";
111111
}
112112

113113
/** {@inheritDoc} */

fop-core/src/main/java/org/apache/fop/afp/ptoca/TransparentDataControlSequence.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
import org.apache.fop.afp.fonts.CharactersetEncoder.EncodedChars;
3030
import org.apache.fop.afp.ptoca.TransparentDataControlSequence.TransparentData;
31-
3231
import static org.apache.fop.afp.ptoca.PtocaConstants.TRANSPARENT_DATA_MAX_SIZE;
3332

3433
/**

fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
import org.apache.fop.util.XMLConstants;
9292
import org.apache.fop.util.XMLUtil;
9393
import org.apache.fop.utils.DefaultErrorListener;
94-
9594
import static org.apache.fop.fo.Constants.FO_REGION_AFTER;
9695
import static org.apache.fop.fo.Constants.FO_REGION_BEFORE;
9796
import static org.apache.fop.fo.Constants.FO_REGION_BODY;

fop-core/src/main/java/org/apache/fop/area/CTM.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import org.apache.fop.datatypes.FODimension;
2828
import org.apache.fop.traits.WritingMode;
29-
3029
import static org.apache.fop.fo.Constants.EN_LR_TB;
3130
import static org.apache.fop.fo.Constants.EN_RL_TB;
3231
import static org.apache.fop.fo.Constants.EN_TB_LR;

fop-core/src/main/java/org/apache/fop/area/LineArea.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.List;
2525

2626
import org.apache.fop.area.inline.InlineArea;
27-
2827
import static org.apache.fop.fo.Constants.EN_CENTER;
2928
import static org.apache.fop.fo.Constants.EN_END;
3029
import static org.apache.fop.fo.Constants.EN_JUSTIFY;

fop-core/src/main/java/org/apache/fop/area/Page.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.apache.fop.fo.properties.CommonMarginBlock;
3535
import org.apache.fop.layoutmgr.TraitSetter;
3636
import org.apache.fop.traits.WritingModeTraitsGetter;
37-
3837
import static org.apache.fop.fo.Constants.EN_ERROR_IF_OVERFLOW;
3938
import static org.apache.fop.fo.Constants.EN_HIDDEN;
4039
import static org.apache.fop.fo.Constants.FO_REGION_AFTER;

fop-core/src/main/java/org/apache/fop/area/PageViewport.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.apache.fop.fo.flow.Markers;
3939
import org.apache.fop.fo.pagination.SimplePageMaster;
4040
import org.apache.fop.traits.WritingModeTraitsGetter;
41-
4241
import static org.apache.fop.fo.Constants.FO_REGION_BODY;
4342

4443
/**

fop-core/src/main/java/org/apache/fop/area/Trait.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.apache.fop.traits.Visibility;
3131
import org.apache.fop.traits.WritingMode;
3232
import org.apache.fop.util.ColorUtil;
33-
3433
import static org.apache.fop.fo.Constants.EN_NOREPEAT;
3534
import static org.apache.fop.fo.Constants.EN_REPEAT;
3635
import static org.apache.fop.fo.Constants.EN_REPEATX;

fop-core/src/main/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.apache.fop.util.CharUtilities;
3535

3636
// CSOFF: LineLengthCheck
37+
// CSOFF: InnerAssignment
3738

3839
/**
3940
* The <code>DelimitedTextRange</code> class implements the "delimited text range" as described

0 commit comments

Comments
 (0)