svn commit: r764096 - in /myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style: cache/FileSystemStyleCache.java xml/parse/StyleSheetNode.java

[jw...@apache.org]

Author: jwaldman
Date: Fri Apr 10 23:17:58 2009
New Revision: 764096

URL: http://svn.apache.org/viewvc?rev=764096&view=rev
Log:
fix the getNativeSelector in FileSystemStyleCache.java

Modified:
    myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
    myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java

Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java?rev=764096&r1=764095&r2=764096&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java Fri Apr 10 23:17:58 2009
@@ -1493,8 +1493,10 @@
       // what we write out to the css. e.g., af|inputText:error::content becomes
       // af|inputText.p_AFError af|inputText::content. This way we don't have to 
       // do this when we write the css inline. We have the information now.
-      return CSSGenerationUtils.getMappedSelector(
+      String mappedSelector =  CSSGenerationUtils.getMappedSelector(
         _afSelectorMap, _namespacePrefixArray, selector.toString());
+      return CSSGenerationUtils.getValidFullNameSelector(
+        mappedSelector, _namespacePrefixArray);
     }
 
     // TODO Do I need ConcurrentHashMap??

Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java?rev=764096&r1=764095&r2=764096&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java Fri Apr 10 23:17:58 2009
@@ -583,6 +583,10 @@
   private final Set<Locale>     _locales;    // The locale variants
   private final int             _direction;  // The reading direction
   // The browsers mapped to their versions (multiple versions for browser supported)
+  // The Integer value is the APPLICATION value in TrinidadAgent, like if 
+  // Integer is 3, it is APPLICATION_GECKO.
+  // TODO It would be clearer to make the Integer an Enum, and to make the
+  // Application constants an enum.
   private final Map<Integer, Set<Version>>    _agentVersions;
   private final Set<Integer>    _platforms;  // The platform variants
   private final int             _mode;       // The mode