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 ga...@apache.org on 2013/01/18 18:45:41 UTC
svn commit: r1435269 - in /xmlgraphics/fop/trunk: ./
src/java/org/apache/fop/complexscripts/fonts/
src/java/org/apache/fop/complexscripts/scripts/
src/java/org/apache/fop/layoutmgr/inline/ src/java/org/apache/fop/pdf/
src/java/org/apache/fop/render/ps/
Author: gadams
Date: Fri Jan 18 17:45:40 2013
New Revision: 1435269
URL: http://svn.apache.org/viewvc?rev=1435269&view=rev
Log:
FOP-2193: fix checkstyle and findbugs warnings
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFText.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextPainter.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java?rev=1435269&r1=1435268&r2=1435269&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java Fri Jan 18 17:45:40 2013
@@ -34,7 +34,7 @@ import org.apache.fop.complexscripts.uti
*/
public abstract class GlyphPositioningSubtable extends GlyphSubtable implements GlyphPositioning {
- private static final GlyphPositioningState state = new GlyphPositioningState();
+ private static final GlyphPositioningState state = new GlyphPositioningState(); // CSOK: ConstantName
/**
* Instantiate a <code>GlyphPositioningSubtable</code>.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java?rev=1435269&r1=1435268&r2=1435269&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java Fri Jan 18 17:45:40 2013
@@ -33,7 +33,7 @@ import org.apache.fop.complexscripts.uti
*/
public abstract class GlyphSubstitutionSubtable extends GlyphSubtable implements GlyphSubstitution {
- private static final GlyphSubstitutionState state = new GlyphSubstitutionState();
+ private static final GlyphSubstitutionState state = new GlyphSubstitutionState(); // CSOK: ConstantName
/**
* Instantiate a <code>GlyphSubstitutionSubtable</code>.
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java?rev=1435269&r1=1435268&r2=1435269&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java Fri Jan 18 17:45:40 2013
@@ -33,7 +33,9 @@ import org.apache.fop.complexscripts.uti
// CSOFF: InnerAssignmentCheck
// CSOFF: LineLengthCheck
+// CSOFF: NoWhitespaceAfterCheck
// CSOFF: ParameterNumberCheck
+// CSOFF: SimplifyBooleanReturnCheck
/**
* <p>Abstract script processor base class for which an implementation of the substitution and positioning methods
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=1435269&r1=1435268&r2=1435269&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 Fri Jan 18 17:45:40 2013
@@ -179,13 +179,13 @@ public class ImageLayout implements Cons
//Adjust viewport if not explicit
if (ipd == -1) {
ipd = constrainExtent(cwidth,
- props.getInlineProgressionDimension(), (foundNonAuto) ?
- props.getContentWidth() : new DefaultLength());
+ props.getInlineProgressionDimension(), (foundNonAuto)
+ ? props.getContentWidth() : new DefaultLength());
}
if (bpd == -1) {
bpd = constrainExtent(cheight,
- props.getBlockProgressionDimension(), (foundNonAuto) ?
- props.getContentHeight() : new DefaultLength());
+ props.getBlockProgressionDimension(), (foundNonAuto)
+ ? props.getContentHeight() : new DefaultLength());
}
this.clip = false;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFText.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFText.java?rev=1435269&r1=1435268&r2=1435269&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFText.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFText.java Fri Jan 18 17:45:40 2013
@@ -213,7 +213,7 @@ public class PDFText extends PDFObject {
*/
public static final void toUnicodeHex(char c, StringBuffer sb) {
for (int i = 0; i < 4; ++i) {
- sb.append(DIGITS[(c >> (12-4*i)) & 0x0F]);
+ sb.append(DIGITS[(c >> (12 - 4 * i)) & 0x0F]);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java?rev=1435269&r1=1435268&r2=1435269&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java Fri Jan 18 17:45:40 2013
@@ -186,7 +186,7 @@ public abstract class PDFTextUtil {
sb.append('/');
sb.append(fontName);
sb.append(' ');
- PDFNumber.doubleOut(fontSize,6,sb);
+ PDFNumber.doubleOut(fontSize, 6, sb);
sb.append(" Tf\n");
write(sb);
this.startText = useMultiByte ? "<" : "(";
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextPainter.java?rev=1435269&r1=1435268&r2=1435269&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSTextPainter.java Fri Jan 18 17:45:40 2013
@@ -38,6 +38,10 @@ import java.util.List;
import org.apache.batik.gvt.font.GVTGlyphVector;
import org.apache.batik.gvt.text.TextPaintInfo;
import org.apache.batik.gvt.text.TextSpanLayout;
+
+import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;
+import org.apache.xmlgraphics.ps.PSGenerator;
+
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontMetrics;
@@ -46,8 +50,6 @@ import org.apache.fop.fonts.MultiByteFon
import org.apache.fop.svg.NativeTextPainter;
import org.apache.fop.util.CharUtilities;
import org.apache.fop.util.HexEncoder;
-import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;
-import org.apache.xmlgraphics.ps.PSGenerator;
/**
* Renders the attributed character iterator of a {@link org.apache.batik.gvt.TextNode TextNode}.
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1435269&r1=1435268&r2=1435269&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri Jan 18 17:45:40 2013
@@ -59,6 +59,9 @@
documents. Example: the fix of marks layering will be such a case when it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Code" dev="GA" type="fix" fixes-bug="FOP-2192">
+ Fix checkstyle and findbugs warnings.
+ </action>
<action context="Renderers" dev="GA" type="fix" fixes-bug="FOP-2191">
Cache matched lookups, assembled lookup spec uses; reduce glyph processing state allocation.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org