You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2010/01/07 02:57:57 UTC
svn commit: r896732 - in
/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal:
share/xml/ skin/ style/xml/ style/xml/parse/
Author: jwaldman
Date: Thu Jan 7 01:57:57 2010
New Revision: 896732
URL: http://svn.apache.org/viewvc?rev=896732&view=rev
Log:
code cleanup
removed synchronization since it is not needed in StyleSheetNodeParser.java
In StyleSheetNodeParser, refactored the _init methods to be similar to the _initBrowsers method which was refactored in an earlier checkin by Blake Sullivan.
removed unused imports from StyleSheetNode.java
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/XMLUtils.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/StyleSheetDocumentUtils.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/IncludePropertyNodeParser.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/SkinPropertyNode.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNodeParser.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocumentParser.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/XMLUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/XMLUtils.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/XMLUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/XMLUtils.java Thu Jan 7 01:57:57 2010
@@ -51,7 +51,7 @@
public class XMLUtils
{
/**
- * Parses an XML file. For includes, see parseInclude().
+ * Parses an XML file, like the skinning .xss file. For includes, see parseInclude().
* @param context the current ParseContext, which will be cloned
* @param xmlProvider an XML provider
* @param manager a ParserManager
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java Thu Jan 7 01:57:57 2010
@@ -60,6 +60,9 @@
/**
+ * Utility class for creating a StyleSheetDocument.
+ * The main method is parseCSSSource which creates a StyleSheetEntry.
+ * The interim object is SkinStyleSheetNode
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/skin/SkinStyleSheetParserUtils.java#0 $) $Date: 10-nov-2005.18:59:00 $
*/
class SkinStyleSheetParserUtils
@@ -72,7 +75,7 @@
* @param sourceName the name of the target, relative to the current file
* @param expectedType the expected Java type of the target.
*/
- static public Object parseCSSSource(
+ static public StyleSheetEntry parseCSSSource(
ParseContext context,
NameResolver resolver,
String sourceName,
@@ -91,7 +94,7 @@
InputStreamProvider provider = resolver.getProvider(sourceName);
Object cached = provider.getCachedResult();
if ((cached != null) && expectedType.isInstance(cached))
- return cached;
+ return (StyleSheetEntry)cached;
InputStream stream = provider.openInputStream();
@@ -159,7 +162,7 @@
* A StyleSheetEntry is an object that contains:
* styleSheetName, StyleSheetDocument
* A StyleSheetDocument contains StyleSheetNodes. A StyleSheetNode contains
- * a list css style selectors and their properties and additional info like
+ * a list style selectors and their properties and additional info like
* the direction, locale, etc. for this list of selectors.
* @param context
* @param sourceName
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java Thu Jan 7 01:57:57 2010
@@ -37,7 +37,10 @@
/**
* Package-private utility class used by Skin implementation
- * to manage a single XSS or CSS skin stylesheet source file.
+ * to manage a single XSS or CSS skin stylesheet source file .
+ * This class calls the parsing code which parses either the XSS or CSS file (_createSkinStyleSheet),
+ * and it stores a StyleSheetDocument object, which is a parsed representation of a
+ * Trinidad style sheet document whether that is in the css or xss format or merged.
* This class could actually
* be pushed into an inner class in Skin, but at the moment
* it is separated out simply to reduce the amount of code in
@@ -48,7 +51,7 @@
class StyleSheetEntry
{
/**
- * Creates a StyleSheetEntry for the specified context/name.
+ * Creates a StyleSheetEntry for the specified context and styleSheetName.
* This method will log any errors/exceptions and return
* null if the style sheet source file could not be found/parsed.
*/
@@ -164,7 +167,7 @@
{
// Parse the style sheet to create the StyleSheetDocument
- StyleSheetDocument document = _createStyleSheetDocument(resolver,
+ StyleSheetDocument document = _createStyleSheetDocumentFromXSS(resolver,
styleSheetName);
if (document == null)
skinStyleSheet = null;
@@ -189,7 +192,7 @@
}
- // Creates the StyleSheetEntry
+ // Creates the StyleSheetEntry from a skinning file that ends in .css
private static StyleSheetEntry _createSkinStyleSheetFromCSS(
NameResolver resolver,
String styleSheetName
@@ -201,7 +204,7 @@
ParseContextImpl parseContext = new ParseContextImpl();
// if this is a utility that isn't in this file, then I can't return a SkinStyleSheet.
// I think instead this parseCSSSource should return a new instance of StyleSheetEntry.
- return (StyleSheetEntry)SkinStyleSheetParserUtils.parseCSSSource(
+ return SkinStyleSheetParserUtils.parseCSSSource(
parseContext,
resolver,
styleSheetName,
@@ -217,8 +220,8 @@
return null;
}
- // Creates the StyleSheetDocument
- private static StyleSheetDocument _createStyleSheetDocument(
+ // Creates the StyleSheetDocument from a skinning file that ends in .xss, like base-desktop.xss
+ private static StyleSheetDocument _createStyleSheetDocumentFromXSS(
NameResolver resolver,
String styleSheetName
)
@@ -228,6 +231,7 @@
try
{
+ // this will parse the xss file adn return a StyleSheetDocument
return StyleSheetDocumentUtils.createStyleSheetDocument(xmlProvider,
resolver,
styleSheetName);
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/StyleSheetDocumentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/StyleSheetDocumentUtils.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/StyleSheetDocumentUtils.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/StyleSheetDocumentUtils.java Thu Jan 7 01:57:57 2010
@@ -49,14 +49,14 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
/**
- * Utility class for parsing an XSS document into a StyleSheetDocument.
+ * Utility class for creating a StyleSheetDocument.
*
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/xml/StyleSheetDocumentUtils.java#0 $) $Date: 10-nov-2005.18:58:00 $
*/
public class StyleSheetDocumentUtils
{
/**
- * Creates a StyleSheetDocument from the specified InputSource
+ * Creates a StyleSheetDocument from the specified InputSource (.xss file)
*
* @param provider The XMLProvider to use to parse the source document
* @param source The InputSource for the source document. The system
@@ -84,7 +84,7 @@
}
/**
- * Creates a StyleSheetDocument from the specified InputSource
+ * Creates a StyleSheetDocument from the specified InputSource (.xss file)
* @param xmlProvider The XMLProvider to use to parse the source document
* @param resolver The NameResolver to use to locate the source document.
* This must be a non-null instance.
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/IncludePropertyNodeParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/IncludePropertyNodeParser.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/IncludePropertyNodeParser.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/IncludePropertyNodeParser.java Thu Jan 7 01:57:57 2010
@@ -30,7 +30,7 @@
import org.apache.myfaces.trinidadinternal.style.xml.XMLConstants;
/**
- * NodeParser for includeProperty nodes
+ * NodeParser for includeProperty nodes. This parses the XSS file.
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/xml/parse/IncludePropertyNodeParser.java#0 $) $Date: 10-nov-2005.18:58:08 $
*/
public class IncludePropertyNodeParser extends LeafNodeParser
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java Thu Jan 7 01:57:57 2010
@@ -33,7 +33,7 @@
import org.apache.myfaces.trinidadinternal.style.xml.XMLConstants;
/**
- * NodeParser for property nodes
+ * NodeParser for property nodes. This parses the XSS file.
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/xml/parse/PropertyNodeParser.java#0 $) $Date: 10-nov-2005.18:58:10 $
*/
public class PropertyNodeParser extends BaseNodeParser
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/SkinPropertyNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/SkinPropertyNode.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/SkinPropertyNode.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/SkinPropertyNode.java Thu Jan 7 01:57:57 2010
@@ -23,6 +23,7 @@
* A SkinProperyNode is a node that
* contains the selector, the -tr- property, and the value
* e.g., af|breadCrumbs, -tr-show-last-item, true
+ * This parses the XSS file.
*
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/xml/parse/SkinPropertyNode.java#0 $) $Date: 10-nov-2005.18:50:45 $
*/
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNodeParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNodeParser.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNodeParser.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNodeParser.java Thu Jan 7 01:57:57 2010
@@ -35,7 +35,7 @@
import org.apache.myfaces.trinidadinternal.style.xml.XMLConstants;
/**
- * NodeParser for style nodes
+ * NodeParser for style nodes. This parses the XSS file.
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/xml/parse/StyleNodeParser.java#0 $) $Date: 10-nov-2005.18:58:12 $
*/
public class StyleNodeParser extends BaseNodeParser
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocumentParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocumentParser.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocumentParser.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocumentParser.java Thu Jan 7 01:57:57 2010
@@ -47,7 +47,7 @@
import org.apache.myfaces.trinidadinternal.style.xml.XMLConstants;
/**
- * NodeParser for style sheet document nodes
+ * NodeParser for style sheet document nodes. This parses the XSS file.
*
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/xml/parse/StyleSheetDocumentParser.java#0 $) $Date: 10-nov-2005.18:58:46 $
*/
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java Thu Jan 7 01:57:57 2010
@@ -41,8 +41,12 @@
* Private implementation of StyleSheetNode. A StyleSheetNode has StyleNodes for particular
* browsers, direction, versions, platforms and mode. In addition, the StyleSheetNode
* provides access to IconNodes representing the icons which were defined within
- * the context of this style sheet.
- *
+ * the context of this style sheet. StyleSheetNodes are contained in StyleSheetDocuments.
+ * And a StyleSheetNode is created for both .xss skin files and .css files.
+ * .xss skin files create StyleSheetNodes via StyleSheetNodeParser
+ * .css skin files create StyleSheetNodes via SkinStyleSheetParserUtils
+ * @see StyleSheetNodeParser
+ * @see org.apache.myfaces.trinidadinternal.skin.SkinStyleSheetParserUtils
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/xml/parse/StyleSheetNode.java#0 $) $Date: 10-nov-2005.18:58:46 $
*/
public class StyleSheetNode
@@ -327,6 +331,9 @@
return 0;
int match = 0;
+
+ if (_locales.contains(locale))
+ return _LOCALE_EXACT_MATCH;
for (Locale tmpLocale : _locales)
{
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java?rev=896732&r1=896731&r2=896732&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java Thu Jan 7 01:57:57 2010
@@ -45,7 +45,8 @@
/**
* NodeParser for style sheet nodes. This class is thread-safe since it is created each time
- * with newInstance(). Therefore we do not synchronize
+ * with newInstance(). Therefore we do not synchronize.
+ * This parses the XSS file and creates a StyleSheetNode object.
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/xml/parse/StyleSheetNodeParser.java#0 $) $Date: 10-nov-2005.18:58:47 $
* @see org.apache.myfaces.trinidadinternal.share.xml.ClassParserFactory#getParser
*/