xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r679781 [32/34] - in /xmlgraphics/fop/branches/Temp_AreaTreeNewDesign: ./ examples/embedding/java/embedding/ examples/embedding/java/embedding/events/ examples/embedding/java/embedding/intermediate/ examples/embedding/java/embedding/model/ ...
Date Fri, 25 Jul 2008 12:46:22 GMT
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/DigestFilterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/DigestFilterTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/DigestFilterTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/DigestFilterTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/GenericFOPTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/GenericFOPTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/GenericFOPTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/GenericFOPTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -44,13 +44,13 @@
  * a MD5 for the source to help diferentiating failures caused by causal
  * source modification from failures caused by regression, a renderer (only
  * PDF currently supported) and a MD5 for the result.
- *  
+ *
  */
 public final class GenericFOPTestCase extends TestCase {
 
     // configure fopFactory as desired
     private FopFactory fopFactory = FopFactory.newInstance();
-    
+
     protected SAXParserFactory parserFactory;
 
     public static Test suite() {

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/KnuthAlgorithmTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/KnuthAlgorithmTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/KnuthAlgorithmTestCase.java Fri Jul 25 05:44:20 2008
@@ -54,14 +54,14 @@
                 seq.add(new KnuthGlue(-5000, 0, 0, null, true));
             }
         }
-        
+
         seq.add(new KnuthPenalty(0, KnuthPenalty.INFINITE, false, null, false));
         seq.add(new KnuthGlue(0, Integer.MAX_VALUE, 0, null, false));
         seq.add(new KnuthPenalty(0, -KnuthPenalty.INFINITE, false, null, false));
         ElementListObserver.observe(seq, "test", null);
         return seq;
     }
-    
+
     /**
      * Tests a special condition where a negative-length glue occurs directly after a break
      * possibility.
@@ -77,18 +77,18 @@
         assertEquals(5000, parts[0].difference);
         assertEquals(5000, parts[1].difference);
     }
-    
+
     private class Part {
         private int difference;
         private double ratio;
         private int position;
     }
-    
+
     private class MyBreakingAlgorithm extends BreakingAlgorithm {
 
         private List parts = new java.util.ArrayList();
-        
-        public MyBreakingAlgorithm(int align, int alignLast, boolean first, 
+
+        public MyBreakingAlgorithm(int align, int alignLast, boolean first,
                     boolean partOverflowRecovery, int maxFlagCount) {
             super(align, alignLast, first, partOverflowRecovery, maxFlagCount);
         }
@@ -96,7 +96,7 @@
         public Part[] getParts() {
             return (Part[])parts.toArray(new Part[parts.size()]);
         }
-        
+
         public void updateData1(int total, double demerits) {
             //nop
         }
@@ -111,7 +111,7 @@
                 // spaces always have enough shrink
                 difference = 0;
             } else if (ratio <= 1 && bestActiveNode.line < total) {
-                // not-last page break with a positive difference smaller than the available 
+                // not-last page break with a positive difference smaller than the available
                 // stretch: spaces can stretch to fill the whole difference
                 difference = 0;
             } else if (ratio > 1) {
@@ -138,7 +138,7 @@
             //nop
             return 0;
         }
-        
+
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/StandardTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/StandardTestSuite.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/StandardTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/StandardTestSuite.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop;
 
 import junit.framework.Test;

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/URIResolutionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/URIResolutionTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/URIResolutionTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/URIResolutionTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop;
 
 import java.io.File;
@@ -57,12 +57,12 @@
 
     // configure fopFactory as desired
     private FopFactory fopFactory = FopFactory.newInstance();
-    
-    private SAXTransformerFactory tfactory 
+
+    private SAXTransformerFactory tfactory
             = (SAXTransformerFactory)SAXTransformerFactory.newInstance();
 
     private File backupDir = new File(getBaseDir(), "build/test-results");
-    
+
     /** @see junit.framework.TestCase#TestCase(String) */
     public URIResolutionTestCase(String name) {
         super(name);
@@ -75,7 +75,7 @@
     public void testFO1a() throws Exception {
         innerTestFO1(false);
     }
-    
+
     /**
      * Test custom URI resolution with a hand-written URIResolver.
      * @throws Exception if anything fails
@@ -83,25 +83,25 @@
     public void testFO1b() throws Exception {
         innerTestFO1(true);
     }
-    
+
     private void innerTestFO1(boolean withStream) throws Exception {
         FOUserAgent ua = fopFactory.newFOUserAgent();
 
         File foFile = new File(getBaseDir(), "test/xml/uri-resolution1.fo");
-        
-        MyURIResolver resolver = new MyURIResolver(withStream); 
+
+        MyURIResolver resolver = new MyURIResolver(withStream);
         ua.setURIResolver(resolver);
         ua.setBaseURL(foFile.getParentFile().toURL().toString());
 
         Document doc = createAreaTree(foFile, ua);
-        
+
         //Check how many times the resolver was consulted
         assertEquals("Expected resolver to do 1 successful URI resolution",
                 1, resolver.successCount);
         assertEquals("Expected resolver to do 0 failed URI resolution",
                 0, resolver.failureCount);
         //Additional XPath checking on the area tree
-        assertEquals("viewport for external-graphic is missing", 
+        assertEquals("viewport for external-graphic is missing",
                 "true", evalXPath(doc, "boolean(//flow/block[1]/lineArea/viewport)"));
         assertEquals("46080", evalXPath(doc, "//flow/block[1]/lineArea/viewport/@ipd"));
         assertEquals("46080", evalXPath(doc, "//flow/block[1]/lineArea/viewport/@bpd"));
@@ -114,9 +114,9 @@
     public void DISABLEDtestFO2() throws Exception {
         //TODO This will only work when we can do URI resolution inside Batik!
         File foFile = new File(getBaseDir(), "test/xml/uri-resolution2.fo");
-        
+
         FOUserAgent ua = fopFactory.newFOUserAgent();
-        MyURIResolver resolver = new MyURIResolver(false); 
+        MyURIResolver resolver = new MyURIResolver(false);
         ua.setURIResolver(resolver);
         ua.setBaseURL(foFile.getParentFile().toURL().toString());
 
@@ -128,7 +128,7 @@
         Source src = new StreamSource(foFile);
         Result res = new SAXResult(fop.getDefaultHandler());
         transformer.transform(src, res);
-        
+
         OutputStream out = new java.io.FileOutputStream(
                 new File(backupDir, foFile.getName() + ".pdf"));
         try {
@@ -136,7 +136,7 @@
         } finally {
             IOUtils.closeQuietly(out);
         }
-        
+
         //Check how many times the resolver was consulted
         assertEquals("Expected resolver to do 1 successful URI resolution",
                 1, resolver.successCount);
@@ -147,7 +147,7 @@
         assertTrue("Generated PDF has zero length", baout.size() > 0);
     }
 
-    private Document createAreaTree(File fo, FOUserAgent ua) 
+    private Document createAreaTree(File fo, FOUserAgent ua)
                 throws TransformerException, FOPException {
         DOMResult domres = new DOMResult();
         //Setup Transformer to convert the area tree to a DOM
@@ -158,19 +158,19 @@
         atrenderer.setUserAgent(ua);
         atrenderer.setContentHandler(athandler);
         ua.setRendererOverride(atrenderer);
-        
+
         Fop fop = fopFactory.newFop(ua);
 
         Transformer transformer = tfactory.newTransformer(); //Identity transf.
         Source src = new StreamSource(fo);
         Result res = new SAXResult(fop.getDefaultHandler());
         transformer.transform(src, res);
-        
+
         Document doc = (Document)domres.getNode();
         saveAreaTreeXML(doc, new File(backupDir, fo.getName() + ".at.xml"));
         return doc;
     }
-    
+
     private String evalXPath(Document doc, String xpath) {
         XObject res;
         try {
@@ -193,19 +193,19 @@
         Result res = new StreamResult(target);
         transformer.transform(src, res);
     }
-    
+
     private class MyURIResolver implements URIResolver {
 
         private static final String PREFIX = "funky:";
-        
-        private boolean withStream; 
+
+        private boolean withStream;
         private int successCount = 0;
         private int failureCount = 0;
-        
+
         public MyURIResolver(boolean withStream) {
             this.withStream = withStream;
         }
-        
+
         /**
          * @see javax.xml.transform.URIResolver#resolve(java.lang.String, java.lang.String)
          */
@@ -235,7 +235,7 @@
                 return null;
             }
         }
-        
+
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/UtilityCodeTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/UtilityCodeTestSuite.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/UtilityCodeTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/UtilityCodeTestSuite.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop;
 
 import junit.framework.Test;

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseUserConfigTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseUserConfigTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseUserConfigTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseUserConfigTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontBaseBadTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontBaseBadTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontBaseBadTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontBaseBadTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -21,7 +21,7 @@
 
 /*
  * this font base does not exist and a relative font path is used
- */ 
+ */
 public class FontBaseBadTestCase extends BaseDestructiveUserConfigTestCase {
 
     public FontBaseBadTestCase(String name) {

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -19,7 +19,7 @@
 
 package org.apache.fop.config;
 
-/** 
+/**
  * this font has a malformed embed-url
  */
 public class FontEmbedUrlMalformedTestCase extends BaseDestructiveUserConfigTestCase {

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -21,7 +21,7 @@
 
 /*
  * this font has a metrics-url that does not exist on filesystem
- */ 
+ */
 public class FontMetricsUrlBadTestCase extends BaseDestructiveUserConfigTestCase {
 
     /**

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -21,7 +21,7 @@
 
 /*
  * this font has a malformed metrics-url
- */ 
+ */
 public class FontMetricsUrlMalformedTestCase extends BaseDestructiveUserConfigTestCase {
 
     public FontMetricsUrlMalformedTestCase(String name) {

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -21,7 +21,7 @@
 
 /*
  * this font has a missing font triplet attribute
- */ 
+ */
 public class FontTripletAttributeMissingTestCase extends BaseDestructiveUserConfigTestCase {
 
     public FontTripletAttributeMissingTestCase(String name) {

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -21,20 +21,20 @@
 
 /*
  * this font has a metrics-url that does not exist on filesystem
- */ 
+ */
 public class FontsDirectoryBadTestCase extends BaseDestructiveUserConfigTestCase {
 
     public FontsDirectoryBadTestCase(String name) {
         super(name);
     }
-    
+
     /**
      * @see org.apache.fop.config.BaseUserConfigTestCase#getUserConfigFilename()
      */
     public String getUserConfigFilename() {
         return "test_fonts_directory_bad.xconf";
     }
-    
+
     /** get test FOP config File */
     protected String getFontFOFilePath() {
         return "test/xml/bugtests/font-dir.fo";

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -20,7 +20,7 @@
 package org.apache.fop.config;
 
 /**
- * tests font directory on system 
+ * tests font directory on system
  */
 public class FontsDirectoryRecursiveTestCase extends BaseConstructiveUserConfigTestCase {
 
@@ -33,5 +33,5 @@
      */
     protected String getUserConfigFilename() {
         return "test_fonts_directory_recursive.xconf";
-    }    
+    }
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/UserConfigTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/UserConfigTestSuite.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/UserConfigTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/UserConfigTestSuite.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java Fri Jul 25 05:44:20 2008
@@ -28,7 +28,7 @@
 
     public void testGetURL() throws Exception {
         String actual;
-        
+
         actual = URISpecification.getURL("http://localhost/test");
         assertEquals("http://localhost/test", actual);
 
@@ -41,10 +41,10 @@
         actual = URISpecification.getURL("url(\"http://localhost/test\")");
         assertEquals("http://localhost/test", actual);
     }
-    
+
     public void testEscapeURI() throws Exception {
         String actual;
-        
+
         actual = URISpecification.escapeURI("http://localhost/test");
         assertEquals("http://localhost/test", actual);
 
@@ -57,5 +57,5 @@
         actual = URISpecification.escapeURI("http://localhost/test test.pdf#page=6");
         assertEquals("http://localhost/test%20test.pdf#page=6", actual);
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/events/BasicEventTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/events/BasicEventTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/events/BasicEventTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/events/BasicEventTestCase.java Fri Jul 25 05:44:20 2008
@@ -26,27 +26,27 @@
 public class BasicEventTestCase extends TestCase {
 
     public void testBasics() throws Exception {
-        
+
         MyEventListener listener = new MyEventListener();
 
         EventBroadcaster broadcaster = new DefaultEventBroadcaster();
         broadcaster.addEventListener(listener);
         assertTrue(broadcaster.hasEventListeners());
-        
+
         Event ev = new Event(this, "123", EventSeverity.INFO,
                 Event.paramsBuilder()
                     .param("reason", "I'm tired")
                     .param("blah", new Integer(23))
                     .build());
         broadcaster.broadcastEvent(ev);
-        
+
         ev = listener.event;
         assertNotNull(ev);
         assertEquals("123", listener.event.getEventID());
         assertEquals(EventSeverity.INFO, listener.event.getSeverity());
         assertEquals("I'm tired", ev.getParam("reason"));
         assertEquals(new Integer(23), ev.getParam("blah"));
-        
+
         broadcaster.removeEventListener(listener);
         assertFalse(broadcaster.hasEventListeners());
 
@@ -60,11 +60,11 @@
         EventBroadcaster broadcaster = new DefaultEventBroadcaster();
         broadcaster.addEventListener(listener);
         assertTrue(broadcaster.hasEventListeners());
-        
-        
+
+
         TestEventProducer producer = TestEventProducer.Provider.get(broadcaster);
         producer.complain(this, "I'm tired", 23);
-        
+
         Event ev = listener.event;
         assertNotNull(ev);
         assertEquals("org.apache.fop.events.TestEventProducer.complain",
@@ -72,18 +72,18 @@
         assertEquals(EventSeverity.WARN, listener.event.getSeverity());
         assertEquals("I'm tired", ev.getParam("reason"));
         assertEquals(new Integer(23), ev.getParam("blah"));
-        
+
         broadcaster.removeEventListener(listener);
         assertFalse(broadcaster.hasEventListeners());
 
         //Just check that there are no NPEs
         broadcaster.broadcastEvent(ev);
     }
-    
+
     private class MyEventListener implements EventListener {
 
         private Event event;
-        
+
         public void processEvent(Event event) {
             if (this.event != null) {
                 fail("Multiple events received");

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/events/TestEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/events/TestEventProducer.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/events/TestEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/events/TestEventProducer.java Fri Jul 25 05:44:20 2008
@@ -29,7 +29,7 @@
      * @event.severity WARN
      */
     void complain(Object source, String reason, int blah);
-    
+
     /**
      * Express joy about something.
      * @param source the event source
@@ -37,12 +37,12 @@
      * @event.severity INFO
      */
     void enjoy(Object source, String what);
- 
+
     public class Provider {
-        
+
         public static TestEventProducer get(EventBroadcaster broadcaster) {
             return (TestEventProducer)broadcaster.getEventProducerFor(TestEventProducer.class);
         }
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -38,7 +38,7 @@
         super();
         tableHandlerFactory = new FOEventHandlerFactory() {
             public FOEventHandler createFOEventHandler(FOUserAgent foUserAgent) {
-                tableHandler = new TableHandler(foUserAgent); 
+                tableHandler = new TableHandler(foUserAgent);
                 return tableHandler;
             }
         };

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java Fri Jul 25 05:44:20 2008
@@ -37,7 +37,7 @@
      * More precisely, checks that the number of row groups corresponds to the size of the
      * given array, and that the number of rows inside each row group is equal to the
      * corresponding integer in the array.
-     * 
+     *
      * @param part a table part whose row groups are to be checked
      * @param expectedRowLengths expected lengths of all the row groups of this part of
      * the table
@@ -123,17 +123,17 @@
         // Table 2: no header, no footer, one body (1 row-group of 2 rows)
         checkNextTableRowGroups(tableIter, null, null, new int[][] {{2}});
 
-        // Table 3: no header, no footer, one body (1 row-group of 2 rows, 1 row) 
+        // Table 3: no header, no footer, one body (1 row-group of 2 rows, 1 row)
         checkNextTableRowGroups(tableIter, null, null, new int[][] {{2, 1}});
 
         // Table 4: no header, no footer, one body (1 row, 1 row-group of 2 rows)
         checkNextTableRowGroups(tableIter, null, null, new int[][] {{1, 2}});
 
-        // Table 5: no header, no footer, one body (1 row, 1 row-group of 3 rows, 1 row) 
+        // Table 5: no header, no footer, one body (1 row, 1 row-group of 3 rows, 1 row)
         checkNextTableRowGroups(tableIter, null, null, new int[][] {{1, 3, 1}});
 
         // Table 6: one header (1 row-group of 2 rows), one footer (1 row, 1 row-group of 3 rows),
-        // one body (1 row-group of 2 rows, 1 row, 1 row-group of 3 rows) 
+        // one body (1 row-group of 2 rows, 1 row, 1 row-group of 3 rows)
         checkNextTableRowGroups(tableIter, new int[] {2}, new int[] {1, 3}, new int[][] {{2, 1, 3}});
     }
 

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -53,7 +53,7 @@
 
     private void checkColumn(Table t, int number, boolean isImplicit, int spans, int repeated, int width) {
         TableColumn c = t.getColumn(number - 1);
-        // TODO a repeated column has a correct number only for its first occurrence 
+        // TODO a repeated column has a correct number only for its first occurrence
 //        assertEquals(number, c.getColumnNumber());
         assertEquals(isImplicit, c.isImplicitColumn());
         assertEquals(spans, c.getNumberColumnsSpanned());

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fonts/TrueTypeAnsiTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fonts/TrueTypeAnsiTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fonts/TrueTypeAnsiTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fonts/TrueTypeAnsiTestCase.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.fonts;
 
 import java.io.File;
@@ -46,7 +46,7 @@
  * Tests XML font metrics file generation and usage for WinAnsi mode.
  */
 public class TrueTypeAnsiTestCase extends TestCase {
-    
+
     /**
      * Tests a TrueType font in WinAnsi mode.
      * @throws Exception if an error occurs
@@ -62,12 +62,12 @@
         if (metricsFile.isFile()) {
             assertTrue(metricsFile.delete());
         }
-        
+
         String[] args = new String[] {"-enc", "ansi",
                 ttfFile.getCanonicalPath(), metricsFile.getCanonicalPath()};
         TTFReader.main(args);
         assertTrue(metricsFile.isFile());
-        
+
         FopFactory fopFactory = FopFactory.newInstance();
         FOUserAgent ua = fopFactory.newFOUserAgent();
         PDFRenderer renderer = new PDFRenderer();
@@ -81,12 +81,12 @@
                 ttfFile.toURI().toASCIIString(), null);
         fontList.add(font);
         renderer.addFontList(fontList);
-        
+
         ua.setRendererOverride(renderer);
         OutputStream out = new NullOutputStream();
-        
+
         Fop fop = fopFactory.newFop(null, ua, out);
-        
+
         TransformerFactory tFactory = TransformerFactory.newInstance();
         Source src = new StreamSource(new StringReader(
                 "<root font-family='" + fontFamily + "'>Test!</root>"));
@@ -103,5 +103,5 @@
         }
         return new StreamSource(url.toExternalForm());
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java Fri Jul 25 05:44:20 2008
@@ -52,11 +52,11 @@
     static {
         DebugHelper.registerStandardElementListObservers();
     }
-    
+
     private FOTreeTestSuite() {
         //don't instantiate!
     }
-    
+
     /**
      * @return the test suite with all the tests (one for each XML file)
      * @throws IOException in case of an I/O problem
@@ -72,7 +72,7 @@
         File mainDir = new File("test/fotree");
 
         final FOTreeTester tester = new FOTreeTester();
-        
+
         IOFileFilter filter;
         String single = System.getProperty("fop.fotree.single");
         String startsWith = System.getProperty("fop.fotree.starts-with");
@@ -85,12 +85,12 @@
             filter = new SuffixFileFilter(".fo");
             filter = LayoutEngineTestSuite.decorateWithDisabledList(filter);
         }
-        Collection files = FileUtils.listFiles(new File(mainDir, "testcases"), 
+        Collection files = FileUtils.listFiles(new File(mainDir, "testcases"),
                 filter, TrueFileFilter.INSTANCE);
         String privateTests = System.getProperty("fop.fotree.private");
         if ("true".equalsIgnoreCase(privateTests)) {
             Collection privateFiles = FileUtils.listFiles(
-                    new File(mainDir, "private-testcases"), 
+                    new File(mainDir, "private-testcases"),
                     filter, TrueFileFilter.INSTANCE);
             files.addAll(privateFiles);
         }
@@ -100,8 +100,8 @@
             addTestCase(suite, tester, f);
         }
     }
-    
-    private static void addTestCase(TestSuite suite, 
+
+    private static void addTestCase(TestSuite suite,
                 final FOTreeTester tester, final File f) {
         suite.addTest(new FOTreeTestCase(f.getName()) {
             public void runTest() throws Exception {
@@ -126,22 +126,22 @@
     }
 
     private static class FOTreeTestCase extends TestCase {
-        
+
         private FOTreeTester tester;
         private File testFile;
-        
+
         public FOTreeTestCase(String name) {
             super(name);
         }
-        
+
         public void prepare(FOTreeTester tester, File testFile) {
             //super(testFile.getName());
             this.tester = tester;
             this.testFile = testFile;
         }
-        
+
         public void testMain() throws Exception {
             tester.runTest(testFile);
         }
-    }    
+    }
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeTester.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeTester.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeTester.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeTester.java Fri Jul 25 05:44:20 2008
@@ -39,7 +39,7 @@
  * Test driver class for FO tree tests.
  */
 public class FOTreeTester {
-    
+
     private FopFactory fopFactory = FopFactory.newInstance();
 
     /**
@@ -48,7 +48,7 @@
     public FOTreeTester() {
         fopFactory.addElementMapping(new TestElementMapping());
     }
-    
+
     /**
      * Runs a test.
      * @param testFile the test file.
@@ -57,13 +57,13 @@
     public void runTest(File testFile) throws Exception {
         ResultCollector collector = ResultCollector.getInstance();
         collector.reset();
-        
+
         SAXParserFactory spf = SAXParserFactory.newInstance();
         spf.setNamespaceAware(true);
         spf.setValidating(false);
         SAXParser parser = spf.newSAXParser();
         XMLReader reader = parser.getXMLReader();
-                
+
         FOUserAgent ua = fopFactory.newFOUserAgent();
         ua.setBaseURL(testFile.getParentFile().toURL().toString());
         ua.setFOEventHandlerOverride(new DummyFOEventHandler(ua));
@@ -72,15 +72,15 @@
 
         //Used to set values in the user agent through processing instructions
         reader = new PIListener(reader, ua);
-        
+
         Fop fop = fopFactory.newFop(ua);
-        
+
         reader.setContentHandler(fop.getDefaultHandler());
         reader.setDTDHandler(fop.getDefaultHandler());
         reader.setErrorHandler(fop.getDefaultHandler());
         reader.setEntityResolver(fop.getDefaultHandler());
         reader.parse(testFile.toURL().toExternalForm());
-        
+
         List results = collector.getResults();
         if (results.size() > 0) {
             for (int i = 0; i < results.size(); i++) {
@@ -91,9 +91,9 @@
     }
 
     private class PIListener extends XMLFilterImpl {
-        
+
         private FOUserAgent userAgent;
-        
+
         public PIListener(XMLReader parent, FOUserAgent userAgent) {
             super(parent);
             this.userAgent = userAgent;
@@ -107,7 +107,7 @@
             }
             super.processingInstruction(target, data);
         }
-        
+
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java Fri Jul 25 05:44:20 2008
@@ -56,7 +56,7 @@
          * This method is called by FOTreeUnitTester when creating a {@link Fop} instance.
          * That lets pass to the custom FOEventHandler the proper user agent that will be
          * used by this instance.
-         * 
+         *
          * @param foUserAgent the user agent needed by the Fop instance that will be used
          * to create the FO tree
          * @return the appropriate FOEventHandler for performing the tests
@@ -77,9 +77,9 @@
 
     /**
      * Launches FOP on the given FO file.
-     * 
+     *
      * @param filename path to the test FO file
-     * @param factory to create the appropriate FOEventHandler for performing tests 
+     * @param factory to create the appropriate FOEventHandler for performing tests
      */
     public void setUp(String filename, FOEventHandlerFactory factory) throws Exception {
         FOUserAgent ua = fopFactory.newFOUserAgent();

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ResultCollector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ResultCollector.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ResultCollector.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ResultCollector.java Fri Jul 25 05:44:20 2008
@@ -23,14 +23,14 @@
 import java.util.List;
 
 /**
- * This class collects the results from assertions injected into the FO stream. 
+ * This class collects the results from assertions injected into the FO stream.
  */
 public class ResultCollector {
 
     private static ResultCollector instance = null;
-    
+
     private List results = new java.util.ArrayList();
-    
+
     /** @return the ResultColletor singleton */
     public static ResultCollector getInstance() {
         if (instance == null) {
@@ -38,12 +38,12 @@
         }
         return instance;
     }
-    
+
     /** Main constructor. */
     public ResultCollector() {
         //nop
     }
-    
+
     /**
      * This notifies the ResultCollector about an Exception.
      * @param e the exception
@@ -52,12 +52,12 @@
         System.out.println(e.getMessage());
         results.add(e);
     }
-    
+
     /** Resets the result list. */
     public void reset() {
         results.clear();
     }
-    
+
     /** @return the list of results */
     public List getResults() {
         return Collections.unmodifiableList(results);

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/AssertElement.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/AssertElement.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/AssertElement.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.fotreetest.ext;
 
 
@@ -50,9 +50,9 @@
     /**
      * @see org.apache.fop.fo.FONode#processNode
      */
-    public void processNode(String elementName, 
-                            Locator locator, 
-                            Attributes attlist, 
+    public void processNode(String elementName,
+                            Locator locator,
+                            Attributes attlist,
                             PropertyList propertyList) throws FOPException {
         //super.processNode(elementName, locator, attlist, propertyList);
 
@@ -102,22 +102,22 @@
             if (!expected.equals(s)) {
                 collector.notifyException(
                     new IllegalStateException(locator.getSystemId()
-                        + "\nProperty '" + propName 
-                        + "' expected to evaluate to '" + expected 
+                        + "\nProperty '" + propName
+                        + "' expected to evaluate to '" + expected
                         + "' but got '" + s
-                        + "'\n(test:assert in " 
+                        + "'\n(test:assert in "
                         + propertyList.getParentFObj().getName()
-                        + " at line #" + locator.getLineNumber() 
+                        + " at line #" + locator.getLineNumber()
                         + ", column #" + locator.getColumnNumber() + ")\n"));
             }
         }
-        
+
     }
 
     /** @see org.apache.fop.fo.FONode#getLocalName() */
     public String getLocalName() {
         return "assert";
     }
-    
+
 }
 

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.fotreetest.ext;
 
 import org.apache.fop.fo.FONode;
@@ -28,7 +28,7 @@
 public class TestElementMapping extends ElementMapping {
 
     /** MathML Namespace */
-    public static final String NAMESPACE = "http://xmlgraphics.apache.org/fop/test"; 
+    public static final String NAMESPACE = "http://xmlgraphics.apache.org/fop/test";
 
     /**
      * Main constructor

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/TestObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/TestObj.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/TestObj.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/fotreetest/ext/TestObj.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -16,7 +16,7 @@
  */
 
 /* $Id$ */
- 
+
 package org.apache.fop.fotreetest.ext;
 
 // FOP

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java Fri Jul 25 05:44:20 2008
@@ -40,26 +40,26 @@
 public class ImageLoaderTestCase extends TestCase {
 
     private static final File DEBUG_TARGET_DIR = null; //new File("D:/");
-    
+
     private FopFactory fopFactory;
-    
+
     public ImageLoaderTestCase(String name) {
         super(name);
         fopFactory = FopFactory.newInstance();
         fopFactory.setSourceResolution(72);
         fopFactory.setTargetResolution(300);
     }
-    
+
     public void testSVG() throws Exception {
         String uri = "test/resources/images/img-w-size.svg";
-        
+
         FOUserAgent userAgent = fopFactory.newFOUserAgent();
-        
+
         ImageManager manager = fopFactory.getImageManager();
         ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext());
         assertNotNull("ImageInfo must not be null", info);
-        
-        Image img = manager.getImage(info, ImageFlavor.XML_DOM, 
+
+        Image img = manager.getImage(info, ImageFlavor.XML_DOM,
                 userAgent.getImageSessionContext());
         assertNotNull("Image must not be null", img);
         assertEquals(ImageFlavor.XML_DOM, img.getFlavor());
@@ -69,7 +69,7 @@
         info = imgDom.getInfo(); //Switch to the ImageInfo returned by the image
         assertEquals(16000, info.getSize().getWidthMpt());
         assertEquals(16000, info.getSize().getHeightMpt());
-        
+
         img = manager.getImage(info, ImageFlavor.RENDERED_IMAGE,
                     userAgent.getImageSessionContext());
         assertNotNull("Image must not be null", img);
@@ -87,16 +87,16 @@
         assertEquals(16000, info.getSize().getWidthMpt());
         assertEquals(16000, info.getSize().getHeightMpt());
     }
-    
+
     public void testWMF() throws Exception {
         String uri = "test/resources/images/testChart.wmf";
-        
+
         FOUserAgent userAgent = fopFactory.newFOUserAgent();
-        
+
         ImageManager manager = fopFactory.getImageManager();
         ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext());
         assertNotNull("ImageInfo must not be null", info);
-        
+
         Image img = manager.getImage(info, ImageFlavor.RENDERED_IMAGE,
                 userAgent.getImageSessionContext());
         assertNotNull("Image must not be null", img);
@@ -114,5 +114,5 @@
         assertEquals(792000, info.getSize().getWidthMpt());
         assertEquals(612000, info.getSize().getHeightMpt());
     }
- 
+
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java Fri Jul 25 05:44:20 2008
@@ -48,29 +48,29 @@
 public class ImagePreloaderTestCase extends TestCase {
 
     private FopFactory fopFactory;
-    
+
     public ImagePreloaderTestCase(String name) {
         super(name);
         fopFactory = FopFactory.newInstance();
         fopFactory.setSourceResolution(72);
         fopFactory.setTargetResolution(300);
     }
-    
+
     public void testSVG() throws Exception {
         String uri = "test/resources/images/img-w-size.svg";
-        
+
         checkSVGFile(uri);
     }
 
     public void testSVGZ() throws Exception {
         String uri = "test/resources/images/img-w-size.svgz";
-        
+
         checkSVGFile(uri);
     }
 
     private void checkSVGFile(String uri) throws ImageException, IOException {
         FOUserAgent userAgent = fopFactory.newFOUserAgent();
-        
+
         ImageManager manager = fopFactory.getImageManager();
         ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext());
         assertNotNull("ImageInfo must not be null", info);
@@ -82,11 +82,11 @@
         assertEquals(16000, info.getSize().getWidthMpt());
         assertEquals(16000, info.getSize().getHeightMpt());
     }
-    
+
     public void testSVGNoSize() throws Exception {
         String uri = "test/resources/images/img.svg";
         FOUserAgent userAgent = fopFactory.newFOUserAgent();
-        
+
         ImageManager manager = fopFactory.getImageManager();
         ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext());
         assertNotNull("ImageInfo must not be null", info);
@@ -102,7 +102,7 @@
     public void testSVGWithDOM() throws Exception {
         String uri = "my:SVGImage";
         FOUserAgent userAgent = fopFactory.newFOUserAgent();
-        
+
         userAgent.setURIResolver(new URIResolver() {
 
             public Source resolve(String href, String base) throws TransformerException {
@@ -114,23 +114,23 @@
                     element.setAttribute("viewBox", "0 0 20 20");
                     element.setAttribute("width", "20pt");
                     element.setAttribute("height", "20pt");
-                    
+
                     Element rect = doc.createElementNS(svgNS, "rect");
                     rect.setAttribute("x", "5");
                     rect.setAttribute("y", "5");
                     rect.setAttribute("width", "10");
                     rect.setAttribute("height", "10");
                     element.appendChild(rect);
-                    
+
                     DOMSource src = new DOMSource(doc);
                     return src;
                 } else {
                     return null;
                 }
             }
-            
+
         });
-        
+
         ImageManager manager = fopFactory.getImageManager();
         ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext());
         assertNotNull("ImageInfo must not be null", info);
@@ -145,9 +145,9 @@
 
     public void testWMF() throws Exception {
         String uri = "test/resources/images/testChart.wmf";
-        
+
         FOUserAgent userAgent = fopFactory.newFOUserAgent();
-        
+
         ImageManager manager = fopFactory.getImageManager();
         ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext());
         assertNotNull("ImageInfo must not be null", info);
@@ -159,5 +159,5 @@
         assertEquals(792000, info.getSize().getWidthMpt());
         assertEquals(612000, info.getSize().getHeightMpt());
     }
- 
+
 }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/ElementListCheck.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/ElementListCheck.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/ElementListCheck.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/ElementListCheck.java Fri Jul 25 05:44:20 2008
@@ -41,7 +41,7 @@
     private String id;
     private int index = -1;
     private Element checkElement;
-    
+
     /**
      * Creates a new instance from a DOM node.
      * @param node DOM node that defines this check
@@ -68,7 +68,7 @@
         NodeList children = checkElement.getChildNodes();
         int pos = -1;
         for (int i = 0; i < children.getLength(); i++) {
-            Node node = children.item(i); 
+            Node node = children.item(i);
             if (node instanceof Element) {
                 pos++;
                 Element domEl = (Element)node;
@@ -78,14 +78,14 @@
                 } else if ("box".equals(domEl.getLocalName())) {
                     if (!(knuthEl instanceof KnuthBox)) {
                         fail("Expected KnuthBox"
-                                + " at position " + pos 
+                                + " at position " + pos
                                 + " but got: " + knuthEl.getClass().getName());
                     }
                     if (domEl.getAttribute("w").length() > 0) {
                         int w = Integer.parseInt(domEl.getAttribute("w"));
                         if (w != knuthEl.getW()) {
-                            fail("Expected w=" + w 
-                                    + " at position " + pos 
+                            fail("Expected w=" + w
+                                    + " at position " + pos
                                     + " but got: " + knuthEl.getW());
                         }
                     }
@@ -104,29 +104,29 @@
                 } else if ("penalty".equals(domEl.getLocalName())) {
                     if (!(knuthEl instanceof KnuthPenalty)) {
                         fail("Expected KnuthPenalty "
-                                + " at position " + pos 
+                                + " at position " + pos
                                 + " but got: " + knuthEl.getClass().getName());
                     }
                     KnuthPenalty pen = (KnuthPenalty)knuthEl;
                     if (domEl.getAttribute("w").length() > 0) {
                         int w = Integer.parseInt(domEl.getAttribute("w"));
                         if (w != knuthEl.getW()) {
-                            fail("Expected w=" + w 
-                                    + " at position " + pos 
+                            fail("Expected w=" + w
+                                    + " at position " + pos
                                     + " but got: " + knuthEl.getW());
                         }
                     }
                     if (domEl.getAttribute("p").length() > 0) {
                         if ("<0".equals(domEl.getAttribute("p"))) {
                             if (knuthEl.getP() >= 0) {
-                                fail("Expected p<0" 
-                                        + " at position " + pos 
+                                fail("Expected p<0"
+                                        + " at position " + pos
                                         + " but got: " + knuthEl.getP());
                             }
                         } else if (">0".equals(domEl.getAttribute("p"))) {
                             if (knuthEl.getP() <= 0) {
-                                fail("Expected p>0" 
-                                        + " at position " + pos 
+                                fail("Expected p>0"
+                                        + " at position " + pos
                                         + " but got: " + knuthEl.getP());
                             }
                         } else {
@@ -143,8 +143,8 @@
                                 p = Integer.parseInt(domEl.getAttribute("p"));
                             }
                             if (p != knuthEl.getP()) {
-                                fail("Expected p=" + p 
-                                        + " at position " + pos 
+                                fail("Expected p=" + p
+                                        + " at position " + pos
                                         + " but got: " + knuthEl.getP());
                             }
                         }
@@ -152,7 +152,7 @@
                     if ("true".equals(domEl.getAttribute("flagged"))) {
                         if (!pen.isFlagged()) {
                             fail("Expected flagged penalty"
-                                    + " at position " + pos); 
+                                    + " at position " + pos);
                         }
                     } else if ("false".equals(domEl.getAttribute("flagged"))) {
                         if (pen.isFlagged()) {
@@ -163,57 +163,57 @@
                     if ("true".equals(domEl.getAttribute("aux"))) {
                         if (!pen.isAuxiliary()) {
                             fail("Expected auxiliary penalty"
-                                    + " at position " + pos); 
+                                    + " at position " + pos);
                         }
                     } else if ("false".equals(domEl.getAttribute("aux"))) {
                         if (pen.isAuxiliary()) {
                             fail("Expected non-auxiliary penalty"
-                                    + " at position " + pos); 
+                                    + " at position " + pos);
                         }
                     }
                 } else if ("glue".equals(domEl.getLocalName())) {
                     if (!(knuthEl instanceof KnuthGlue)) {
-                        fail("Expected KnuthGlue" 
-                                + " at position " + pos 
+                        fail("Expected KnuthGlue"
+                                + " at position " + pos
                                 + " but got: " + knuthEl.getClass().getName());
                     }
                     KnuthGlue glue = (KnuthGlue)knuthEl;
                     if (domEl.getAttribute("w").length() > 0) {
                         int w = Integer.parseInt(domEl.getAttribute("w"));
                         if (w != knuthEl.getW()) {
-                            fail("Expected w=" + w 
-                                    + " at position " + pos 
+                            fail("Expected w=" + w
+                                    + " at position " + pos
                                     + " but got: " + knuthEl.getW());
                         }
                     }
                     if (domEl.getAttribute("y").length() > 0) {
                         int stretch = Integer.parseInt(domEl.getAttribute("y"));
                         if (stretch != knuthEl.getY()) {
-                            fail("Expected y=" + stretch 
-                                    + " (stretch) at position " + pos 
+                            fail("Expected y=" + stretch
+                                    + " (stretch) at position " + pos
                                     + " but got: " + knuthEl.getY());
                         }
                     }
                     if (domEl.getAttribute("z").length() > 0) {
                         int shrink = Integer.parseInt(domEl.getAttribute("z"));
                         if (shrink != knuthEl.getZ()) {
-                            fail("Expected z=" + shrink 
-                                    + " (shrink) at position " + pos 
+                            fail("Expected z=" + shrink
+                                    + " (shrink) at position " + pos
                                     + " but got: " + knuthEl.getZ());
                         }
                     }
                 } else {
-                    throw new IllegalArgumentException("Invalid child node for 'element-list': " 
+                    throw new IllegalArgumentException("Invalid child node for 'element-list': "
                             + domEl.getLocalName()
                             + " at position " + pos + " (" + this + ")");
                 }
-                
+
             }
         }
         pos++;
         if (elementList.getElementList().size() > pos) {
-            fail("There are " 
-                    + (elementList.getElementList().size() - pos) 
+            fail("There are "
+                    + (elementList.getElementList().size() - pos)
                     + " unchecked elements at the end of the list");
         }
     }
@@ -221,7 +221,7 @@
     private void fail(String msg) {
         throw new RuntimeException(msg + " (" + this + ")");
     }
-    
+
     private boolean haveID() {
         return (this.id != null && this.id.length() > 0);
     }
@@ -262,7 +262,7 @@
         }
         return sb.toString();
     }
-    
+
     /** @see java.lang.Object#toString() */
     public String toString() {
         StringBuffer sb = new StringBuffer("element-list");

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/ElementListCollector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/ElementListCollector.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/ElementListCollector.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/ElementListCollector.java Fri Jul 25 05:44:20 2008
@@ -30,21 +30,21 @@
 public class ElementListCollector implements Observer {
 
     private List elementLists = new java.util.ArrayList();
-    
+
     /**
      * Resets the collector.
      */
     public void reset() {
         elementLists.clear();
     }
-    
+
     /**
      * @return the list of ElementList instances.
      */
     public List getElementLists() {
         return this.elementLists;
     }
-    
+
     /** @see org.apache.fop.layoutmgr.ElementListObserver.Observer */
     public void observe(List elementList, String category, String id) {
         elementLists.add(new ElementList(elementList, category, id));
@@ -54,11 +54,11 @@
      * Data object representing an element list along with additional information.
      */
     public static class ElementList {
-        
+
         private List elementList;
         private String category;
         private String id;
-        
+
         /**
          * Creates a new ElementList instance
          * @param elementList the element list
@@ -70,21 +70,21 @@
             this.category = category;
             this.id = id;
         }
-        
+
         /** @return the element list */
         public List getElementList() {
             return elementList;
         }
-        
+
         /** @return the category */
         public String getCategory() {
             return category;
         }
-        
+
         /** @return the ID, may be null */
         public String getID() {
             return id;
         }
     }
-    
+
 }
\ No newline at end of file

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/EvalCheck.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/EvalCheck.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/EvalCheck.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/EvalCheck.java Fri Jul 25 05:44:20 2008
@@ -36,7 +36,7 @@
     private String xpath;
     private double tolerance;
     private PrefixResolver prefixResolver;
-    
+
     /**
      * Creates a new instance
      * @param expected expected value
@@ -46,7 +46,7 @@
         this.expected = expected;
         this.xpath = xpath;
     }
-    
+
     /**
      * Creates a new instance from a DOM node.
      * @param node DOM node that defines this check
@@ -60,7 +60,7 @@
         }
         this.prefixResolver = new PrefixResolverDefault(node);
     }
-    
+
     /** @see org.apache.fop.layoutengine.LayoutEngineCheck */
     public void check(LayoutResult result) {
         XObject res;
@@ -75,13 +75,13 @@
             double v2 = Double.parseDouble(actual);
             if (Math.abs(v1 - v2) > tolerance) {
                 throw new RuntimeException(
-                        "Expected XPath expression to evaluate to '" + expected + "', but got '" 
+                        "Expected XPath expression to evaluate to '" + expected + "', but got '"
                         + actual + "' (" + this + ", outside tolerance)");
             }
         } else {
             if (!expected.equals(actual)) {
                 throw new RuntimeException(
-                        "Expected XPath expression to evaluate to '" + expected + "', but got '" 
+                        "Expected XPath expression to evaluate to '" + expected + "', but got '"
                         + actual + "' (" + this + ")");
             }
         }

Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java Fri Jul 25 05:44:20 2008
@@ -29,5 +29,5 @@
      * @param result the results from the processing run
      */
     void check(LayoutResult result);
-    
+
 }



---------------------------------------------------------------------
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