[myfaces-trinidad] 29/30: Checkpoint: enable stable names by default

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to branch andys-skin-pregen
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad.git

commit b17a947f51782014e565589673db0c4b971aed4a
Author: Andy Schwartz <an...@apache.org>
AuthorDate: Wed Mar 21 15:17:59 2012 +0000

    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.
---
 .../trinidadinternal/renderkit/core/StyleContextImpl.java  |  4 ++--
 .../trinidadinternal/style/util/StableNameUtils.java       | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
index d24f25c..2b6d1b1 100644
--- a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
+++ b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
@@ -351,7 +351,7 @@ class StyleContextImpl implements StyleContext
       }
     }
 
-    return StyleSheetNamingStrategy.SHORT;
+    return StyleSheetNamingStrategy.STABLE;
   }
 
   private ConcurrentMap<String, Object> _getConcurrentApplicationScopedMap()
@@ -419,7 +419,7 @@ class StyleContextImpl implements StyleContext
     "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);
diff --git a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/StableNameUtils.java b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/StableNameUtils.java
index 39667ab..afce85b 100644
--- a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/StableNameUtils.java
+++ b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/StableNameUtils.java
@@ -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);

-- 
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.