Cache CharacterProperty

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

1 files changed, 32 insertions, 6 deletions

diff --git a/src/java/org/apache/fop/fo/properties/CharacterProperty.java b/src/java/org/apache/fop/fo/properties/CharacterProperty.java
index 79b0ebc07..1496f5f86 100644
--- a/src/java/org/apache/fop/fo/properties/CharacterProperty.java
+++ b/src/java/org/apache/fop/fo/properties/CharacterProperty.java
@@ -25,8 +25,8 @@ import org.apache.fop.fo.PropertyList;
 /**
  * Superclass for properties that wrap a character value
  */
-public class CharacterProperty extends Property {
-
+public final class CharacterProperty extends Property {
+    
     /**
      * Inner class for creating instances of CharacterProperty
      */
@@ -42,19 +42,27 @@ public class CharacterProperty extends Property {
         public Property make(PropertyList propertyList, String value,
                              FObj fo) {
             char c = value.charAt(0);
-            return new CharacterProperty(c);
+            return CharacterProperty.getInstance(c);
         }
 
-    }    // end Character.Maker
+    }
+
+    /** cache containing all canonical CharacterProperty instances */
+    private static final PropertyCache cache = new PropertyCache();
 
-    private char character;
+    private final char character;
 
     /**
      * @param character character value to be wrapped in this property
      */
-    public CharacterProperty(char character) {
+    private CharacterProperty(char character) {
         this.character = character;
     }
+    
+    public static CharacterProperty getInstance(char character) {
+        return (CharacterProperty) cache.fetch(
+                        new CharacterProperty(character));
+    }
 
     /**
      * @return this.character cast as an Object
@@ -77,4 +85,22 @@ public class CharacterProperty extends Property {
         return new Character(character).toString();
     }
 
+    /** 
+     * {@inheritDoc}
+     */
+    public boolean equals(Object obj) {
+        if (obj instanceof CharacterProperty) {
+            return (((CharacterProperty)obj).character == this.character);
+        } else {
+            return false;
+        }
+    }
+
+    /** 
+     * {@inheritDoc}
+     */
+    public int hashCode() {
+        return (int) character;
+    }
+
 }