Author: vhennebert
Date: Tue Dec 3 12:44:41 2013
New Revision: 1547372
URL: http://svn.apache.org/r1547372
Log:
Enabled LineLength check and fixed corresponding issues
Modified:
xmlgraphics/fop/trunk/checkstyle-5.5.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
Modified: xmlgraphics/fop/trunk/checkstyle-5.5.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-5.5.xml?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-5.5.xml (original)
+++ xmlgraphics/fop/trunk/checkstyle-5.5.xml Tue Dec 3 12:44:41 2013
@@ -51,6 +51,12 @@
<module name="TreeWalker">
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
+ <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
+
+ <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
<module name="AnnotationUseStyle"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
Tue Dec 3 12:44:41 2013
@@ -35,6 +35,8 @@ import org.apache.fop.util.CharUtilities
*/
public final class CharScript {
+ // CSOFF: LineLength
+
//
// The following script codes are based on ISO 15924. Codes less than 1000
are
// official assignments from 15924; those equal to or greater than 1000
are FOP
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java Tue
Dec 3 12:44:41 2013
@@ -36,7 +36,8 @@ public abstract class FunctionBase imple
/** {@inheritDoc} */
public Property getOptionalArgDefault(int index, PropertyInfo pi) throws
PropertyException {
if (index >= getOptionalArgsCount()) {
- PropertyException e = new PropertyException(new
IndexOutOfBoundsException("illegal optional argument index"));
+ PropertyException e = new PropertyException(
+ new IndexOutOfBoundsException("illegal optional argument
index"));
e.setPropertyInfo(pi);
throw e;
} else {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
Tue Dec 3 12:44:41 2013
@@ -385,7 +385,8 @@ public final class PropertyParser extend
}
int numArgs = args.size();
if (numArgs < numReq) {
- throw new PropertyException("Expected " + numReq + " required
arguments, but only " + numArgs + " specified");
+ throw new PropertyException("Expected " + numReq + " required
arguments, but only "
+ + numArgs + " specified");
} else {
for (int i = 0; i < numOpt; i++) {
if (args.size() < (numReq + i + 1)) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontTriplet.java Tue
Dec 3 12:44:41 2013
@@ -27,7 +27,8 @@ import java.io.Serializable;
*/
public class FontTriplet implements Comparable<FontTriplet>, Serializable {
- public static final FontTriplet DEFAULT_FONT_TRIPLET = new
FontTriplet("any", Font.STYLE_NORMAL, Font.WEIGHT_NORMAL);
+ public static final FontTriplet DEFAULT_FONT_TRIPLET
+ = new FontTriplet("any", Font.STYLE_NORMAL, Font.WEIGHT_NORMAL);
/** serial version UID */
private static final long serialVersionUID = 1168991106658033508L;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OTFSubSetFile.java
Tue Dec 3 12:44:41 2013
@@ -451,7 +451,8 @@ public class OTFSubSetFile extends OTFFi
localUniques =
foundLocalUniquesB.get(subsetFDSelect.get(subsetGlyphs.get(gid)).getNewFDIndex());
byte[] data = charStringsIndex.getValue(gid);
subsetLocalIndexSubr =
fdSubrs.get(subsetFDSelect.get(subsetGlyphs.get(gid)).getNewFDIndex());
- subsetLocalSubrCount =
foundLocalUniques.get(subsetFDSelect.get(subsetGlyphs.get(gid)).getNewFDIndex()).size();
+ subsetLocalSubrCount = foundLocalUniques.get(
+
subsetFDSelect.get(subsetGlyphs.get(gid)).getNewFDIndex()).size();
data = readCharStringData(data, subsetLocalSubrCount);
subsetCharStringsIndex.add(data);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPFontConfig.java
Tue Dec 3 12:44:41 2013
@@ -316,8 +316,8 @@ public final class AFPFontConfig impleme
private final String characterset;
- private CIDKeyedFontConfig(List<FontTriplet> triplets, String type,
String codePage,
- String encoding, String characterset, String name,
CharacterSetType charsetType, boolean embeddable, String uri) {
+ private CIDKeyedFontConfig(List<FontTriplet> triplets, String type,
String codePage, String encoding,
+ String characterset, String name, CharacterSetType
charsetType, boolean embeddable, String uri) {
super(triplets, type, codePage, encoding, name, embeddable, uri);
this.characterset = characterset;
this.charsetType = charsetType;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfig.java
Tue Dec 3 12:44:41 2013
@@ -103,7 +103,8 @@ public final class AFPRendererConfig imp
}
}
- private final EnumMap<AFPRendererOption, Object> params = new
EnumMap<AFPRendererOption, Object>(AFPRendererOption.class);
+ private final EnumMap<AFPRendererOption, Object> params
+ = new EnumMap<AFPRendererOption, Object>(AFPRendererOption.class);
private final EnumMap<ImagesModeOptions, Object> imageModeParams
= new EnumMap<ImagesModeOptions, Object>(ImagesModeOptions.class);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderingUtil.java
Tue Dec 3 12:44:41 2013
@@ -463,7 +463,8 @@ class PDFRenderingUtil {
private PDFDictionary augmentDictionary(PDFDictionary dictionary,
PDFDictionaryExtension extension) {
for (PDFCollectionEntryExtension entry : extension.getEntries()) {
if (entry instanceof PDFDictionaryExtension) {
- dictionary.put(entry.getKey(), augmentDictionary(new
PDFDictionary(dictionary), (PDFDictionaryExtension) entry));
+ dictionary.put(entry.getKey(),
+ augmentDictionary(new PDFDictionary(dictionary),
(PDFDictionaryExtension) entry));
} else if (entry instanceof PDFArrayExtension) {
dictionary.put(entry.getKey(), augmentArray(new
PDFArray(dictionary), (PDFArrayExtension) entry));
} else {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
Tue Dec 3 12:44:41 2013
@@ -119,7 +119,8 @@ public class PSSVGGraphics2D extends PSG
List<Double> theCoords = new java.util.ArrayList<Double>();
- AffineTransform start = applyTransform(lgp.getTransform(),
lgp.getStartPoint().getX(), lgp.getStartPoint().getY());
+ AffineTransform start = applyTransform(lgp.getTransform(),
+ lgp.getStartPoint().getX(), lgp.getStartPoint().getY());
AffineTransform end = applyTransform(lgp.getTransform(),
lgp.getEndPoint().getX(), lgp.getEndPoint().getY());
double startX = start.getTranslateX();
double startY = start.getTranslateY();
@@ -177,8 +178,10 @@ public class PSSVGGraphics2D extends PSG
transform.concatenate(getTransform());
transform.concatenate(rgp.getTransform());
- AffineTransform resultCentre = applyTransform(rgp.getTransform(),
rgp.getCenterPoint().getX(), rgp.getCenterPoint().getY());
- AffineTransform resultFocus = applyTransform(rgp.getTransform(),
rgp.getFocusPoint().getX(), rgp.getFocusPoint().getY());
+ AffineTransform resultCentre = applyTransform(rgp.getTransform(),
+ rgp.getCenterPoint().getX(), rgp.getCenterPoint().getY());
+ AffineTransform resultFocus = applyTransform(rgp.getTransform(),
+ rgp.getFocusPoint().getX(), rgp.getFocusPoint().getY());
double scale = Math.sqrt(rgp.getTransform().getDeterminant());
double radius = rgp.getRadius() * scale;
double centreX = resultCentre.getTranslateX();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java?rev=1547372&r1=1547371&r2=1547372&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
Tue Dec 3 12:44:41 2013
@@ -88,7 +88,8 @@ public class PDFDocumentGraphics2DConfig
final boolean strict = false;
if (cfg != null) {
URI thisUri = new File(".").getAbsoluteFile().toURI();
- InternalResourceResolver resourceResolver =
ResourceResolverFactory.createDefaultInternalResourceResolver(thisUri);
+ InternalResourceResolver resourceResolver
+ =
ResourceResolverFactory.createDefaultInternalResourceResolver(thisUri);
//TODO The following could be optimized by retaining the
FontManager somewhere
FontManager fontManager = new FontManager(resourceResolver,
FontDetectorFactory.createDefault(),
FontCacheManagerFactory.createDefault());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
