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 vh...@apache.org on 2014/07/18 16:21:14 UTC
svn commit: r1611658 [6/6] - in
/xmlgraphics/fop/branches/FOP-2393_gradient-rendering: ./ lib/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/fonts/
src/java/org/apache/fop/afp/goca/ src/java/org/apache/fop/afp/ioca/
src/java/org/apache/fop/a...
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/AbstractFOPImageElementBridge.java Fri Jul 18 14:21:06 2014
@@ -180,7 +180,7 @@ public abstract class AbstractFOPImageEl
/** parsed url */
protected final ParsedURL purl;
/** original graphics mode */
- protected GraphicsNode origGraphicsNode = null;
+ protected GraphicsNode origGraphicsNode;
/**
* Create a new image node for drawing natively handled images
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java Fri Jul 18 14:21:06 2014
@@ -90,7 +90,7 @@ public abstract class AbstractFOPTransco
private Log logger;
private EntityResolver resolver;
- private Configuration cfg = null;
+ private Configuration cfg;
private ImageManager imageManager;
private ImageSessionContext imageSessionContext;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/PDFGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/PDFGraphics2D.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/PDFGraphics2D.java Fri Jul 18 14:21:06 2014
@@ -145,13 +145,13 @@ public class PDFGraphics2D extends Abstr
/**
* The PDF graphics state level that this svg is being drawn into.
*/
- protected int baseLevel = 0;
+ protected int baseLevel;
/**
* The count of natively handled images added to document so they receive
* unique keys.
*/
- protected int nativeCount = 0;
+ protected int nativeCount;
/**
* The current font information.
@@ -162,7 +162,7 @@ public class PDFGraphics2D extends Abstr
* The override font state used when drawing text and the font cannot be
* set using java fonts.
*/
- protected Font ovFontState = null;
+ protected Font ovFontState;
/**
* the current stream to add PDF commands to
@@ -185,7 +185,7 @@ public class PDFGraphics2D extends Abstr
* the pdf document objects to reduce memory.
* Especially with images.
*/
- protected OutputStream outputStream = null;
+ protected OutputStream outputStream;
private TransparencyIgnoredEventListener transparencyIgnoredEventListener;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/PDFTranscoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/PDFTranscoder.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/PDFTranscoder.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/PDFTranscoder.java Fri Jul 18 14:21:06 2014
@@ -75,7 +75,7 @@ import org.apache.fop.svg.font.FOPFontFa
public class PDFTranscoder extends AbstractFOPTranscoder {
/** Graphics2D instance that is used to paint to */
- protected PDFDocumentGraphics2D graphics = null;
+ protected PDFDocumentGraphics2D graphics;
/**
* Constructs a new {@link PDFTranscoder}.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/svg/SimpleSVGUserAgent.java Fri Jul 18 14:21:06 2014
@@ -38,9 +38,9 @@ import org.apache.batik.gvt.font.FontFam
*/
public class SimpleSVGUserAgent extends UserAgentAdapter {
- private AffineTransform currentTransform = null;
+ private AffineTransform currentTransform;
- private float pixelUnitToMillimeter = 0.0f;
+ private float pixelUnitToMillimeter;
private final FontFamilyResolver fontFamilyResolver;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/tools/TestConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/tools/TestConverter.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/tools/TestConverter.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/tools/TestConverter.java Fri Jul 18 14:21:06 2014
@@ -51,17 +51,17 @@ import org.apache.fop.tools.anttasks.Fil
*/
public class TestConverter {
- private boolean failOnly = false;
+ private boolean failOnly;
private String outputFormat = MimeConstants.MIME_FOP_AREA_TREE;
private File destdir;
- private File compare = null;
+ private File compare;
private String baseDir = "./";
private Map differ = new java.util.HashMap();
/**
* logging instance
*/
- protected SimpleLog logger = null;
+ protected SimpleLog logger;
/**
* This main method can be used to run the test converter from
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/tools/anttasks/Fop.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/tools/anttasks/Fop.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/tools/anttasks/Fop.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/tools/anttasks/Fop.java Fri Jul 18 14:21:06 2014
@@ -79,8 +79,8 @@ public class Fop extends Task {
private File userConfig;
private int messageType = Project.MSG_VERBOSE;
private boolean logFiles = true;
- private boolean force = false;
- private boolean relativebase = false;
+ private boolean force;
+ private boolean relativebase;
private boolean throwExceptions = true;
/**
@@ -389,7 +389,7 @@ class FOPTaskStarter {
/**
* logging instance
*/
- protected Log logger = null;
+ protected Log logger;
/**
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/ColorUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/ColorUtil.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/ColorUtil.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/ColorUtil.java Fri Jul 18 14:21:06 2014
@@ -68,7 +68,7 @@ public final class ColorUtil {
* <p>
* Important: The use of this color map assumes that all Color instances are immutable!
*/
- private static Map<String, Color> colorMap = null;
+ private static Map<String, Color> colorMap;
/** Logger instance */
protected static final Log log = LogFactory.getLog(ColorUtil.class);
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/XMLResourceBundle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/XMLResourceBundle.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/XMLResourceBundle.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/XMLResourceBundle.java Fri Jul 18 14:21:06 2014
@@ -335,7 +335,7 @@ public class XMLResourceBundle extends R
private StringBuffer valueBuffer = new StringBuffer();
private Stack elementStack = new Stack();
- private String currentKey = null;
+ private String currentKey;
private boolean isOwnNamespace(String uri) {
return ("".equals(uri));
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java Fri Jul 18 14:21:06 2014
@@ -45,7 +45,7 @@ import javax.media.jai.PlanarImage;
public class JAIMonochromeBitmapConverter implements
MonochromeBitmapConverter {
- private boolean isErrorDiffusion = false;
+ private boolean isErrorDiffusion;
/** {@inheritDoc} */
public void setHint(String name, String value) {
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/util/text/AdvancedMessageFormat.java Fri Jul 18 14:21:06 2014
@@ -398,7 +398,7 @@ public class AdvancedMessageFormat {
protected List<Part> parts = new java.util.ArrayList<Part>();
private boolean conditional;
- private boolean hasSections = false;
+ private boolean hasSections;
public CompositePart(boolean conditional) {
this.conditional = conditional;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/mif/MIFElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/mif/MIFElement.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/mif/MIFElement.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/mif/MIFElement.java Fri Jul 18 14:21:06 2014
@@ -34,15 +34,15 @@ public class MIFElement {
/** name */
protected String name;
/** value string */
- protected String valueStr = null;
+ protected String valueStr;
/** value elements */
- protected List valueElements = null;
+ protected List valueElements;
/** true if started */
- protected boolean started = false;
+ protected boolean started;
/** true if finishing */
- protected boolean finish = false;
+ protected boolean finish;
/** true if finished */
- protected boolean finished = false;
+ protected boolean finished;
/**
* @param name a name
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/mif/MIFFile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/mif/MIFFile.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/mif/MIFFile.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/mif/MIFFile.java Fri Jul 18 14:21:06 2014
@@ -34,35 +34,35 @@ import java.util.List;
public class MIFFile extends MIFElement {
/** colorCatalog */
- protected MIFElement colorCatalog = null;
+ protected MIFElement colorCatalog;
/** pgfCatalog */
- protected PGFElement pgfCatalog = null;
+ protected PGFElement pgfCatalog;
/** fontCatalog */
- protected MIFElement fontCatalog = null;
+ protected MIFElement fontCatalog;
/** rulingCatalog */
- protected RulingElement rulingCatalog = null;
+ protected RulingElement rulingCatalog;
/** tblCatalog */
- protected MIFElement tblCatalog = null;
+ protected MIFElement tblCatalog;
/** views */
- protected MIFElement views = null;
+ protected MIFElement views;
/** variableFormats */
- protected MIFElement variableFormats = null;
+ protected MIFElement variableFormats;
/** xRefFormats */
- protected MIFElement xRefFormats = null;
+ protected MIFElement xRefFormats;
/** document */
- protected MIFElement document = null;
+ protected MIFElement document;
/** bookComponent */
- protected MIFElement bookComponent = null;
+ protected MIFElement bookComponent;
/** initialAutoNums */
- protected MIFElement initialAutoNums = null;
+ protected MIFElement initialAutoNums;
/** aFrames */
- protected MIFElement aFrames = null;
+ protected MIFElement aFrames;
/** tbls */
- protected MIFElement tbls = null;
+ protected MIFElement tbls;
/** pages */
protected List pages = new java.util.ArrayList();
/** textFlows */
- protected List textFlows = null;
+ protected List textFlows;
/** default constructor */
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/sandbox/org/apache/fop/render/svg/EmbeddedSVGImageHandler.java Fri Jul 18 14:21:06 2014
@@ -107,7 +107,7 @@ public class EmbeddedSVGImageHandler imp
DOMSource src = new DOMSource(svg.getDocument());
SAXResult res = new SAXResult(new DelegatingFragmentContentHandler(handler) {
- private boolean topLevelSVGFound = false;
+ private boolean topLevelSVGFound;
private void setAttribute(AttributesImpl atts, String localName, String value) {
int index;
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/DebugHelper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/DebugHelper.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/DebugHelper.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/DebugHelper.java Fri Jul 18 14:21:06 2014
@@ -30,7 +30,7 @@ public final class DebugHelper {
private DebugHelper() {
}
- private static boolean elObserversRegistered = false;
+ private static boolean elObserversRegistered;
/**
* Registers the default element list observers used for debugging.
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fonts/truetype/OTFFileTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fonts/truetype/OTFFileTestCase.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fonts/truetype/OTFFileTestCase.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fonts/truetype/OTFFileTestCase.java Fri Jul 18 14:21:06 2014
@@ -30,9 +30,9 @@ import static org.junit.Assert.assertTru
public class OTFFileTestCase {
protected OTFFile sourceSansProBold;
- protected FontFileReader sourceSansReader = null;
+ protected FontFileReader sourceSansReader;
protected OTFFile alexBrush;
- protected FontFileReader alexBrushReader = null;
+ protected FontFileReader alexBrushReader;
/**
* Initializes fonts used for the testing of reading OTF CFF
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fonts/type1/Type1SubsetFileTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fonts/type1/Type1SubsetFileTestCase.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fonts/type1/Type1SubsetFileTestCase.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fonts/type1/Type1SubsetFileTestCase.java Fri Jul 18 14:21:06 2014
@@ -54,7 +54,7 @@ public class Type1SubsetFileTestCase {
@Test
public void test() throws IOException {
InputStream in = new FileInputStream(TEST_FONT_A);
- compareCharStringData(in, TEST_FONT_A, createFontASubset(in, TEST_FONT_A));
+ compareCharStringData(TEST_FONT_A, createFontASubset(in, TEST_FONT_A));
}
@Test
@@ -135,12 +135,12 @@ public class Type1SubsetFileTestCase {
assertEquals(segment[3], 65);
}
- private void compareCharStringData(InputStream in, String font, byte[] subsetFont)
+ private void compareCharStringData(String font, byte[] subsetFont)
throws IOException {
decodedSections = new ArrayList<byte[]>();
//Reinitialise the input stream as reset only supports 1000 bytes.
- in = new FileInputStream(font);
+ InputStream in = new FileInputStream(font);
List<PSElement> origElements = parseElements(in);
List<PSElement> subsetElements = parseElements(new ByteArrayInputStream(subsetFont));
@@ -173,8 +173,6 @@ public class Type1SubsetFileTestCase {
SingleByteFont sbfont = mock(SingleByteFont.class);
//Glyph index & selector
Map<Integer, Integer> glyphs = new HashMap<Integer, Integer>();
- //Selector & unicode
- Map<Integer, Character> usedCharsIndex = new HashMap<Integer, Character>();
Map<Integer, String> usedCharNames = new HashMap<Integer, String>();
int count = 0;
for (int i = 32; i < 127; i++) {
@@ -185,7 +183,6 @@ public class Type1SubsetFileTestCase {
}
for (int i = 161; i < 204; i++) {
glyphs.put(i, count++);
- usedCharsIndex.put(count, (char)i);
when(sbfont.getUnicodeFromSelector(count)).thenReturn((char)i);
usedCharNames.put(i, String.format("/%s", Glyphs.charToGlyphName((char)i)));
when(sbfont.getGlyphName(i)).thenReturn(AdobeStandardEncoding.getCharFromCodePoint(i));
@@ -195,14 +192,12 @@ public class Type1SubsetFileTestCase {
};
for (int i = 0; i < randomGlyphs.length; i++) {
glyphs.put(randomGlyphs[i], count++);
- usedCharsIndex.put(count, (char)randomGlyphs[i]);
when(sbfont.getUnicodeFromSelector(count)).thenReturn((char)randomGlyphs[i]);
usedCharNames.put(i, String.format("/%s", Glyphs.charToGlyphName((char)i)));
when(sbfont.getGlyphName(i)).thenReturn(AdobeStandardEncoding.getCharFromCodePoint(i));
}
for (int i = 256; i < 335; i++) {
glyphs.put(i, count++);
- usedCharsIndex.put(count, (char)i);
when(sbfont.getUnicodeFromSelector(count)).thenReturn((char)i);
usedCharNames.put(i, String.format("/%s", Glyphs.charToGlyphName((char)i)));
when(sbfont.getGlyphName(i)).thenReturn(AdobeStandardEncoding.getCharFromCodePoint(i));
@@ -211,7 +206,7 @@ public class Type1SubsetFileTestCase {
when(sbfont.getUsedGlyphs()).thenReturn(glyphs);
when(sbfont.getEmbedFileURI()).thenReturn(URI.create(font));
Type1SubsetFile subset = new Type1SubsetFile();
- return subset.createSubset(in, sbfont, "AAAAAA");
+ return subset.createSubset(in, sbfont);
}
private List<PSElement> parseElements(InputStream in)
@@ -235,7 +230,6 @@ public class Type1SubsetFileTestCase {
private byte[] readFullCharString(byte[] decoded, byte[] data, PSFixedArray subroutines) {
List<BytesNumber> operands = new ArrayList<BytesNumber>();
- List<BytesNumber> fullList = new ArrayList<BytesNumber>();
for (int i = 0; i < data.length; i++) {
int cur = data[i] & 0xFF;
if (cur >= 0 && cur <= 31) {
@@ -256,20 +250,16 @@ public class Type1SubsetFileTestCase {
}
BytesNumber operand = new BytesNumber(cur, i);
operand.setName(getName(cur, next));
- fullList.add(operand);
}
operands.clear();
}
if (cur >= 32 && cur <= 246) {
operands.add(new BytesNumber(cur - 139, 1));
- fullList.add(operands.get(operands.size() - 1));
} else if (cur >= 247 && cur <= 250) {
operands.add(new BytesNumber((cur - 247) * 256 + (data[i + 1] & 0xFF) + 108, 2));
- fullList.add(operands.get(operands.size() - 1));
i++;
} else if (cur >= 251 && cur <= 254) {
operands.add(new BytesNumber(-(cur - 251) * 256 - (data[i + 1] & 0xFF) - 108, 2));
- fullList.add(operands.get(operands.size() - 1));
i++;
} else if (cur == 255) {
int b1 = data[i + 1] & 0xFF;
@@ -278,7 +268,6 @@ public class Type1SubsetFileTestCase {
int b4 = data[i + 4] & 0xFF;
int value = b1 << 24 | b2 << 16 | b3 << 8 | b4;
operands.add(new BytesNumber(value, 5));
- fullList.add(operands.get(operands.size() - 1));
i += 4;
}
}
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fotreetest/ResultCollector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fotreetest/ResultCollector.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fotreetest/ResultCollector.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/fotreetest/ResultCollector.java Fri Jul 18 14:21:06 2014
@@ -28,7 +28,7 @@ import java.util.List;
*/
public class ResultCollector {
- private static ResultCollector instance = null;
+ private static ResultCollector instance;
private List<String> results = new ArrayList<String>();
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java Fri Jul 18 14:21:06 2014
@@ -59,7 +59,7 @@ public final class LayoutEngineTestUtils
private static class FilenameHandler extends DefaultHandler {
private StringBuffer buffer = new StringBuffer(128);
- private boolean readingFilename = false;
+ private boolean readingFilename;
private List<String> filenames;
public FilenameHandler(List<String> filenames) {
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/threading/FOPTestbed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/threading/FOPTestbed.java?rev=1611658&r1=1611657&r2=1611658&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/threading/FOPTestbed.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/threading/FOPTestbed.java Fri Jul 18 14:21:06 2014
@@ -59,7 +59,7 @@ public class FOPTestbed extends Abstract
private Processor foprocessor;
private boolean writeToDevNull;
- private int counter = 0;
+ private int counter;
private List results = Collections.synchronizedList(new java.util.LinkedList());
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org