Author: jwaldman
Date: Wed Oct 4 08:25:39 2006
New Revision: 452911
URL: http://svn.apache.org/viewvc?view=rev&rev=452911
Log:
ADFFACES-56 change -ora-* skinning properties to have another prefix
I'm not totally satisfied with -tr-, but I changed it to that for now. I can
change it again later if I need to.
Modified:
incubator/adffaces/trunk/trinidad/src/site/xdoc/api-changes.xml
incubator/adffaces/trunk/trinidad/src/site/xdoc/skin-selectors.xml
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputText.xml
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/beach/beach.css
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinProperties.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java
Modified: incubator/adffaces/trunk/trinidad/src/site/xdoc/api-changes.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/src/site/xdoc/api-changes.xml?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
--- incubator/adffaces/trunk/trinidad/src/site/xdoc/api-changes.xml (original)
+++ incubator/adffaces/trunk/trinidad/src/site/xdoc/api-changes.xml Wed Oct 4
08:25:39 2006
@@ -398,7 +398,7 @@
You can still modify the public style definitions and it will be picked
up
by using the "Marker" style class
because in our base skin implementation we map to the public style by
doing this:
- af|inputText.AFFieldNumberMarker::content
{-ora-rule-ref:selector(".AFFieldNumber")}.
+ af|inputText.AFFieldNumberMarker::content
{-tr-rule-ref:selector(".AFFieldNumber")}.
We recommend that you do not
add style properties to the "Marker" style classes. They are used solely
in the
css descendant selector to point to the content pseudo-element.
Modified: incubator/adffaces/trunk/trinidad/src/site/xdoc/skin-selectors.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/src/site/xdoc/skin-selectors.xml?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
--- incubator/adffaces/trunk/trinidad/src/site/xdoc/skin-selectors.xml
(original)
+++ incubator/adffaces/trunk/trinidad/src/site/xdoc/skin-selectors.xml Wed Oct
4 08:25:39 2006
@@ -36,7 +36,7 @@
/* Selectors to customize buttons. These are global selectors, too, since
they affect all buttons. */
.AFButtonServerText:alias {background-color:#CECFCE; color:#25009E}
- .AFButtonServerTextDisabled:alias {background-color:#F0F0F0;
color:gray;-ora-text-antialias:true}
+ .AFButtonServerTextDisabled:alias {background-color:#F0F0F0;
color:gray;-tr-text-antialias:true}
.AFButtonStartIcon:alias {content:url(/skins/purple/images/btns.gif);
width:7px; height:18px}
.AFButtonStartIcon:alias:rtl {content:url(/skins/purple/images/btne.gif);
width:7px; height:18px}
@@ -528,7 +528,7 @@
<td>
This style is used to provide the foreground color, background
color, and font information for server-side generated buttons.
- You can set attributes background-color, color,
-ora-text-antialias, font-size,
+ You can set attributes background-color, color,
-tr-text-antialias, font-size,
font-family.
</td>
</tr>
@@ -536,7 +536,7 @@
<td>
This style is used to provide the foreground color, background
color, and font information for server-side generated disabled
- buttons. You can attributes background-color, color,
-ora-text-antialias, font-size,
+ buttons. You can attributes background-color, color,
-tr-text-antialias, font-size,
font-family.
</td>
</tr>
@@ -879,7 +879,7 @@
rendered on the root dom element, they have no style properties
of its own, and they map the content
piece of the component's styling to the public style class without
the 'Marker'. For example, we map AFFieldTextMarker
to AFFieldText by defining this skin definition for you in our
base skin:
- af|inputText.AFFieldTextMarker af|inputText::content
{-ora-rule-ref: selector(".AFFieldText")}.
+ af|inputText.AFFieldTextMarker af|inputText::content
{-tr-rule-ref: selector(".AFFieldText")}.
If you set styleClass="AFFieldText", the entire component will be
affected, including the label.
If you want to affect only the 'content' piece, use one of these
marker style classes</td>
<td>AFFieldTextMarker, AFFieldTextLTRMarker,
AFPhoneFieldTextMarker, AFPostalCodeFieldTextMarker, AFAddressFieldTextMarker,
@@ -932,7 +932,7 @@
rendered on the root dom element, they have no style properties
of its own, and they map the content
piece of the component's styling to the public style class without
the 'Marker'. For example, we map AFFieldNumberMarker
to AFFieldNumber by defining this skin definition for you in our
base skin:
- af|inputNumberSpinbox.AFFieldNumberMarker
af|inputNumberSpinbox::content {-ora-rule-ref: selector(".AFFieldNumber")}.
+ af|inputNumberSpinbox.AFFieldNumberMarker
af|inputNumberSpinbox::content {-tr-rule-ref: selector(".AFFieldNumber")}.
If you set styleClass="AFFieldNumber", the entire component will
be affected, including the label.
If you want to affect only the 'content' piece, use one of these
marker style classes</td>
<td>AFFieldTextMarker, AFFieldTextLTRMarker,
AFFieldNumberMarker</td>
@@ -1168,7 +1168,7 @@
<tr>
<td style="white-space:
nowrap">af|navigationPath::selected-step</td>
<td>Styles the selected step of tr:navigationPath. This step may
be hidden
- if the -ora-show-last-item property is set to false.</td>
+ if the -tr-show-last-item property is set to false.</td>
</tr>
<tr>
<td>af|navigationPath::step</td>
@@ -1225,10 +1225,10 @@
<th>Description</th>
</tr>
<tr>
- <td>-ora-show-last-item</td>
+ <td>-tr-show-last-item</td>
<td>Valid values are true or false. Determines whether the last
item
is displayed or not. e.g., af|navigationPath
- {-ora-show-last-item:false} will not show the last item in the
+ {-tr-show-last-item:false} will not show the last item in the
navigationPath.</td>
</tr>
</table>
@@ -2966,13 +2966,13 @@
<th>Description</th>
</tr>
<tr>
- <td>-ora-render-parent-train</td>
+ <td>-tr-render-parent-train</td>
<td>Boolean value that specifies if parent train icons should be
rendered if this train is a sub-train. A sub-train is a process
not located at the root of its TreeModel.</td>
</tr>
<tr>
- <td>-ora-visible-stop-count</td>
+ <td>-tr-visible-stop-count</td>
<td>Strictly positive integer value specifying the maximum amount
of
stops visible at a time.</td>
</tr>
@@ -3044,7 +3044,7 @@
<td>af|train::overflow-start</td>
<td>Styles a train start overflow. A start overflow is generated
when the amount
of steps in the process is higher than the amount of visibled
stop defined by
- the -ora-visible-stop-count property. In LTR mode, this
selector represents
+ the -tr-visible-stop-count property. In LTR mode, this
selector represents
the left side overflow (previous step group). This selector
includes both the
icon and its content. This selector is combinable with state
pseudo-classes.</td>
</tr>
@@ -3064,7 +3064,7 @@
<td>af|train::overflow-end</td>
<td>Styles a train end overflow. A end overflow is generated when
the amount
of steps in the process is higher than the amount of visibled
stop defined by
- the -ora-visible-stop-count property. In LTR mode, this
selector represents
+ the -tr-visible-stop-count property. In LTR mode, this
selector represents
the right side overflow (next step group). This selector
includes both the
icon and its content. This selector is combinable with state
pseudo-classes.</td>
</tr>
@@ -3089,7 +3089,7 @@
<tr>
<td>af|train::parent-start</td>
<td>Styles a train start parent. A parent is generated when the
current train is
- not located at the root of its TreeModel and that
-ora-render-parent-train
+ not located at the root of its TreeModel and that
-tr-render-parent-train
property is set to true. In LTR mode this will be rendered to
the left of the
first step's stop. This selector includes both the icon and
its content.
This selector is NOT combinable with state pseudo-classes.</td>
@@ -3109,7 +3109,7 @@
<tr>
<td>af|train::parent-end</td>
<td>Styles a train end parent. A parent is generated when the
current train is
- not located at the root of its TreeModel and that
-ora-render-parent-train
+ not located at the root of its TreeModel and that
-tr-render-parent-train
property is set to true. In LTR mode this will be rendered to
the right of
the last step's stop. This selector includes both the icon and
its content.
This selector is NOT combinable with state pseudo-classes.</td>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputText.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputText.xml?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputText.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputText.xml
Wed Oct 4 08:25:39 2006
@@ -267,7 +267,7 @@
You can still modify the public style definitions for these marker style
classes
and it will be picked up by using these "Marker" style class
because in our base skin implementation we map to the public style by
doing this:
- af|inputText.AFFieldNumberMarker af|inputText::content
{-ora-rule-ref:selector(".AFFieldNumber")}.
+ af|inputText.AFFieldNumberMarker af|inputText::content
{-tr-rule-ref:selector(".AFFieldNumber")}.
We recommend that you do not add style properties to the "Marker" style
classes.
They are used solely in the css descendant selector to point to the
content pseudo-element.</html>]]>
</description>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/beach/beach.css
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/beach/beach.css?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/beach/beach.css
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/beach/beach.css
Wed Oct 4 08:25:39 2006
@@ -47,7 +47,7 @@
/* make up a color for hovering over menuTabs and menuBars */
/* put the extension :alias so it won't get written out to the final css file,
cuz I know it won't be used directly. Instead it will be included in
- other style definions using the -ora-rule-ref property. */
+ other style definions using the -tr-rule-ref property. */
.MyLinkHoverColor:alias { color: #E08D3C; }
@@ -60,7 +60,7 @@
/* bg-color: bluish; color: deep blue */
.AFButtonServerText:alias {color:#25009E;
background-image:url(/skins/purple/images/menuTabsEnabledEnd.gif);}
/* antialias the text for our disabled buttons */
-.AFButtonServerTextDisabled:alias {background-color:#F0F0F0;
color:Gray;-ora-text-antialias:true}
+.AFButtonServerTextDisabled:alias {background-color:#F0F0F0;
color:Gray;-tr-text-antialias:true}
.AFButtonStartIcon:alias {content:url(/skins/beach/images/btnStart.gif);
width:7px; height:18px}
@@ -133,7 +133,7 @@
af|panelTabbed::tab-link:hover
{
- -ora-rule-ref:selector(".MyLinkHoverColor:alias");
+ -tr-rule-ref:selector(".MyLinkHoverColor:alias");
}
/* put some space in the
@@ -208,7 +208,7 @@
}
af|menuTabs::enabled-link:hover, af|menuTabs::selected-link:hover
{
- -ora-rule-ref:selector(".MyLinkHoverColor:alias");
+ -tr-rule-ref:selector(".MyLinkHoverColor:alias");
}
@@ -218,7 +218,7 @@
af|menuBar
{
- -ora-rule-ref:selector(".AFDarkBorder:alias");
+ -tr-rule-ref:selector(".AFDarkBorder:alias");
padding: 6px;
}
af|menuBar::enabled-link, af|menuBar::selected-link
@@ -237,7 +237,7 @@
af|menuBar::enabled-link:hover
{
- -ora-rule-ref:selector(".MyLinkHoverColor:alias");
+ -tr-rule-ref:selector(".MyLinkHoverColor:alias");
}
af|menuBar::separator
{
@@ -264,15 +264,15 @@
af|menuButtons::text:hover
{
- -ora-rule-ref:selector(".MyLinkHoverColor:alias");
+ -tr-rule-ref:selector(".MyLinkHoverColor:alias");
}
af|menuButtons::text-selected:hover
{
- -ora-rule-ref:selector(".MyLinkHoverColor:alias");
+ -tr-rule-ref:selector(".MyLinkHoverColor:alias");
}
af|menuButtons::text-disabled:hover
{
- -ora-rule-ref:selector(".MyLinkHoverColor:alias");
+ -tr-rule-ref:selector(".MyLinkHoverColor:alias");
}
@@ -365,7 +365,7 @@
/* use special properties to change the ui **/
/* don't show the last item in breadCrumbs (the default is to show it)*/
-af|breadCrumbs {-ora-show-last-item:false}
+af|breadCrumbs {-tr-show-last-item:false}
/** if, for some reason, you don't want an icon to show up, you
can hide it like this (this feature will be more useful when skins can
@@ -382,7 +382,7 @@
af|messages
{
- -ora-rule-ref: selector(".AFVeryDarkAccentBorder:alias");
+ -tr-rule-ref: selector(".AFVeryDarkAccentBorder:alias");
border-style:solid;
border-width:1px;
padding:5px;
@@ -391,7 +391,7 @@
af|messages::header
{
- -ora-rule-ref: selector(".AFDarkAccentBorder:alias");
+ -tr-rule-ref: selector(".AFDarkAccentBorder:alias");
border-width:0px 0px 1px 0px;
border-style:solid;
vertical-align:bottom;
@@ -401,7 +401,7 @@
.AFHeaderText:alias
{
- -ora-rule-ref: selector(".AFDarkForeground:alias");
+ -tr-rule-ref: selector(".AFDarkForeground:alias");
font-weight:bold;
padding: 0px;
margin: 0px;
@@ -443,5 +443,5 @@
af|panelFormLayout::label-cell
{
- -ora-rule-ref: selector(".AFStartTextAlign:alias");
+ -tr-rule-ref: selector(".AFStartTextAlign:alias");
}
Modified:
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
Wed Oct 4 08:25:39 2006
@@ -37,7 +37,7 @@
/* make up a color for hovering over menuTabs and menuBars */
/* put the extension :alias so it won't get written out to the final css file,
cuz I know it won't be used directly. Instead it will be included in
- other style definions using the -ora-rule-ref property. */
+ other style definions using the -tr-rule-ref property. */
.MyLinkHoverColor:alias { color:Lime; }
@@ -50,7 +50,7 @@
/** use this to color the button background and text **/
.AFButtonServerText:alias {background-color:#CECFCE; color:#25009E}
/* antialias the text for our disabled buttons */
-.AFButtonServerTextDisabled:alias {background-color:#F0F0F0;
color:gray;-ora-text-antialias:true}
+.AFButtonServerTextDisabled:alias {background-color:#F0F0F0;
color:gray;-tr-text-antialias:true}
.AFButtonStartIcon:alias {content:url(/skins/purple/images/btns.gif);
width:7px; height:18px}
@@ -127,7 +127,7 @@
af|panelTabbed::tab-link:hover
{
- -ora-rule-ref:selector(".MyLinkHoverColor:alias");
+ -tr-rule-ref:selector(".MyLinkHoverColor:alias");
}
/* put some space in the
@@ -189,7 +189,7 @@
af|menuTabs::enabled-link:hover
{
- -ora-rule-ref:selector(".MyLinkHoverColor:alias");
+ -tr-rule-ref:selector(".MyLinkHoverColor:alias");
}
@@ -272,7 +272,7 @@
{
border-width: 3px 2px 0px 2px;
border-style:solid;
- -ora-rule-ref:selector(".AFDarkBorder:alias");
+ -tr-rule-ref:selector(".AFDarkBorder:alias");
padding: 12px;
}
@@ -282,7 +282,7 @@
}
af|menuBar::enabled-link:hover
{
- -ora-rule-ref:selector(".MyLinkHoverColor:alias");
+ -tr-rule-ref:selector(".MyLinkHoverColor:alias");
}
af|menuBar::separator
{
@@ -324,7 +324,7 @@
af|panelBox::header
{
padding: 3px 3px;
- -ora-rule-ref: selector(".AFMediumFont:alias");
+ -tr-rule-ref: selector(".AFMediumFont:alias");
font-weight: bold;
}
/* for panelBox without a header and shuttles */
@@ -342,7 +342,7 @@
/** ----------- **/
af|panelHeader
{
- -ora-rule-ref:selector(".AFDarkAccentBorder:alias");
+ -tr-rule-ref:selector(".AFDarkAccentBorder:alias");
border-width:0px 0px 1px 0px;
border-style:solid;
vertical-align:bottom;
@@ -406,7 +406,7 @@
/* use special properties to change the ui **/
/* don't show the last item in breadCrumbs (the default is to show it)*/
-af|breadCrumbs {-ora-show-last-item:false}
+af|breadCrumbs {-tr-show-last-item:false}
af|breadCrumbs::step {color: purple;}
af|breadCrumbs::step:hover {color: green}
@@ -432,7 +432,7 @@
af|messages
{
- -ora-rule-ref: selector("AFVeryDarkAccentBorder:alias");
+ -tr-rule-ref: selector("AFVeryDarkAccentBorder:alias");
border-style:solid;
border-width:1px;
padding:5px;
@@ -441,7 +441,7 @@
af|messages::header
{
- -ora-rule-ref: selector("AFDarkAccentBorder:alias");
+ -tr-rule-ref: selector("AFDarkAccentBorder:alias");
border-width:0px 0px 1px 0px;
border-style:solid;
vertical-align:bottom;
@@ -451,7 +451,7 @@
.AFHeaderText:alias
{
- -ora-rule-ref: selector("AFDarkForeground:alias");
+ -tr-rule-ref: selector("AFDarkForeground:alias");
font-weight:bold;
padding: 0px;
margin: 0px;
@@ -509,7 +509,7 @@
af|objectSeparator
{
- -ora-rule-ref: selector(".AFDarkBorder:alias");
+ -tr-rule-ref: selector(".AFDarkBorder:alias");
border-style: dashed none none;
border-width: 1px 0px 0px;
height: 1px;
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TrainRenderer.java
Wed Oct 4 08:25:39 2006
@@ -1828,13 +1828,13 @@
/**
* Gives the amount of visible stops that get rendered by default if no
- * amount is specified by the -ora-visible-stop-count skin property.
+ * amount is specified by the -tr-visible-stop-count skin property.
*/
public static final int DEFAULT_MAX_VISIBLE_STOP_COUNT = 6;
/**
* Determines if the parent train of sub-trains should be rendered by
- * default if not specified by the -ora-render-parent-train skin property.
+ * default if not specified by the -tr-render-parent-train skin property.
*/
public static final boolean DEFAULT_RENDER_PARENT_TRAIN = false;
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinProperties.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinProperties.java?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinProperties.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinProperties.java
Wed Oct 4 08:25:39 2006
@@ -35,22 +35,22 @@
//
// FIXME: Name inconsistency, should be AF_NAVIGATION_PATH
public static final String AF_NAVIGATIONPATH_SHOW_LAST_ITEM_PROPERTY_KEY =
- "af|breadCrumbs-ora-show-last-item";
+ "af|breadCrumbs-tr-show-last-item";
// FIXME: Name inconsistency, should be AF_PANEL_HEADER
public static final String AF_PANELHEADER_INDENT_CONTENT =
- "af|panelHeader-ora-indent-content";
+ "af|panelHeader-tr-indent-content";
public static final String AF_PANEL_BORDER_LAYOUT_SPACER_WIDTH =
- "af|panelBorderLayout-ora-spacer-width";
+ "af|panelBorderLayout-tr-spacer-width";
public static final String AF_PANEL_LIST_DEFAULT_COLUMNS =
- "af|panelList-ora-default-columns";
+ "af|panelList-tr-default-columns";
public static final String AF_TABLE_REPEAT_CONTROL_BAR =
- "af|table-ora-repeat-control-bar";
+ "af|table-tr-repeat-control-bar";
public static final String AF_TABLE_SELECTION_BAR_IN_TABLE =
- "af|table-ora-selection-bar-in-table";
+ "af|table-tr-selection-bar-in-table";
public static final String AF_TRAIN_RENDER_PARENT_TRAIN =
- "af|train-ora-render-parent-train";
+ "af|train-tr-render-parent-train";
public static final String AF_TRAIN_VISIBLE_STOP_COUNT =
- "af|train-ora-visible-stop-count";
+ "af|train-tr-visible-stop-count";
public static final String AF_TREE_TABLE_SPACER_WIDTH =
- "af|treeTable-ora-spacer-width";
+ "af|treeTable-tr-spacer-width";
}
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinImpl.java
Wed Oct 4 08:25:39 2006
@@ -453,12 +453,8 @@
for(SkinPropertyNode property : skinProperties)
{
Object propValueObj = property.getPropertyValue();
- // convert to a type if possible first
- // =-=jmw should I get the type for
af|breadCrumbs-ora-show-last-item or just
- // -ora-show-last-item. in other words, will the property name
be the same type
- // no matter which component it is being used for? If so, then
- // just storing -ora-show-last-item in the map is good enough.
- // For now, just for the heck of it, use
af|breadCrumbs-ora-show-last-item
+ // Store the property selector + property Name as the Skin
Property Key.
+ // e.g., use af|breadCrumbs-tr-show-last-item
String key = property.getPropertySelector() +
property.getPropertyName();
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetParserUtils.java
Wed Oct 4 08:25:39 2006
@@ -214,8 +214,8 @@
skinPropertyNodeList.addAll(resolvedProperties.getSkinPropertyNodeList());
- List<PropertyNode> noOraPropertyList =
- resolvedProperties.getNoOraPropertyList();
+ List<PropertyNode> noTrPropertyList =
+ resolvedProperties.getNoTrPropertyList();
// =-=jmw There is no good way to tell if this is an icon.
// for now, I look at the selector name.
@@ -240,9 +240,20 @@
selectorName = selectorName.concat(StyleUtils.RTL_CSS_SUFFIX);
// create an IconNode object and add it ot the iconNodeList
- _addIconNode(selectorName,
- noOraPropertyList,
- iconNodeList);
+ boolean addStyleNode = _addIconNode(selectorName,
+ noTrPropertyList,
+ iconNodeList);
+ if (addStyleNode)
+ {
+ _addStyleNode(selectorName,
+ noTrPropertyList,
+ resolvedProperties.getTrRuleRefList(),
+ resolvedProperties.getInhibitedProperties(),
+ resolvedProperties.isTrTextAntialias(),
+ styleNodeList);
+ }
+
+
// log warning if the icon is defined within an @agent or @platform
// block that tells the user that this icon will be used
// for all agents and platforms.
@@ -265,10 +276,10 @@
{
// create a StyleNode object and add it to the styleNodeList.
_addStyleNode(selectorName,
- noOraPropertyList,
- resolvedProperties.getOraRuleRefList(),
+ noTrPropertyList,
+ resolvedProperties.getTrRuleRefList(),
resolvedProperties.getInhibitedProperties(),
- resolvedProperties.isOraTextAntialias(),
+ resolvedProperties.isTrTextAntialias(),
styleNodeList);
}
@@ -323,21 +334,25 @@
String sourceName)
{
- List<PropertyNode> noOraPropertyList = new ArrayList<PropertyNode>();
- List<String> oraRuleRefList = new ArrayList<String>();
+ List<PropertyNode> noTrPropertyList = new ArrayList<PropertyNode>();
+ List<String> trRuleRefList = new ArrayList<String>();
Set<String> inhibitedPropertySet = new TreeSet<String>();
List<SkinPropertyNode> skinPropertyNodeList =
new ArrayList<SkinPropertyNode>();
- boolean oraTextAntialias = false;
+ boolean trTextAntialias = false;
// loop through each property in the propertyList
// and resolve into
- // noOraPropertyList (properties that do not start with -ora-)
- // oraRuleRefList (properties that start with -ora-rule-ref)
- // boolean oraTextAntialias (property value for -ora-text-antialias
- // skinPropertyNodeList (all other properties that start with -ora-)
- // These properties are all stored in th ResolvedSkinProperties inner
class.
+ // noTrPropertyList (properties that do not start with -tr-.
+ // (or -ora- for backwards compatibility))
+ // trRuleRefList (properties that start with -tr-rule-ref
+ // (or -ora-rule-ref for backwards compatibility))
+ // boolean trTextAntialias (property value for -tr-text-antialias
+ // (or -ora-text-antialias for backwards
compatibility)
+ // skinPropertyNodeList (all other properties that start with -tr-
+ // (or -ora- for backwards compatibility))
+ // These properties are stored in the ResolvedSkinProperties inner class.
for(PropertyNode propertyNode : propertyNodeList)
{
@@ -346,20 +361,26 @@
if(propertyName != null && propertyValue != null)
{
- if(propertyName.startsWith(_ORA_PROPERTY_PREFIX))
- {
- if (propertyName.equals(_ORA_RULE_REF))
+ boolean oraProperty = propertyName.startsWith(_ORA_PROPERTY_PREFIX);
+ boolean trProperty = propertyName.startsWith(_TR_PROPERTY_PREFIX);
+ if( oraProperty || trProperty)
+ {
+ int suffixIndex = (oraProperty) ?
+ _ORA_PROPERTY_PREFIX.length() :
+ _TR_PROPERTY_PREFIX.length();
+ String propertyNameSuffix = propertyName.substring(suffixIndex);
+ if (propertyNameSuffix.equals(_PROPERTY_RULE_REF))
{
// add the rule ref value to the list
- oraRuleRefList.add(propertyValue);
+ trRuleRefList.add(propertyValue);
}
- else if (propertyName.equals(_ORA_TEXT_ANTIALIAS))
+ else if (propertyNameSuffix.equals(_PROPERTY_TEXT_ANTIALIAS))
{
if ("true".equals(propertyValue))
- oraTextAntialias = true;
+ trTextAntialias = true;
}
- else if (propertyName.equals(_ORA_INHIBIT))
+ else if (propertyNameSuffix.equals(_PROPERTY_INHIBIT))
{
for (String value : propertyValue.split("\\s"))
{
@@ -406,17 +427,17 @@
}
}
- noOraPropertyList.add(propertyNode);
+ noTrPropertyList.add(propertyNode);
}
}
}
return new ResolvedSkinProperties(
- noOraPropertyList,
- oraRuleRefList,
+ noTrPropertyList,
+ trRuleRefList,
inhibitedPropertySet,
skinPropertyNodeList,
- oraTextAntialias);
+ trTextAntialias);
}
private static String _resolveURL(
@@ -522,12 +543,12 @@
* Create an IconNode and add it to the iconNodeList.
* @param selectorName
* @param propertyNodeList
- * @param oraTextAntialias
+ * @param trTextAntialias
* @param iconNodeList
*/
- private static void _addIconNode(
+ private static boolean _addIconNode(
String selectorName,
- List<PropertyNode> noOraPropertyNodeList,
+ List<PropertyNode> noTrPropertyNodeList,
List<IconNode> iconNodeList)
{
@@ -561,11 +582,12 @@
String uri = null;
String text = null;
boolean isNullIcon = false;
+ boolean createStyleNode = false;
// append all the styles that are not content, width or height into
// inline style
CSSStyle inlineStyle = new CSSStyle();
- for(PropertyNode propertyNode : noOraPropertyNodeList)
+ for(PropertyNode propertyNode : noTrPropertyNodeList)
{
String propertyName = propertyNode.getName();
String propertyValue = propertyNode.getValue();
@@ -665,6 +687,16 @@
new URIImageIcon(uri, uri, width, height, null, inlineStyle);
}
}
+ else
+ {
+ /// neither text or image icon. Must be a StyleClassIcon
+ if (inlineStyle != null)
+ {
+ // icon = new StyleClassIcon(selectorName);
+ // create a styleNode, too with the inlineStyles.
+ createStyleNode = true;
+ }
+ }
}
else
{
@@ -675,6 +707,8 @@
if (icon != null)
iconNodeList.add(new IconNode(selectorName, icon));
+
+ return createStyleNode;
}
@@ -682,15 +716,15 @@
* Creates a StyleNode object and adds it to the styleNodeList
* @param selectorName
* @param propertyNodeList
- * @param oraRuleRefList
+ * @param trRuleRefList
* @param styleNodeList
*/
private static void _addStyleNode(
String selectorName,
List<PropertyNode> propertyNodeList,
- List<String> oraRuleRefList,
+ List<String> trRuleRefList,
Set<String> inhibitedProperties,
- boolean oraTextAntialias,
+ boolean trTextAntialias,
List<StyleNode> styleNodeList)
{
@@ -712,7 +746,7 @@
selector = selectorName;
// add text-antialias if it is set
- if (oraTextAntialias)
+ if (trTextAntialias)
{
propertyNodeList.add(new PropertyNode("text-antialias", "true"));
}
@@ -720,19 +754,19 @@
PropertyNode[] propertyArray =
propertyNodeList.toArray(new PropertyNode[propertyNodeList.size()]);
- // if the oraRuleRefList is not empty, create IncludeStyleNodes.
- int length = oraRuleRefList.size();
+ // if the trRuleRefList is not empty, create IncludeStyleNodes.
+ int length = trRuleRefList.size();
List<IncludeStyleNode> includeStyleNodes = new
ArrayList<IncludeStyleNode>();
if (length > 0)
{
- for(String value : oraRuleRefList)
+ for(String value : trRuleRefList)
{
// parse the value, which will be of this form:
- // -ora-rule-ref: selector(".AFBaseFont:alias") selector(".Foo")
- // where you have more than one selector in an -ora-rule-ref definition
- // or -ora-rule-ref: selector(".AFBaseFont:alias")
- // where you have only one selector in an -ora-rule-ref definition.
+ // -tr-rule-ref: selector(".AFBaseFont:alias") selector(".Foo")
+ // where you have more than one selector in an -tr-rule-ref definition
+ // or -tr-rule-ref: selector(".AFBaseFont:alias")
+ // where you have only one selector in an -tr-rule-ref definition.
// I want each selector value to be an IncludeStyleNode.
_addIncludeStyleNodes(value, includeStyleNodes);
@@ -754,7 +788,7 @@
}
- // This is for -ora-rule-ref properties on styles.
+ // This is for -tr-rule-ref properties on styles.
private static void _addIncludeStyleNodes(
String value,
List <IncludeStyleNode> includeStyleNodes )
@@ -1057,27 +1091,27 @@
ResolvedSkinProperties(
- List<PropertyNode> noOraPropertyList,
- List<String> oraRuleRefList,
+ List<PropertyNode> noTrPropertyList,
+ List<String> trRuleRefList,
Set<String> inhibitedPropertySet,
List<SkinPropertyNode> skinPropertyNodeList,
- boolean oraTextAntialias)
+ boolean trTextAntialias)
{
- _noOraPropertyList = noOraPropertyList;
- _oraRuleRefList = oraRuleRefList;
+ _noTrPropertyList = noTrPropertyList;
+ _trRuleRefList = trRuleRefList;
_inhibitedPropertySet = inhibitedPropertySet;
_skinPropertyNodeList = skinPropertyNodeList;
- _oraTextAntialias = oraTextAntialias;
+ _trTextAntialias = trTextAntialias;
}
- public List<PropertyNode> getNoOraPropertyList()
+ public List<PropertyNode> getNoTrPropertyList()
{
- return _noOraPropertyList;
+ return _noTrPropertyList;
}
- public List<String> getOraRuleRefList()
+ public List<String> getTrRuleRefList()
{
- return _oraRuleRefList;
+ return _trRuleRefList;
}
public List<SkinPropertyNode> getSkinPropertyNodeList()
@@ -1090,23 +1124,27 @@
return _inhibitedPropertySet;
}
- public boolean isOraTextAntialias()
+ public boolean isTrTextAntialias()
{
- return _oraTextAntialias;
+ return _trTextAntialias;
}
private Set<String> _inhibitedPropertySet;
- private List<PropertyNode> _noOraPropertyList;
- private List<String> _oraRuleRefList;
+ private List<PropertyNode> _noTrPropertyList;
+ private List<String> _trRuleRefList;
private List<SkinPropertyNode> _skinPropertyNodeList;
- private boolean _oraTextAntialias;
+ private boolean _trTextAntialias;
}
-
+ // Custom Trinidad css properties:
+ //-tr-rule-ref, -tr-inhibit, -tr-text-antialias
+ private static final String _TR_PROPERTY_PREFIX = "-tr-";
+ // For backwards compatibility, keep the -ora- css properties in
+ // addition to the -tr- css properties.
private static final String _ORA_PROPERTY_PREFIX = "-ora-";
- private static final String _ORA_RULE_REF = "-ora-rule-ref";
- private static final String _ORA_INHIBIT = "-ora-inhibit";
- private static final String _ORA_TEXT_ANTIALIAS = "-ora-text-antialias";
+ private static final String _PROPERTY_RULE_REF = "rule-ref";
+ private static final String _PROPERTY_INHIBIT = "inhibit";
+ private static final String _PROPERTY_TEXT_ANTIALIAS = "text-antialias";
// Set of values that are legal for url() values
private static final Set<String> _URI_PROPERTIES = new HashSet<String>();
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/StyleSheetEntry.java
Wed Oct 4 08:25:39 2006
@@ -152,8 +152,8 @@
/**
* Returns the SkinProperties List for this
* StyleSheetEntry. This is a list of SkinProperyNodes
- * a node contains the selector, the -ora- property, and the value.
- * e.g, selector: af|breadCrumbs, property: -ora-show-last-item,
+ * a node contains the selector, the -tr- property, and the value.
+ * e.g, selector: af|breadCrumbs, property: -tr-show-last-item,
* value: true
*/
public List <SkinPropertyNode> getSkinProperties()
@@ -401,7 +401,7 @@
private StyleSheetDocument _document;
// List of IconNodes
private List <IconNode> _icons;
- // List of -ora- properties that the skin can be set on the skin.
+ // List of -tr- properties that the skin can be set on the skin.
// This is a List of SkinPropertyNodes
// jmw it will be key, name, value. or name/value???
private List <SkinPropertyNode> _skinProperties;
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java?view=diff&rev=452911&r1=452910&r2=452911
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafConstants.java
Wed Oct 4 08:25:39 2006
@@ -846,20 +846,6 @@
"af|panelAccordion::title-disabled-link";
- // =============PROPERTY NAMES================
-
- public static final String AF_NAVIGATIONPATH_SHOW_LAST_ITEM_PROPERTY_KEY =
- "af|breadCrumbs-ora-show-last-item";
- public static final String AF_PANEL_LIST_DEFAULT_COLUMNS =
- "af|panelList-ora-default-columns";
- public static final String AF_TABLE_SELECTION_BAR_IN_TABLE =
- "af|table-ora-selection-bar-in-table";
- public static final String AF_TABLE_REPEAT_CONTROL_BAR =
- "af|table-ora-repeat-control-bar";
- public static final String AF_TREE_TABLE_SPACER_WIDTH =
- "af|treeTable-ora-spacer-width";
-
-
// =============ICON NAMES================
// used by MessagePromptRenderer for pda and desktop.
