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/18 21:40:14 UTC
svn commit: r755724 - in /myfaces/trinidad/branches/jwaldman_StyleMap:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/style/
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/laf/browser/
trinidad-impl/src/main/java/org/apac...
Author: jwaldman
Date: Wed Mar 18 20:40:14 2009
New Revision: 755724
URL: http://svn.apache.org/viewvc?rev=755724&view=rev
Log:
move some of the Style interface to the public api.
renamed the internal Style interface to CoreStyle.
Added:
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-api/src/main/java/org/apache/myfaces/trinidad/style/
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-api/src/main/java/org/apache/myfaces/trinidad/style/Style.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CoreStyle.java
- copied, changed from r755416, myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/Style.java
Removed:
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/Style.java
Modified:
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/share/expl/Coercions.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/URIImageIcon.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CSSStyle.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleMap.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/style/util/CSSGenerationUtils.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.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/Icon.java
myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.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
Added: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-api/src/main/java/org/apache/myfaces/trinidad/style/Style.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-api/src/main/java/org/apache/myfaces/trinidad/style/Style.java?rev=755724&view=auto
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-api/src/main/java/org/apache/myfaces/trinidad/style/Style.java (added)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-api/src/main/java/org/apache/myfaces/trinidad/style/Style.java Wed Mar 18 20:40:14 2009
@@ -0,0 +1,59 @@
+package org.apache.myfaces.trinidad.style;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Iterator;
+
+/**
+ * A Style object defines a set of visual (or aural) style properties.
+ * The Style interface exposes one method for retrieving properties:
+ * getProperty(). getProperty() takes a String property name and
+ * returns a String property value. You can get an Iterator of PropertyNames
+ * by calling getPropretyNames().
+ *
+ */
+public interface Style
+{
+
+ /**
+ * Returns the names of the properties defined by this style.
+ */
+ // -= Simon Lessard =-
+ // FIXME: This should be changed to <String> once the issues
+ // with ArrayMap are fixed. ATM (2006-08-04) ArrayMap
+ // have huge problem working with anything but Object???
+ // TODO???
+ public Iterator<Object> getPropertyNames();
+
+ /**
+ * Returns the value of the property with the specified name.
+ *
+ * @param name The property name for the property to return
+ */
+ public String getProperty(String name);
+
+
+ /**
+ * Converts the style to a String suitable for use as an inline style
+ * attribute value.
+ */
+ public String toInlineString();
+}
+
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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -41,7 +41,7 @@
import org.apache.myfaces.trinidadinternal.style.ParsedPropertyKey;
import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
-import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.style.StyleMap;
@@ -158,7 +158,7 @@
String styleClass
)
{
- return _getColor(context, styleClass, Style.FOREGROUND_KEY, false);
+ return _getColor(context, styleClass, CoreStyle.FOREGROUND_KEY, false);
}
// Returns the foreground Color from the specified style
@@ -167,7 +167,7 @@
String styleClass
)
{
- return _getColor(context, styleClass, Style.BACKGROUND_KEY, false);
+ return _getColor(context, styleClass, CoreStyle.BACKGROUND_KEY, false);
}
// Returns the foreground Color from the specified style
@@ -176,7 +176,7 @@
String styleName
)
{
- return _getColor(context, styleName, Style.FOREGROUND_KEY, true);
+ return _getColor(context, styleName, CoreStyle.FOREGROUND_KEY, true);
}
// Returns the foreground Color from the specified style
@@ -185,7 +185,7 @@
String styleName
)
{
- return _getColor(context, styleName, Style.BACKGROUND_KEY, true);
+ return _getColor(context, styleName, CoreStyle.BACKGROUND_KEY, true);
}
// Get a mnemonic index given a String and access char.
@@ -370,12 +370,12 @@
return null;
}
- Style style = null;
+ CoreStyle style = null;
if (isNamed)
- style = map.getStyleByName(context.getStyleContext(), styleID);
+ style = (CoreStyle)map.getStyleByName(context.getStyleContext(), styleID);
else
- style = map.getStyleByClass(context.getStyleContext(), styleID);
+ style = (CoreStyle)map.getStyleByClass(context.getStyleContext(), styleID);
if (style == 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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -24,7 +24,7 @@
import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
-import org.apache.myfaces.trinidadinternal.style.Style;
+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;
@@ -96,7 +96,7 @@
int bottom = _defaultInsets.bottom;
int right = _defaultInsets.right;
- Style style = _getPaddingStyle(context);
+ CoreStyle style = _getPaddingStyle(context);
if (style != null)
{
top = _getPadding(style, _TOP_PADDING, top);
@@ -114,7 +114,7 @@
// Get the Style object which contains padding information
// for this specific paint.
- private Style _getPaddingStyle(PaintContext context)
+ private CoreStyle _getPaddingStyle(PaintContext context)
{
// First, get the StyleProvider from the context
ImageContext imageContext = context.getImageContext();
@@ -131,7 +131,7 @@
Font font = context.getPaintFont();
String name = _styleNamePrefix + font.getName();
- return map.getStyleByName(styleContext, name);
+ return (CoreStyle)map.getStyleByName(styleContext, name);
}
}
@@ -144,7 +144,7 @@
// value can not be converted to an int, the
// defaultValue is used.
private static int _getPadding(
- Style style,
+ CoreStyle style,
String propertyName,
int defaultValue
)
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/expl/Coercions.java Wed Mar 18 20:40:14 2009
@@ -31,7 +31,7 @@
import org.apache.myfaces.trinidadinternal.share.text.RGBColorFormat;
import org.apache.myfaces.trinidadinternal.share.xml.NamespaceURI;
import org.apache.myfaces.trinidadinternal.share.xml.XMLUtils;
-import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.style.util.CSSUtils;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -160,7 +160,7 @@
{
return NamespaceURI.create(context, text, "");
}
- else if (type == Style.class)
+ else if (type == CoreStyle.class)
{
return CSSUtils.parseStyle(text);
}
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/BaseImageIcon.java Wed Mar 18 20:40:14 2009
@@ -28,9 +28,9 @@
import org.apache.myfaces.trinidad.skin.Icon;
import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.style.Style;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
-import org.apache.myfaces.trinidadinternal.style.Style;
import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
/**
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/ContextImageIcon.java Wed Mar 18 20:40:14 2009
@@ -24,8 +24,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.trinidad.context.RenderingContext;
-
-import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidad.style.Style;
/**
* An Icon implementation for icons which are under the
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/TextIcon.java Wed Mar 18 20:40:14 2009
@@ -24,11 +24,11 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import org.apache.myfaces.trinidad.context.RenderingContext;
import org.apache.myfaces.trinidad.skin.Icon;
+import org.apache.myfaces.trinidad.style.Style;
-import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.style.Style;
import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
/**
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/URIImageIcon.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/URIImageIcon.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/URIImageIcon.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/icon/URIImageIcon.java Wed Mar 18 20:40:14 2009
@@ -21,7 +21,7 @@
import javax.faces.context.FacesContext;
import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidad.style.Style;
/**
* ImageIcon implementation which takes a full URI.
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/BaseStyle.java Wed Mar 18 20:40:14 2009
@@ -22,6 +22,7 @@
import java.util.Map;
import java.util.Iterator;
+import org.apache.myfaces.trinidad.style.Style;
import org.apache.myfaces.trinidad.util.ArrayMap;
@@ -29,7 +30,7 @@
* Base class for Style implementations
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/BaseStyle.java#0 $) $Date: 10-nov-2005.18:57:54 $
*/
-abstract public class BaseStyle implements Style, Serializable
+abstract public class BaseStyle implements CoreStyle, Serializable
{
/**
* Creates an empty BaseStyle.
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CSSStyle.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CSSStyle.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CSSStyle.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CSSStyle.java Wed Mar 18 20:40:14 2009
@@ -23,6 +23,8 @@
import java.util.Collections;
import java.util.Iterator;
+import org.apache.myfaces.trinidad.style.Style;
+
import org.apache.myfaces.trinidadinternal.style.util.CSSUtils;
@@ -129,27 +131,27 @@
{
Object value = null;
- if (key == Style.BACKGROUND_KEY)
+ if (key == CoreStyle.BACKGROUND_KEY)
{
value = CSSUtils.parseColor(getProperty(_BACKGROUND_NAME));
}
- else if (key == Style.FOREGROUND_KEY)
+ else if (key == CoreStyle.FOREGROUND_KEY)
{
value = CSSUtils.parseColor(getProperty(_FOREGROUND_NAME));
}
- else if (key == Style.FONT_SIZE_KEY)
+ else if (key == CoreStyle.FONT_SIZE_KEY)
{
value = CSSUtils.parseFontSize(getProperty(_FONT_SIZE_NAME));
}
- else if (key == Style.FONT_STYLE_KEY)
+ else if (key == CoreStyle.FONT_STYLE_KEY)
{
value = CSSUtils.parseFontStyle(getProperty(_FONT_STYLE_NAME));
}
- else if (key == Style.FONT_WEIGHT_KEY)
+ else if (key == CoreStyle.FONT_WEIGHT_KEY)
{
value = CSSUtils.parseFontWeight(getProperty(_FONT_WEIGHT_NAME));
}
- else if (key == Style.FONT_FAMILIES_KEY)
+ else if (key == CoreStyle.FONT_FAMILIES_KEY)
{
String[] families = CSSUtils.parseFontFamilies(getProperty(
_FONT_FAMILY_NAME));
@@ -157,7 +159,7 @@
if (families != null)
value = Collections.unmodifiableList(Arrays.asList(families));
}
- else if (key == Style.TEXT_ANTIALIAS_KEY)
+ else if (key == CoreStyle.TEXT_ANTIALIAS_KEY)
{
String antialiased = getProperty(_TEXT_ANTIALIAS_NAME);
if ((antialiased != null) && "true".equalsIgnoreCase(antialiased))
Copied: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CoreStyle.java (from r755416, myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/Style.java)
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CoreStyle.java?p2=myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CoreStyle.java&p1=myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/Style.java&r1=755416&r2=755724&rev=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/Style.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/CoreStyle.java Wed Mar 18 20:40:14 2009
@@ -18,11 +18,11 @@
*/
package org.apache.myfaces.trinidadinternal.style;
-import java.util.Iterator;
+import org.apache.myfaces.trinidad.style.Style;
/**
- * A Style object defines a set of visual (or aural) style properties.
- * The Style interface exposes two method for retrieving properties:
+ * A CoreStyle object defines a set of visual (or aural) style properties.
+ * The CoreStyle interface exposes two method for retrieving properties:
* getProperty() and getParsedProperty(). getProperty()
* takes a String property name and returns a String property value.
* getParsedProperty() takes a key object (eg. FONT_WEIGHT_KEY) and
@@ -33,7 +33,7 @@
*
* @version $Name: $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/style/Style.java#0 $) $Date: 10-nov-2005.18:57:56 $
*/
-public interface Style
+public interface CoreStyle extends Style
{
/**
* Key for obtaining the Color object which corresponds to the
@@ -114,22 +114,6 @@
public static final Object BOLD_FONT_WEIGHT = 1;
/**
- * Returns the names of the properties defined by this style.
- */
- // -= Simon Lessard =-
- // FIXME: This should be changed to <String> once the issues
- // with ArrayMap are fixed. ATM (2006-08-04) ArrayMap
- // have huge problem working with anything but Object
- public Iterator<Object> getPropertyNames();
-
- /**
- * Returns the value of the property with the specified name.
- *
- * @param name The property name for the property to return
- */
- public String getProperty(String name);
-
- /**
* Returns a parsed Java object corresponding to the specified
* property key.
* <p>
@@ -148,9 +132,4 @@
public Object getParsedProperty(ParsedPropertyKey key)
throws PropertyParseException;
- /**
- * Converts the style to a String suitable for use as an inline style
- * attribute value.
- */
- public String toInlineString();
}
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleMap.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleMap.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleMap.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/StyleMap.java Wed Mar 18 20:40:14 2009
@@ -18,6 +18,8 @@
*/
package org.apache.myfaces.trinidadinternal.style;
+import org.apache.myfaces.trinidad.style.Style;
+
/**
* The StyleMap is a type-safe map interface for obtaining
* Style objects based on a style selector. Context-specific
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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -49,6 +49,7 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.skin.Icon;
import org.apache.myfaces.trinidad.skin.Skin;
+import org.apache.myfaces.trinidad.style.Style;
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
@@ -59,7 +60,6 @@
import org.apache.myfaces.trinidadinternal.share.xml.JaxpXMLProvider;
import org.apache.myfaces.trinidadinternal.share.xml.XMLProvider;
import org.apache.myfaces.trinidadinternal.style.CSSStyle;
-import org.apache.myfaces.trinidadinternal.style.Style;
import org.apache.myfaces.trinidadinternal.style.StyleContext;
import org.apache.myfaces.trinidadinternal.style.StyleMap;
import org.apache.myfaces.trinidadinternal.style.StyleProvider;
@@ -521,12 +521,19 @@
// Next, get the fully resolved styles for this context. This will be
// those StyleNodes that match the locale, direction, browser, portlet mode
// etc -- the info that is in the StyleContext.
+ // These styles contain all the StyleNodes, that is, where selector or
+ // name (aka alias) are non-null.
StyleNode[] styles = _getStyleContextResolvedStyles(context, document);
if (styles == null)
return null;
+
// Generate the style sheet file, if it isn't already generated,
// and return the uri.
+ // Only the StyleNodes with non-null selectors get written to the
+ // generated css file.
+ // Named styles (StyleNode where name != null) do not get
+ // written to the generated css file.
List<String> uris = _createStyleSheetFiles(context,
document,
styles,
@@ -548,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(), icons, skinProperties);
+ Entry entry = new Entry(uris, new StyleMapImpl(styles), icons, skinProperties);
cache.put(key, entry);
// Also, cache the new entry in the entry cache
@@ -1387,6 +1394,48 @@
*/
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 getStyleBySelector,
+ * 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]);
+ _resolvedStyleMap.put(selector, style);
+
+
+ }
+ else
+ {
+ String name = _resolvedStyles[i].getName();
+ // create a Style Object from the StyleNode object
+ Style style = _convertStyleNode(_resolvedStyles[i]);
+ _resolvedStyleMap.put(name, style);
+
+ }
+ }
+ //System.out.println("----");
+ }
+
// Implementation of StyleMap.getStyleBySelector()
public Style getStyleBySelector(
StyleContext context,
@@ -1396,7 +1445,10 @@
if (_selectorMap == null)
_selectorMap = _createMap();
- return _getStyle(context, _selectorMap, selector, "", false);
+ Style oldStyle = _getStyle(context, _selectorMap, selector, "", false);
+ Style newStyle = _resolvedStyleMap.get(selector);
+ return newStyle;
+ //return _getStyle(context, _selectorMap, selector, "", false);
}
// Implementation of StyleMap.getStyleByClass()
@@ -1424,6 +1476,8 @@
}
// 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.
private Style _getStyle(
StyleContext context,
Map<String, Style> map,
@@ -1477,8 +1531,28 @@
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);
@@ -1491,6 +1565,11 @@
private Hashtable<String, Style> _selectorMap;
private Hashtable<String, Style> _classMap;
private Hashtable<String, Style> _nameMap;
+
+ private ConcurrentMap<String, Style> _resolvedStyleMap =
+ new ConcurrentHashMap<String, Style>();
+
+ private StyleNode[] _resolvedStyles;
}
private class StyleWriterFactoryImpl
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSGenerationUtils.java Wed Mar 18 20:40:14 2009
@@ -117,6 +117,9 @@
// pass to find matching StyleNodes.
String[] propertyStrings = new String[styles.length];
+ // at this point the styles StyleNode[] can contain both Styles with
+ // non-null selector or non-null name(aka alias). We only generate
+ // the styles where getSelector is non-null.
for (int i = 0; i < styles.length; i++)
{
StyleNode style = styles[i];
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java Wed Mar 18 20:40:14 2009
@@ -32,9 +32,10 @@
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.util.ArrayMap;
+import org.apache.myfaces.trinidad.style.Style;
import org.apache.myfaces.trinidadinternal.style.CSSStyle;
+import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
-import org.apache.myfaces.trinidadinternal.style.Style;
import org.apache.myfaces.trinidadinternal.util.LRUCache;
/**
@@ -454,10 +455,10 @@
value = value.toLowerCase();
if (_NORMAL_STYLE.equals(value))
- return Style.PLAIN_FONT_STYLE;
+ return CoreStyle.PLAIN_FONT_STYLE;
if (_ITALIC_STYLE.equals(value) || _OBLIQUE_STYLE.equals(value))
- return Style.ITALIC_FONT_STYLE;
+ return CoreStyle.ITALIC_FONT_STYLE;
throw new PropertyParseException(_INVALID_FONT_STYLE + value);
}
@@ -484,10 +485,10 @@
value = value.toLowerCase();
if (_NORMAL_WEIGHT.equals(value) || _LIGHTER_WEIGHT.equals(value))
- return Style.PLAIN_FONT_WEIGHT;
+ return CoreStyle.PLAIN_FONT_WEIGHT;
if (_BOLD_WEIGHT.equals(value) || _BOLDER_WEIGHT.equals(value))
- return Style.BOLD_FONT_WEIGHT;
+ return CoreStyle.BOLD_FONT_WEIGHT;
// Check for sizes 100 - 900
try
@@ -496,9 +497,9 @@
if ((weight >= 100) && (weight <= 900) && ((weight % 100) == 0))
{
if (weight >= 600)
- return Style.BOLD_FONT_WEIGHT;
+ return CoreStyle.BOLD_FONT_WEIGHT;
- return Style.PLAIN_FONT_WEIGHT;
+ return CoreStyle.PLAIN_FONT_WEIGHT;
}
}
catch (NumberFormatException e)
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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -32,6 +32,7 @@
import javax.faces.context.ExternalContext;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+import org.apache.myfaces.trinidad.style.Style;
import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
import org.apache.myfaces.trinidadinternal.share.config.Configuration;
@@ -39,7 +40,7 @@
import org.apache.myfaces.trinidadinternal.share.url.EncoderUtils;
import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
-import org.apache.myfaces.trinidadinternal.style.Style;
+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;
@@ -901,7 +902,7 @@
public static void pushStyleAttrs(
UIXRenderingContext context,
String styleClass,
- Style inlineStyle
+ CoreStyle inlineStyle
)
{
_getStyleStack(context).push(styleClass, inlineStyle);
@@ -969,7 +970,7 @@
// Push style attributes onto the stack
public void push(
String styleClass,
- Style inlineStyle
+ CoreStyle inlineStyle
)
{
// It really seems like it would be more efficient to
@@ -1051,7 +1052,7 @@
StyleContext styleContext = context.getStyleContext();
Style style = map.getStyleByClass(styleContext, entry.styleClass);
- background = _getBackground(style);
+ background = _getBackground((CoreStyle)style);
}
}
@@ -1066,13 +1067,13 @@
}
// Gets the background color from a Style object
- private static Color _getBackground(Style style)
+ private static Color _getBackground(CoreStyle style)
{
if (style != null)
{
try
{
- return (Color)style.getParsedProperty(Style.BACKGROUND_KEY);
+ return (Color)style.getParsedProperty(CoreStyle.BACKGROUND_KEY);
}
catch (PropertyParseException e)
{
@@ -1089,11 +1090,11 @@
private static class Entry
{
public final String styleClass;
- public final Style inlineStyle;
+ public final CoreStyle inlineStyle;
public Color background;
public Entry next;
- public Entry(String styleClass, Style inlineStyle, Entry next)
+ public Entry(String styleClass, CoreStyle inlineStyle, Entry next)
{
this.styleClass = styleClass;
this.inlineStyle = inlineStyle;
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/Icon.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/Icon.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/Icon.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/Icon.java Wed Mar 18 20:40:14 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.trinidadinternal.share.io.NameResolver;
-import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeel;
/**
@@ -90,7 +90,7 @@
boolean isSymmetric,
boolean isTransparent,
String styleClass,
- Style inlineStyle
+ CoreStyle inlineStyle
)
{
this(gifName, isCoreColor, isSymmetric, isTransparent);
@@ -183,7 +183,7 @@
/**
* Returns the inline style
*/
- public Style getInlineStyle()
+ public CoreStyle getInlineStyle()
{
return _inlineStyle;
}
@@ -202,5 +202,5 @@
private boolean _isTransparent;
private String _styleClass;
- private Style _inlineStyle;
+ private CoreStyle _inlineStyle;
}
Modified: myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.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/ButtonRenderer.java?rev=755724&r1=755723&r2=755724&view=diff
==============================================================================
--- myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java (original)
+++ myfaces/trinidad/branches/jwaldman_StyleMap/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java Wed Mar 18 20:40:14 2009
@@ -33,7 +33,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
import org.apache.myfaces.trinidadinternal.image.cache.CompositeButtonKey;
import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
-import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.style.util.CSSUtils;
import org.apache.myfaces.trinidadinternal.style.util.FontProxy;
import org.apache.myfaces.trinidadinternal.style.util.MutableFontProxy;
@@ -433,9 +433,9 @@
getBooleanAttributeValue(context, node, _END_ROUNDED_ATTR, true);
Object name = getImageName(context, node);
String styleName = getServerStyleName(context, node, disabled);
- Style style = getStyle(context, node, styleName);
+ CoreStyle style = getStyle(context, node, styleName);
- Style inlineStyle;
+ CoreStyle inlineStyle;
Object inlineStyleObj = getInlineStyle(context, node);
if (inlineStyleObj == null)
inlineStyle = null;
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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -35,7 +35,7 @@
import org.apache.myfaces.trinidadinternal.style.ParsedPropertyKey;
import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
-import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.style.StyleMap;
import org.apache.myfaces.trinidadinternal.image.ImageConstants;
@@ -314,7 +314,7 @@
}
// Returns the style for the specified name
- static protected Style getStyle(
+ static protected CoreStyle getStyle(
UIXRenderingContext context,
UINode node,
String name
@@ -327,7 +327,7 @@
if (map == null)
return null;
- return map.getStyleByName(context.getStyleContext(), name);
+ return (CoreStyle)map.getStyleByName(context.getStyleContext(), name);
}
// Returns the vertical alignment
@@ -339,8 +339,8 @@
static protected int getFontStyle(
UIXRenderingContext context,
UINode node,
- Style classStyle,
- Style inlineStyle,
+ CoreStyle classStyle,
+ CoreStyle inlineStyle,
String styleName
)
{
@@ -353,7 +353,7 @@
// First, try getting font-style and font-weight from inline style
if (inlineStyle != null)
{
- value = _parseValue(inlineStyle, null, Style.FONT_STYLE_KEY);
+ value = _parseValue(inlineStyle, null, CoreStyle.FONT_STYLE_KEY);
if (value != null)
{
@@ -361,7 +361,7 @@
gotStyle = true;
}
- value = _parseValue(inlineStyle, null, Style.FONT_WEIGHT_KEY);
+ value = _parseValue(inlineStyle, null, CoreStyle.FONT_WEIGHT_KEY);
if (value != null)
{
fontWeight = _getAWTFontWeight(value);
@@ -374,8 +374,7 @@
if (!gotStyle)
{
value = _parseValue(classStyle,
- styleName,
- Style.FONT_STYLE_KEY);
+ styleName, CoreStyle.FONT_STYLE_KEY);
if (value != null)
fontStyle = _getAWTFontStyle(value);
}
@@ -383,8 +382,7 @@
if (!gotWeight)
{
value = _parseValue(classStyle,
- styleName,
- Style.FONT_WEIGHT_KEY);
+ styleName, CoreStyle.FONT_WEIGHT_KEY);
if (value != null)
fontWeight = _getAWTFontWeight(value);
@@ -397,8 +395,8 @@
static protected int getFontSize(
UIXRenderingContext context,
UINode node,
- Style classStyle,
- Style inlineStyle,
+ CoreStyle classStyle,
+ CoreStyle inlineStyle,
String styleName
)
{
@@ -406,8 +404,7 @@
if (inlineStyle != null)
{
Object value = _parseValue(inlineStyle,
- null,
- Style.FONT_SIZE_KEY);
+ null, CoreStyle.FONT_SIZE_KEY);
if (value instanceof Integer)
return ((Integer)value).intValue();
@@ -416,8 +413,7 @@
if (styleName != null)
{
Object value = _parseValue(classStyle,
- styleName,
- Style.FONT_SIZE_KEY);
+ styleName, CoreStyle.FONT_SIZE_KEY);
if (value instanceof Integer)
return ((Integer)value).intValue();
@@ -430,20 +426,20 @@
static protected Collection<Object> getFontFamilies(
UIXRenderingContext context,
UINode node,
- Style style,
+ CoreStyle style,
String styleName
)
{
if (style != null)
{
- if(_parseValue(style, null, Style.FONT_FAMILIES_KEY) instanceof Collection)
+ if(_parseValue(style, null, CoreStyle.FONT_FAMILIES_KEY) instanceof Collection)
{
- return (Collection<Object>)_parseValue(style, null, Style.FONT_FAMILIES_KEY);
+ return (Collection<Object>)_parseValue(style, null, CoreStyle.FONT_FAMILIES_KEY);
}
else
{
Collection<Object> parsedValueList = new ArrayList<Object>();
- parsedValueList.add(_parseValue(style, null, Style.FONT_FAMILIES_KEY));
+ parsedValueList.add(_parseValue(style, null, CoreStyle.FONT_FAMILIES_KEY));
return parsedValueList;
}
}
@@ -454,45 +450,43 @@
static protected Color getBackground(
UIXRenderingContext context,
UINode node,
- Style classStyle,
- Style inlineStyle,
+ CoreStyle classStyle,
+ CoreStyle inlineStyle,
String styleName
)
{
if (inlineStyle != null)
{
Color background = (Color)_parseValue(inlineStyle,
- null,
- Style.BACKGROUND_KEY);
+ null, CoreStyle.BACKGROUND_KEY);
if (background != null)
return background;
}
return (Color)
- _parseValue(classStyle, styleName, Style.BACKGROUND_KEY);
+ _parseValue(classStyle, styleName, CoreStyle.BACKGROUND_KEY);
}
static protected Color getForeground(
UIXRenderingContext context,
UINode node,
- Style classStyle,
- Style inlineStyle,
+ CoreStyle classStyle,
+ CoreStyle inlineStyle,
String styleName
)
{
if (inlineStyle != null)
{
Color foreground = (Color)_parseValue(inlineStyle,
- null,
- Style.FOREGROUND_KEY);
+ null, CoreStyle.FOREGROUND_KEY);
if (foreground != null)
return foreground;
}
return (Color)
- _parseValue(classStyle, styleName, Style.FOREGROUND_KEY);
+ _parseValue(classStyle, styleName, CoreStyle.FOREGROUND_KEY);
}
static protected Color getSurroundingColor(UIXRenderingContext context)
@@ -506,19 +500,19 @@
static protected boolean isTextAntialiased(
UIXRenderingContext context,
UINode node,
- Style classStyle,
- Style inlineStyle
+ CoreStyle classStyle,
+ CoreStyle inlineStyle
)
{
if (inlineStyle != null)
{
- Object value = inlineStyle.getParsedProperty(Style.TEXT_ANTIALIAS_KEY);
+ Object value = inlineStyle.getParsedProperty(CoreStyle.TEXT_ANTIALIAS_KEY);
return Boolean.TRUE.equals(value);
}
if (classStyle != null)
{
- Object value = classStyle.getParsedProperty(Style.TEXT_ANTIALIAS_KEY);
+ Object value = classStyle.getParsedProperty(CoreStyle.TEXT_ANTIALIAS_KEY);
return Boolean.TRUE.equals(value);
}
@@ -526,7 +520,7 @@
}
static private Object _parseValue(
- Style style,
+ CoreStyle style,
String styleName,
ParsedPropertyKey key
)
@@ -554,7 +548,7 @@
static private int _getAWTFontStyle(Object style)
{
- if (style == Style.ITALIC_FONT_STYLE)
+ if (style == CoreStyle.ITALIC_FONT_STYLE)
return Font.ITALIC;
return Font.PLAIN;
@@ -562,7 +556,7 @@
static private int _getAWTFontWeight(Object weight)
{
- if (weight == Style.BOLD_FONT_WEIGHT)
+ if (weight == CoreStyle.BOLD_FONT_WEIGHT)
return Font.BOLD;
return Font.PLAIN;
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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -23,7 +23,7 @@
import javax.faces.context.ResponseWriter;
import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
-import org.apache.myfaces.trinidadinternal.style.Style;
+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;
@@ -325,7 +325,7 @@
}
else if (isIE(context))
{
- Style style = XhtmlLafUtils.getClassStyle(context,
+ CoreStyle style = XhtmlLafUtils.getClassStyle(context,
AF_MENU_BAR_STYLE_CLASS);
if (style != null)
{
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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -25,7 +25,7 @@
import org.apache.myfaces.trinidad.component.UIXHierarchy;
import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
-import org.apache.myfaces.trinidadinternal.style.Style;
+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.UIXRenderingContext;
@@ -402,7 +402,7 @@
if (styleMap != null)
{
StyleContext styleContext = context.getStyleContext();
- Style style = styleMap.getStyleByClass(styleContext,
+ CoreStyle style = (CoreStyle)styleMap.getStyleByClass(styleContext,
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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -25,7 +25,7 @@
import org.apache.myfaces.trinidad.component.UIXHierarchy;
import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
-import org.apache.myfaces.trinidadinternal.style.Style;
+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.desktop.BaseDesktopConstants;
@@ -151,7 +151,7 @@
if ( renderStyleElements(context))
{
- Style classStyle = XhtmlLafUtils.getClassStyle(context,
+ CoreStyle 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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -25,7 +25,7 @@
import org.apache.myfaces.trinidad.component.UIXHierarchy;
import org.apache.myfaces.trinidad.component.UIXNavigationLevel;
-import org.apache.myfaces.trinidadinternal.style.Style;
+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.desktop.BaseDesktopConstants;
@@ -67,7 +67,7 @@
if ( renderStyleElements(context))
{
- Style classStyle = XhtmlLafUtils.getClassStyle(context,
+ CoreStyle 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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -33,7 +33,7 @@
import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
-import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.style.StyleMap;
import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
@@ -265,12 +265,12 @@
if (map != null)
{
- Style style = map.getStyleByClass(context.getStyleContext(), styleClass);
+ CoreStyle style = (CoreStyle)map.getStyleByClass(context.getStyleContext(), styleClass);
if (style != null)
{
try
{
- color = (Color)style.getParsedProperty(Style.BACKGROUND_KEY);
+ color = (Color)style.getParsedProperty(CoreStyle.BACKGROUND_KEY);
}
catch (PropertyParseException e)
{
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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -39,7 +39,7 @@
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;
-import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidadinternal.style.CoreStyle;
import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
import org.apache.myfaces.trinidadinternal.ui.NodeRole;
import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
@@ -493,7 +493,7 @@
// any of the same styles as the styleClass. This is a
// bad assumption which may eventually break, but it makes
// this function much, much more efficient.
- Style inlineStyleClass = XhtmlLafUtils.getClassStyle(context,
+ CoreStyle inlineStyleClass = XhtmlLafUtils.getClassStyle(context,
styleClass);
renderInlineStyleAttribute(context, inlineStyleClass);
@@ -775,7 +775,7 @@
for ( ; j < styleClasses.length; j++ )
{
Object styleClass = styleClasses[j];
- Style inlineStyle = XhtmlLafUtils.getClassStyle(context, styleClass);
+ CoreStyle inlineStyle = XhtmlLafUtils.getClassStyle(context, styleClass);
if (inlineStyle != null )
inline.append(inlineStyle.toInlineString());
@@ -955,7 +955,7 @@
*/
protected final void startRenderingStyleElements(
UIXRenderingContext context,
- Style inlineStyle,
+ CoreStyle inlineStyle,
Object className
) throws IOException
{
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=755724&r1=755723&r2=755724&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 Wed Mar 18 20:40:14 2009
@@ -44,7 +44,7 @@
import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
import org.apache.myfaces.trinidadinternal.style.ParsedPropertyKey;
-import org.apache.myfaces.trinidadinternal.style.Style;
+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;
@@ -210,7 +210,7 @@
/**
* Resolves the class name to the appropriate Style object
*/
- public static Style getClassStyle(
+ public static CoreStyle getClassStyle(
UIXRenderingContext context,
Object className
)
@@ -220,7 +220,7 @@
StyleMap map = context.getStyleContext().getStyleMap();
if (map != null)
{
- return map.getStyleByClass(context.getStyleContext(),
+ return (CoreStyle)map.getStyleByClass(context.getStyleContext(),
className.toString());
}
}
@@ -239,7 +239,7 @@
String propertyName
)
{
- Style classStyle = getClassStyle(context,
+ CoreStyle classStyle = getClassStyle(context,
className);
if (classStyle != null)
{
@@ -375,8 +375,8 @@
*/
public static void startRenderingStyleElements(
UIXRenderingContext context,
- Style inlineStyle,
- Style classStyle
+ CoreStyle inlineStyle,
+ CoreStyle classStyle
) throws IOException
{
Stack[] styleInfo = _getStyleInfo(context);
@@ -391,19 +391,17 @@
{
// handle BACKGROUND_KEY
Object fontStyle = _getParsedStyleProperty(inlineStyle,
- classStyle,
- Style.FONT_STYLE_KEY);
+ classStyle, CoreStyle.FONT_STYLE_KEY);
- Boolean isItalic = (Style.ITALIC_FONT_STYLE == fontStyle)
+ Boolean isItalic = (CoreStyle.ITALIC_FONT_STYLE == fontStyle)
? Boolean.TRUE
: null;
Object fontWeight = _getParsedStyleProperty(inlineStyle,
- classStyle,
- Style.FONT_WEIGHT_KEY);
+ classStyle, CoreStyle.FONT_WEIGHT_KEY);
- Boolean isBold = (Style.BOLD_FONT_WEIGHT == fontWeight)
+ Boolean isBold = (CoreStyle.BOLD_FONT_WEIGHT == fontWeight)
? Boolean.TRUE
: null;
@@ -462,8 +460,7 @@
// element
Integer pixelSize = (Integer)_getParsedStyleProperty(
inlineStyle,
- classStyle,
- Style.FONT_SIZE_KEY);
+ classStyle, CoreStyle.FONT_SIZE_KEY);
if (pixelSize != null)
{
@@ -549,8 +546,8 @@
* Style2, if Style1 doesn't return a value.
*/
private static Object _getParsedStyleProperty(
- Style style1,
- Style style2,
+ CoreStyle style1,
+ CoreStyle style2,
ParsedPropertyKey stylePropertyKey
)
{
@@ -580,8 +577,8 @@
* Style2, if Style1 doesn't return a value.
*/
public static String getStyleProperty(
- Style style1,
- Style style2,
+ CoreStyle style1,
+ CoreStyle style2,
String stylePropertyName
)
{