PropertyCache phase 2:

        * improvement of the PropertyCache itself should guarantee acceptable
          performance of the static caches in multi-session environments, which is 
          a possible problem with synchronizedMap
        * changed CommonFont to use the cache: 
          added CachedCommonFont to contain the properties that are always cacheable
          CommonFont itself is only cached if the remaining properties are absolutes
        * changed CommonHyphenation, KeepProperty, ColorProperty and FontFamilyProperty
          to use the cache

Facilitate the implementation for font-selection-strategy:
        * Changed FontInfo.fontLookup to always return an array of FontTriplet
        * Changed CommonFont.getFontState to return an array of FontTriplet
        * Initial modifications to the related LMs: initialized with
          the font corresponding to the first of the triplets

This line, and those below, will be ignored--

M    src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
M    src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
M    src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
M    src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java
M    src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
M    src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java
M    src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
M    src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
M    src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
M    src/java/org/apache/fop/fonts/FontInfo.java
M    src/java/org/apache/fop/fo/properties/CommonHyphenation.java
M    src/java/org/apache/fop/fo/properties/CommonAccessibility.java
M    src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
M    src/java/org/apache/fop/fo/properties/FontFamilyProperty.java
M    src/java/org/apache/fop/fo/properties/FixedLength.java
M    src/java/org/apache/fop/fo/properties/PropertyCache.java
M    src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
M    src/java/org/apache/fop/fo/properties/CommonFont.java
M    src/java/org/apache/fop/fo/properties/ColorProperty.java
M    src/java/org/apache/fop/fo/properties/KeepProperty.java
M    src/java/org/apache/fop/fo/PropertyList.java
M    src/java/org/apache/fop/fo/FOPropertyMapping.java
M    src/java/org/apache/fop/fo/expr/PropertyParser.java
M    src/java/org/apache/fop/fo/expr/ICCColorFunction.java
M    src/java/org/apache/fop/fo/expr/CMYKcolorFunction.java
M    src/java/org/apache/fop/fo/expr/RGBColorFunction.java
M    src/java/org/apache/fop/fo/expr/SystemColorFunction.java
M    status.xml


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@578311 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java
index 8a59b5751..6d4dbd43c 100644
--- a/src/java/org/apache/fop/fo/PropertyList.java
+++ b/src/java/org/apache/fop/fo/PropertyList.java
@@ -577,7 +577,7 @@ public abstract class PropertyList {
      */
     public CommonBorderPaddingBackground getBorderPaddingBackgroundProps() 
                 throws PropertyException {
-        return new CommonBorderPaddingBackground(this, fobj);
+        return new CommonBorderPaddingBackground(this);
     }
     
     /**
@@ -586,7 +586,7 @@ public abstract class PropertyList {
      * @throws PropertyException if there's a problem while processing the properties
      */
     public CommonHyphenation getHyphenationProps() throws PropertyException {
-        return new CommonHyphenation(this);
+        return CommonHyphenation.getInstance(this);
     }
     
     /**
@@ -652,7 +652,7 @@ public abstract class PropertyList {
      * @throws PropertyException if there's a problem while processing the properties
      */
     public CommonFont getFontProps() throws PropertyException {
-        return CommonFont(this);
+        return CommonFont.getInstance(this);
     }
     
     /**