xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r1557840 [9/9] - in /xmlgraphics/fop/branches/Temp_InlineContainer: ./ examples/fo/basic/ lib/ src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/ src/documentation/intermediate-format-ng/ src/java/org/apache/fop/ src/java/org/apac...
Date Mon, 13 Jan 2014 20:39:41 GMT
Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java Mon Jan 13 20:39:34 2014
@@ -21,6 +21,10 @@ package org.apache.fop.render.pdf;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.fop.apps.AbstractRendererConfigParserTester;
 import org.apache.fop.apps.PDFRendererConfBuilder;
 import org.apache.fop.pdf.PDFAMode;
@@ -28,10 +32,6 @@ import org.apache.fop.pdf.PDFXMode;
 import org.apache.fop.pdf.Version;
 import org.apache.fop.render.pdf.PDFRendererConfig.PDFRendererConfigParser;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 public class PDFRendererConfigParserTestCase
         extends AbstractRendererConfigParserTester<PDFRendererConfBuilder, PDFRendererConfig> {
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java Mon Jan 13 20:39:34 2014
@@ -29,6 +29,8 @@ import java.util.Map;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.fop.pdf.PDFAMode;
 import org.apache.fop.pdf.PDFEncryptionParams;
 import org.apache.fop.pdf.PDFXMode;
@@ -40,7 +42,6 @@ import static org.apache.fop.render.pdf.
 import static org.apache.fop.render.pdf.PDFRendererOption.PDF_A_MODE;
 import static org.apache.fop.render.pdf.PDFRendererOption.PDF_X_MODE;
 import static org.apache.fop.render.pdf.PDFRendererOption.VERSION;
-import static org.junit.Assert.assertEquals;
 
 public class PDFRendererOptionsConfigTestCase {
 
@@ -51,7 +52,7 @@ public class PDFRendererOptionsConfigTes
     static {
         final EnumMap<PDFRendererOption, Object> props
         = new EnumMap<PDFRendererOption, Object>(PDFRendererOption.class);
-        for(PDFRendererOption option : PDFRendererOption.values()) {
+        for (PDFRendererOption option : PDFRendererOption.values()) {
             props.put(option, option.getDefaultValue());
         }
         DEFAULT_OPTIONS = Collections.unmodifiableMap(props);
@@ -102,7 +103,7 @@ public class PDFRendererOptionsConfigTes
         assertEncryptionParamsEquals(expectedEncryptionParams, actual.getEncryptionParameters());
     }
 
-    private static void assertEncryptionParamsEquals(PDFEncryptionParams expected, 
+    private static void assertEncryptionParamsEquals(PDFEncryptionParams expected,
             PDFEncryptionParams actual) {
         assertEquals(expected == null, actual == null);
         if (actual != null) {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,14 +19,14 @@
 
 package org.apache.fop.render.pdf;
 
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.io.IOException;
 
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
+import static org.junit.Assert.fail;
+
 import org.apache.fop.apps.FOUserAgent;
 
 /**

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java Mon Jan 13 20:39:34 2014
@@ -28,8 +28,6 @@ import org.junit.runners.Suite.SuiteClas
  * A test suite for org.apache.fop.render.pdf.*
  */
 @RunWith(Suite.class)
-@SuiteClasses({
-        PDFRendererConfigParserTestCase.class
-})
+@SuiteClasses(PDFRendererConfigParserTestCase.class)
 public final class RenderPDFTestSuite {
 }

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java Mon Jan 13 20:39:34 2014
@@ -19,11 +19,11 @@
 
 package org.apache.fop.render.ps;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.File;
 import java.io.IOException;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.xmlgraphics.ps.PSResource;
 import org.apache.xmlgraphics.ps.dsc.DSCException;
 import org.apache.xmlgraphics.ps.dsc.DSCParser;

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ImageEncoderPNGTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ImageEncoderPNGTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ImageEncoderPNGTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ImageEncoderPNGTestCase.java Mon Jan 13 20:39:34 2014
@@ -27,17 +27,16 @@ import java.io.IOException;
 
 import org.junit.Test;
 
-import org.apache.xmlgraphics.image.loader.ImageSize;
-import org.apache.xmlgraphics.image.loader.impl.ImageRawPNG;
-
-import org.apache.fop.render.RawPNGTestUtil;
-
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.image.loader.impl.ImageRawPNG;
+
+import org.apache.fop.render.RawPNGTestUtil;
+
 public class ImageEncoderPNGTestCase {
 
     @Test

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java Mon Jan 13 20:39:34 2014
@@ -18,15 +18,15 @@
 /* $Id$ */
 
 package org.apache.fop.render.ps;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.commons.io.IOUtils;
 
 import org.apache.xmlgraphics.ps.DSCConstants;

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSPainterTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSPainterTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSPainterTestCase.java Mon Jan 13 20:39:34 2014
@@ -146,11 +146,11 @@ public class PSPainterTestCase {
         int y = 100000;
         int letterSpacing = 0;
         int wordSpacing = 0;
-        int dp[][] = {{100, 100, 0, 0}, null, null, {200, 200, -100, -100}};
-        double X = (x + dp[0][0]) / 1000.0;
-        double Y = (y - dp[0][1]) / 1000.0;
-        when(psGenerator.formatDouble(X)).thenReturn("100.100");
-        when(psGenerator.formatDouble(Y)).thenReturn("99.900");
+        int[][] dp = {{100, 100, 0, 0}, null, null, {200, 200, -100, -100}};
+        double xAsDouble = (x + dp[0][0]) / 1000.0;
+        double yAsDouble = (y - dp[0][1]) / 1000.0;
+        when(psGenerator.formatDouble(xAsDouble)).thenReturn("100.100");
+        when(psGenerator.formatDouble(yAsDouble)).thenReturn("99.900");
         String text = "Hello Mock!";
         try {
             psPainter.drawText(x, y, letterSpacing, wordSpacing, dp, text);

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRendererConfigParserTestCase.java Mon Jan 13 20:39:34 2014
@@ -21,14 +21,14 @@ package org.apache.fop.render.ps;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.xmlgraphics.ps.PSGenerator;
 
 import org.apache.fop.apps.AbstractRendererConfigParserTester;
 import org.apache.fop.apps.PSRendererConfBuilder;
 import org.apache.fop.render.ps.PSRendererConfig.PSRendererConfigParser;
 
-import static org.junit.Assert.assertEquals;
-
 public class PSRendererConfigParserTestCase
         extends AbstractRendererConfigParserTester<PSRendererConfBuilder, PSRendererConfig> {
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRendererConfiguratorTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,16 +19,16 @@ package org.apache.fop.render.ps;
 
 import org.junit.Test;
 
-import org.apache.fop.apps.AbstractRendererConfiguratorTest;
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.apps.PSRendererConfBuilder;
-import org.apache.fop.render.ps.PSRendererConfig.PSRendererConfigParser;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 
+import org.apache.fop.apps.AbstractRendererConfiguratorTest;
+import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.apps.PSRendererConfBuilder;
+import org.apache.fop.render.ps.PSRendererConfig.PSRendererConfigParser;
+
 public class PSRendererConfiguratorTestCase extends
         AbstractRendererConfiguratorTest<PSRendererConfigurator, PSRendererConfBuilder> {
     private PSRenderingUtil psUtil;

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/PSRenderingUtilTestCase.java Mon Jan 13 20:39:34 2014
@@ -23,13 +23,13 @@ import java.io.IOException;
 
 import org.junit.Test;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import org.apache.xmlgraphics.ps.PSGenerator;
 
 import org.apache.fop.render.ps.extensions.PSPageTrailerCodeBefore;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
 public class PSRenderingUtilTestCase {
 
     private final String content = "<< /MyEntry 0 >> command";

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,11 +19,6 @@
 
 package org.apache.fop.render.ps;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,6 +28,11 @@ import java.util.Set;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.commons.io.IOUtils;
 
 import org.apache.xmlgraphics.ps.DSCConstants;

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java Mon Jan 13 20:39:34 2014
@@ -21,13 +21,14 @@ package org.apache.fop.render.rtf;
 
 import java.io.StringWriter;
 
+import org.junit.Test;
+
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfFile;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
-import org.junit.Test;
 
 /**
  * Test for http://issues.apache.org/bugzilla/show_bug.cgi?id=39607

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java Mon Jan 13 20:39:34 2014
@@ -27,6 +27,6 @@ import org.junit.runners.Suite.SuiteClas
  * Test suite for FOP's RTF library.
  */
 @RunWith(Suite.class)
-@SuiteClasses({ Bug39607TestCase.class })
+@SuiteClasses(Bug39607TestCase.class)
 public class RichTextFormatTestSuite {
 }

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java Mon Jan 13 20:39:34 2014
@@ -27,17 +27,15 @@
 
 package org.apache.fop.render.rtf.rtflib.testdocs;
 
+import java.io.IOException;
+
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfHyperLink;
-
-import java.io.IOException;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 
 /**
  * Class <code>BasicLink</code> here.
- *
- * @author <a href="mailto:mks@ANDREAS">Andreas Putz</a>
  */
 
 public class BasicLink extends TestDocument {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java Mon Jan 13 20:39:34 2014
@@ -29,11 +29,8 @@ package org.apache.fop.render.rtf.rtflib
 
 import java.io.File;
 import java.io.IOException;
-//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo;
 
 /**  Create test RTF documents from classes found in this package.
- *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
- *  @author Andreas Putz a.putz@skynamics.com
  */
 
 public class CreateTestDocuments {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java Mon Jan 13 20:39:34 2014
@@ -33,8 +33,6 @@ import org.apache.fop.render.rtf.rtflib.
  *  to create documents without worrying about nested tables handling.
  *  Might need to be replaced by more complete version in some sample
  *  documents created by this package.
- *
- *  @author bdelacretaz@codeconsult.ch
  */
 
 class DummyTableColumnsInfo implements ITableColumnsInfo {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java Mon Jan 13 20:39:34 2014
@@ -27,16 +27,14 @@
 
 package org.apache.fop.render.rtf.rtflib.testdocs;
 
+import java.io.IOException;
+
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfExternalGraphic;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
-
-import java.io.IOException;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 /**
  * Generate a test document containing external graphics.
- *
- * @author <a href="mailto:a.putz@skynamics.com">Andreas Putz</a>
  */
 class ExternalGraphic extends TestDocument {
     private String file = "file:///tmp/jfor-images/logo.";

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java Mon Jan 13 20:39:34 2014
@@ -30,13 +30,13 @@ package org.apache.fop.render.rtf.rtflib
 import java.io.IOException;
 
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfList;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfListItem;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java Mon Jan 13 20:39:34 2014
@@ -32,11 +32,10 @@ import java.io.IOException;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
 
 /**  Generates an RTF test document containing merged table cells
- *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 
 class MergedTableCells extends TestDocument {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java Mon Jan 13 20:39:34 2014
@@ -30,14 +30,13 @@ package org.apache.fop.render.rtf.rtflib
 import java.io.IOException;
 
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
 
 /**  Generates an RTF document to test nested tables with the jfor rtflib package.
- *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 
 class NestedTable extends TestDocument {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java Mon Jan 13 20:39:34 2014
@@ -27,14 +27,13 @@
 
 package org.apache.fop.render.rtf.rtflib.testdocs;
 
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
- *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 public class ParagraphAlignment extends TestDocument {
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java Mon Jan 13 20:39:34 2014
@@ -30,11 +30,10 @@ package org.apache.fop.render.rtf.rtflib
 import java.io.IOException;
 
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
- *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 
 class SimpleDocument

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java Mon Jan 13 20:39:34 2014
@@ -30,15 +30,14 @@ package org.apache.fop.render.rtf.rtflib
 import java.io.IOException;
 
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfList;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfListItem;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfListStyle;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfListStyleNumber;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
- *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 
 class SimpleLists extends TestDocument {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java Mon Jan 13 20:39:34 2014
@@ -32,11 +32,10 @@ import java.io.IOException;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTable;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableCell;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfTableRow;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
- *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 class SimpleTable extends TestDocument {
     /** generate the body of the test document */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java Mon Jan 13 20:39:34 2014
@@ -27,19 +27,17 @@
 
 package org.apache.fop.render.rtf.rtflib.testdocs;
 
-import java.util.Date;
 import java.io.File;
-import java.io.IOException;
 import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Date;
 
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfFile;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
-//import org.apache.fop.render.rtf.rtflib.jfor.main.JForVersionInfo;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 
 /**  Base class for generating RTF documents used to test the jfor rtflib package.
- *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 
 abstract class TestDocument {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java Mon Jan 13 20:39:34 2014
@@ -29,14 +29,13 @@ package org.apache.fop.render.rtf.rtflib
 
 import java.io.IOException;
 
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfText;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
 
 /**  Generates a simple RTF test document for the jfor rtflib package.
- *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 
 class TextAttributes extends TestDocument {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java Mon Jan 13 20:39:34 2014
@@ -30,11 +30,10 @@ package org.apache.fop.render.rtf.rtflib
 import java.io.IOException;
 
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfDocumentArea;
-import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfParagraph;
+import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfSection;
 
 /**  Generates an RTF document to test the WhitespaceCollapser
- *  @author Bertrand Delacretaz bdelacretaz@codeconsult.ch
  */
 
 class Whitespace extends TestDocument {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java Mon Jan 13 20:39:34 2014
@@ -21,13 +21,12 @@ package org.apache.fop.render.txt;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.fop.apps.AbstractRendererConfigParserTester;
 import org.apache.fop.apps.TxtRendererConfBuilder;
-import org.apache.fop.render.RendererConfig.RendererConfigParser;
-import org.apache.fop.render.txt.TxtRendererConfig.TxtRendererOption;
 import org.apache.fop.render.txt.TxtRendererConfig.TxtRendererConfigParser;
-
-import static org.junit.Assert.assertEquals;
+import org.apache.fop.render.txt.TxtRendererConfig.TxtRendererOption;
 
 public class TxtRendererConfigParserTestCase
         extends AbstractRendererConfigParserTester<TxtRendererConfBuilder, TxtRendererConfig> {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,10 +19,10 @@
 
 package org.apache.fop.text.linebreak;
 
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Test;
 
+import static org.junit.Assert.assertTrue;
+
 
 /**
  * JUnit test case for the LineBreakStatus class

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,10 +19,10 @@
 
 package org.apache.fop.text.linebreak;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * TODO add javadoc
  *

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/threading/FOProcessorImpl.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/threading/FOProcessorImpl.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/threading/FOProcessorImpl.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/threading/FOProcessorImpl.java Mon Jan 13 20:39:34 2014
@@ -81,8 +81,8 @@ public class FOProcessorImpl extends Abs
         }
     }
 
-    /** {@inheritDoc} 
-     * @throws URISyntaxException 
+    /** {@inheritDoc}
+     * @throws URISyntaxException
      * @throws SAXException */
     public void process(Source src, Templates templates, OutputStream out)
             throws java.io.IOException, URISyntaxException, SAXException {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/threading/Main.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/threading/Main.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/threading/Main.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/threading/Main.java Mon Jan 13 20:39:34 2014
@@ -32,7 +32,10 @@ import org.apache.avalon.framework.logge
 /**
  * Starter class for the multi-threading testbed.
  */
-public class Main {
+public final class Main {
+
+    private Main() {
+    }
 
     private static void prompt() throws IOException {
         BufferedReader in = new BufferedReader(new java.io.InputStreamReader(System.in));

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/traits/BorderPropsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/traits/BorderPropsTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/traits/BorderPropsTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/traits/BorderPropsTestCase.java Mon Jan 13 20:39:34 2014
@@ -23,14 +23,14 @@ import java.awt.Color;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.xmlgraphics.java2d.color.ColorWithAlternatives;
 import org.apache.xmlgraphics.java2d.color.DeviceCMYKColorSpace;
 
 import org.apache.fop.fo.Constants;
 import org.apache.fop.util.ColorUtil;
 
-import static org.junit.Assert.assertEquals;
-
 /**
  * Tests the BorderProps class.
  */
@@ -67,7 +67,7 @@ public class BorderPropsTestCase {
         Color col = new Color(1.0f, 1.0f, 0.5f, 1.0f);
         //Normalize: Avoid false alarms due to color conversion (rounding)
         col = ColorUtil.parseColorString(null, ColorUtil.colorToString(col));
-        for(BorderProps.Mode mode : BorderProps.Mode.values()) {
+        for (BorderProps.Mode mode : BorderProps.Mode.values()) {
             BorderProps sut = BorderProps.makeRectangular(Constants.EN_SOLID, 10, col, mode);
             testSerialization(sut);
             sut = new BorderProps(Constants.EN_SOLID, 10, 4, 3, col, mode);

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/traits/MinOptMaxTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/traits/MinOptMaxTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/traits/MinOptMaxTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/traits/MinOptMaxTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,13 +19,13 @@
 
 package org.apache.fop.traits;
 
+import org.junit.Test;
+
 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 org.junit.Test;
-
 /**
  * Tests the {@link MinOptMax} class.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,15 +19,16 @@
 
 package org.apache.fop.util;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Map;
 
-import org.apache.fop.events.model.EventSeverity;
-import org.apache.fop.util.text.AdvancedMessageFormat;
 import org.junit.Test;
 import org.xml.sax.helpers.LocatorImpl;
 
+import static org.junit.Assert.assertEquals;
+
+import org.apache.fop.events.model.EventSeverity;
+import org.apache.fop.util.text.AdvancedMessageFormat;
+
 /**
  * Tests for EventFormatter.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/BitmapImageUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/BitmapImageUtilTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/BitmapImageUtilTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/BitmapImageUtilTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,8 +19,6 @@
 
 package org.apache.fop.util;
 
-import static org.junit.Assert.assertEquals;
-
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -31,13 +29,18 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
 
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
 import org.apache.commons.io.IOUtils;
-import org.apache.fop.util.bitmap.BitmapImageUtil;
-import org.apache.fop.util.bitmap.MonochromeBitmapConverter;
+
 import org.apache.xmlgraphics.image.writer.ImageWriterUtil;
 import org.apache.xmlgraphics.util.WriterOutputStream;
 import org.apache.xmlgraphics.util.io.ASCIIHexOutputStream;
-import org.junit.Test;
+
+import org.apache.fop.util.bitmap.BitmapImageUtil;
+import org.apache.fop.util.bitmap.MonochromeBitmapConverter;
 
 /**
  * Tests {@link BitmapImageUtil}.

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/ColorUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/ColorUtilTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/ColorUtilTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/ColorUtilTestCase.java Mon Jan 13 20:39:34 2014
@@ -26,6 +26,11 @@ import java.net.URI;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.xmlgraphics.java2d.color.ColorSpaces;
 import org.apache.xmlgraphics.java2d.color.ColorWithAlternatives;
 import org.apache.xmlgraphics.java2d.color.NamedColorSpace;
@@ -34,11 +39,6 @@ import org.apache.xmlgraphics.java2d.col
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.FopFactory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Tests the ColorUtil class.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/DigestFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/DigestFilter.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/DigestFilter.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/DigestFilter.java Mon Jan 13 20:39:34 2014
@@ -95,9 +95,6 @@ public class DigestFilter extends XMLFil
         super.endDocument();
     }
 
-    /* (non-Javadoc)
-     * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-     */
     public void startElement(
         String url,
         String localName,

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/ElementListUtilsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/ElementListUtilsTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/ElementListUtilsTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/ElementListUtilsTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,17 +19,18 @@
 
 package org.apache.fop.util;
 
+import java.util.LinkedList;
+
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-import java.util.LinkedList;
-
 import org.apache.fop.layoutmgr.ElementListUtils;
 import org.apache.fop.layoutmgr.KnuthBox;
 import org.apache.fop.layoutmgr.KnuthElement;
 import org.apache.fop.layoutmgr.KnuthGlue;
 import org.apache.fop.layoutmgr.KnuthPenalty;
-import org.junit.Test;
 
 /**
  * Test class for ElementListUtils.

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/LanguageTagsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/LanguageTagsTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/LanguageTagsTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/LanguageTagsTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,12 +19,12 @@
 
 package org.apache.fop.util;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Locale;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Tests {@link LanguageTags}.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/XMLResourceBundleTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/XMLResourceBundleTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/XMLResourceBundleTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/util/XMLResourceBundleTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,15 +19,15 @@
 
 package org.apache.fop.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 /**
  * Tests for XMLResourceBundle.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/visual/BitmapComparator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/visual/BitmapComparator.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/visual/BitmapComparator.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/visual/BitmapComparator.java Mon Jan 13 20:39:34 2014
@@ -30,11 +30,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
+import org.apache.commons.io.IOUtils;
+
 import org.apache.batik.ext.awt.image.GraphicsUtil;
 import org.apache.batik.ext.awt.image.renderable.Filter;
 import org.apache.batik.ext.awt.image.spi.ImageTagRegistry;
 import org.apache.batik.util.ParsedURL;
-import org.apache.commons.io.IOUtils;
 
 /**
  * Helper class to visually compare two bitmap images.
@@ -45,7 +46,11 @@ import org.apache.commons.io.IOUtils;
  * <p>
  * TODO Move as utility class to XML Graphics Commons when possible
  */
-public class BitmapComparator {
+public final class BitmapComparator {
+
+
+    private BitmapComparator() {
+    }
 
     /**
      * Builds a new BufferedImage that is the difference between the two input images
@@ -79,15 +84,14 @@ public class BitmapComparator {
         int w = ref.getWidth();
         int h = ref.getHeight();
 
-        int y, i, val;
         int [] refPix = null;
         int [] genPix = null;
-        for (y = 0; y < h; y++) {
-            refPix = refWR.getPixels (0, y, w, 1, refPix);
-            genPix = genWR.getPixels (0, y, w, 1, genPix);
-            for (i = 0; i < refPix.length; i++) {
+        for (int y = 0; y < h; y++) {
+            refPix = refWR.getPixels(0, y, w, 1, refPix);
+            genPix = genWR.getPixels(0, y, w, 1, genPix);
+            for (int i = 0; i < refPix.length; i++) {
                 // val = ((genPix[i] - refPix[i]) * 5) + 128;
-                val = ((refPix[i] - genPix[i]) * 10) + 128;
+                int val = ((refPix[i] - genPix[i]) * 10) + 128;
                 if ((val & 0xFFFFFF00) != 0) {
                     if ((val & 0x80000000) != 0) {
                         val = 0;

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/visual/ConvertUtils.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/visual/ConvertUtils.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/visual/ConvertUtils.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/visual/ConvertUtils.java Mon Jan 13 20:39:34 2014
@@ -27,7 +27,10 @@ import org.apache.commons.logging.Log;
 /**
  * Utilities for converting files with external converters.
  */
-public class ConvertUtils {
+public final class ConvertUtils {
+
+    private ConvertUtils() {
+    }
 
     /**
      * Calls an external converter application (GhostScript, for example).



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message