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 2009/03/24 20:13:41 UTC
svn commit: r757963 - in /myfaces/trinidad/branches/jwaldman_StyleMap:
trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/
trinidad-impl/src/main/java/org/apac...
Author: jwaldman
Date: Tue Mar 24 19:13:37 2009
New Revision: 757963
URL: http://svn.apache.org/viewvc?rev=757963&view=rev
Log:
remove StyleMap
Removed:
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleMap.java
Modified:
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/BlafImageUtils.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/painter/AdjustableBorderPainter.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleProvider.java
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/ui/laf/base/BaseLafUtils.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalHeaderRenderer.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TabBarRenderer.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/GlobalHeaderRenderer.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/TabBarRenderer.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/AccentedLafIconProvider.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css Tue Mar 24 19:13:37 2009
@@ -26,6 +26,9 @@
in other component's style selectors or other component's icons. It is
meant to be a fast way to change styles. The alternative is to style each
component. **/
+
+af|foo af|bar {color: purple; background-color: green; border-color: pink}
+
.AFInstructionText
{
font-size: medium;
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/BlafImageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/BlafImageUtils.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/BlafImageUtils.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/BlafImageUtils.java Tue Mar 24 19:13:37 2009
@@ -40,13 +40,12 @@
import org.apache.myfaces.trinidadinternal.image.painter.ImmInsets;
import org.apache.myfaces.trinidadinternal.style.ParsedPropertyKey;
-import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
import org.apache.myfaces.trinidadinternal.style.CoreStyle;
-import org.apache.myfaces.trinidadinternal.style.StyleMap;
/**
* Utilities for Browser Look And Feel support.
+ * This class and everything in the image package needs to be deleted.
*
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/image/laf/browser/BlafImageUtils.java#0 $) $Date: 10-nov-2005.19:05:04 $
*/
@@ -360,40 +359,6 @@
boolean isNamed
)
{
- StyleMap map = context.getStyleContext().getStyleMap();
-
- if (map == null)
- {
-// =-=ags Don't log this condition for now. The ImageGenerator doesn't
-// set up the StyleMap yet, so let's blow this off for now
-// _LOG.fine(_MAP_ERROR);
- return null;
- }
-
- CoreStyle style = null;
-
- if (isNamed)
- style = (CoreStyle)map.getStyleByName(context.getStyleContext(), styleID);
- else
- style = (CoreStyle)map.getStyleByClass(context.getStyleContext(), styleID);
-
- if (style == null)
- {
- if (_LOG.isFine())
- _LOG.fine(_STYLE_ERROR + styleID);
-
- return null;
- }
-
- try
- {
- return (Color)style.getParsedProperty(key);
- }
- catch (PropertyParseException e)
- {
- _LOG.warning(e);
- }
-
return null;
}
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/painter/AdjustableBorderPainter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/painter/AdjustableBorderPainter.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/painter/AdjustableBorderPainter.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/painter/AdjustableBorderPainter.java Tue Mar 24 19:13:37 2009
@@ -18,18 +18,13 @@
*/
package org.apache.myfaces.trinidadinternal.image.painter;
-import java.awt.Font;
import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
-import org.apache.myfaces.trinidadinternal.style.StyleContext;
import org.apache.myfaces.trinidadinternal.style.CoreStyle;
-import org.apache.myfaces.trinidadinternal.style.StyleMap;
-import org.apache.myfaces.trinidadinternal.style.StyleProvider;
import org.apache.myfaces.trinidadinternal.style.util.CSSUtils;
-import org.apache.myfaces.trinidadinternal.image.ImageContext;
/**
* A border that insets painting of the wrapped painter by an amount
@@ -41,6 +36,7 @@
* for the "Dialog" font. Padding values for each inset are defined using
* the CSS style properties "padding-top", "padding-bottom", "padding-left"
* and "padding-right".
+ * This class and everything in its package needs to be deleted.
*
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/image/painter/AdjustableBorderPainter.java#0 $) $Date: 10-nov-2005.19:04:53 $
*/
@@ -116,25 +112,6 @@
// for this specific paint.
private CoreStyle _getPaddingStyle(PaintContext context)
{
- // First, get the StyleProvider from the context
- ImageContext imageContext = context.getImageContext();
- StyleContext styleContext = imageContext.getStyleContext();
- StyleProvider provider = styleContext.getStyleProvider();
- if (provider != null)
- {
- // Get the StyleMap
- StyleMap map = provider.getStyleMap(styleContext);
-
- if (map != null)
- {
- // Derive the style name to use from the font name.
- Font font = context.getPaintFont();
- String name = _styleNamePrefix + font.getName();
-
- return (CoreStyle)map.getStyleByName(styleContext, name);
- }
- }
-
return null;
}
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/StyleContextImpl.java Tue Mar 24 19:13:37 2009
@@ -37,7 +37,6 @@
import org.apache.myfaces.trinidadinternal.share.config.Configuration;
import org.apache.myfaces.trinidadinternal.skin.SkinStyleProvider;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
-import org.apache.myfaces.trinidadinternal.style.StyleMap;
import org.apache.myfaces.trinidadinternal.style.StyleProvider;
@@ -81,13 +80,6 @@
return getStyleProvider();
}
- public StyleMap getStyleMap()
- {
- if (_styleMap == null)
- _styleMap = getStyleProvider().getStyleMap(this);
- return _styleMap;
- }
-
public Styles getStyles()
{
if (_styles == null)
@@ -245,11 +237,6 @@
return null;
}
- public StyleMap getStyleMap(StyleContext context)
- {
- return null;
- }
-
public Styles getStyles(StyleContext context)
{
return null;
@@ -272,7 +259,6 @@
private RenderingContext _arc;
private String _generatedFilesPath;
private StyleProvider _styleProvider;
- private StyleMap _styleMap;
private Styles _styles;
private Boolean _isDisableStyleCompression;
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/StyleSheetRenderer.java Tue Mar 24 19:13:37 2009
@@ -37,7 +37,6 @@
import org.apache.myfaces.trinidad.style.Styles;
import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
-import org.apache.myfaces.trinidadinternal.style.StyleMap;
import org.apache.myfaces.trinidadinternal.style.StyleProvider;
@@ -90,7 +89,7 @@
StyleContext sContext = ((CoreRenderingContext) arc).getStyleContext();
StyleProvider provider = sContext.getStyleProvider();
- _testGetSelectorStyleMap(arc);
+ _testGetSelectorStyleMap(context, arc);
if (provider != null)
{
List<String> uris = provider.getStyleSheetURIs(sContext);
@@ -168,60 +167,19 @@
}
}
- // TODO DELETE THIS TEST
- private void _testGetStyleBySelector(RenderingContext arc)
- {
- StyleContext sContext = ((CoreRenderingContext) arc).getStyleContext();
- StyleProvider provider = sContext.getStyleProvider();
- if (provider != null)
- {
- // Check if we want to write out the css into the page or not. In portlet mode the
- // producer tries to share the consumer's stylesheet if it matches exactly.
- // jmw
- StyleMap styleMap = provider.getStyleMap(sContext);
- String[] selectors = {".AFInstructionText", // selector
- "af|inputText::content", // selector
- "af|treeTable::expansion", // selector
- "af|treeTable::locator", // selector
- "af|inputText:disabled.AFFieldTextMarker::content", // selector
- "af|foo af|bar", // selector
- ".AFDefaultFont:alias", // nothing, since currently it's in the wrong format to be a named sele ctor
- ".AFDefaultFont",// nothing, since currently it's in the wrong format to be a named sele ctor
- "AFDefaultFont"};// name
-
- System.out.println("getStyleBySelector");
- for (int i=0; i < selectors.length; i++)
- {
- String selector = selectors[i];
- Style style = styleMap.getStyleBySelector(sContext,selector);
- if (style != null)
- System.out.println(selector+" inlineString is " + style.toInlineString());
- else
- System.out.println("no styles for " + selector);
- }
- System.out.println("");
- System.out.println("getStyleByName");
- for (int i=0; i < selectors.length; i++)
- {
- String selector = selectors[i];
- Style style = styleMap.getStyleByName(sContext,selector);
- if (style != null)
- System.out.println(selector+" inlineString is " + style.toInlineString());
- else
- System.out.println("no styles for " + selector);
- }
- }
- }
// TODO DELETE THIS TEST
- private void _testGetSelectorStyleMap(RenderingContext arc)
- {
+ private void _testGetSelectorStyleMap(FacesContext context, RenderingContext arc)
+ throws IOException
+ {
StyleContext sContext = ((CoreRenderingContext) arc).getStyleContext();
StyleProvider provider = sContext.getStyleProvider();
if (provider != null)
{
+
+ ResponseWriter writer = context.getResponseWriter();
// Check if we want to write out the css into the page or not. In portlet mode the
// producer tries to share the consumer's stylesheet if it matches exactly.
// jmw
@@ -250,13 +208,36 @@
}
+ String[] simpleSelectorsToInline = {"af|document",
+ "af|panelHeader",
+ "af|showDetailHeader",
+ "af|inputText",
+ "af|selectOneChoice",
+ "af|panelLabelAndMessage",
+ "af|image",
+ "af|table",
+ "af|column",
+ "af|goLink"};
+
// now try to get the getSelectorsForSimpleSelector to see if we can get the selectors with a certain key like af|inputText
- Set<String> selectorSet = styles.getSelectorsForSimpleSelector("af|inputText");
- System.out.println("All the selectors that have af|inputText in it: ");
- for (String eachSelector : selectorSet)
+ writer.startElement("style", null);
+ for (int i=0; i< simpleSelectorsToInline.length; i++)
{
- System.out.println(eachSelector);
+ System.out.println("Get styles for " + simpleSelectorsToInline[i]);
+ Set<String> selectorSet = styles.getSelectorsForSimpleSelector(simpleSelectorsToInline[i]);
+ for (String eachSelector : selectorSet)
+ {
+ System.out.print(eachSelector + "{");
+ writer.write(eachSelector);
+ writer.write("{");
+ String cssInlineProperties = selectorStyleMap.get(eachSelector).toInlineString();
+ System.out.print(cssInlineProperties);
+ System.out.println("}");
+ writer.write(cssInlineProperties);
+ writer.write("}");
+ }
}
+ writer.endElement("style");
}
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleContext.java Tue Mar 24 19:13:37 2009
@@ -49,7 +49,6 @@
public StyleProvider getStyleProvider();
public StyleProvider getStyleProvider(boolean recompute);
- public StyleMap getStyleMap();
public Styles getStyles();
public AccessibilityProfile getAccessibilityProfile();
public boolean isPortletMode();
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleProvider.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleProvider.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleProvider.java Tue Mar 24 19:13:37 2009
@@ -30,7 +30,7 @@
* The StyleProvider API is used to access context-dependent style
* information. Style information is exposed in two ways - as
* CSS style sheet URIs (via getStyleSheetURI()), or as Style objects
- * (via getStyleMap()). Both methods take a StyleContext object,
+ * (via getStyles()). Both methods take a StyleContext object,
* which describes the target end user environment.
*
* In addition to providing access to style-related information, the
@@ -38,8 +38,8 @@
* style sheets via the getIcons() API.
*
* @see StyleContext
- * @see StyleMap
- * @see Style
+ * @see Styles
+ * @see org.apache.myfaces.trinidad.Style
*
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/StyleProvider.java#0 $) $Date: 10-nov-2005.18:57:58 $
*/
@@ -70,16 +70,6 @@
*/
public List<String> getStyleSheetURIs(StyleContext context);
- /**
- * Returns a StyleMap object, which can be used to
- * retreive Style objects for the specified context.
- *
- * @param context The context which describes the target end user
- * environment
- * @return A StyleMap object which exposes the Styles for the
- * specified context.
- */
- public StyleMap getStyleMap(StyleContext context);
public Styles getStyles(StyleContext context);
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=757963&r1=757962&r2=757963&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 Tue Mar 24 19:13:37 2009
@@ -62,7 +62,6 @@
import org.apache.myfaces.trinidadinternal.share.xml.XMLProvider;
import org.apache.myfaces.trinidadinternal.style.CSSStyle;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
-import org.apache.myfaces.trinidadinternal.style.StyleMap;
import org.apache.myfaces.trinidadinternal.style.StyleProvider;
import org.apache.myfaces.trinidadinternal.style.util.CSSGenerationUtils;
import org.apache.myfaces.trinidadinternal.style.util.NameUtils;
@@ -169,20 +168,6 @@
}
/**
- * Implementation of StyleProvider.getStyleMap().
- */
- public StyleMap getStyleMap(StyleContext context)
- {
-
- Entry entry = _getEntry(context);
-
- if (entry == null)
- return null;
-
- return entry.map;
- }
-
- /**
* Implementation of StyleProvider.getStyles().
*/
public Styles getStyles(StyleContext context)
@@ -570,7 +555,7 @@
// Create a new entry and cache it in the "normal" cache. The "normal" cache is one
// where the key is the Key object which is built based on information from the StyleContext,
// like browser, agent, locale, direction.
- Entry entry = new Entry(uris, new StyleMapImpl(styles), new StylesImpl(styles), icons, skinProperties);
+ Entry entry = new Entry(uris, new StylesImpl(styles), icons, skinProperties);
cache.put(key, entry);
// Also, cache the new entry in the entry cache
@@ -1318,20 +1303,17 @@
private static class Entry
{
public final List<String> uris;
- public final StyleMap map;
public final Styles styles;
public final ConcurrentMap<String, Icon> icons;
public final ConcurrentMap<Object, Object> skinProperties;
public Entry(
List<String> uris,
- StyleMap map,
Styles styles,
ConcurrentMap<String, Icon> icons,
ConcurrentMap<Object, Object> skinProperties)
{
this.uris = uris;
- this.map = map;
this.styles = styles;
this.icons = icons;
this.skinProperties = skinProperties;
@@ -1507,197 +1489,6 @@
}
- /**
- * A StyleMap implementation which creates Style objects as needed.
- * This is not used anymore in the current code. It's only used in obsolete code.
- */
- private class StyleMapImpl implements StyleMap
- {
- /**
- * This constructor takes an array of StyleNode where each StyleNode has
- * already been resolved based on the StyleContext. Therefore there is no
- * more merging that needs to be done, and the 'included' properties on
- * StyleNode are all null. This way we do not have to resolve the
- * styles based on the StyleContext when someone calls getStyles,
- * etc.
- * TODO This is just a test for now to see if we can get rid of the StyleContext
- * from the API.
- * @param resolvedStyles
- */
- public StyleMapImpl(StyleNode[] resolvedStyles)
- {
- _resolvedStyles = resolvedStyles;
- // TODO create a map right here (aggressively versus lazily)
- // else I could make a List out of this and then I could create
- // it lazily from then on.
- // Loop through each StyleNode and use it to add to the StyleMap.
- for (int i=0; i < _resolvedStyles.length; i++)
- {
- String selector = _resolvedStyles[i].getSelector();
- if (selector != null)
- {
- // System.out.println("Add selector to _resolvedStyles " + selector);
- // create a Style Object from the StyleNode object
- Style style = _convertStyleNode(_resolvedStyles[i]);
- _resolvedSelectorStyleMap.put(selector, style);
-
-
- }
- else
- {
- String name = _resolvedStyles[i].getName();
- // create a Style Object from the StyleNode object
- Style style = _convertStyleNode(_resolvedStyles[i]);
- _resolvedNamedSelectorsStyleMap.put(name, style);
-
- }
- }
- //System.out.println("----");
- }
-
- // Implementation of StyleMap.getStyleBySelector()
- public Style getStyleBySelector(
- StyleContext context,
- String selector
- )
- {
- if (_selectorMap == null)
- _selectorMap = _createMap();
-
- Style newStyle = _resolvedSelectorStyleMap.get(selector);
- return newStyle;
- //return _getStyle(context, _selectorMap, selector, "", false);
- }
-
- // Implementation of StyleMap.getStyleByClass()
- public Style getStyleByClass(
- StyleContext context,
- String styleClass
- )
- {
- if (_classMap == null)
- _classMap = _createMap();
- String prefix = (styleClass.indexOf('|') > -1) ? "" : ".";
- return _resolvedSelectorStyleMap.get(prefix+styleClass);
- //return _getStyle(context, _classMap, styleClass, prefix , false);
- }
-
- // Implementation of StyleMap.getStyleByClass()
- public Style getStyleByName(
- StyleContext context,
- String name
- )
- {
- if (_nameMap == null)
- _nameMap = _createMap();
- Style newStyle = _resolvedNamedSelectorsStyleMap.get(name);
- return newStyle;
- //return _getStyle(context, _nameMap, name, "", true);
- }
-
- // Do all of the real work
- // TODO if using the _resolvedStyles works, then we can get rid of all the
- // excess code in StyleSheetDocument to getStyleByName, etc.
- /**** jmw. Won't need this with the new APIs.
- private Style _getStyle(
- StyleContext context,
- Map<String, Style> map,
- String id,
- String prefix,
- boolean isName
- )
- {
- CSSStyle style = (CSSStyle)map.get(id);
-
- if (style == _MISS)
- return null;
- if (style != null)
- return style;
-
- // Next, try getting the Style from the StyleSheetDocument
- StyleSheetDocument document = __getStyleSheetDocument();
- if (document == null)
- return null;
-
- StyleNode styleNode = null;
-
- if (isName)
- {
- styleNode = document.getStyleByName(context, id);
- }
- else
- {
- styleNode = document.getStyleBySelector(context, prefix + id);
- }
-
- if (styleNode == null)
- {
- map.put(id, _MISS);
- return null;
- }
-
- // Convert the styleNode into a Style
- style = new CSSStyle();
-
- // Add in the properties for the style
- Iterable<PropertyNode> propertyNodeList = styleNode.getProperties();
- for (PropertyNode property : propertyNodeList)
- {
- String name = property.getName();
- String value = property.getValue();
-
- style.setProperty(name, value);
- }
-
- map.put(id, style);
- return style;
- }
- */
-
- public Style _convertStyleNode(StyleNode styleNode)
- {
- // Convert the styleNode into a Style
- CSSStyle style = new CSSStyle();
-
- // Add in the properties for the style
- Iterable<PropertyNode> propertyNodeList = styleNode.getProperties();
- for (PropertyNode property : propertyNodeList)
- {
- String name = property.getName();
- String value = property.getValue();
-
- style.setProperty(name, value);
- }
-
- return style;
-
- }
-
- // Creates a map of the specified size
- // TODO why only 19? Do we think we are only going to ask for 19 styles?
- private Hashtable<String, Style> _createMap()
- {
- return new Hashtable<String, Style>(19);
- }
-
-
- // Our local Style maps
- // -= Simon Lessard =-
- // TODO: Check if synchronization is truly needed
- private Hashtable<String, Style> _selectorMap;
- private Hashtable<String, Style> _classMap;
- private Hashtable<String, Style> _nameMap;
-
- private ConcurrentMap<String, Style> _resolvedSelectorStyleMap =
- new ConcurrentHashMap<String, Style>();
- private ConcurrentMap<String, Style> _resolvedNamedSelectorsStyleMap =
- new ConcurrentHashMap<String, Style>();
-
- private StyleNode[] _resolvedStyles;
-
- }
-
-
private class StyleWriterFactoryImpl
implements StyleWriterFactory
{
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java Tue Mar 24 19:13:37 2009
@@ -42,7 +42,6 @@
import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
-import org.apache.myfaces.trinidadinternal.style.StyleMap;
import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
@@ -1045,6 +1044,7 @@
// style, check the style class
if ((background == null) && (entry.styleClass != null))
{
+ /** =-=jmw removed StyleMap
// We need to look up the style class in the style map
StyleMap map = context.getStyleContext().getStyleMap();
if (map != null)
@@ -1053,7 +1053,9 @@
Style style = map.getStyleByClass(styleContext, entry.styleClass);
background = _getBackground((CoreStyle)style);
+
}
+ */
}
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java Tue Mar 24 19:13:37 2009
@@ -36,7 +36,6 @@
import org.apache.myfaces.trinidadinternal.style.ParsedPropertyKey;
import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
import org.apache.myfaces.trinidadinternal.style.CoreStyle;
-import org.apache.myfaces.trinidadinternal.style.StyleMap;
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
@@ -48,6 +47,7 @@
/**
* Base class for Renderers that generate images.
+ * This class needs to be deleted. Trinidad does not generate images.
*
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/laf/oracle/desktop/TecateRenderer.java#1 $) $Date: 11-nov-2005.14:59:38 $
* @deprecated This class comes from the old Java 1.2 UIX codebase and should not be used anymore.
@@ -320,14 +320,7 @@
String name
)
{
- if (name == null)
return null;
-
- StyleMap map = context.getStyleContext().getStyleMap();
- if (map == null)
- return null;
-
- return (CoreStyle)map.getStyleByName(context.getStyleContext(), name);
}
// Returns the vertical alignment
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalHeaderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalHeaderRenderer.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalHeaderRenderer.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalHeaderRenderer.java Tue Mar 24 19:13:37 2009
@@ -20,22 +20,20 @@
import java.io.IOException;
-import java.util.Map;
-
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
-import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.LinkUtils;
import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
import org.apache.myfaces.trinidad.skin.Icon;
+import org.apache.myfaces.trinidad.style.Style;
/**
- * GlobalHeader Renderer for the desktop implementation of the
+ * GlobalHeader Renderer for the desktop implementation of the
* Base Look And Feel.
- *
+ *
* The base.desktop.GlobalHeaderRenderer exposes a single customizable
* icon:
* <ul>
@@ -327,8 +325,8 @@
}
else if (isIE(context))
{
- CoreStyle style = XhtmlLafUtils.getClassStyle(context,
- AF_MENU_BAR_STYLE_CLASS);
+ Style style =XhtmlLafUtils.getClassStyle(context,
+ AF_MENU_BAR_STYLE_CLASS);
if (style != null)
{
String minHeight = style.getProperties().get("min-height");
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TabBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TabBarRenderer.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TabBarRenderer.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/TabBarRenderer.java Tue Mar 24 19:13:37 2009
@@ -20,14 +20,14 @@
import java.io.IOException;
+
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.component.UIXHierarchy;
import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
-import org.apache.myfaces.trinidadinternal.style.CoreStyle;
-import org.apache.myfaces.trinidadinternal.style.StyleContext;
-import org.apache.myfaces.trinidadinternal.style.StyleMap;
+import org.apache.myfaces.trinidad.style.Style;
+import org.apache.myfaces.trinidad.style.Styles;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.LinkUtils;
@@ -398,12 +398,10 @@
// is defined
boolean doRenderSep = false;
- StyleMap styleMap = context.getStyleContext().getStyleMap();
- if (styleMap != null)
+ Styles styles = context.getStyleContext().getStyles();
+ if (styles != null)
{
- StyleContext styleContext = context.getStyleContext();
- CoreStyle style = (CoreStyle)styleMap.getStyleByClass(styleContext,
- AF_MENU_TABS_SEPARATOR_STYLE_CLASS);
+ Style style = styles.getSelectorStyleMap().get(AF_MENU_TABS_SEPARATOR_STYLE_CLASS);
if (style != null)
{
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/GlobalHeaderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/GlobalHeaderRenderer.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/GlobalHeaderRenderer.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/GlobalHeaderRenderer.java Tue Mar 24 19:13:37 2009
@@ -25,6 +25,7 @@
import org.apache.myfaces.trinidad.component.UIXHierarchy;
import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
+import org.apache.myfaces.trinidad.style.Style;
import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -151,7 +152,7 @@
if ( renderStyleElements(context))
{
- CoreStyle classStyle = XhtmlLafUtils.getClassStyle(context,
+ Style classStyle = XhtmlLafUtils.getClassStyle(context,
_GLOBAL_HEADER_STYLE_CLASS);
if (classStyle != null)
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/TabBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/TabBarRenderer.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/TabBarRenderer.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/TabBarRenderer.java Tue Mar 24 19:13:37 2009
@@ -25,6 +25,7 @@
import org.apache.myfaces.trinidad.component.UIXHierarchy;
import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
+import org.apache.myfaces.trinidad.style.Style;
import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UINode;
@@ -67,7 +68,7 @@
if ( renderStyleElements(context))
{
- CoreStyle classStyle = XhtmlLafUtils.getClassStyle(context,
+ Style classStyle = XhtmlLafUtils.getClassStyle(context,
_TAB_BAR_STYLE_CLASS);
if (classStyle != null)
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/AccentedLafIconProvider.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/AccentedLafIconProvider.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/AccentedLafIconProvider.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/AccentedLafIconProvider.java Tue Mar 24 19:13:37 2009
@@ -32,10 +32,6 @@
import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
-import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
-import org.apache.myfaces.trinidadinternal.style.CoreStyle;
-import org.apache.myfaces.trinidadinternal.style.StyleMap;
-
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
import org.apache.myfaces.trinidadinternal.ui.UIConstants;
@@ -259,9 +255,10 @@
if (color != null)
return color;
+ /***
// If the color hasn't been stored on the RenderingContext, get it
// from the style map.
- StyleMap map = context.getStyleContext().getStyleMap();
+ StyleMap map =context.getStyleContext().getStyleMap();
if (map != null)
{
@@ -279,6 +276,7 @@
}
}
}
+*/
if (color == null)
color = defaultColor;
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java Tue Mar 24 19:13:37 2009
@@ -36,6 +36,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
import org.apache.myfaces.trinidad.context.PartialPageContext;
import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.style.Style;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
@@ -775,7 +776,7 @@
for ( ; j < styleClasses.length; j++ )
{
Object styleClass = styleClasses[j];
- CoreStyle inlineStyle = XhtmlLafUtils.getClassStyle(context, styleClass);
+ Style inlineStyle = XhtmlLafUtils.getClassStyle(context, styleClass);
if (inlineStyle != null )
inline.append(inlineStyle.toInlineString());
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java?rev=757963&r1=757962&r2=757963&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java Tue Mar 24 19:13:37 2009
@@ -33,6 +33,8 @@
import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.skin.Icon;
+import org.apache.myfaces.trinidad.style.Style;
+import org.apache.myfaces.trinidad.style.Styles;
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.AutoSubmitUtils;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
@@ -45,7 +47,6 @@
import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
import org.apache.myfaces.trinidadinternal.style.ParsedPropertyKey;
import org.apache.myfaces.trinidadinternal.style.CoreStyle;
-import org.apache.myfaces.trinidadinternal.style.StyleMap;
import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
@@ -217,11 +218,12 @@
{
if (className != null)
{
- StyleMap map = context.getStyleContext().getStyleMap();
- if (map != null)
+ Styles styles = context.getStyleContext().getStyles();
+ if (styles != null)
{
- return (CoreStyle)map.getStyleByClass(context.getStyleContext(),
- className.toString());
+ Map<String, Style> map = styles.getSelectorStyleMap();
+ if (map != null)
+ return (CoreStyle)map.get(className.toString());
}
}
@@ -239,7 +241,7 @@
String propertyName
)
{
- CoreStyle classStyle = getClassStyle(context,
+ Style classStyle = getClassStyle(context,
className);
if (classStyle != null)
{