svn commit: r1067069 - in /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style: BaseStyle.java xml/parse/PropertyNode.java

[jw...@apache.org]

Author: jwaldman
Date: Fri Feb  4 02:54:57 2011
New Revision: 1067069

URL: http://svn.apache.org/viewvc?rev=1067069&view=rev
Log:
TRINIDAD-2025 move _styleNodeToStyleMap to FileSystemStyleCache to take advantage of same entires on the higher, browser or version or platform layer
1. PropertyNode is interning values that are likely duplicated in the css file. This checkin protects against a potential NPE in that new interning code if value is null.
2. remove extra @duplicated tag in BaseStyle

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java?rev=1067069&r1=1067068&r2=1067069&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java Fri Feb  4 02:54:57 2011
@@ -31,6 +31,7 @@ import java.util.concurrent.ConcurrentHa
  * the un-used image generation code.
  * TODO Then remove CoreStyle and implement the public Style object instead.
  * @deprecated
+ * @deprecated
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/BaseStyle.java#0 $) $Date: 10-nov-2005.18:57:54 $
  */
 abstract public class BaseStyle extends CoreStyle implements Serializable 

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java?rev=1067069&r1=1067068&r2=1067069&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java Fri Feb  4 02:54:57 2011
@@ -48,17 +48,20 @@ public class PropertyNode
       // This will improve the memory used.
       _name = name.intern();
      
-      if (_INTERN_VALUES_FOR.contains(name))
+      if (value != null)
       {
-        value = value.intern();
-      }
-      else
-      {
-        String internedValue =  _INTERNED_VALUES.get(value);
-       
-        if (internedValue != null)
+        if (_INTERN_VALUES_FOR.contains(name))
+        {
+          value = value.intern();
+        }
+        else
         {
-          value = internedValue;
+          String internedValue =  _INTERNED_VALUES.get(value);
+         
+          if (internedValue != null)
+          {
+            value = internedValue;
+          }
         }
       }