xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r679758 [10/34] - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./ examples/embedding/java/embedding/ examples/embedding/java/embedding/events/ examples/embedding/java/embedding/intermediate/ examples/embedding/java/embedding/model/ e...
Date Fri, 25 Jul 2008 10:56:32 GMT
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/Root.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/Root.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/Root.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/Root.java Fri Jul 25 03:55:49 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.
@@ -63,12 +63,12 @@
      * Context class used while building the FO tree.
      */
     private FOTreeBuilderContext builderContext;
-    
+
     /**
      * FOEventHandler object for this FO Tree
      */
     private FOEventHandler foEventHandler = null;
-     
+
     /**
      * Base constructor
      *
@@ -88,7 +88,7 @@
     /** {@inheritDoc} */
     protected void endOfNode() throws FOPException {
         if (!pageSequenceFound || layoutMasterSet == null) {
-            missingChildElementError("(layout-master-set, declarations?, " 
+            missingChildElementError("(layout-master-set, declarations?, "
                 + "bookmark-tree?, (page-sequence|fox:external-document)+)");
         }
     }
@@ -98,14 +98,14 @@
      * <br>XSL 1.0 Spec: (layout-master-set,declarations?,page-sequence+)
      * <br>FOP: (layout-master-set, declarations?, fox:bookmarks?, page-sequence+)
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
         throws ValidationException {
         if (FO_URI.equals(nsURI)) {
-            if (localName.equals("layout-master-set")) {   
+            if (localName.equals("layout-master-set")) {
                 if (layoutMasterSet != null) {
                     tooManyNodesError(loc, "fo:layout-master-set");
                 }
-            } else if (localName.equals("declarations")) { 
+            } else if (localName.equals("declarations")) {
                 if (layoutMasterSet == null) {
                     nodesOutOfOrderError(loc, "fo:layout-master-set", "fo:declarations");
                 } else if (declarations != null) {
@@ -123,7 +123,7 @@
                 } else if (pageSequenceFound) {
                     nodesOutOfOrderError(loc, "fo:bookmark-tree", "fo:page-sequence");
                 }
-            } else if (localName.equals("page-sequence")) { 
+            } else if (localName.equals("page-sequence")) {
                 if (layoutMasterSet == null) {
                     nodesOutOfOrderError(loc, "fo:layout-master-set", "fo:page-sequence");
                 } else {
@@ -142,7 +142,7 @@
             //Ignore non-FO elements under root
         }
     }
-    
+
 
     /** @inheritDoc */
     protected void validateChildNode(Locator loc, FONode child) throws ValidationException {
@@ -159,15 +159,15 @@
         this.foEventHandler = foEventHandler;
     }
 
-    /**      
-     * This method overrides the FONode version. The FONode version calls the    
-     * method by the same name for the parent object. Since Root is at the top   
-     * of the tree, it returns the actual FOEventHandler object. Thus, any FONode    
-     * can use this chain to find which FOEventHandler it is being built for.    
-     * @return the FOEventHandler implementation that this Root is attached to   
-     */      
-    public FOEventHandler getFOEventHandler() {      
-        return foEventHandler;   
+    /**
+     * This method overrides the FONode version. The FONode version calls the
+     * method by the same name for the parent object. Since Root is at the top
+     * of the tree, it returns the actual FOEventHandler object. Thus, any FONode
+     * can use this chain to find which FOEventHandler it is being built for.
+     * @return the FOEventHandler implementation that this Root is attached to
+     */
+    public FOEventHandler getFOEventHandler() {
+        return foEventHandler;
     }
 
     /**
@@ -182,7 +182,7 @@
     public FOTreeBuilderContext getBuilderContext() {
         return this.builderContext;
     }
-    
+
     /**
     * Gets the last page number generated by the previous page-sequence
     * @return the last page number, 0 if no page sequences yet generated
@@ -207,15 +207,15 @@
      * @param additionalPages the total pages generated by the sequence (for statistics)
      * @throws IllegalArgumentException for negative additional page counts
      */
-    public void notifyPageSequenceFinished(int lastPageNumber, int additionalPages) {    
-        
+    public void notifyPageSequenceFinished(int lastPageNumber, int additionalPages) {
+
         if (additionalPages >= 0) {
             totalPagesGenerated += additionalPages;
-            endingPageNumberOfPreviousSequence = lastPageNumber;           
+            endingPageNumberOfPreviousSequence = lastPageNumber;
         } else {
             throw new IllegalArgumentException(
                 "Number of additional pages must be zero or greater.");
-        }       
+        }
     }
 
     /**

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SideRegion.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SideRegion.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SideRegion.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SideRegion.java Fri Jul 25 03:55:49 2008
@@ -30,7 +30,7 @@
 public abstract class SideRegion extends Region {
 
     private Length extent;
-    
+
     /**
      * Creates a new side region.
      * @param parent the parent node
@@ -45,10 +45,10 @@
         super.bind(pList);
         extent = pList.get(PR_EXTENT).getLength();
     }
-    
+
     /** @return the "extent" property. */
     public Length getExtent() {
         return extent;
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java Fri Jul 25 03:55:49 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.
@@ -80,7 +80,7 @@
         pageWidth = pList.get(PR_PAGE_WIDTH).getLength();
         referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
         writingMode = pList.getWritingMode();
-        
+
         if (masterName == null || masterName.equals("")) {
             missingPropertyError("master-name");
         }
@@ -112,7 +112,7 @@
      * {@inheritDoc}
      * <br>XSL Content Model: (region-body,region-before?,region-after?,region-start?,region-end?)
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
             throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if (localName.equals("region-body")) {
@@ -247,12 +247,12 @@
     public Length getPageHeight() {
         return pageHeight;
     }
-    
+
     /** @return the "writing-mode" property. */
     public int getWritingMode() {
         return writingMode;
     }
-    
+
     /** @return the "reference-orientation" property. */
     public int getReferenceOrientation() {
         return referenceOrientation.getValue();

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java Fri Jul 25 03:55:49 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.
@@ -34,13 +34,13 @@
  * This is a reference for a single page. It returns the
  * master name only once until reset.
  */
-public class SinglePageMasterReference extends FObj 
+public class SinglePageMasterReference extends FObj
     implements SubSequenceSpecifier {
 
     // The value of properties relevant for fo:single-page-master-reference.
     private String masterReference;
     // End of property values
-    
+
     private static final int FIRST = 0;
     private static final int DONE = 1;
 
@@ -62,7 +62,7 @@
 
         if (masterReference == null || masterReference.equals("")) {
             missingPropertyError("master-reference");
-        }        
+        }
     }
 
     /** {@inheritDoc} */
@@ -70,12 +70,12 @@
         PageSequenceMaster pageSequenceMaster = (PageSequenceMaster) parent;
         pageSequenceMaster.addSubsequenceSpecifier(this);
     }
-    
+
     /**
      * {@inheritDoc}
      * <br>XSL Content Model: empty
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             invalidChildError(loc, nsURI, localName);
@@ -100,8 +100,8 @@
     public void reset() {
         this.state = FIRST;
     }
-    
-    
+
+
 
     /** {@inheritDoc} */
     public boolean goToPrevious() {
@@ -112,7 +112,7 @@
             return true;
         }
     }
-    
+
     /** {@inheritDoc} */
     public boolean hasPagePositionLast() {
         return false;
@@ -122,7 +122,7 @@
     public boolean hasPagePositionOnly() {
         return false;
     }
-    
+
     /** {@inheritDoc} */
     public String getLocalName() {
         return "single-page-master-reference";

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/StaticContent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/StaticContent.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/StaticContent.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/StaticContent.java Fri Jul 25 03:55:49 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.
@@ -63,7 +63,7 @@
      * {@inheritDoc}
      * <br>XSL Content Model: (%block;)+
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if (!isBlockItem(nsURI, localName)) {

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java Fri Jul 25 03:55:49 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.fo.pagination;
 
 
@@ -25,7 +25,7 @@
  * and are capable of looking up an appropriate {@link SimplePageMaster}.
  */
 public interface SubSequenceSpecifier {
-    
+
     /**
      * Returns the name of the next page master.
      * @param isOddPage True if the next page number is odd
@@ -57,9 +57,9 @@
 
     /** @return true if the subsequence has a page master for page-position "last" */
     boolean hasPagePositionLast();
-    
+
     /** @return true if the subsequence has a page master for page-position "only" */
     boolean hasPagePositionOnly();
-    
+
 }
 

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/Title.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/Title.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/Title.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/Title.java Fri Jul 25 03:55:49 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.
@@ -46,7 +46,7 @@
      * {@inheritDoc} String, String)
      * <br>XSL/FOP: (#PCDATA|%inline;)*
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
         throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if (!isInlineItem(nsURI, localName)) {

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java Fri Jul 25 03:55:49 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.
@@ -31,7 +31,7 @@
 
 /**
  * Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_bookmark">
- * <code>fo:bookmark</code></a> object, first introduced in the 
+ * <code>fo:bookmark</code></a> object, first introduced in the
  * XSL 1.1 WD.
  */
 public class Bookmark extends FObj {
@@ -42,7 +42,7 @@
     private String internalDestination;
     private String externalDestination;
     private boolean bShow = true; // from starting-state property
-    
+
     // Valid, but unused properties. Commented out for performance
     // private CommonAccessibility commonAccessibility;
 
@@ -63,8 +63,8 @@
         internalDestination = pList.get(PR_INTERNAL_DESTINATION).getString();
         bShow = (pList.get(PR_STARTING_STATE).getEnum() == EN_SHOW);
 
-        // per spec, internal takes precedence if both specified        
-        if (internalDestination.length() > 0) { 
+        // per spec, internal takes precedence if both specified
+        if (internalDestination.length() > 0) {
             externalDestination = null;
         } else if (externalDestination.length() == 0) {
             // slightly stronger than spec "should be specified"
@@ -79,7 +79,7 @@
      * {@inheritDoc}
      * <br>XSL/FOP: (bookmark-title, bookmark*)
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if (localName.equals("bookmark-title")) {
@@ -89,7 +89,7 @@
             } else if (localName.equals("bookmark")) {
                 if (bookmarkTitle == null) {
                     nodesOutOfOrderError(loc, "fo:bookmark-title", "fo:bookmark");
-                }                
+                }
             } else {
                 invalidChildError(loc, nsURI, localName);
             }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java Fri Jul 25 03:55:49 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.
@@ -46,7 +46,7 @@
 
     /**
      * Add the characters to this BookmarkTitle.
-     * The text data inside the BookmarkTitle xml element 
+     * The text data inside the BookmarkTitle xml element
      * is used for the BookmarkTitle string.
      *
      * @param data the character data
@@ -64,7 +64,7 @@
      * {@inheritDoc}
      * <br>XSL/FOP: empty
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
         throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             invalidChildError(loc, nsURI, localName);
@@ -79,7 +79,7 @@
     public String getTitle() {
         return title;
     }
-    
+
     /** {@inheritDoc} */
     public String getLocalName() {
         return "bookmark-title";

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java Fri Jul 25 03:55:49 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.
@@ -67,7 +67,7 @@
      * {@inheritDoc}
      * <br>XSL/FOP: (bookmark+)
      */
-    protected void validateChildNode(Locator loc, String nsURI, String localName) 
+    protected void validateChildNode(Locator loc, String nsURI, String localName)
                 throws ValidationException {
         if (FO_URI.equals(nsURI)) {
             if (!localName.equals("bookmark")) {

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java Fri Jul 25 03:55:49 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.
@@ -43,16 +43,16 @@
 
         /**
          * Construct an instance of a Maker for the given property.
-         * 
+         *
          * @param propId The Constant ID of the property to be made.
          */
         public Maker(int propId) {
             super(propId);
         }
-        
-        
-        /** 
-         * {@inheritDoc} 
+
+
+        /**
+         * {@inheritDoc}
          * If only <code>background-position-horizontal</code> is
          * specified, <code>background-position-vertical</code> is set
          * to "50%".
@@ -60,7 +60,7 @@
         public Property make(PropertyList propertyList, String value, FObj fo) throws PropertyException {
             Property p = super.make(propertyList, value, fo);
             if (p.getList().size() == 1) {
-                /* only background-position-horizontal specified 
+                /* only background-position-horizontal specified
                  * through the shorthand, as a length or percentage:
                  * background-position-vertical=50% (see: XSL-FO 1.1 -- 7.31.2)
                  */
@@ -71,8 +71,8 @@
             return p;
         }
 
-        /** 
-         * {@inheritDoc} 
+        /**
+         * {@inheritDoc}
          * Returns a {@link org.apache.fop.datatypes.PercentBase} whose
          * <code>getDimension()</code> returns 1.
          */
@@ -92,11 +92,11 @@
                 public int getDimension() {
                     return 1;
                 }
-                
+
             };
         }
     }
-    
+
     /**
      * Inner class to provide shorthand parsing capabilities
      *
@@ -109,7 +109,7 @@
                                             PropertyMaker maker,
                                             PropertyList propertyList)
                         throws PropertyException {
-            
+
             int index = -1;
             List propList = property.getList();
             if (propId == Constants.PR_BACKGROUND_POSITION_HORIZONTAL) {
@@ -119,8 +119,8 @@
             }
             if (index >= 0) {
                 return maker.convertProperty(
-                        (Property) propList.get(index), 
-                        propertyList, 
+                        (Property) propList.get(index),
+                        propertyList,
                         propertyList.getFObj());
             } // else: invalid index? shouldn't happen...
             return null;

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java Fri Jul 25 03:55:49 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.
@@ -24,21 +24,21 @@
 import org.apache.fop.fo.expr.PropertyException;
 
 /**
- * This subclass of LengthProperty.Maker handles the special treatment of 
+ * This subclass of LengthProperty.Maker handles the special treatment of
  * border width described in 7.7.20.
  */
 public class BorderWidthPropertyMaker extends LengthProperty.Maker {
-    int borderStyleId = 0;    
-    
+    int borderStyleId = 0;
+
     /**
      * Create a length property which check the value of the border-*-style
-     * property and return a length of 0 when the style is "none". 
+     * property and return a length of 0 when the style is "none".
      * @param propId the border-*-width of the property.
      */
     public BorderWidthPropertyMaker(int propId) {
         super(propId);
     }
-    
+
     /**
      * Set the propId of the style property for the same side.
      * @param borderStyleId
@@ -50,9 +50,9 @@
     /**
      * Check the value of the style property and return a length of 0 when
      * the style is NONE.
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
-   
+
     public Property get(int subpropId, PropertyList propertyList,
                         boolean bTryInherit, boolean bTryDefault)
         throws PropertyException

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java Fri Jul 25 03:55:49 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_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CharacterProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CharacterProperty.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CharacterProperty.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CharacterProperty.java Fri Jul 25 03:55:49 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.
@@ -26,7 +26,7 @@
  * Superclass for properties that wrap a character value
  */
 public final class CharacterProperty extends Property {
-    
+
     /**
      * Inner class for creating instances of CharacterProperty
      */
@@ -58,7 +58,7 @@
     private CharacterProperty(char character) {
         this.character = character;
     }
-    
+
     public static CharacterProperty getInstance(char character) {
         return (CharacterProperty) cache.fetch(
                         new CharacterProperty(character));
@@ -85,7 +85,7 @@
         return new Character(character).toString();
     }
 
-    /** 
+    /**
      * {@inheritDoc}
      */
     public boolean equals(Object obj) {
@@ -96,7 +96,7 @@
         }
     }
 
-    /** 
+    /**
      * {@inheritDoc}
      */
     public int hashCode() {

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/ColorProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/ColorProperty.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/ColorProperty.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/ColorProperty.java Fri Jul 25 03:55:49 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.
@@ -31,16 +31,16 @@
  * Class for properties that wrap Color values
  */
 public final class ColorProperty extends Property  {
-    
+
     /** cache holding canonical ColorProperty instances */
     private static final PropertyCache cache = new PropertyCache(ColorProperty.class);
-    
+
     /**
      * The color represented by this property.
      */
     protected final Color color;
 
-    
+
     /**
      * Inner class for creating instances of ColorTypeProperty
      */
@@ -57,7 +57,7 @@
          * Return a ColorProperty object based on the passed Property object.
          * This method is called if the Property object built by the parser
          * isn't the right type for this property.
-         * 
+         *
          * @param p
          *            The Property object return by the expression parser
          * @param propertyList
@@ -70,7 +70,7 @@
          *             for invalid or inconsistent FO input
          */
         public Property convertProperty(Property p,
-                                        PropertyList propertyList, FObj fo) 
+                                        PropertyList propertyList, FObj fo)
                     throws PropertyException {
             if (p instanceof ColorProperty) {
                 return p;
@@ -89,10 +89,10 @@
     /**
      * Set the color given a particular String. For a full List of supported
      * values please see ColorUtil.
-     * 
+     *
      * @param foUserAgent FOP user agent
      * @param value RGB value as String to be parsed
-     * @return the canonical ColorProperty instance corresponding 
+     * @return the canonical ColorProperty instance corresponding
      *         to the given value
      * @throws PropertyException if the value can't be parsed
      * @see ColorUtil#parseColorString(FOUserAgent, String)
@@ -106,13 +106,13 @@
 
     /**
      * Create a new ColorProperty with a given color.
-     * 
+     *
      * @param value the color to use.
      */
     private ColorProperty(Color value) {
         this.color = value;
     }
-    
+
     /**
      * Returns an AWT instance of this color
      * @param foUserAgent FOP user agent
@@ -141,19 +141,19 @@
     public Object getObject() {
         return this;
     }
-    
+
     /** {@inheritDoc} */
     public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        
+
         if (o instanceof ColorProperty) {
             return ((ColorProperty) o).color.equals(this.color);
         }
         return false;
     }
-    
+
     /** {@inheritDoc} */
     public int hashCode() {
         return this.color.hashCode();

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java Fri Jul 25 03:55:49 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,12 +44,12 @@
      * The "right" property.
      */
     public Length right;
-    
+
     /**
      * The "bottom" property.
      */
     public Length bottom;
-    
+
     /**
      * The "left" property.
      */
@@ -64,9 +64,9 @@
         top = pList.get(Constants.PR_TOP).getLength();
         bottom = pList.get(Constants.PR_BOTTOM).getLength();
         left = pList.get(Constants.PR_LEFT).getLength();
-        right = pList.get(Constants.PR_RIGHT).getLength();      
+        right = pList.get(Constants.PR_RIGHT).getLength();
     }
-    
+
     public String toString() {
         StringBuffer sb = new StringBuffer("CommonAbsolutePosition{");
         sb.append(" absPos=");

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAccessibility.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAccessibility.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAccessibility.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAccessibility.java Fri Jul 25 03:55:49 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.
@@ -52,7 +52,7 @@
         if ("none".equals(role)) {
             role = null;
         }
-        
+
     }
 
 

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAural.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAural.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAural.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonAural.java Fri Jul 25 03:55:49 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_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java Fri Jul 25 03:55:49 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.
@@ -39,14 +39,14 @@
  */
 public class CommonBorderPaddingBackground {
 
-    /** 
-     *  cache holding all canonical instances 
+    /**
+     *  cache holding all canonical instances
      *  (w/ absolute background-position-* and padding-*)
      */
     private static final PropertyCache cache = new PropertyCache(CommonBorderPaddingBackground.class);
-    
+
     private int hash = -1;
-    
+
     /**
      * The "background-attachment" property.
      */
@@ -91,17 +91,17 @@
     public static final int END = 3;
 
     /**
-     * 
+     *
      */
     public static class BorderInfo {
-        
+
         /** cache holding all canonical instances */
         private static final PropertyCache cache = new PropertyCache(BorderInfo.class);
-        
+
         private int mStyle; // Enum for border style
         private Color mColor; // Border color
         private CondLengthProperty mWidth;
-        
+
         private int hash = -1;
 
         /**
@@ -115,7 +115,7 @@
 
         /**
          * Returns a BorderInfo instance corresponding to the given values
-         * 
+         *
          * @param style the border-style
          * @param width the border-width
          * @param color the border-color
@@ -149,7 +149,7 @@
         /**
          * Convenience method returning the border-width,
          * taking into account values of "none" and "hidden"
-         * 
+         *
          * @return  the retained border-width
          */
         public int getRetainedWidth() {
@@ -173,23 +173,23 @@
             sb.append("}");
             return sb.toString();
         }
-        
+
         /** {@inheritDoc} */
         public boolean equals(Object obj) {
             if (this == obj) {
                 return true;
             }
-            
+
             if (obj instanceof BorderInfo) {
                 BorderInfo bi = (BorderInfo)obj;
                 return (this.mColor == bi.mColor
                     && this.mStyle == bi.mStyle
                     && this.mWidth == bi.mWidth);
             }
-            
+
             return false;
         }
-        
+
         /** {@inheritDoc} */
         public int hashCode() {
             if (this.hash == -1) {
@@ -207,9 +207,9 @@
      * A border info with style "none". Used as a singleton, in the collapsing-border model,
      * for elements which don't specify any border on some of their sides.
      */
-    private static final BorderInfo defaultBorderInfo 
+    private static final BorderInfo defaultBorderInfo
             = BorderInfo.getInstance(Constants.EN_NONE, new ConditionalNullLength(), null);
-    
+
     /**
      * A conditional length of value 0. Returned by the
      * {@link CommonBorderPaddingBackground#getBorderInfo(int)} method when the
@@ -265,7 +265,7 @@
 
     /**
      * Returns a default BorderInfo of style none.
-     * 
+     *
      * @return a BorderInfo instance with style set to {@link Constants#EN_NONE}
      */
     public static BorderInfo getDefaultBorderInfo() {
@@ -277,14 +277,14 @@
 
     /**
      * Construct a CommonBorderPaddingBackground object.
-     * 
+     *
      * @param pList The PropertyList to get properties from.
      * @throws PropertyException if there's an error while binding the properties
      */
     private CommonBorderPaddingBackground(PropertyList pList) throws PropertyException {
 
         backgroundAttachment = pList.get(Constants.PR_BACKGROUND_ATTACHMENT).getEnum();
-        
+
         Color bc = pList.get(Constants.PR_BACKGROUND_COLOR).getColor(
                                         pList.getFObj().getUserAgent());
         if (bc.getAlpha() == 0) {
@@ -332,16 +332,16 @@
     }
 
     /**
-     * Obtain a CommonBorderPaddingBackground instance based on the 
+     * Obtain a CommonBorderPaddingBackground instance based on the
      * related property valus in the given {@link PropertyList}
-     * 
+     *
      * @param pList the {@link PropertyList} to use
      * @return a CommonBorderPaddingBackground instance (cached if possible)
      * @throws PropertyException in case of an error
      */
-    public static CommonBorderPaddingBackground getInstance(PropertyList pList) 
+    public static CommonBorderPaddingBackground getInstance(PropertyList pList)
         throws PropertyException {
-        
+
         CommonBorderPaddingBackground newInstance
                 = new CommonBorderPaddingBackground(pList);
         CommonBorderPaddingBackground cachedInstance = null;
@@ -355,9 +355,9 @@
                 && (newInstance.backgroundPositionVertical == null || newInstance.backgroundPositionVertical.isAbsolute())) {
             cachedInstance = cache.fetch(newInstance);
         }
-        
+
         /* for non-cached, or not-yet-cached instances, preload the image */
-        if ((cachedInstance == null 
+        if ((cachedInstance == null
                 || cachedInstance == newInstance)
                 && !("".equals(newInstance.backgroundImage))) {
             //Additional processing: preload image
@@ -374,14 +374,14 @@
             }
             //TODO Report to caller so he can decide to throw an exception
         }
-        
+
         return (cachedInstance != null ? cachedInstance : newInstance);
     }
 
     private void initBorderInfo(PropertyList pList, int side,
                     int colorProp, int styleProp, int widthProp, int paddingProp)
                 throws PropertyException {
-        
+
         padding[side] = pList.get(paddingProp).getCondLength();
         // If style = none, force width to 0, don't get Color (spec 7.7.20)
         int style = pList.get(styleProp).getEnum();
@@ -391,7 +391,7 @@
                 pList.get(widthProp).getCondLength(),
                 pList.get(colorProp).getColor(ua)), side);
         }
-        
+
     }
 
     /**
@@ -517,7 +517,7 @@
 
     /**
      * The border-color for the given side
-     * 
+     *
      * @param side one of {@link #BEFORE}, {@link #AFTER}, {@link #START}, {@link #END}
      * @return  the border-color for the given side
      */
@@ -531,7 +531,7 @@
 
     /**
      * The border-style for the given side
-     * 
+     *
      * @param side one of {@link #BEFORE}, {@link #AFTER}, {@link #START}, {@link #END}
      * @return  the border-style for the given side
      */
@@ -547,7 +547,7 @@
      * Return the padding for the given side, taking into account
      * the conditionality and evaluating any percentages in the given
      * context.
-     * 
+     *
      * @param side  one of {@link #BEFORE}, {@link #AFTER}, {@link #START}, {@link #END}
      * @param discard   true if the conditionality component should be considered
      * @param context   the context for percentage-resolution
@@ -620,7 +620,7 @@
                 + getBorderStartWidth(false) + getBorderEndWidth(false)) > 0);
     }
 
-    /** 
+    /**
      * @param context for percentage based evaluation.
      * @return true if padding is non-zero.
      */
@@ -634,7 +634,7 @@
         return (borderInfo[BEFORE] != null || borderInfo[AFTER] != null
                 || borderInfo[START] != null || borderInfo[END] != null);
     }
-    
+
     /** {@inheritDoc} */
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -657,10 +657,10 @@
                 && this.padding[START] == cbpb.padding[START]
                 && this.padding[END] == cbpb.padding[END]);
         }
-        
+
         return false;
     }
-    
+
     /** {@inheritDoc} */
     public int hashCode() {
         if (this.hash == -1) {
@@ -681,7 +681,7 @@
             hash = 37 * hash + (padding[END] == null ? 0 : padding[END].hashCode());
             this.hash = hash;
         }
-        
+
         return this.hash;
     }
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonFont.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonFont.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonFont.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonFont.java Fri Jul 25 03:55:49 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,10 +38,10 @@
     /** cache holding canonical CommonFont instances (only those with
      *  absolute font-size and font-size-adjust) */
     private static final PropertyCache cache = new PropertyCache(CommonFont.class);
-    
+
     /** hashcode of this instance */
     private int hash = 0;
-    
+
     /** The "font-family" property. */
     private final FontFamilyProperty fontFamily;
 
@@ -59,17 +59,17 @@
 
     /** The "font-weight" property. */
     private final EnumProperty fontWeight;
-    
+
     /** The "font-size" property. */
     public final Length fontSize;
 
     /** The "font-size-adjust" property. */
     public final Numeric fontSizeAdjust;
 
-    
+
     /**
      * Construct a CommonFont instance
-     * 
+     *
      * @param fontFamily    the font-family property
      * @param fontSelectionStrategy the font-selection-strategy property
      * @param fontStretch   the font-stretch property
@@ -84,8 +84,8 @@
                        EnumProperty fontStretch,
                        EnumProperty fontStyle,
                        EnumProperty fontVariant,
-                       EnumProperty fontWeight, 
-                       Length fontSize, 
+                       EnumProperty fontWeight,
+                       Length fontSize,
                        Numeric fontSizeAdjust) {
         this.fontFamily = fontFamily;
         this.fontSelectionStrategy = fontSelectionStrategy;
@@ -103,7 +103,7 @@
      * the entire instance will be cached.
      * If not, then a distinct instance will be returned, with
      * as much cached information as possible.
-     * 
+     *
      * @param pList the PropertyList to get the properties from
      * @return  a CommonFont instance corresponding to the properties
      * @throws PropertyException    if there was a problem getting the properties
@@ -117,19 +117,19 @@
         EnumProperty fontWeight = (EnumProperty) pList.get(Constants.PR_FONT_WEIGHT);
         Numeric fontSizeAdjust = pList.get(Constants.PR_FONT_SIZE_ADJUST).getNumeric();
         Length fontSize = pList.get(Constants.PR_FONT_SIZE).getLength();
-        
-        CommonFont commonFont = new CommonFont(fontFamily, 
-                                               fontSelectionStrategy, 
-                                               fontStretch, 
-                                               fontStyle, 
-                                               fontVariant, 
+
+        CommonFont commonFont = new CommonFont(fontFamily,
+                                               fontSelectionStrategy,
+                                               fontStretch,
+                                               fontStyle,
+                                               fontVariant,
                                                fontWeight,
                                                fontSize,
                                                fontSizeAdjust);
-        
+
         return cache.fetch(commonFont);
     }
-    
+
     /** @return an array with the font-family names */
     private String[] getFontFamily() {
         List lst = fontFamily.getList();
@@ -139,12 +139,12 @@
         }
         return fontFamily;
     }
-        
+
     /** @return the first font-family name in the list */
     public String getFirstFontFamily() {
         return ((Property) fontFamily.list.get(0)).getString();
     }
-    
+
     /** @return the "font-selection-strategy" property */
     public int getFontSelectionStrategy() {
         return fontSelectionStrategy.getEnum();
@@ -154,12 +154,12 @@
     public int getFontStretch() {
         return fontStretch.getEnum();
     }
-    
+
     /** @return the "font-style" property */
     public int getFontStyle() {
         return fontStyle.getEnum();
     }
-    
+
     /** @return the "font-variant" property */
     public int getFontVariant() {
         return fontVariant.getEnum();
@@ -169,11 +169,11 @@
     public int getFontWeight() {
         return fontWeight.getEnum();
     }
-    
+
     /**
-     * Create and return an array of <code>FontTriplets</code> based on 
+     * Create and return an array of <code>FontTriplets</code> based on
      * the properties stored in the instance variables.
-     * 
+     *
      * @param fontInfo
      * @return a Font object.
      */
@@ -194,13 +194,13 @@
 
         String style;
         switch (fontStyle.getEnum()) {
-        case Constants.EN_ITALIC: 
+        case Constants.EN_ITALIC:
             style = "italic";
             break;
-        case Constants.EN_OBLIQUE: 
+        case Constants.EN_OBLIQUE:
             style = "oblique";
             break;
-        case Constants.EN_BACKSLANT: 
+        case Constants.EN_BACKSLANT:
             style = "backslant";
             break;
         default:
@@ -210,22 +210,22 @@
         // various kinds of keywords too
         //int fontVariant = propertyList.get("font-variant").getEnum();
         FontTriplet[] triplets = fontInfo.fontLookup(
-                                    getFontFamily(), 
+                                    getFontFamily(),
                                     style, font_weight);
         return triplets;
     }
 
     /** {@inheritDoc} */
     public boolean equals(Object o) {
-        
+
         if (o == null) {
             return false;
         }
-        
+
         if (this == o) {
             return true;
         }
-        
+
         if (o instanceof CommonFont) {
             CommonFont cf = (CommonFont) o;
             return (cf.fontFamily == this.fontFamily)
@@ -238,12 +238,12 @@
                     && (cf.fontSizeAdjust == this.fontSizeAdjust);
         }
         return false;
-        
+
     }
-    
+
     /** {@inheritDoc} */
     public int hashCode() {
-        
+
         if (this.hash == -1) {
             int hash = 17;
             hash = 37 * hash + (fontSize == null ? 0 : fontSize.hashCode());
@@ -257,6 +257,6 @@
             this.hash = hash;
         }
         return hash;
-        
+
     }
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonHyphenation.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonHyphenation.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonHyphenation.java Fri Jul 25 03:55:49 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.
@@ -37,11 +37,11 @@
 
     /** Logger */
     protected static Log log = LogFactory.getLog(CommonHyphenation.class);
-    
+
     private static final PropertyCache cache = new PropertyCache(CommonHyphenation.class);
-    
+
     private int hash = 0;
-    
+
     /** The "language" property */
     public final StringProperty language;
 
@@ -65,7 +65,7 @@
 
     /**
      * Construct a CommonHyphenation object holding the given properties
-     * 
+     *
      */
     private CommonHyphenation(StringProperty language,
                               StringProperty country,
@@ -82,46 +82,46 @@
         this.hyphenationPushCharacterCount = hyphenationPushCharacterCount;
         this.hyphenationRemainCharacterCount = hyphenationRemainCharacterCount;
     }
-    
+
     /**
      * Gets the canonical <code>CommonHyphenation</code> instance corresponding
-     * to the values of the related properties present on the given 
+     * to the values of the related properties present on the given
      * <code>PropertyList</code>
-     * 
+     *
      * @param propertyList  the <code>PropertyList</code>
      */
     public static CommonHyphenation getInstance(PropertyList propertyList) throws PropertyException {
-        StringProperty language = 
+        StringProperty language =
             (StringProperty) propertyList.get(Constants.PR_LANGUAGE);
-        StringProperty country = 
+        StringProperty country =
             (StringProperty) propertyList.get(Constants.PR_COUNTRY);
-        StringProperty script = 
+        StringProperty script =
             (StringProperty) propertyList.get(Constants.PR_SCRIPT);
-        EnumProperty hyphenate = 
+        EnumProperty hyphenate =
             (EnumProperty) propertyList.get(Constants.PR_HYPHENATE);
-        CharacterProperty hyphenationCharacter = 
+        CharacterProperty hyphenationCharacter =
             (CharacterProperty) propertyList.get(Constants.PR_HYPHENATION_CHARACTER);
-        NumberProperty hyphenationPushCharacterCount = 
+        NumberProperty hyphenationPushCharacterCount =
             (NumberProperty) propertyList.get(Constants.PR_HYPHENATION_PUSH_CHARACTER_COUNT);
-        NumberProperty hyphenationRemainCharacterCount = 
+        NumberProperty hyphenationRemainCharacterCount =
             (NumberProperty) propertyList.get(Constants.PR_HYPHENATION_REMAIN_CHARACTER_COUNT);
-        
+
         CommonHyphenation instance = new CommonHyphenation(
-                                language, 
-                                country, 
-                                script, 
-                                hyphenate, 
-                                hyphenationCharacter, 
-                                hyphenationPushCharacterCount, 
+                                language,
+                                country,
+                                script,
+                                hyphenate,
+                                hyphenationCharacter,
+                                hyphenationPushCharacterCount,
                                 hyphenationRemainCharacterCount);
-        
+
         return cache.fetch(instance);
-        
+
     }
-    
+
     private static final char HYPHEN_MINUS = '-';
     private static final char MINUS_SIGN = '\u2212';
-    
+
     /**
      * Returns the effective hyphenation character for a font. The hyphenation character specified
      * in XSL-FO may be substituted if it's not available in the font.
@@ -166,13 +166,13 @@
         if (warn) {
             log.warn("Substituted specified hyphenation character (0x"
                     + Integer.toHexString(hyphChar)
-                    + ") with 0x" + Integer.toHexString(effHyphChar) 
-                    + " because the font doesn't have the specified hyphenation character: " 
+                    + ") with 0x" + Integer.toHexString(effHyphChar)
+                    + " because the font doesn't have the specified hyphenation character: "
                     + font.getFontTriplet());
         }
         return effHyphChar;
     }
-    
+
     /**
      * Returns the IPD for the hyphenation character for a font.
      * @param font the font
@@ -182,7 +182,7 @@
         char hyphChar = getHyphChar(font);
         return font.getCharWidth(hyphChar);
     }
-    
+
     /** {@inheritDoc} */
     public boolean equals(Object obj) {
         if (obj == this) {
@@ -200,7 +200,7 @@
         }
         return false;
     }
-    
+
     /** {@inheritDoc} */
     public int hashCode() {
         if (this.hash == 0) {
@@ -209,15 +209,15 @@
             hash = 37 * hash + (script == null ? 0 : script.hashCode());
             hash = 37 * hash + (country == null ? 0 : country.hashCode());
             hash = 37 * hash + (hyphenate == null ? 0 : hyphenate.hashCode());
-            hash = 37 * hash + 
+            hash = 37 * hash +
                 (hyphenationCharacter == null ? 0 : hyphenationCharacter.hashCode());
-            hash = 37 * hash + 
+            hash = 37 * hash +
                 (hyphenationPushCharacterCount == null ? 0 : hyphenationPushCharacterCount.hashCode());
-            hash = 37 * hash + 
+            hash = 37 * hash +
                 (hyphenationRemainCharacterCount == null ? 0 : hyphenationRemainCharacterCount.hashCode());
             this.hash = hash;
         }
         return this.hash;
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java Fri Jul 25 03:55:49 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.
@@ -86,17 +86,17 @@
         startIndent = pList.get(Constants.PR_START_INDENT).getLength();
         endIndent = pList.get(Constants.PR_END_INDENT).getLength();
     }
-    
+
     /** {@inheritDoc} */
     public String toString() {
-        return "CommonMarginBlock:\n" 
-            + "Margins (top, bottom, left, right): (" 
-            + marginTop + ", " + marginBottom + ", " 
+        return "CommonMarginBlock:\n"
+            + "Margins (top, bottom, left, right): ("
+            + marginTop + ", " + marginBottom + ", "
             + marginLeft + ", " + marginRight + ")\n"
-            + "Space (before, after): (" 
-            + spaceBefore + ", " + spaceAfter + ")\n" 
+            + "Space (before, after): ("
+            + spaceBefore + ", " + spaceAfter + ")\n"
             + "Indents (start, end): ("
             + startIndent + ", " + endIndent + ")\n";
     }
-    
+
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonMarginInline.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonMarginInline.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonMarginInline.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonMarginInline.java Fri Jul 25 03:55:49 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_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java Fri Jul 25 03:55:49 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.
@@ -34,7 +34,7 @@
      * The "relative-position" property.
      */
     public int relativePosition;
-    
+
     /**
      * The "top" property.
      */
@@ -44,12 +44,12 @@
      * The "right" property.
      */
     public Length right;
-    
+
     /**
      * The "bottom" property.
      */
     public Length bottom;
-    
+
     /**
      * The "left" property.
      */
@@ -64,7 +64,7 @@
         top = pList.get(Constants.PR_TOP).getLength();
         bottom = pList.get(Constants.PR_BOTTOM).getLength();
         left = pList.get(Constants.PR_LEFT).getLength();
-        right = pList.get(Constants.PR_RIGHT).getLength();      
+        right = pList.get(Constants.PR_RIGHT).getLength();
     }
 
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java Fri Jul 25 03:55:49 2008
@@ -39,30 +39,30 @@
     private static final int OVERLINE     = 2;
     private static final int LINE_THROUGH = 4;
     private static final int BLINK        = 8;
-    
+
     private int decoration;
     private Color underColor;
     private Color overColor;
     private Color throughColor;
-    
+
     /**
      * Creates a new CommonTextDecoration object with default values.
      */
     public CommonTextDecoration() {
     }
-    
+
     /**
      * Creates a CommonTextDecoration object from a property list.
      * @param pList the property list to build the object for
      * @return a CommonTextDecoration object or null if the obj would only have default values
      * @throws PropertyException if there's a problem while processing the property
      */
-    public static CommonTextDecoration createFromPropertyList(PropertyList pList) 
+    public static CommonTextDecoration createFromPropertyList(PropertyList pList)
                 throws PropertyException {
         return calcTextDecoration(pList);
     }
-    
-    private static CommonTextDecoration calcTextDecoration(PropertyList pList) 
+
+    private static CommonTextDecoration calcTextDecoration(PropertyList pList)
                 throws PropertyException {
         CommonTextDecoration deco = null;
         PropertyList parentList = pList.getParentPropertyList();
@@ -76,7 +76,7 @@
             List list = textDecoProp.getList();
             Iterator i = list.iterator();
             while (i.hasNext()) {
-                Property prop = (Property)i.next(); 
+                Property prop = (Property)i.next();
                 int propEnum = prop.getEnum();
                 FOUserAgent ua = (pList == null)
                         ? null
@@ -135,7 +135,7 @@
         }
         return deco;
     }
-    
+
     /** @return true if underline is active */
     public boolean hasUnderline() {
         return (this.decoration & UNDERLINE) != 0;
@@ -155,12 +155,12 @@
     public boolean isBlinking() {
         return (this.decoration & BLINK) != 0;
     }
-    
+
     /** @return the color of the underline mark */
     public Color getUnderlineColor() {
         return this.underColor;
     }
-    
+
     /** @return the color of the overline mark */
     public Color getOverlineColor() {
         return this.overColor;

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java Fri Jul 25 03:55:49 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.
@@ -26,13 +26,13 @@
 import org.apache.fop.fo.expr.PropertyException;
 
 /**
- * This class extends Property.Maker with support for sub-properties.  
+ * This class extends Property.Maker with support for sub-properties.
  */
 public class CompoundPropertyMaker extends PropertyMaker {
     /**
      *  The list of subproperty makers supported by this compound maker.
-     */ 
-    private PropertyMaker[] subproperties = 
+     */
+    private PropertyMaker[] subproperties =
                     new PropertyMaker[Constants.COMPOUND_COUNT];
 
     /**
@@ -63,7 +63,7 @@
             }
         }
     }
-    
+
     /**
      * Add a subproperty to this maker.
      * @param subproperty
@@ -72,7 +72,7 @@
         // Place the base propId in the propId of the subproperty.
         subproperty.propId &= Constants.COMPOUND_MASK;
         subproperty.propId |= propId;
-        
+
         subproperties[getSubpropIndex(subproperty.getPropId())] = subproperty;
 
         // Store the first subproperty with a setByShorthand. That subproperty
@@ -81,8 +81,8 @@
             shorthandMaker = subproperty;
         }
     }
-    
-    
+
+
     /**
      * Return a Maker object which is used to set the values on components
      * of compound property types, such as "space".
@@ -96,11 +96,11 @@
     public PropertyMaker getSubpropMaker(int subpropertyId) {
         return subproperties[getSubpropIndex(subpropertyId)];
     }
-    
+
     /**
      * Calculate the real value of a subproperty by unmasking and shifting
      * the value into the range [0 - (COMPOUND_COUNT-1)].
-     * The value is used as index into the subproperties array. 
+     * The value is used as index into the subproperties array.
      * @param propId the property id of the sub property.
      * @return the array index.
      */
@@ -111,7 +111,7 @@
 
     /**
      * For compound properties which can take enumerate values.
-     * Delegate the enumeration check to one of the subpropeties. 
+     * Delegate the enumeration check to one of the subpropeties.
      * @param value the string containing the property value
      * @return the Property encapsulating the enumerated equivalent of the
      * input value
@@ -136,7 +136,7 @@
      *        Is 0 when retriving a base property.
      * @param propertyList The PropertyList object being built for this FO.
      * @param tryInherit true if inherited properties should be examined.
-     * @param tryDefault true if the default value should be returned. 
+     * @param tryDefault true if the default value should be returned.
      */
     public Property get(int subpropertyId, PropertyList propertyList,
                         boolean tryInherit, boolean tryDefault)
@@ -148,7 +148,7 @@
         }
         return p;
     }
-   
+
     /**
      * Return a Property object based on the passed Property object.
      * This method is called if the Property object built by the parser
@@ -165,7 +165,7 @@
                                     FObj fo) throws PropertyException {
         // Delegate to the subproperty maker to do conversions.
         p = shorthandMaker.convertProperty(p, propertyList, fo);
-        
+
         if (p != null) {
             Property prop = makeCompound(propertyList, fo);
             CompoundDatatype pval = (CompoundDatatype) prop.getObject();
@@ -181,7 +181,7 @@
     }
 
     /**
-     * Make a compound property with default values. 
+     * Make a compound property with default values.
      * @param propertyList The PropertyList object being built for this FO.
      * @return the Property object corresponding to the parameters
      * @throws PropertyException for invalid or inconsisten FO input
@@ -193,7 +193,7 @@
             return makeCompound(propertyList, propertyList.getParentFObj());
         }
     }
-    
+
     /**
      * Create a Property object from an attribute specification.
      * @param propertyList The PropertyList object being built for this FO.
@@ -201,14 +201,14 @@
      * @param fo The parent FO for the FO whose property is being made.
      * @return The initialized Property object.
      * @throws PropertyException for invalid or inconsistent FO input
-     */    
+     */
     public Property make(PropertyList propertyList, String value,
                          FObj fo) throws PropertyException {
         Property p = super.make(propertyList, value, fo);
         p = convertProperty(p, propertyList, fo);
-        return p; 
+        return p;
     }
-    
+
     /**
      * Return a property value for a compound property. If the property
      * value is already partially initialized, this method will modify it.
@@ -243,7 +243,7 @@
         }
         return baseProperty;
     }
-    
+
     /**
      * Create a empty compound property and fill it with default values for
      * the subproperties.
@@ -265,5 +265,5 @@
             }
         }
         return p;
-    }    
+    }
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CondLengthProperty.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CondLengthProperty.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CondLengthProperty.java Fri Jul 25 03:55:49 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.
@@ -31,14 +31,14 @@
  * Superclass for properties that have conditional lengths
  */
 public class CondLengthProperty extends Property implements CompoundDatatype {
-    
+
     /** cache holding canonical instances (for absolute conditional lengths) */
     private static final PropertyCache cache = new PropertyCache(CondLengthProperty.class);
-    
+
     /** components */
     private Property length;
     private EnumProperty conditionality;
-    
+
     private boolean isCached = false;
     private int hash = -1;
 
@@ -56,7 +56,7 @@
 
         /**
          * Create a new empty instance of CondLengthProperty.
-         * @return the new instance. 
+         * @return the new instance.
          */
         public Property makeNewProperty() {
             return new CondLengthProperty();
@@ -64,7 +64,7 @@
 
         /**
          * {@inheritDoc}
-         */        
+         */
         public Property convertProperty(Property p, PropertyList propertyList, FObj fo)
                     throws PropertyException {
             if (p instanceof KeepProperty) {
@@ -75,7 +75,7 @@
     }
 
     /**
-     * {@inheritDoc} 
+     * {@inheritDoc}
      */
     public void setComponent(int cmpId, Property cmpnValue,
                              boolean bIsDefault) {
@@ -83,7 +83,7 @@
             throw new IllegalStateException(
                     "CondLengthProperty.setComponent() called on a cached value!");
         }
-        
+
         if (cmpId == CP_LENGTH) {
             length = cmpnValue;
         } else if (cmpId == CP_CONDITIONALITY) {
@@ -147,11 +147,11 @@
 
     /** {@inheritDoc} */
     public String toString() {
-        return "CondLength[" + length.getObject().toString() 
-                + ", " + (isDiscard() 
-                        ? conditionality.toString().toLowerCase() 
+        return "CondLength[" + length.getObject().toString()
+                + ", " + (isDiscard()
+                        ? conditionality.toString().toLowerCase()
                         : conditionality.toString()) + "]";
-    }    
+    }
 
     /**
      * @return this.condLength
@@ -188,7 +188,7 @@
         if (this == obj) {
             return true;
         }
-        
+
         if (obj instanceof CondLengthProperty) {
             CondLengthProperty clp = (CondLengthProperty)obj;
             return (this.length == clp.length
@@ -196,7 +196,7 @@
         }
         return false;
     }
-    
+
     /** {@inheritDoc} */
     public int hashCode() {
         if (this.hash == -1) {

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java Fri Jul 25 03:55:49 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.
@@ -33,19 +33,19 @@
     protected int tb_rl;
     protected boolean useParent;
     private boolean relative;
-    
+
     public CorrespondingPropertyMaker(PropertyMaker baseMaker) {
         this.baseMaker = baseMaker;
         baseMaker.setCorresponding(this);
     }
-    
-    
+
+
     public void setCorresponding(int lr_tb, int rl_tb, int tb_rl) {
         this.lr_tb = lr_tb;
         this.rl_tb = rl_tb;
         this.tb_rl = tb_rl;
     }
-    
+
     /**
      * Controls whether the PropertyMaker accesses the parent property list or the current
      * property list for determining the writing mode.
@@ -58,7 +58,7 @@
     public void setRelative(boolean relative) {
         this.relative = relative;
     }
-    
+
     /**
      * For properties that operate on a relative direction (before, after,
      * start, end) instead of an absolute direction (top, bottom, left,
@@ -80,18 +80,18 @@
         if (!relative) {
             return false;
         }
-        
+
         PropertyList pList = getWMPropertyList(propertyList);
         if (pList != null) {
             int correspondingId = pList.getWritingMode(lr_tb, rl_tb, tb_rl);
-        
+
             if (pList.getExplicit(correspondingId) != null) {
                 return true;
             }
-        } 
+        }
         return false;
     }
-    
+
     /**
      * Return a Property object representing the value of this property,
      * based on other property values for this FO.
@@ -108,7 +108,7 @@
             return null;
         }
         int correspondingId = pList.getWritingMode(lr_tb, rl_tb, tb_rl);
-            
+
         Property p = propertyList.getExplicitOrShorthand(correspondingId);
         if (p != null) {
             FObj parentFO = propertyList.getParentFObj();
@@ -116,7 +116,7 @@
         }
         return p;
     }
-    
+
     /**
      * Return the property list to use for fetching writing mode depending property
      * ids.

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java Fri Jul 25 03:55:49 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.
@@ -35,7 +35,7 @@
     public DimensionPropertyMaker(PropertyMaker baseMaker) {
         super(baseMaker);
     }
-    
+
     public void setExtraCorresponding(int[][] extraCorresponding) {
         this.extraCorresponding = extraCorresponding;
     }
@@ -47,7 +47,7 @@
             int wmcorr = extraCorresponding[i][0]; //propertyList.getWritingMode()];
             if (propertyList.getExplicit(wmcorr) != null)
                 return true;
-        }            
+        }
         return false;
     }
 
@@ -59,8 +59,8 @@
         }
 
         // Based on min-[width|height]
-        int wmcorr = propertyList.getWritingMode(extraCorresponding[0][0], 
-                                        extraCorresponding[0][1], 
+        int wmcorr = propertyList.getWritingMode(extraCorresponding[0][0],
+                                        extraCorresponding[0][1],
                                         extraCorresponding[0][2]);
         Property subprop = propertyList.getExplicitOrShorthand(wmcorr);
         if (subprop != null) {
@@ -68,8 +68,8 @@
         }
 
         // Based on max-[width|height]
-        wmcorr = propertyList.getWritingMode(extraCorresponding[1][0], 
-                                    extraCorresponding[1][1], 
+        wmcorr = propertyList.getWritingMode(extraCorresponding[1][0],
+                                    extraCorresponding[1][1],
                                     extraCorresponding[1][2]);
         subprop = propertyList.getExplicitOrShorthand(wmcorr);
         // TODO: Don't set when NONE.
@@ -78,5 +78,5 @@
         }
 
         return p;
-    }   
+    }
 }

Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/EnumLength.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/EnumLength.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/EnumLength.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/properties/EnumLength.java Fri Jul 25 03:55:49 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.fo.properties;
 
 import org.apache.fop.datatypes.PercentBaseContext;
@@ -26,7 +26,7 @@
  */
 public class EnumLength extends LengthProperty {
     private Property enumProperty;
-    
+
     public EnumLength(Property enumProperty) {
         this.enumProperty = enumProperty;
     }



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