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 2014/08/07 08:46:58 UTC
svn commit: r1616416 - in /xmlgraphics/fop/trunk: ./
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/goca/
src/java/org/apache/fop/cli/ src/java/org/apache/fop/fo/pagination/
src/java/org/apache/fop/fo/properties/ src/java/org/apache/fop/fonts...
Author: gadams
Date: Thu Aug 7 06:46:57 2014
New Revision: 1616416
URL: http://svn.apache.org/r1616416
Log:
Fix 2-instance findbug warnings.
Modified:
xmlgraphics/fop/trunk/findbugs-exclude.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/Main.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageProductionException.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Glyphs.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OFDirTabEntry.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OpenFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageFormResource.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/RunTest.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorWithFallback.java
Modified: xmlgraphics/fop/trunk/findbugs-exclude.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/findbugs-exclude.xml?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/findbugs-exclude.xml (original)
+++ xmlgraphics/fop/trunk/findbugs-exclude.xml Thu Aug 7 06:46:57 2014
@@ -34,10 +34,6 @@
<Bug pattern="DM_BOOLEAN_CTOR"/>
</Match>
<Match>
- <!-- 2 warnings -->
- <Bug pattern="DM_BOXED_PRIMITIVE_TOSTRING"/>
- </Match>
- <Match>
<!-- 29 warnings -->
<Bug pattern="DM_CONVERT_CASE"/>
</Match>
@@ -54,22 +50,10 @@
<Bug pattern="DM_NUMBER_CTOR"/>
</Match>
<Match>
- <!-- 2 warnings -->
- <Bug pattern="DM_STRING_TOSTRING"/>
- </Match>
- <Match>
<!-- 4 warnings -->
<Bug pattern="DM_STRING_VOID_CTOR"/>
</Match>
<Match>
- <!-- 2 warnings -->
- <Bug pattern="DMI_INVOKING_TOSTRING_ON_ARRAY"/>
- </Match>
- <Match>
- <!-- 2 warnings -->
- <Bug pattern="DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED"/>
- </Match>
- <Match>
<!-- 84 warnings -->
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
@@ -87,10 +71,6 @@
</Or>
</Match>
<Match>
- <!-- 2 warnings -->
- <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>
- </Match>
- <Match>
<!-- 3 warnings -->
<Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/>
</Match>
@@ -103,10 +83,6 @@
<Bug pattern="FE_FLOATING_POINT_EQUALITY"/>
</Match>
<Match>
- <!-- 2 warnings -->
- <Bug pattern="IM_BAD_CHECK_FOR_ODD"/>
- </Match>
- <Match>
<!-- 3 warnings -->
<Bug pattern="IS2_INCONSISTENT_SYNC"/>
</Match>
@@ -119,10 +95,6 @@
<Bug pattern="LI_LAZY_INIT_STATIC"/>
</Match>
<Match>
- <!-- 2 warnings -->
- <Bug pattern="MF_CLASS_MASKS_FIELD"/>
- </Match>
- <Match>
<Bug pattern="MS_EXPOSE_REP"/>
<Or>
<And>
@@ -160,10 +132,6 @@
<Bug pattern="NP_NULL_ON_SOME_PATH"/>
</Match>
<Match>
- <!-- 2 warnings -->
- <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
- </Match>
- <Match>
<!-- 3 warnings -->
<Bug pattern="NS_DANGEROUS_NON_SHORT_CIRCUIT"/>
</Match>
@@ -172,10 +140,6 @@
<Bug pattern="OS_OPEN_STREAM"/>
</Match>
<Match>
- <!-- 2 warnings -->
- <Bug pattern="OS_OPEN_STREAM_EXCEPTION_PATH"/>
- </Match>
- <Match>
<!-- 46 warnings -->
<Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
</Match>
@@ -200,22 +164,10 @@
<Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/>
</Match>
<Match>
- <!-- 2 warnings -->
- <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION"/>
- </Match>
- <Match>
<!-- 33 warnings -->
<Bug pattern="SE_BAD_FIELD"/>
</Match>
<Match>
- <!-- 2 warnings -->
- <Bug pattern="SE_BAD_FIELD_INNER_CLASS"/>
- </Match>
- <Match>
- <!-- 2 warnings -->
- <Bug pattern="SE_BAD_FIELD_STORE"/>
- </Match>
- <Match>
<!-- 6 warnings -->
<Bug pattern="SE_INNER_CLASS"/>
</Match>
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPPaintingState.java Thu Aug 7 06:46:57 2014
@@ -57,7 +57,7 @@ public class AFPPaintingState extends or
private float bitmapEncodingQuality;
/** color image handler */
- private ColorConverter colorConverter = GrayScaleColorConverter.getInstance();
+ private transient ColorConverter colorConverter = GrayScaleColorConverter.getInstance();
/**
* true if certain image formats may be embedded unchanged in their native
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java Thu Aug 7 06:46:57 2014
@@ -130,13 +130,17 @@ public abstract class AbstractGraphicsCo
/** {@inheritDoc} */
public String toString() {
- String coordsStr = "";
+ StringBuffer sb = new StringBuffer();
for (int i = 0; i < coords.length; i++) {
- coordsStr += (i % 2 == 0) ? "x" : "y";
- coordsStr += (i / 2) + "=" + coords[i] + ",";
+ if (sb.length() > 0) {
+ sb.append(',');
+ }
+ sb.append((i % 2 == 0) ? 'x' : 'y');
+ sb.append(i / 2);
+ sb.append('=');
+ sb.append(coords[i]);
}
- coordsStr = coordsStr.substring(0, coordsStr.length() - 1);
- return getName() + "{" + coordsStr + "}";
+ return getName() + "{" + sb.toString() + "}";
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/Main.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/Main.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/Main.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/Main.java Thu Aug 7 06:46:57 2014
@@ -25,6 +25,8 @@ import java.io.OutputStream;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.List;
import org.apache.commons.io.IOUtils;
@@ -125,10 +127,15 @@ public final class Main {
*/
public static void startFOPWithDynamicClasspath(String[] args) {
try {
- URL[] urls = getJARList();
+ final URL[] urls = getJARList();
//System.out.println("CCL: "
// + Thread.currentThread().getContextClassLoader().toString());
- ClassLoader loader = new java.net.URLClassLoader(urls, null);
+ ClassLoader loader = (ClassLoader)
+ AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return new java.net.URLClassLoader(urls, null);
+ }
+ });
Thread.currentThread().setContextClassLoader(loader);
Class clazz = Class.forName("org.apache.fop.cli.Main", true, loader);
//System.out.println("CL: " + clazz.getClassLoader().toString());
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java Thu Aug 7 06:46:57 2014
@@ -104,7 +104,7 @@ public abstract class AbstractPageSequen
startingPageNumber++;
}
} else if (pageNumberType == EN_AUTO_EVEN) {
- if (startingPageNumber % 2 == 1) {
+ if (startingPageNumber % 2 != 0) {
startingPageNumber++;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageProductionException.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageProductionException.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageProductionException.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageProductionException.java Thu Aug 7 06:46:57 2014
@@ -36,7 +36,7 @@ public class PageProductionException ext
private static final long serialVersionUID = -5126033718398975158L;
private String localizedMessage;
- private Locator locator;
+ private transient Locator locator;
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java Thu Aug 7 06:46:57 2014
@@ -271,7 +271,7 @@ public class PageSequence extends Abstra
if (pageSequenceMaster == null) {
return simplePageMaster;
}
- boolean isOddPage = ((page % 2) == 1);
+ boolean isOddPage = ((page % 2) != 0);
if (log.isDebugEnabled()) {
log.debug("getNextSimplePageMaster(page=" + page
+ " isOdd=" + isOddPage
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CharacterProperty.java Thu Aug 7 06:46:57 2014
@@ -90,7 +90,7 @@ public final class CharacterProperty ext
* @return this.character cast as a String
*/
public String getString() {
- return new Character(character).toString();
+ return Character.toString(character);
}
@Override
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java Thu Aug 7 06:46:57 2014
@@ -83,17 +83,20 @@ public class GenericShorthandParser impl
PropertyList propertyList)
throws PropertyException {
Property prop = null;
- String vProperty = "";
+ StringBuffer vProperty = new StringBuffer();
// Try each of the stored values in turn
Iterator iprop = property.getList().iterator();
while (iprop.hasNext() && prop == null) {
Property p = (Property)iprop.next();
if (p.getNCname() != null) {
- vProperty += p.getNCname() + " ";
+ if (vProperty.length() > 0) {
+ vProperty.append(' ');
+ }
+ vProperty.append(p.getNCname());
}
prop = maker.convertShorthandProperty(propertyList, p, null);
}
- propertyList.validatePropertyValue(vProperty.trim(), prop, property);
+ propertyList.validatePropertyValue(vProperty.toString(), prop, property);
return prop;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Glyphs.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Glyphs.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Glyphs.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Glyphs.java Thu Aug 7 06:46:57 2014
@@ -1277,7 +1277,7 @@ public final class Glyphs {
* @return the name of the glyph
*/
public static String charToGlyphName(char ch) {
- return stringToGlyph(new Character(ch).toString());
+ return stringToGlyph(Character.toString(ch));
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OFDirTabEntry.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OFDirTabEntry.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OFDirTabEntry.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OFDirTabEntry.java Thu Aug 7 06:46:57 2014
@@ -21,6 +21,7 @@ package org.apache.fop.fonts.truetype;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
/**
@@ -57,19 +58,17 @@ public class OFDirTabEntry {
offset = in.readTTFULong();
length = in.readTTFULong();
- String tagStr = new String(tag, "ISO-8859-1");
- return tagStr;
+ return getTagString();
}
@Override
public String toString() {
- return "Read dir tab ["
- + tag[0] + " " + tag[1] + " " + tag[2] + " " + tag[3] + "]"
+ return "Read dir tab [" + Arrays.toString(tag) + "]"
+ " offset: " + offset
+ " length: " + length
- + " name: " + tag;
+ + " name: " + getTagString();
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OpenFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OpenFont.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OpenFont.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/OpenFont.java Thu Aug 7 06:46:57 2014
@@ -266,7 +266,7 @@ public abstract class OpenFont {
/**
* Key-value helper class.
*/
- final static class UnicodeMapping implements Comparable {
+ static final class UnicodeMapping implements Comparable {
private final int unicodeIndex;
private final int glyphIndex;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java Thu Aug 7 06:46:57 2014
@@ -91,7 +91,7 @@ public abstract class AbstractBreaker {
* Helper class, extending the functionality of the
* basic {@link BlockKnuthSequence}.
*/
- public class BlockSequence extends BlockKnuthSequence {
+ public static class BlockSequence extends BlockKnuthSequence {
private static final long serialVersionUID = -5348831120146774118L;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java Thu Aug 7 06:46:57 2014
@@ -38,7 +38,8 @@ import org.apache.fop.traits.MinOptMax;
public abstract class AbstractPageNumberCitationLayoutManager extends LeafNodeLayoutManager {
/** The page number citation object */
- protected AbstractPageNumberCitation fobj;
+ protected AbstractPageNumberCitation citation;
+
/** Font for the page-number-citation */
protected Font font;
@@ -55,15 +56,15 @@ public abstract class AbstractPageNumber
*/
public AbstractPageNumberCitationLayoutManager(AbstractPageNumberCitation node) {
super(node);
- fobj = node;
+ citation = node;
}
/** {@inheritDoc} */
public void initialize() {
- FontInfo fi = fobj.getFOEventHandler().getFontInfo();
- FontTriplet[] fontkeys = fobj.getCommonFont().getFontState(fi);
- font = fi.getFontInstance(fontkeys[0], fobj.getCommonFont().fontSize.getValue(this));
- setCommonBorderPaddingBackground(fobj.getCommonBorderPaddingBackground());
+ FontInfo fi = citation.getFOEventHandler().getFontInfo();
+ FontTriplet[] fontkeys = citation.getCommonFont().getFontState(fi);
+ font = fi.getFontInstance(fontkeys[0], citation.getCommonFont().fontSize.getValue(this));
+ setCommonBorderPaddingBackground(citation.getCommonBorderPaddingBackground());
}
/**
@@ -72,11 +73,11 @@ public abstract class AbstractPageNumber
protected AlignmentContext makeAlignmentContext(LayoutContext context) {
return new AlignmentContext(
font
- , fobj.getLineHeight().getOptimum(this).getLength().getValue(this)
- , fobj.getAlignmentAdjust()
- , fobj.getAlignmentBaseline()
- , fobj.getBaselineShift()
- , fobj.getDominantBaseline()
+ , citation.getLineHeight().getOptimum(this).getLength().getValue(this)
+ , citation.getAlignmentAdjust()
+ , citation.getAlignmentBaseline()
+ , citation.getBaselineShift()
+ , citation.getDominantBaseline()
, context.getAlignmentContext()
);
}
@@ -114,7 +115,7 @@ public abstract class AbstractPageNumber
protected InlineArea getEffectiveArea(LayoutContext layoutContext) {
InlineArea area = getPageNumberCitationArea();
if (!layoutContext.treatAsArtifact()) {
- TraitSetter.addStructureTreeElement(area, fobj.getStructureTreeElement());
+ TraitSetter.addStructureTreeElement(area, citation.getStructureTreeElement());
}
return area;
}
@@ -125,9 +126,9 @@ public abstract class AbstractPageNumber
text = new TextArea();
text.addWord(citationString, 0);
} else {
- UnresolvedPageNumber unresolved = new UnresolvedPageNumber(fobj.getRefId(), font,
+ UnresolvedPageNumber unresolved = new UnresolvedPageNumber(citation.getRefId(), font,
getReferenceType());
- getPSLM().addUnresolvedArea(fobj.getRefId(), unresolved);
+ getPSLM().addUnresolvedArea(citation.getRefId(), unresolved);
text = unresolved;
}
setTraits(text);
@@ -141,7 +142,7 @@ public abstract class AbstractPageNumber
protected abstract boolean getReferenceType();
private void setTraits(TextArea text) {
- TraitSetter.setProducerID(text, fobj.getId());
+ TraitSetter.setProducerID(text, citation.getId());
int bidiLevel = getBidiLevel();
text.setBidiLevel(bidiLevel);
int width = getStringWidth(citationString); // TODO: [GA] !I18N!
@@ -149,15 +150,15 @@ public abstract class AbstractPageNumber
text.setBPD(font.getAscender() - font.getDescender());
text.setBaselineOffset(font.getAscender());
TraitSetter.addFontTraits(text, font);
- text.addTrait(Trait.COLOR, fobj.getColor());
- TraitSetter.addTextDecoration(text, fobj.getTextDecoration());
+ text.addTrait(Trait.COLOR, citation.getColor());
+ TraitSetter.addTextDecoration(text, citation.getTextDecoration());
}
/**
* @return bidi level governing abstract page number citation
*/
protected int getBidiLevel() {
- return fobj.getBidiLevel();
+ return citation.getBidiLevel();
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Thu Aug 7 06:46:57 2014
@@ -191,7 +191,7 @@ public class LineLayoutManager extends I
}
// this class represents a paragraph
- private class Paragraph extends InlineKnuthSequence {
+ private static class Paragraph extends InlineKnuthSequence {
private static final long serialVersionUID = 5862072380375189105L;
@@ -239,7 +239,7 @@ public class LineLayoutManager extends I
// add the element representing text indentation
// at the beginning of the first paragraph
- if (isFirstInBlock && knuthParagraphs.size() == 0
+ if (layoutManager.isFirstInBlock && layoutManager.knuthParagraphs.size() == 0
&& textIndent != 0) {
this.add(new KnuthInlineBox(textIndent, null,
null, false));
@@ -250,7 +250,7 @@ public class LineLayoutManager extends I
public void endParagraph() {
KnuthSequence finishedPar = this.endSequence();
if (finishedPar != null) {
- knuthParagraphs.add(finishedPar);
+ layoutManager.knuthParagraphs.add(finishedPar);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java Thu Aug 7 06:46:57 2014
@@ -40,8 +40,8 @@ public class PageNumberCitationLastLayou
@Override
protected PageViewport getCitedPage() {
- if (getPSLM().associateLayoutManagerID(fobj.getRefId())) {
- return getPSLM().getLastPVWithID(fobj.getRefId());
+ if (getPSLM().associateLayoutManagerID(citation.getRefId())) {
+ return getPSLM().getLastPVWithID(citation.getRefId());
} else {
return null;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java Thu Aug 7 06:46:57 2014
@@ -40,7 +40,7 @@ public class PageNumberCitationLayoutMan
@Override
protected PageViewport getCitedPage() {
- return getPSLM().getFirstPVWithID(fobj.getRefId());
+ return getPSLM().getFirstPVWithID(citation.getRefId());
}
@Override
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java Thu Aug 7 06:46:57 2014
@@ -61,7 +61,7 @@ public class PDFJavaScriptLaunchAction e
PDFJavaScriptLaunchAction launch = (PDFJavaScriptLaunchAction) obj;
- if (!launch.script.toString().equals(script.toString())) {
+ if (!launch.script.equals(script)) {
return false;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java Thu Aug 7 06:46:57 2014
@@ -128,10 +128,11 @@ public class ImageProxyPanel extends JPa
image = (BufferedImage)imageRef.get();
}
- int x = (getWidth() - image.getWidth()) / 2;
- int y = (getHeight() - image.getHeight()) / 2;
-
- graphics.drawImage(image, x, y, image.getWidth(), image.getHeight(), null);
+ if (image != null) {
+ int x = (getWidth() - image.getWidth()) / 2;
+ int y = (getHeight() - image.getHeight()) / 2;
+ graphics.drawImage(image, x, y, image.getWidth(), image.getHeight(), null);
+ }
} catch (FOPException fopEx) {
fopEx.printStackTrace();
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java Thu Aug 7 06:46:57 2014
@@ -626,7 +626,7 @@ public class PreviewDialog extends JFram
}
public void run() {
- processStatus.setText(message.toString());
+ processStatus.setText(message);
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java Thu Aug 7 06:46:57 2014
@@ -116,52 +116,59 @@ public class ImageRawPNGAdapter extends
// TODO: Implement code to combine image with background color if transparency is not allowed
// here we need to inflate the PNG pixel data, which includes alpha, separate the alpha channel
// and then deflate it back again
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- DeflaterOutputStream dos = new DeflaterOutputStream(baos, new Deflater());
- InputStream in = ((ImageRawStream) image).createInputStream();
+ ByteArrayOutputStream baos = null;
+ DeflaterOutputStream dos = null;
+ InputStream in = null;
try {
- InflaterInputStream infStream = new InflaterInputStream(in, new Inflater());
- DataInputStream dataStream = new DataInputStream(infStream);
- // offset is the byte offset of the alpha component
- int offset = numberOfInterleavedComponents - 1; // 1 for GA, 3 for RGBA
- int numColumns = image.getSize().getWidthPx();
- int bytesPerRow = numberOfInterleavedComponents * numColumns;
- int filter;
- // read line by line; the first byte holds the filter
- while ((filter = dataStream.read()) != -1) {
- byte[] bytes = new byte[bytesPerRow];
- dataStream.readFully(bytes, 0, bytesPerRow);
- dos.write((byte) filter);
- for (int j = 0; j < numColumns; j++) {
- dos.write(bytes, offset, 1);
- offset += numberOfInterleavedComponents;
+ baos = new ByteArrayOutputStream();
+ dos = new DeflaterOutputStream(baos, new Deflater());
+ in = ((ImageRawStream) image).createInputStream();
+ try {
+ InflaterInputStream infStream = new InflaterInputStream(in, new Inflater());
+ DataInputStream dataStream = new DataInputStream(infStream);
+ // offset is the byte offset of the alpha component
+ int offset = numberOfInterleavedComponents - 1; // 1 for GA, 3 for RGBA
+ int numColumns = image.getSize().getWidthPx();
+ int bytesPerRow = numberOfInterleavedComponents * numColumns;
+ int filter;
+ // read line by line; the first byte holds the filter
+ while ((filter = dataStream.read()) != -1) {
+ byte[] bytes = new byte[bytesPerRow];
+ dataStream.readFully(bytes, 0, bytesPerRow);
+ dos.write((byte) filter);
+ for (int j = 0; j < numColumns; j++) {
+ dos.write(bytes, offset, 1);
+ offset += numberOfInterleavedComponents;
+ }
+ offset = numberOfInterleavedComponents - 1;
}
- offset = numberOfInterleavedComponents - 1;
+ } catch (IOException e) {
+ throw new RuntimeException("Error processing transparency channel:", e);
}
- dos.close();
- } catch (IOException e) {
- throw new RuntimeException("Error processing transparency channel:", e);
+ // set up alpha channel compression
+ FlateFilter transFlate;
+ try {
+ transFlate = new FlateFilter();
+ transFlate.setApplied(true);
+ transFlate.setPredictor(FlateFilter.PREDICTION_PNG_OPT);
+ transFlate.setColors(1);
+ transFlate.setColumns(image.getSize().getWidthPx());
+ transFlate.setBitsPerComponent(this.getBitsPerComponent());
+ } catch (PDFFilterException e) {
+ throw new RuntimeException("FlateFilter configuration error", e);
+ }
+ BitmapImage alphaMask = new BitmapImage("Mask:" + this.getKey(), image.getSize().getWidthPx(),
+ image.getSize().getHeightPx(), baos.toByteArray(), null);
+ IOUtils.closeQuietly(baos);
+ alphaMask.setPDFFilter(transFlate);
+ alphaMask.disallowMultipleFilters();
+ alphaMask.setColorSpace(new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_GRAY));
+ softMask = doc.addImage(null, alphaMask).makeReference();
} finally {
IOUtils.closeQuietly(in);
+ IOUtils.closeQuietly(dos);
+ IOUtils.closeQuietly(baos);
}
- // set up alpha channel compression
- FlateFilter transFlate;
- try {
- transFlate = new FlateFilter();
- transFlate.setApplied(true);
- transFlate.setPredictor(FlateFilter.PREDICTION_PNG_OPT);
- transFlate.setColors(1);
- transFlate.setColumns(image.getSize().getWidthPx());
- transFlate.setBitsPerComponent(this.getBitsPerComponent());
- } catch (PDFFilterException e) {
- throw new RuntimeException("FlateFilter configuration error", e);
- }
- BitmapImage alphaMask = new BitmapImage("Mask:" + this.getKey(), image.getSize().getWidthPx(),
- image.getSize().getHeightPx(), baos.toByteArray(), null);
- alphaMask.setPDFFilter(transFlate);
- alphaMask.disallowMultipleFilters();
- alphaMask.setColorSpace(new PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_GRAY));
- softMask = doc.addImage(null, alphaMask).makeReference();
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageFormResource.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageFormResource.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageFormResource.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageFormResource.java Thu Aug 7 06:46:57 2014
@@ -57,4 +57,14 @@ public class PSImageFormResource extends
return this.uri;
}
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return super.equals(obj);
+ }
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java Thu Aug 7 06:46:57 2014
@@ -41,14 +41,12 @@ abstract class RtfAfterBeforeBase
extends RtfContainer
implements IRtfParagraphContainer, IRtfExternalGraphicContainer, IRtfTableContainer,
IRtfTextrunContainer {
- protected RtfAttributes attrib;
private RtfParagraph para;
private RtfExternalGraphic externalGraphic;
private RtfTable table;
RtfAfterBeforeBase(RtfSection parent, Writer w, RtfAttributes attrs) throws IOException {
super((RtfContainer)parent, w, attrs);
- attrib = attrs;
}
public RtfParagraph newParagraph() throws IOException {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/servlet/FopServlet.java Thu Aug 7 06:46:57 2014
@@ -88,7 +88,7 @@ public class FopServlet extends HttpServ
/** The FopFactory used to create Fop instances */
protected FopFactory fopFactory;
/** URIResolver for use by this servlet */
- protected URIResolver uriResolver;
+ protected transient URIResolver uriResolver;
/**
* {@inheritDoc}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java Thu Aug 7 06:46:57 2014
@@ -31,6 +31,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.fop.apps.FOUserAgent;
@@ -295,11 +296,15 @@ public class TestConverter {
outname + makeResultExtension());
outputFile.getParentFile().mkdirs();
- OutputStream outStream = new java.io.BufferedOutputStream(
- new java.io.FileOutputStream(outputFile));
- logger.debug("ddir:" + destdir + " on:" + outputFile.getName());
- inputHandler.renderTo(userAgent, outputFormat, outStream);
- outStream.close();
+ OutputStream outStream = null;
+ try {
+ outStream = new java.io.BufferedOutputStream(
+ new java.io.FileOutputStream(outputFile));
+ logger.debug("ddir:" + destdir + " on:" + outputFile.getName());
+ inputHandler.renderTo(userAgent, outputFormat, outStream);
+ } finally {
+ IOUtils.closeQuietly(outStream);
+ }
// check difference
if (compare != null) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/RunTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/RunTest.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/RunTest.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/RunTest.java Thu Aug 7 06:46:57 2014
@@ -25,6 +25,8 @@ import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
@@ -138,9 +140,14 @@ public class RunTest extends Task {
// return;
// } else {
try {
- ClassLoader loader = new URLClassLoader(createUrls(referenceJar));
+ final URL[] urls = createUrls(referenceJar);
+ ClassLoader loader = (ClassLoader)
+ AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run() {
+ return new URLClassLoader(urls);
+ }
+ });
boolean failed = false;
-
try {
Class cla = Class.forName("org.apache.fop.apps.Fop", true,
loader);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java Thu Aug 7 06:46:57 2014
@@ -548,7 +548,7 @@ public abstract class AbstractPaintingSt
+ ", fontName=" + fontName
+ ", fontSize=" + fontSize
+ ", lineWidth=" + lineWidth
- + ", dashArray=" + dashArray
+ + ", dashArray=" + Arrays.toString(dashArray)
+ ", transform=" + transform
+ ", layer=" + layer;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorWithFallback.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorWithFallback.java?rev=1616416&r1=1616415&r2=1616416&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorWithFallback.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorWithFallback.java Thu Aug 7 06:46:57 2014
@@ -82,4 +82,23 @@ public class ColorWithFallback extends C
return this.fallback;
}
+ @Override
+ public int hashCode() {
+ return super.hashCode() ^ fallback.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ } else if (!super.equals(obj)) {
+ return false;
+ } else if (obj instanceof ColorWithFallback) {
+ ColorWithFallback other = (ColorWithFallback) obj;
+ return other.fallback.equals(fallback);
+ } else {
+ return false;
+ }
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org