Author: mehdi
Date: Mon Jan 30 11:46:13 2012
New Revision: 1237610
URL: http://svn.apache.org/viewvc?rev=1237610&view=rev
Log:
Amended checkstyle errors and return carriages
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/AFPBase12FontCollection.java
Mon Jan 30 11:46:13 2012
@@ -43,6 +43,9 @@ public class AFPBase12FontCollection imp
private final AFPEventProducer eventProducer;
+ /**
+ * @param eventProducer the AFP-specific event producer
+ */
public AFPBase12FontCollection(AFPEventProducer eventProducer) {
this.eventProducer = eventProducer;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
Mon Jan 30 11:46:13 2012
@@ -325,6 +325,7 @@ public class GraphicsObject extends Abst
* @param str the string
* @param x the x coordinate
* @param y the y coordinate
+ * @param charSet the character set associated with the string
*/
public void addString(String str, int x, int y, CharacterSet charSet) {
addObject(new GraphicsCharacterString(str, x, y, charSet));
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
Mon Jan 30 11:46:13 2012
@@ -62,7 +62,7 @@ public class Type1FontLoader extends Fon
return pfbURI.substring(0, pfbURI.length() - 4) + "." + pfmExt;
}
- private static final String[] AFM_EXTENSIONS = new String[] { ".AFM",
".afm", ".Afm" };
+ private static final String[] AFM_EXTENSIONS = new String[] {".AFM",
".afm", ".Afm"};
/** {@inheritDoc} */
@Override
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
Mon Jan 30 11:46:13 2012
@@ -57,6 +57,9 @@ import org.apache.fop.traits.BorderProps
*/
public abstract class AbstractPathOrientedRenderer extends PrintRenderer {
+ /**
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
+ */
public AbstractPathOrientedRenderer(FOUserAgent userAgent) {
super(userAgent);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java Mon
Jan 30 11:46:13 2012
@@ -43,6 +43,9 @@ import org.apache.fop.fonts.base14.Base1
/** Abstract base class of "Print" type renderers. */
public abstract class PrintRenderer extends AbstractRenderer {
+ /**
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
+ */
public PrintRenderer(FOUserAgent userAgent) {
super(userAgent);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
Mon Jan 30 11:46:13 2012
@@ -204,8 +204,10 @@ public class AFPRendererConfigurator ext
"org.apache.fop.fonts.base14." +
base14).asSubclass(Typeface.class);
try {
Typeface tf = clazz.newInstance();
- font.addCharacterSet(sizeMpt,
CharacterSetBuilder.getSingleByteInstance()
- .build(characterset, codepage, encoding,
tf, eventProducer));
+ font.addCharacterSet(sizeMpt,
+ CharacterSetBuilder.getSingleByteInstance()
+ .build(characterset,
codepage, encoding, tf,
+ eventProducer));
} catch (Exception ie) {
String msg = "The base 14 font class " +
clazz.getName()
+ " could not be instantiated";
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
Mon Jan 30 11:46:13 2012
@@ -41,6 +41,9 @@ import org.apache.fop.render.java2d.Java
*/
public class PNGRenderer extends Java2DRenderer {
+ /**
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
+ */
public PNGRenderer(FOUserAgent userAgent) {
super(userAgent);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
Mon Jan 30 11:46:13 2012
@@ -82,7 +82,11 @@ public class TIFFRenderer extends Java2D
return MIME_TYPE;
}
- /** Creates TIFF renderer. */
+ /**
+ * Creates TIFF renderer.
+ *
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
+ */
public TIFFRenderer(FOUserAgent userAgent) {
super(userAgent);
writerParams = new ImageWriterParams();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
Mon Jan 30 11:46:13 2012
@@ -158,6 +158,8 @@ public class IFRenderer extends Abstract
/**
* Main constructor
+ *
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
*/
public IFRenderer(FOUserAgent userAgent) {
super(userAgent);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
Mon Jan 30 11:46:13 2012
@@ -146,7 +146,11 @@ public abstract class Java2DRenderer ext
private GeneralPath currentPath = null;
- /** Default constructor */
+ /**
+ * Default constructor
+ *
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
+ */
public Java2DRenderer(FOUserAgent userAgent) {
super(userAgent);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java
Mon Jan 30 11:46:13 2012
@@ -72,6 +72,8 @@ public class PageableRenderer extends Ja
/**
* Creates a new PageableRenderer.
+ *
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
*/
public PageableRenderer(FOUserAgent userAgent) {
super(userAgent);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRenderer.java
Mon Jan 30 11:46:13 2012
@@ -54,6 +54,8 @@ public class PrintRenderer extends Pagea
/**
* Creates a new PrintRenderer with the options set through the renderer
options if a custom
* PrinterJob is not given in FOUserAgent's renderer options.
+ *
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
*/
public PrintRenderer(FOUserAgent userAgent) {
super(userAgent);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
Mon Jan 30 11:46:13 2012
@@ -110,6 +110,8 @@ public class TXTRenderer extends Abstrac
/**
* Constructs a newly allocated <code>TXTRenderer</code> object.
+ *
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
*/
public TXTRenderer(FOUserAgent userAgent) {
super(userAgent);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
Mon Jan 30 11:46:13 2012
@@ -49,6 +49,9 @@ import org.apache.fop.render.RendererCon
/** Abstract xml renderer base class. */
public abstract class AbstractXMLRenderer extends PrintRenderer {
+ /**
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
+ */
public AbstractXMLRenderer(FOUserAgent userAgent) {
super(userAgent);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
Mon Jan 30 11:46:13 2012
@@ -112,6 +112,9 @@ public class XMLRenderer extends Abstrac
private int pageSequenceIndex;
+ /**
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
+ */
public XMLRenderer(FOUserAgent userAgent) {
super(userAgent);
context = new RendererContext(this, XML_MIME_TYPE);
Modified:
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
Mon Jan 30 11:46:13 2012
@@ -70,6 +70,9 @@ public class SVGRenderer extends Java2DR
/** Helper class for generating multiple files */
private MultiFileRenderingUtil multiFileUtil;
+ /**
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
+ */
public SVGRenderer(FOUserAgent userAgent) {
super(userAgent);
}
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
Mon Jan 30 11:46:13 2012
@@ -1,57 +1,57 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.fonts.truetype;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Test;
-
-import org.apache.fop.fonts.EncodingMode;
-import org.apache.fop.fonts.FontManager;
-import org.apache.fop.fonts.FontResolver;
-
-/**
- * Test case for {@link TTFFontLoader}.
- */
-public class TTFFontLoaderTestCase {
-
- @Test
- public void testUseKerning() throws IOException {
- File file = new File("test/resources/fonts/ttf/DejaVuLGCSerif.ttf");
- String absoluteFilePath = file.toURL().toExternalForm();
- FontResolver resolver = FontManager.createMinimalFontResolver();
- String fontName = "Deja Vu";
- boolean embedded = false;
- boolean useKerning = true;
-
- TTFFontLoader fontLoader = new TTFFontLoader(absoluteFilePath,
fontName, embedded,
- EncodingMode.AUTO, useKerning, resolver);
- assertTrue(fontLoader.getFont().hasKerningInfo());
- useKerning = false;
-
- fontLoader = new TTFFontLoader(absoluteFilePath, fontName, embedded,
EncodingMode.AUTO,
- useKerning, resolver);
- assertFalse(fontLoader.getFont().hasKerningInfo());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.fonts.truetype;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.Test;
+
+import org.apache.fop.fonts.EncodingMode;
+import org.apache.fop.fonts.FontManager;
+import org.apache.fop.fonts.FontResolver;
+
+/**
+ * Test case for {@link TTFFontLoader}.
+ */
+public class TTFFontLoaderTestCase {
+
+ @Test
+ public void testUseKerning() throws IOException {
+ File file = new File("test/resources/fonts/ttf/DejaVuLGCSerif.ttf");
+ String absoluteFilePath = file.toURI().toURL().toExternalForm();
+ FontResolver resolver = FontManager.createMinimalFontResolver();
+ String fontName = "Deja Vu";
+ boolean embedded = false;
+ boolean useKerning = true;
+
+ TTFFontLoader fontLoader = new TTFFontLoader(absoluteFilePath,
fontName, embedded,
+ EncodingMode.AUTO, useKerning, resolver);
+ assertTrue(fontLoader.getFont().hasKerningInfo());
+ useKerning = false;
+
+ fontLoader = new TTFFontLoader(absoluteFilePath, fontName, embedded,
EncodingMode.AUTO,
+ useKerning, resolver);
+ assertFalse(fontLoader.getFont().hasKerningInfo());
+ }
+}
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java?rev=1237610&r1=1237609&r2=1237610&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
Mon Jan 30 11:46:13 2012
@@ -19,13 +19,17 @@
package org.apache.fop.pdf;
-import org.junit.Test;
-import org.junit.Before;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import org.junit.Before;
+import org.junit.Test;
+
/**
* Tests the PDFObject class.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
