svn commit: r1303434 - in /myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal: renderkit/core/StyleContextImpl.java style/util/StableNameUtils.java

[an...@apache.org]

Author: andys
Date: Wed Mar 21 15:17:59 2012
New Revision: 1303434

URL: http://svn.apache.org/viewvc?rev=1303434&view=rev
Log:
Checkpoint: enable stable names by default

Rather than polluting our configuration space with an additional context parameter, let's try going with stable names enabled by default.  I've left an internal "org.apache.myfaces.trinidadinternal.STYLE_SHEET_NAMING_STRATEGY" context parameter wich can be set to "short" to revert back to the old naming behavior if we run into some case where this turns out to be necessary.

Modified:
    myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
    myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/StableNameUtils.java

Modified: myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java?rev=1303434&r1=1303433&r2=1303434&view=diff
==============================================================================
--- myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java (original)
+++ myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java Wed Mar 21 15:17:59 2012
@@ -351,7 +351,7 @@ class StyleContextImpl implements StyleC
       }
     }
 
-    return StyleSheetNamingStrategy.SHORT;
+    return StyleSheetNamingStrategy.STABLE;
   }
 
   private ConcurrentMap<String, Object> _getConcurrentApplicationScopedMap()
@@ -419,7 +419,7 @@ class StyleContextImpl implements StyleC
     "org.apache.myfaces.trinidad.skin.dirty";
   
   static private final String _NAMING_STRATEGY_PARAM =
-    "org.apache.myfaces.trinidad.STYLE_SHEET_NAMING_STRATEGY";
+    "org.apache.myfaces.trinidadinternal.STYLE_SHEET_NAMING_STRATEGY";
 
   private static final TrinidadLogger _LOG =
     TrinidadLogger.createTrinidadLogger(StyleContextImpl.class);

Modified: myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/StableNameUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/StableNameUtils.java?rev=1303434&r1=1303433&r2=1303434&view=diff
==============================================================================
--- myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/StableNameUtils.java (original)
+++ myfaces/trinidad/branches/andys-skin-pregen/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/StableNameUtils.java Wed Mar 21 15:17:59 2012
@@ -125,16 +125,18 @@ public final class StableNameUtils
       // avoid reallocations.
       StringBuilder builder = new StringBuilder(100);
       
-      _appendDocumentName(builder);
-      _appendVisitNames(builder, visitors);
-      _appendNonVisitNames(builder);
+      _appendSkinIdentifierSection(builder);
+      _appendVariantsSection(builder, visitors);
+      _appendContextualSection(builder);
       _appendSuffix(builder);
       
       return builder.toString();
     }
 
-    private void _appendDocumentName(StringBuilder builder)
+    private void _appendSkinIdentifierSection(StringBuilder builder)
     {
+      // The document id is actually just the content/version hash.  The skin
+      // id is later prepended in SkinStyleProvider.getTargetStyleSheetName().
       builder.append(_documentId);
       
       // Double-separator to make it easier to write regular
@@ -144,7 +146,7 @@ public final class StableNameUtils
       builder.append(_SEPARATOR);      
     }
     
-    private void _appendVisitNames(
+    private void _appendVariantsSection(
       StringBuilder builder,
       Collection<NamingStyleSheetVisitor> visitors
       )
@@ -162,7 +164,7 @@ public final class StableNameUtils
       builder.append(_SEPARATOR);
     }
 
-    private void _appendNonVisitNames(StringBuilder builder)
+    private void _appendContextualSection(StringBuilder builder)
     {
       builder.append(_context.isPortletMode() ? "p" : "s");
       builder.append(_SEPARATOR);