incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r428081 [7/12] - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java/org/apache/myfaces/trinidad/context/ trinidad-api/src/test/java/org/apache/myfaces/trinidad/component/core/layout/ trinidad-api/src/test/java/org/apache/myfa...
Date Wed, 02 Aug 2006 18:35:05 GMT
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/performance/multipleComponents_styleMap_adf.jspx Wed Aug  2 11:34:29 2006
@@ -22,9 +22,9 @@
   <f:view>
  <tr:document title="Components using style resource maps">
         <tr:form>
-          <tr:panelGroup layout="vertical">
+          <tr:panelGroupLayout layout="vertical">
             <f:facet name="separator">
-              <tr:objectSeparator/>
+              <tr:separator/>
             </f:facet>
         
             <tr:commandLink immediate="true" text="Component Guide"
@@ -93,12 +93,12 @@
                                    styleUsage="inContextBranding"/>
               </f:facet>
               <f:facet name="location">
-                <tr:navigationPath>
-                  <tr:commandNavigationItem text="item 1" action="guide.navigationPath" />
-                  <tr:commandNavigationItem text="item 2" action="guide.navigationPath" />
-                  <tr:commandNavigationItem text="item 3" action="guide.navigationPath" />
-                  <tr:commandNavigationItem text="item 4" action="guide.navigationPath" />
-                </tr:navigationPath>
+                <tr:breadCrumbs>
+                  <tr:commandNavigationItem text="item 1" action="guide.breadCrumbs" />
+                  <tr:commandNavigationItem text="item 2" action="guide.breadCrumbs" />
+                  <tr:commandNavigationItem text="item 3" action="guide.breadCrumbs" />
+                  <tr:commandNavigationItem text="item 4" action="guide.breadCrumbs" />
+                </tr:breadCrumbs>
               </f:facet>
               <f:facet name="appCopyright">
                 <tr:outputText value="copyright facet"/>
@@ -214,7 +214,7 @@
             
             <jsp:directive.include file="../components/editor.jspf" />
     
-          </tr:panelGroup>           
+          </tr:panelGroupLayout>           
         
         </tr:form>        
  </tr:document>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/reorderTest.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/reorderTest.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/reorderTest.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/reorderTest.jspx Wed Aug  2 11:34:29 2006
@@ -22,14 +22,14 @@
   <f:view>
     <tr:document title="Reordering Test">
       <tr:form>
-        <tr:panelGroup binding="#{reorder.panel}" layout="vertical">
+        <tr:panelGroupLayout binding="#{reorder.panel}" layout="vertical">
           <tr:outputText value="Item 1"/>
           <tr:outputText value="Item 2"/>
           <tr:outputText value="Item 3"/>
           <f:facet name="separator">
             <tr:outputText value="----------"/>
           </f:facet>
-        </tr:panelGroup>
+        </tr:panelGroupLayout>
         <f:verbatim><br /></f:verbatim>
         <tr:commandButton text="Add" actionListener="#{reorder.add}"/>
         <tr:commandButton text="Remove last" actionListener="#{reorder.remove}"/>

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?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- 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 Aug  2 11:34:29 2006
@@ -87,67 +87,67 @@
 
 
 
-/** showOneTab **/
+/** panelTabbed **/
 /** ---------- **/
-/** .AFShowOneTab:alias is included in af|showOneTab::orientation-top and 
-    af|showOneTab::orientation-bottom which are the styles on the table. **/
-.AFShowOneTab:alias {
+/** .AFPanelTabbed:alias is included in af|panelTabbed::orientation-top and 
+    af|panelTabbed::orientation-bottom which are the styles on the table. **/
+.AFPanelTabbed:alias {
   background-color:#A4CACA; 
   text-align:center;
 }
 /** make the top tab bar have a solid border underneath **/
-af|showOneTab::orientation-top
+af|panelTabbed::orientation-top
 {
   border-bottom:3px solid #367FA8;border-top:3px solid #367FA8;
 }
 /** make the bottom tab bar have a solid border on top **/
-af|showOneTab::orientation-bottom
+af|panelTabbed::orientation-bottom
 {
   border-bottom:3px solid #367FA8;border-top:3px solid #367FA8;
 }
 
-af|showOneTab::separator {
+af|panelTabbed::separator {
   margin-width:4px;
   border-top: #ADBCC5; solid 4pt ;
   border-bottom: #ADBCC5; solid 4pt ;
   BACKGROUND-COLOR: white;
   PADDING-LEFT: 1px;}
 
-af|showOneTab::tab {
+af|panelTabbed::tab {
   font-weight:bold;
   font-family:Tahoma; 
   padding:6px 8px;
 }
 
-af|showOneTab::tab-selected {
+af|panelTabbed::tab-selected {
   font-family:Tahoma;
   padding:6px 8px; 
   text-decoration: none; 
   background-color:white
 }  
 
-af|showOneTab::tab-link {
+af|panelTabbed::tab-link {
   color:white;
   text-decoration: none;
 }
 
-af|showOneTab::tab-link:hover
+af|panelTabbed::tab-link:hover
 {
   -ora-rule-ref:selector(".MyLinkHoverColor:alias");
 }
 
 /* put some space in the
 first cell */
-af|showOneTab::cell-start {
+af|panelTabbed::cell-start {
   background-color:transparent; 
   padding-left:10px;
   width:50%;
 }
-af|showOneTab::cell-end {
+af|panelTabbed::cell-end {
   width:50%;
 }
 /** put some space between the tabs and the body */
-af|showOneTab::body
+af|panelTabbed::body
 {
   padding: 10px;
 }
@@ -331,7 +331,7 @@
 }
 
 
-/** processTrain **/
+/** train **/
 /** ------------ **/
 /**  We override the AFTrainStation alias style to add some
        padding, and also to display the station indicator
@@ -364,14 +364,14 @@
 }
 
 /* use special properties to change the ui **/
-/* don't show the last item in navigationPath (the default is to show it)*/
-af|navigationPath {-ora-show-last-item:false}
+/* don't show the last item in breadCrumbs (the default is to show it)*/
+af|breadCrumbs {-ora-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
     extends other skins besides simple)
 
-af|navigationPath::separator-icon {content:inhibit}    
+af|breadCrumbs::separator-icon {content:inhibit}    
 */
 
 .AFHeaderErrorIcon:alias 
@@ -441,7 +441,7 @@
   font-size:small;
 }
 
-af|panelForm::label-cell
+af|panelFormLayout::label-cell
 {
   -ora-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?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- 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 Aug  2 11:34:29 2006
@@ -81,63 +81,63 @@
 /** when the panelBox is dark, this is the background color */
 .AFPanelBoxDarkBackground:alias {background-color:green}
 
-/** showOneTab **/
+/** panelTabbed **/
 /** ---------- **/
-/** .AFShowOneTab:alias is included in af|showOneTab::orientation-top and 
-    af|showOneTab::orientation-bottom which are the styles on the table. **/
-.AFShowOneTab:alias {
+/** .AFPanelTabbed:alias is included in af|panelTabbed::orientation-top and 
+    af|panelTabbed::orientation-bottom which are the styles on the table. **/
+.AFPanelTabbed:alias {
   background-color:#BB95BB; 
   text-align:center;
 }
 /** make the top tab bar have a solid border underneath **/
-af|showOneTab::orientation-top
+af|panelTabbed::orientation-top
 {
   border-bottom: 3px solid black;
 }
 /** make the bottom tab bar have a solid border on top **/
-af|showOneTab::orientation-bottom
+af|panelTabbed::orientation-bottom
 {
   border-top: 3px solid black;
 }
 
-af|showOneTab::separator {
+af|panelTabbed::separator {
   margin:4px;
   border-top: #BB95BB; solid 4pt ;
   border-bottom: #BB95BB; solid 4pt ;
   BACKGROUND-COLOR: white;
   PADDING-LEFT: 1px;}
 
-af|showOneTab::tab {
+af|panelTabbed::tab {
   font-weight:bold;
   font-family:Tahoma; 
   padding:2px 8px;
 }
 
-af|showOneTab::tab-selected {
+af|panelTabbed::tab-selected {
   font-family:Tahoma;
   padding:2px 8px; 
   text-decoration: none; 
   background-color:white
 }  
 
-af|showOneTab::tab-link {
+af|panelTabbed::tab-link {
   color:white;
   text-decoration: none;
 }
 
-af|showOneTab::tab-link:hover
+af|panelTabbed::tab-link:hover
 {
   -ora-rule-ref:selector(".MyLinkHoverColor:alias");
 }
 
 /* put some space in the
 first cell */
-af|showOneTab::cell-start {
+af|panelTabbed::cell-start {
   background-color:transparent; 
   padding-left:10px
 }
 /** put some space between the tabs and the body */
-af|showOneTab::body
+af|panelTabbed::body
 {
   padding: 10px;
 }
@@ -353,7 +353,7 @@
 }
 
 
-/** processTrain **/
+/** train **/
 /** ------------ **/
 /**  We override the AFTrainStation alias style to add some
        padding, and also to display the station indicator
@@ -364,7 +364,7 @@
   border-width:3px 0px 0px 0px;
   padding:3pt;
 }
-af|processTrain::visited af|processTrain::link
+af|train::visited af|train::link
 {
   color: Fuchsia;
 }
@@ -390,13 +390,13 @@
 }
 
 /** selectInputDate launch icon **/
-af|selectInputDate::launch-icon
+af|inputDate::launch-icon
 {
   content:url(/skins/purple/images/dateButtonPurple.gif); 
   width:19px; 
   height:24px
 }
-af|selectInputDate::launch-icon:rtl
+af|inputDate::launch-icon:rtl
 {
   content:url(/skins/purple/images/dateButtonPurpleRTL.gif); 
   width:19px; 
@@ -404,13 +404,13 @@
 }
 
 /* use special properties to change the ui **/
-/* don't show the last item in navigationPath (the default is to show it)*/
+/* don't show the last item in breadCrumbs (the default is to show it)*/
 
-af|navigationPath {-ora-show-last-item:false}
+af|breadCrumbs {-ora-show-last-item:false}
 
-af|navigationPath::step {color: purple;}
-af|navigationPath::step:hover {color: green}
-af|navigationPath::selected-step:hover {color: green;}
+af|breadCrumbs::step {color: purple;}
+af|breadCrumbs::step:hover {color: green}
+af|breadCrumbs::selected-step:hover {color: green;}
 
 af|treeTable::path-step {color: purple; text-decoration:none}
 af|treeTable::path-step:hover {color: green}
@@ -421,7 +421,7 @@
     can hide it like this (this feature will be more useful when skins can
     extends other skins besides simple)
 
-af|navigationPath::separator-icon {content:inhibit}    
+af|breadCrumbs::separator-icon {content:inhibit}    
 */
 
 .AFHeaderErrorIcon:alias 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyConfirm.jspx Wed Aug  2 11:34:29 2006
@@ -25,7 +25,7 @@
         <tr:panelPage>
           <tr:panelHeader text="Please review your answers and make any last changes:">
        
-            <tr:panelForm>
+            <tr:panelFormLayout>
 <!-- question 1 -->
              <tr:selectOneRadio label="#{survey.q0.prompt}" 
                                     required="true"
@@ -74,7 +74,7 @@
               <tr:selectItem label="#{survey.q4.answerString}" value="3"/>
             </tr:selectOneRadio >        
         
-        </tr:panelForm>
+        </tr:panelFormLayout>
        </tr:panelHeader>
             <f:facet name="navigationGlobal">
               <tr:menuButtons>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage1.jspx Wed Aug  2 11:34:29 2006
@@ -25,7 +25,7 @@
         <tr:panelPage>
       
         <tr:panelHeader text="Question 5 of 5">
-          <tr:panelForm>
+          <tr:panelFormLayout>
           
             <tr:selectOneRadio label="#{survey.q0.prompt}" 
                                   required="true"
@@ -37,7 +37,7 @@
               </tr:forEach>
             </tr:selectOneRadio >
           
-          </tr:panelForm>
+          </tr:panelFormLayout>
         </tr:panelHeader>
 
           <f:facet name="navigationGlobal">
@@ -48,13 +48,13 @@
             </tr:menuButtons>
           </f:facet>
           <f:facet name="location">        
-            <tr:processTrain  value="#{surveyMenuModel}" var="surveyNode">
+            <tr:train  value="#{surveyMenuModel}" var="surveyNode">
               <f:facet name="nodeStamp">
                 <tr:commandNavigationItem text="#{surveyNode.label}"
                                     action="#{surveyNode.getOutcome}"
                                     readOnly="true"/>
               </f:facet>
-            </tr:processTrain>
+            </tr:train>
           </f:facet>
 
          <tr:singleStepButtonBar selectedStep="1" maxStep="5" 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage2.jspx Wed Aug  2 11:34:29 2006
@@ -24,11 +24,11 @@
        
         <tr:panelPage>
       <tr:panelHeader text="Question 2 of 5">
-        <tr:panelForm>
+        <tr:panelFormLayout>
           <tr:inputText label="#{survey.q1.prompt}" 
                                 required="true"
                                 value="#{survey.a1}"/>
-        </tr:panelForm>
+        </tr:panelFormLayout>
       </tr:panelHeader>
           <f:facet name="navigationGlobal">
             <tr:menuButtons>
@@ -39,13 +39,13 @@
           </f:facet>
           
           <f:facet name="location">   
-            <tr:processTrain  value="#{surveyMenuModel}" var="surveyNode">
+            <tr:train  value="#{surveyMenuModel}" var="surveyNode">
               <f:facet name="nodeStamp">
                 <tr:commandNavigationItem text="#{surveyNode.label}"
                                     action="#{surveyNode.getOutcome}"
                                     readOnly="true"/>
               </f:facet>
-            </tr:processTrain>
+            </tr:train>
           </f:facet>          
           
          <tr:singleStepButtonBar selectedStep="2" maxStep="5"

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage3.jspx Wed Aug  2 11:34:29 2006
@@ -25,7 +25,7 @@
         <tr:panelPage>
 
       <tr:panelHeader text="Question 3 of 5">
-        <tr:panelForm>
+        <tr:panelFormLayout>
           <tr:selectOneRadio label="#{survey.q2.prompt}" 
                                 required="true"
                                 value="#{survey.a2}">            
@@ -35,7 +35,7 @@
               <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
             </tr:forEach>
           </tr:selectOneRadio >
-        </tr:panelForm>
+        </tr:panelFormLayout>
       </tr:panelHeader>
 
           <f:facet name="navigationGlobal">
@@ -46,13 +46,13 @@
             </tr:menuButtons>
           </f:facet>
           <f:facet name="location">               
-            <tr:processTrain  value="#{surveyMenuModel}" var="surveyNode">
+            <tr:train  value="#{surveyMenuModel}" var="surveyNode">
               <f:facet name="nodeStamp">
                 <tr:commandNavigationItem text="#{surveyNode.label}"
                                     action="#{surveyNode.getOutcome}"
                                     readOnly="true"/>
               </f:facet>
-            </tr:processTrain> 
+            </tr:train> 
           </f:facet>
         <tr:panelButtonBar>
           <tr:singleStepButtonBar selectedStep="3" maxStep="5"

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage4.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage4.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage4.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage4.jspx Wed Aug  2 11:34:29 2006
@@ -41,13 +41,13 @@
             </tr:menuButtons>
           </f:facet>
           <f:facet name="location">               
-            <tr:processTrain  value="#{surveyMenuModel}" var="surveyNode" >
+            <tr:train  value="#{surveyMenuModel}" var="surveyNode" >
               <f:facet name="nodeStamp">
                 <tr:commandNavigationItem text="#{surveyNode.label}"
                                     action="#{surveyNode.getOutcome}"
                                     readOnly="true"/>
               </f:facet>
-            </tr:processTrain>
+            </tr:train>
           </f:facet>
           <tr:panelButtonBar>
             <tr:singleStepButtonBar selectedStep="4" maxStep="5"

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyPage5.jspx Wed Aug  2 11:34:29 2006
@@ -24,7 +24,7 @@
        
         <tr:panelPage>
       <tr:panelHeader text="Question 5 of 5">
-        <tr:panelForm>
+        <tr:panelFormLayout>
           <tr:selectOneRadio label="#{survey.q4.prompt}" 
                                 required="true"
                                 value="#{survey.a4}">            
@@ -34,7 +34,7 @@
               <tr:selectItem label="#{item}" value="#{''}#{iter.index}"/>
             </tr:forEach>
            </tr:selectOneRadio >
-        </tr:panelForm>
+        </tr:panelFormLayout>
       </tr:panelHeader>
 
           <f:facet name="navigationGlobal">
@@ -45,13 +45,13 @@
             </tr:menuButtons>
           </f:facet>
           <f:facet name="location">               
-            <tr:processTrain  value="#{surveyMenuModel}" var="surveyNode">
+            <tr:train  value="#{surveyMenuModel}" var="surveyNode">
               <f:facet name="nodeStamp">
                 <tr:commandNavigationItem text="#{surveyNode.label}"
                                     action="#{surveyNode.getOutcome}"
                                     readOnly="true"/>
               </f:facet>
-            </tr:processTrain>
+            </tr:train>
           </f:facet>
           <tr:panelButtonBar>
             <tr:singleStepButtonBar selectedStep="5" maxStep="5"

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyResults.jspx Wed Aug  2 11:34:29 2006
@@ -26,7 +26,7 @@
           <tr:panelPage>
            <tr:panelHeader text="Please review your responses:">
        
-            <tr:panelForm>
+            <tr:panelFormLayout>
 <!-- question 1 -->
              <tr:selectOneRadio label="#{survey.q0.prompt}" 
                                     required="true"
@@ -97,7 +97,7 @@
               <survey:validate_answer questionIndex="4"/>
             </tr:selectOneRadio >        
         
-        </tr:panelForm>
+        </tr:panelFormLayout>
        </tr:panelHeader>
           <f:facet name="navigationGlobal">
             <tr:menuButtons>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/webapp/surveydemo/surveyStart.jspx Wed Aug  2 11:34:29 2006
@@ -37,7 +37,7 @@
           <tr:outputText value="Test your knowledge of California Driving Laws"
                           styleClass="AFInstructionText"/>
         
-          <tr:objectSpacer height="20"/>
+          <tr:spacer height="20"/>
           <tr:commandButton action="#{survey.start}" text="begin survey"/>
          </tr:panelHeader>
        </tr:panelPage>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/billing.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/billing.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/billing.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/billing.jspx Wed Aug  2 11:34:29 2006
@@ -29,14 +29,14 @@
         <tr:panelPage>
           <tr:messages/>
           <tr:panelHeader text="Billing Address">
-            <tr:panelForm>     
+            <tr:panelFormLayout>     
               <tr:inputText label="First Name"  value="#{order.billingAddress.firstName}"/>   
               <tr:inputText label="Last Name"  value="#{order.billingAddress.lastName}"/>   
               <tr:inputText label="Street Address" value="#{order.billingAddress.streetAddress}"/>   
               <tr:inputText label="City" value="#{order.billingAddress.city}"/>   
               <tr:inputText label="State" value="#{order.billingAddress.state}"/>   
               <tr:inputText label="Zip Code" value="#{order.billingAddress.zip}"/>   
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelButtonBar>        
              <tr:singleStepButtonBar selectedStep="3" maxStep="5"
                                 nextActionListener="#{order.processNext}" 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/cart.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/cart.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/cart.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/cart.jspx Wed Aug  2 11:34:29 2006
@@ -30,9 +30,9 @@
           <tr:messages/>
     
           <tr:panelHeader text="Shopping Cart">
-          <tr:panelForm>        
+          <tr:panelFormLayout>        
             <tr:inputText readOnly="true" value="foobar" label="Items" />
-          </tr:panelForm>
+          </tr:panelFormLayout>
           
           <tr:panelButtonBar>
             <tr:commandButton action="checkout" text="Proceed to Checkout"/>        

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/composite.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/composite.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/composite.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/composite.jspx Wed Aug  2 11:34:29 2006
@@ -29,12 +29,12 @@
        <tr:panelPage>
        <tr:form>
          <tr:messages/>
-         <tr:panelGroup layout="vertical">
+         <tr:panelGroupLayout layout="vertical">
            <afdemo:dateField id="dateField" value="#{date.date1}"/>
            <tr:message for="dateField"/>
            <tr:outputText value="Date is now #{date.date1}"/>
 
-           <tr:objectSeparator/>
+           <tr:separator/>
 
     <!-- Use a normal inputText, but use binding to force the renderer type -->
            <h:inputText id="dateInput" value="#{date.date2}" binding="#{compositeTest.dateInput}"/>
@@ -42,10 +42,10 @@
            <tr:message for="dateInput"/>
            <tr:outputText value="Date is now #{date.date2}"/>
 
-           <tr:objectSeparator/>
+           <tr:separator/>
 
            <tr:commandButton text="Submit"/>
-         </tr:panelGroup>
+         </tr:panelGroupLayout>
        </tr:form>
        </tr:panelPage>
       </trh:body>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/credit.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/credit.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/credit.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/credit.jspx Wed Aug  2 11:34:29 2006
@@ -27,14 +27,14 @@
         <tr:form>
           <tr:panelPage>
             <tr:messages/>
-            <tr:panelForm>
+            <tr:panelFormLayout>
               <tr:panelHeader text="Credit Card">
                 <tr:inputText label="First Name" value="#{order.creditCard.firstName}"/>
                 <tr:inputText label="Last Name" value="#{order.creditCard.lastName}"/>
                 <tr:inputText label="Card Number" value="#{order.creditCard.number}"/>
                 <tr:inputText label="Expiration Date" value="#{order.creditCard.expirationDate}"/>
               </tr:panelHeader>
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelButtonBar>
               <tr:singleStepButtonBar selectedStep="2" maxStep="5"
                                       nextActionListener="#{order.processNext}"

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/el.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/el.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/el.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/el.jspx Wed Aug  2 11:34:29 2006
@@ -27,7 +27,7 @@
        <tr:panelPage>
        <tr:form>
          <tr:messages/>
-         <tr:panelGroup layout="vertical">
+         <tr:panelGroupLayout layout="vertical">
            <tr:outputText value="Current context is #{requestContext}"/>
            <tr:outputText value="Right to left? :  #{requestContext.rightToLeft}"/>
            <tr:outputText value="Look and feel? :  #{requestContext.lookAndFeel}"/>
@@ -37,7 +37,7 @@
            <tr:outputText value="#{requestContext.formatter['Test {0} MessageFormat']['of']}"/>
            <tr:goLink destination="#{requestContext.helpSystem.frontPage}" text="Get Help"/>
            <tr:goLink destination="#{requestContext.helpTopic.ui_table}" text="Get Help"/>
-         </tr:panelGroup>
+         </tr:panelGroupLayout>
        </tr:form>
        </tr:panelPage>
       </trh:body>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/forEachTest.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/forEachTest.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/forEachTest.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/forEachTest.jspx Wed Aug  2 11:34:29 2006
@@ -22,7 +22,7 @@
   <jsp:directive.page contentType="text/html;charset=iso-8859-1"/>
   <f:view>
    <tr:form>
-   <tr:panelGroup layout="vertical">
+   <tr:panelGroupLayout layout="vertical">
    
    <!-- EACH OF THE BLOCK BELOW IS A SINGLE TEST CASE, UNCOMMENT EACH AND TEST -->
    
@@ -108,7 +108,7 @@
     <!--<tr:forEach varStatus="outer" var="outer" begin="1" end="10" step="20">
     </tr:forEach>-->
 
-   </tr:panelGroup>
+   </tr:panelGroupLayout>
    </tr:form>   
   </f:view>
 </jsp:root>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/items.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/items.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/items.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/items.jspx Wed Aug  2 11:34:29 2006
@@ -29,9 +29,9 @@
         <tr:panelPage>
           <tr:messages/>
           <tr:panelHeader text="Items">
-            <tr:panelForm>        
+            <tr:panelFormLayout>        
               <tr:inputText readOnly="true" value="foobar" label="Items" />
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelButtonBar>        
               <tr:singleStepButtonBar selectedStep="1" maxStep="5"
                 nextActionListener="#{order.processNext}" 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/login.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/login.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/login.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/login.jspx Wed Aug  2 11:34:29 2006
@@ -29,10 +29,10 @@
         <tr:panelPage>
           <tr:messages/>
           <tr:panelHeader text="Log In">
-            <tr:panelForm> 
+            <tr:panelFormLayout> 
               <tr:inputText label="UserName" value="#{order.customer.userName}"/>
               <tr:inputText label="Password" value="#{order.customer.password}" secret="true"/>   
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelButtonBar>  
               <tr:commandButton text="Log In" action="loggedIn"/>
               <tr:commandButton text="New User" action="newUser"/>   

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/register.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/register.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/register.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/register.jspx Wed Aug  2 11:34:29 2006
@@ -29,12 +29,12 @@
         <tr:panelPage>
           <tr:messages/>
           <tr:panelHeader text="Register">
-            <tr:panelForm>      
+            <tr:panelFormLayout>      
               <tr:inputText label="UserName"   value="#{order.customer.userName}"/>
               <tr:inputText label="Password"   value="#{order.customer.password}" secret="true"/>    
               <tr:inputText label="First Name"  value="#{order.customer.firstName}"/>   
               <tr:inputText label="Last Name"  value="#{order.customer.lastName}"/>   
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelButtonBar>    
               <tr:commandButton text="Log In" action="loggedIn"/> 
             </tr:panelButtonBar>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/review.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/review.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/review.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/review.jspx Wed Aug  2 11:34:29 2006
@@ -30,38 +30,38 @@
           <tr:messages/>
           <tr:panelHeader text="Review Order Information">
             <tr:panelHeader text="Customer Information">
-              <tr:panelForm>        
+              <tr:panelFormLayout>        
                 <tr:inputText readOnly="true" label="First Name"  value="#{order.customer.firstName}"/>   
                 <tr:inputText readOnly="true" label="Last Name"  value="#{order.customer.lastName}"/>   
-              </tr:panelForm>
+              </tr:panelFormLayout>
             </tr:panelHeader>
             <tr:panelHeader text="Credit Card Information">
-              <tr:panelForm>       
+              <tr:panelFormLayout>       
                <tr:inputText readOnly="true" label="First Name"  value="#{order.creditCard.firstName}"/>   
                <tr:inputText readOnly="true" label="Last Name"  value="#{order.creditCard.lastName}"/>      
                <tr:inputText readOnly="true" label="Card Number" value="#{order.creditCard.number}"/>   
                <tr:inputText readOnly="true" label="Expiration Date" value="#{order.creditCard.expirationDate}"/>   
-              </tr:panelForm>
+              </tr:panelFormLayout>
             </tr:panelHeader>
             <tr:panelHeader text="Billing Address">
-              <tr:panelForm>     
+              <tr:panelFormLayout>     
                <tr:inputText readOnly="true" label="First Name"  value="#{order.billingAddress.firstName}"/>   
                <tr:inputText readOnly="true" label="Last Name"  value="#{order.billingAddress.lastName}"/>         
                <tr:inputText readOnly="true" label="Street Address" value="#{order.billingAddress.streetAddress}"/>   
                <tr:inputText readOnly="true" label="City" value="#{order.billingAddress.city}"/>   
                <tr:inputText readOnly="true" label="State" value="#{order.billingAddress.state}"/>   
                <tr:inputText readOnly="true" label="Zip Code" value="#{order.billingAddress.zip}"/>   
-              </tr:panelForm>
+              </tr:panelFormLayout>
             </tr:panelHeader> 
             <tr:panelHeader text="Shipping Address">
-              <tr:panelForm>     
+              <tr:panelFormLayout>     
                 <tr:inputText readOnly="true" label="First Name"  value="#{order.shippingAddress.firstName}"/>   
                 <tr:inputText readOnly="true" label="Last Name"  value="#{order.shippingAddress.lastName}"/>      
                 <tr:inputText readOnly="true" label="Street Address" value="#{order.shippingAddress.streetAddress}"/>   
                 <tr:inputText readOnly="true" label="City" value="#{order.shippingAddress.city}"/>   
                 <tr:inputText readOnly="true" label="State" value="#{order.shippingAddress.state}"/>   
                 <tr:inputText readOnly="true" label="Zip Code" value="#{order.shippingAddress.zip}"/>    
-              </tr:panelForm>
+              </tr:panelFormLayout>
             </tr:panelHeader>
             <tr:panelButtonBar>        
               <tr:singleStepButtonBar selectedStep="5" maxStep="5" 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/selectItemTest.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/selectItemTest.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/selectItemTest.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/selectItemTest.jspx Wed Aug  2 11:34:29 2006
@@ -25,7 +25,7 @@
       <trh:head title="Test of selectItemSupport"/>
       <trh:body>
        <tr:form>
-         <tr:panelForm rows="5" maxColumns="3">
+         <tr:panelFormLayout rows="5" maxColumns="3">
            <tr:selectOneChoice label="Explicit selectItem">
              <f:selectItem itemValue="foo" itemLabel="Foo"/>
              <f:selectItem itemValue="bar" itemLabel="Bar"/>
@@ -98,7 +98,7 @@
              <f:selectItems value="#{selectItemTest.itemMap}"/>
            </tr:selectOneRadio>
 
-         </tr:panelForm>
+         </tr:panelFormLayout>
     
          <tr:selectOrderShuttle>
            <f:selectItems value="#{selectItemTest.itemList}"/>

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/shipping.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/shipping.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/shipping.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/shipping.jspx Wed Aug  2 11:34:29 2006
@@ -29,14 +29,14 @@
         <tr:panelPage>
           <tr:messages/>
           <tr:panelHeader text="Shipping Address">
-            <tr:panelForm>
+            <tr:panelFormLayout>
               <tr:inputText label="First Name"  value="#{order.shippingAddress.firstName}"/>   
               <tr:inputText label="Last Name"  value="#{order.shippingAddress.lastName}"/>    
               <tr:inputText label="Street Address" value="#{order.shippingAddress.streetAddress}"/>   
               <tr:inputText label="City" value="#{order.shippingAddress.city}"/>   
               <tr:inputText label="State" value="#{order.shippingAddress.state}"/>   
               <tr:inputText label="Zip Code" value="#{order.shippingAddress.zip}"/>   
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:panelButtonBar>        
              <tr:singleStepButtonBar selectedStep="4" maxStep="5"
                                 nextActionListener="#{order.processNext}" 

Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/showDetail.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/showDetail.jspx?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/showDetail.jspx (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/webapp/showDetail.jspx Wed Aug  2 11:34:29 2006
@@ -28,14 +28,14 @@
         <tr:panelPage>
           <tr:messages/>
           <tr:panelHeader text="Detail of #{pageFlowScope.detail.string}">
-            <tr:panelForm>
+            <tr:panelFormLayout>
               <tr:panelLabelAndMessage label="Int:">
                 <tr:outputText value="#{pageFlowScope.detail.int}"/>
               </tr:panelLabelAndMessage>
               <tr:panelLabelAndMessage label="String:">
                 <tr:outputText value="#{pageFlowScope.detail.string}"/>
               </tr:panelLabelAndMessage>
-            </tr:panelForm>
+            </tr:panelFormLayout>
             <tr:commandButton text="Return..."
                                action="sample"/>
           </tr:panelHeader>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopRenderKit.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopRenderKit.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopRenderKit.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopRenderKit.java Wed Aug  2 11:34:29 2006
@@ -25,6 +25,9 @@
     addRenderer("org.apache.myfaces.trinidad.Table",
 		"org.apache.myfaces.trinidad.Table",
                 new DesktopTableRenderer());
+    addRenderer("org.apache.myfaces.trinidad.Process",
+    "org.apache.myfaces.trinidad.Train",
+                new TrainRenderer());
   }
 
   protected String getDecoratedRenderKitId()

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java Wed Aug  2 11:34:29 2006
@@ -39,7 +39,6 @@
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormData;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.NavigationPathRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ResourceKeyUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
@@ -519,7 +518,7 @@
   private static final CoreRenderer _TREE_NODE = new TreeNodeColumnRenderer();
   private static final CoreRenderer _CRUMBS = new BreadCrumbsRenderer();
 
-  private static final class BreadCrumbsRenderer extends NavigationPathRenderer
+  private static final class BreadCrumbsRenderer extends org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.BreadCrumbsRenderer
   {
     protected void renderLink(
       FacesContext context,
@@ -576,7 +575,7 @@
       FacesContext context,
       UIComponent  component)
     {
-      // the ID is rendered by TreeTableRenderer and not NavigationPathRenderer:
+      // the ID is rendered by TreeTableRenderer and not org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.BreadCrumbsRenderer:
       // bug 4587950:
       return false;
     }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/CalendarDialogJSP.java Wed Aug  2 11:34:29 2006
@@ -26,9 +26,9 @@
 import org.apache.myfaces.trinidad.component.core.CoreForm;
 import org.apache.myfaces.trinidad.component.core.CoreImportScript;
 import org.apache.myfaces.trinidad.component.core.input.CoreChooseDate;
-import org.apache.myfaces.trinidad.component.core.layout.CorePanelGroup;
+import org.apache.myfaces.trinidad.component.core.layout.CorePanelGroupLayout;
 import org.apache.myfaces.trinidad.component.core.nav.CoreGoButton;
-import org.apache.myfaces.trinidad.component.core.output.CoreObjectSpacer;
+import org.apache.myfaces.trinidad.component.core.output.CoreSpacer;
 import org.apache.myfaces.trinidad.component.html.HtmlRowLayout;
 import org.apache.myfaces.trinidad.component.html.HtmlTableLayout;
 import org.apache.myfaces.trinidad.context.RequestContext;
@@ -92,7 +92,7 @@
     // Create a spacer
     //
     UIComponent spacerRow = _createRow(isDesktop, null);
-    CoreObjectSpacer cos = new CoreObjectSpacer();
+    CoreSpacer cos = new CoreSpacer();
     spacerRow.getChildren().add(cos);
     cos.setHeight("8");
 
@@ -170,10 +170,10 @@
     }
     else
     {
-      CorePanelGroup cpg = new CorePanelGroup();
+      CorePanelGroupLayout cpg = new CorePanelGroupLayout();
       form.getChildren().add(cpg);
 
-      cpg.setLayout(CorePanelGroup.LAYOUT_VERTICAL);
+      cpg.setLayout(CorePanelGroupLayout.LAYOUT_VERTICAL);
       cpg.getChildren().add(calendarRow);
       cpg.getChildren().add(spacerRow);
       cpg.getChildren().add(buttonRow);
@@ -239,7 +239,7 @@
     String  halign)
   {
     if (!isDesktop)
-      return new CorePanelGroup();
+      return new CorePanelGroupLayout();
 
     HtmlRowLayout hrl = new HtmlRowLayout();
     if (halign != null)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pages/ColorPickerJSP.java Wed Aug  2 11:34:29 2006
@@ -25,10 +25,10 @@
 import org.apache.myfaces.trinidad.component.core.CoreDocument;
 import org.apache.myfaces.trinidad.component.core.CoreForm;
 import org.apache.myfaces.trinidad.component.core.input.CoreChooseColor;
-import org.apache.myfaces.trinidad.component.core.input.CoreSelectInputColor;
+import org.apache.myfaces.trinidad.component.core.input.CoreInputColor;
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelButtonBar;
 import org.apache.myfaces.trinidad.component.core.nav.CoreGoButton;
-import org.apache.myfaces.trinidad.component.core.output.CoreObjectSpacer;
+import org.apache.myfaces.trinidad.component.core.output.CoreSpacer;
 import org.apache.myfaces.trinidad.component.html.HtmlCellFormat;
 import org.apache.myfaces.trinidad.component.html.HtmlRowLayout;
 import org.apache.myfaces.trinidad.component.html.HtmlScript;
@@ -60,7 +60,7 @@
     CoreDocument doc = new CoreDocument();
     context.getViewRoot().getChildren().add(doc);
 
-    doc.setTitle(arc.getTranslatedString("af_selectInputColor.PICKER_TITLE"));
+    doc.setTitle(arc.getTranslatedString("af_inputColor.PICKER_TITLE"));
     
     CoreForm form = new CoreForm();
     form.setId("d");
@@ -75,7 +75,7 @@
     rl1.getChildren().add(cf1);
     cf1.setHalign("center");
     
-    CoreSelectInputColor sic = new CoreSelectInputColor();
+    CoreInputColor sic = new CoreInputColor();
     cf1.getChildren().add(sic);
     sic.setId("c");
     sic.setOnkeypress("if(_getKC(event)==13){selectColor();return false}");
@@ -85,11 +85,11 @@
     sic.setConverter(converter);
     sic.setValue(value);
     sic.setChooseId("choose");
-    sic.setLabel(arc.getTranslatedString("af_selectInputColor.PICKER_PROMPT"));
+    sic.setLabel(arc.getTranslatedString("af_inputColor.PICKER_PROMPT"));
 
     HtmlRowLayout rl2 = new HtmlRowLayout();
     tl.getChildren().add(rl2);
-    CoreObjectSpacer spacer = new CoreObjectSpacer();
+    CoreSpacer spacer = new CoreSpacer();
     rl2.getChildren().add(spacer);
     spacer.setHeight("8");
     
@@ -106,7 +106,7 @@
     
     HtmlRowLayout rl4 = new HtmlRowLayout();
     tl.getChildren().add(rl4);
-    CoreObjectSpacer spacer2 = new CoreObjectSpacer();
+    CoreSpacer spacer2 = new CoreSpacer();
     rl4.getChildren().add(spacer2);
     spacer2.setHeight("8");
     
@@ -120,12 +120,12 @@
 
 
     CoreGoButton cancel = 
-       JspUtils.createGoButton(arc, "af_selectInputColor.CANCEL");
+       JspUtils.createGoButton(arc, "af_inputColor.CANCEL");
     bar.getChildren().add(cancel);
     cancel.setOnclick("doCancel()");
 
     CoreGoButton select = 
-       JspUtils.createGoButton(arc, "af_selectInputColor.APPLY");
+       JspUtils.createGoButton(arc, "af_inputColor.APPLY");
     bar.getChildren().add(select);
     select.setOnclick("return selectColor()");
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaRenderKit.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaRenderKit.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaRenderKit.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaRenderKit.java Wed Aug  2 11:34:29 2006
@@ -25,6 +25,9 @@
     addRenderer("org.apache.myfaces.trinidad.Table",
 		"org.apache.myfaces.trinidad.Table",
                 new PdaTableRenderer());
+    addRenderer("org.apache.myfaces.trinidad.Process",
+    "org.apache.myfaces.trinidad.Train",
+                new TrainRenderer());
   }
 
   protected String getDecoratedRenderKitId()

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java Wed Aug  2 11:34:29 2006
@@ -85,8 +85,7 @@
     if (UIXPanel.COMPONENT_FAMILY.equals(family))
     {
       String rendererType = parent.getRendererType();
-      if ("org.apache.myfaces.trinidad.Form".equals(rendererType) ||
-          "org.apache.myfaces.trinidad.rich.Form".equals(rendererType))
+      if (_isFormRendererType(rendererType))
         return false;
     }
     else if (HtmlTableLayout.COMPONENT_FAMILY.equals(family))
@@ -121,12 +120,12 @@
     if (UIXPanel.COMPONENT_FAMILY.equals(family))
     {
       String rendererType = parentComponent.getRendererType();
-      if ("org.apache.myfaces.trinidad.Form".equals(rendererType) ||
-          "org.apache.myfaces.trinidad.rich.Form".equals(rendererType))
+      if (_isFormRendererType(rendererType))
         return true;
     }
     return false;
   }
+
    // put the outer style class here, like af_selectManyRadio, styleClass,
   // inlineStyle, 'state' styles like p_AFDisabled, etc.  
   protected void renderRootDomElementStyles(
@@ -232,7 +231,7 @@
       
       if (needsPanelFormLayout)
       {
-        PanelFormRenderer.encodeBetweenLabelAndFieldCells(context, arc, rw);
+        PanelFormLayoutRenderer.encodeBetweenLabelAndFieldCells(context, arc, rw);
       }
       
       _renderFieldCell(context, arc, component, bean, labelExists,
@@ -699,6 +698,14 @@
             (String) keyMap.get(styleClass) :
             null;
   }
+  
+  private boolean _isFormRendererType(String rendererType)
+  {
+    return "org.apache.myfaces.trinidad.Form".equals(rendererType) ||
+        "org.apache.myfaces.trinidad.FormLayout".equals(rendererType) ||
+        "org.apache.myfaces.trinidad.rich.Form".equals(rendererType);
+  }
+
   
   // THESE VALUES MUST MATCH THOSE IN INLINEMESSAGERENDERER
   // (at least for as long as both classes exist)

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ProcessUtils.java Wed Aug  2 11:34:29 2006
@@ -17,9 +17,11 @@
 
 import java.io.IOException;
 
+import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
+import org.apache.myfaces.trinidad.component.UIXProcess;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
 import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
@@ -34,8 +36,6 @@
  */
 public class ProcessUtils
 {
-
-
   /**
    * Returns a String with the javascript function call _navSubmit
    */
@@ -74,6 +74,43 @@
   }
 
   /**
+ * @param component
+ * @param stamp
+ * @param startIndex
+ * @return
+ */
+  public static int getBackIndex(
+    UIXProcess component,
+    UIComponent stamp,
+    int startIndex)
+  {
+    int i = startIndex - 1;
+    while (i >= 0)
+    {
+      component.setRowIndex(i);
+      boolean disabled = Boolean.TRUE.equals(
+        stamp.getAttributes().get("disabled"));
+      boolean readOnly = Boolean.TRUE.equals(
+        stamp.getAttributes().get("readOnly"));
+      boolean rendered = stamp.isRendered();
+
+      // if this node is rendered and not disabled and not readOnly
+      // then it can be used as the back button node.
+      if (!disabled && !readOnly && rendered)
+      {
+        component.setRowIndex(startIndex);
+        return i;
+      }
+
+      i--;
+    }
+
+    component.setRowIndex(startIndex);
+    return NO_INDEX;
+
+  }
+
+  /**
    */
   public static String getChoiceOnChangeFormSubmitted(
     String           form,
@@ -104,6 +141,43 @@
     return buffer.toString();
   }
 
+
+  /**
+   * @param component
+   * @param stamp
+   * @param startIndex
+   * @return
+   */
+  public static int getNextIndex(
+    UIXProcess component, 
+    UIComponent stamp,
+    int startIndex)
+  {
+    int i = startIndex + 1;
+    int rowCount = component.getRowCount();
+    while (i < rowCount)
+    {
+      component.setRowIndex(i);
+      boolean disabled = Boolean.TRUE.equals(
+        stamp.getAttributes().get("disabled"));
+      boolean readOnly = Boolean.TRUE.equals(
+        stamp.getAttributes().get("readOnly"));
+      boolean rendered = stamp.isRendered();
+
+      // if this node is rendered and not disabled and not readOnly
+      // then it can be used as the back button node.
+      if (!disabled && !readOnly && rendered)
+      {
+        component.setRowIndex(startIndex);
+        return i;
+      }
+
+      i++;
+    }
+
+    component.setRowIndex(startIndex);
+    return NO_INDEX;
+  }
 
   public static void renderNavSubmitScript(
     FacesContext        context,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java Wed Aug  2 11:34:29 2006
@@ -41,7 +41,7 @@
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
 
 /**
- *  Base Renderer for ShowOneChoice and ShowOneRadio
+ *  Base Renderer for ShowOneChoice and PanelRadio
  * <p>
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/renderkit/html/layout/ShowOneListRendererBase.java#0 $) $Date: 10-nov-2005.19:01:14 $
  * @author The Oracle ADF Faces Team

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceURI.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceURI.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceURI.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/share/xml/NamespaceURI.java Wed Aug  2 11:34:29 2006
@@ -89,8 +89,8 @@
     String uri;
     String name;
     // jmw test
-    // af|navigationPath::separator-icon fails, because it thinks that
-    // af|navigationPath is the prefix.
+    // af|breadCrumbs::separator-icon fails, because it thinks that
+    // af|breadCrumbs is the prefix.
     // distinguish between single quotes and double quotes for now.
 
     // jmw test

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java Wed Aug  2 11:34:29 2006
@@ -452,11 +452,11 @@
               SkinPropertyNode property = (SkinPropertyNode)e.next();
               Object propValueObj = property.getPropertyValue();
               // convert to a type if possible first
-              // =-=jmw should I get the type for af|navigationPath-ora-show-last-item or just
+              // =-=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|navigationPath-ora-show-last-item
+              // For now, just for the heck of it, use af|breadCrumbs-ora-show-last-item
 
               String key = property.getPropertySelector() +
                            property.getPropertyName();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinCSSDocumentHandler.java Wed Aug  2 11:34:29 2006
@@ -73,7 +73,7 @@
    
   /**
   * Call this at the beginning of parsing one set of selectors/properties.
-  * e.g., .AFDefaultFont, af|navigationPath::font 
+  * e.g., .AFDefaultFont, af|breadCrumbs::font 
   * {font-family:Arial,Helvetica; font-size:small}
   */
   public void startSelector()
@@ -86,10 +86,10 @@
    * Call this at the end of parsing one set of selectors/properties.
    * @param selectors A List of Strings, each String is a selector.
    * e.g., given the selectors/properties:
-   * .AFDefaultFont, af|navigationPath::font 
+   * .AFDefaultFont, af|breadCrumbs::font 
    * {font-family:Arial,Helvetica; font-size:small}
    * The selectors in the List are 
-   * ".AFDefaultFont" and "af|navigationPath::font"
+   * ".AFDefaultFont" and "af|breadCrumbs::font"
   */
   public void endSelector(List selectors)
   {
@@ -116,7 +116,7 @@
    /**
     * Call this when a property name/value is found.
     * e.g., given the selectors/properties:
-    * .AFDefaultFont, af|navigationPath::font 
+    * .AFDefaultFont, af|breadCrumbs::font 
     * {font-family:Arial,Helvetica; font-size:small}
     * One property name/value pair is "font-family"/"Arial,Helvetica"
     * @param name 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetNode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetNode.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetNode.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/SkinStyleSheetNode.java Wed Aug  2 11:34:29 2006
@@ -26,7 +26,7 @@
  * @todo honor the namespaces that are set in the css file. For now, we ignore
  * them. We need to honor them for icons, properties, and styles at the same
  * time so they are consistent. By honoring, I mean if the namespace is
- * af http://uix.faces.abc and the style name is af|navigationPath, we store the 
+ * af http://uix.faces.abc and the style name is af|breadCrumbs, we store the 
  * icon or property as http://uix.faces.abc|navigationPath. We need to do something
  * similar with styles.
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/skin/SkinStyleSheetNode.java#0 $) $Date: 10-nov-2005.18:58:59 $

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?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- 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 Aug  2 11:34:29 2006
@@ -416,14 +416,14 @@
     // Icon selectors that end with :rtl will be a separate Icon object.
     // I won't combine :rtl icons with regular icons into the same object
     // like we did in 2.2.
-    // af|navigationPath::separatorIcon {content: ">"}
-    // af|navigationPath::separatorIcon:rtl {content: "<"}
+    // af|breadCrumbs::separatorIcon {content: ">"}
+    // af|breadCrumbs::separatorIcon:rtl {content: "<"}
     // this will create
-    // key=af|navigationPath::separatorIcon with TextIcon(">", ">", style, inlineStyle)
+    // key=af|breadCrumbs::separatorIcon with TextIcon(">", ">", style, inlineStyle)
     // and
-    // key=af|navigationPath::separatorIcon:rtl with TextIcon("<", "<", rtlstyle, rtlinlineStyle)
-    // then when I go to get the icon af|navigationPath::separatorIcon, the skin
-    // will know to ask for af|navigationPath::separatorIcon:rtl or af|navigationPath::separatorIcon
+    // key=af|breadCrumbs::separatorIcon:rtl with TextIcon("<", "<", rtlstyle, rtlinlineStyle)
+    // then when I go to get the icon af|breadCrumbs::separatorIcon, the skin
+    // will know to ask for af|breadCrumbs::separatorIcon:rtl or af|breadCrumbs::separatorIcon
     // depending upon the DIRECTION that is set on the context.
     // The current Icon classes code will not have to change.
 
@@ -712,7 +712,7 @@
 /** unused for now. we want to do this for icons, properties and styles at once
   // substitute the prefix (the part that comes before the |) with
   // its namespace
-  // e.g., selectorName = af|navigationPath
+  // e.g., selectorName = af|breadCrumbs
   // af maps to http://myfaces.apache.org/adf/faces
   // return
   // http://myfaces.apache.org/adf/faces|navigationPath

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?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- 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 Aug  2 11:34:29 2006
@@ -153,7 +153,7 @@
    * 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|navigationPath, property: -ora-show-last-item,
+   * e.g, selector: af|breadCrumbs, property: -ora-show-last-item,
    * value: true
    */
   public List <SkinPropertyNode> getSkinProperties()

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java Wed Aug  2 11:34:29 2006
@@ -1491,12 +1491,12 @@
     _STYLE_KEY_MAP.put("af|panelList::unordered-list",
                  "af|panelList UL");
 
-    _STYLE_KEY_MAP.put("af|selectInputDate::nav-link",
-                 "af|selectInputDate::nav A");
-    _STYLE_KEY_MAP.put("af|selectInputDate::content-link",
-                 "af|selectInputDate::content A");
-    _STYLE_KEY_MAP.put("af|selectInputDate::disabled-link",
-                 "af|selectInputDate::disabled A");
+    _STYLE_KEY_MAP.put("af|inputDate::nav-link",
+                 "af|inputDate::nav A");
+    _STYLE_KEY_MAP.put("af|inputDate::content-link",
+                 "af|inputDate::content A");
+    _STYLE_KEY_MAP.put("af|inputDate::disabled-link",
+                 "af|inputDate::disabled A");
     _STYLE_KEY_MAP.put("af|chooseDate::nav-link",
                  "af|chooseDate::nav A");
     _STYLE_KEY_MAP.put("af|chooseDate::content-link",
@@ -1516,10 +1516,17 @@
         XhtmlLafConstants.AF_SHOWONEACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS,
         "A.af|showOneAccordion::title-disabled-link");
 
-    _STYLE_KEY_MAP.put("af|showOneTab::tab-link",
-        "af|showOneTab::tab A");
-    _STYLE_KEY_MAP.put("af|showOneTab::tab-selected-link",
-        "af|showOneTab::tab-selected A");
+    _STYLE_KEY_MAP.put(
+        XhtmlLafConstants.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS,
+        "A.af|panelAccordion::title-link");
+    _STYLE_KEY_MAP.put(
+        XhtmlLafConstants.AF_PANELACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS,
+        "A.af|panelAccordion::title-disabled-link");
+
+    _STYLE_KEY_MAP.put("af|panelTabbed::tab-link",
+        "af|panelTabbed::tab A");
+    _STYLE_KEY_MAP.put("af|panelTabbed::tab-selected-link",
+        "af|panelTabbed::tab-selected A");
 
     _STYLE_KEY_MAP.put(":read-only",
                        ".p_AFReadOnly");

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/RootRenderingContext.java Wed Aug  2 11:34:29 2006
@@ -534,7 +534,7 @@
     return getSkinResourceMappedKey(key);
     /*** =-=jmw @todo get the style class from the skin.
      * the skin should return a short style class given a long style class
-     * like af|navigationPath::step-selected
+     * like af|breadCrumbs::step-selected
     if (mappedKey != null)
     {
       return getSkin().getStyleClass(mappedKey);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java Wed Aug  2 11:34:29 2006
@@ -103,6 +103,7 @@
   public static final AttributeKey READ_ONLY_ATTR  = new AttributeKey("readOnly", 12);
   public static final AttributeKey RENDERED_ATTR  = new AttributeKey("rendered", 13);
   public static final AttributeKey DISCLOSE_NONE_ATTR  = new AttributeKey("discloseNone");
+  public static final AttributeKey DISCLOSE_MANY_ATTR  = new AttributeKey("discloseMany");
   public static final AttributeKey DISCLOSED_ATTR  = new AttributeKey("disclosed");
   public static final AttributeKey USES_UPLOAD_ATTR  = new AttributeKey("usesUpload");
   public static final AttributeKey DEFAULT_COMMAND_ATTR  = new AttributeKey("defaultCommand");
@@ -458,7 +459,7 @@
   public static final String SEPARATOR_NAME = "separator";
   public static final String SERVLET_INCLUDE_NAME = "servletInclude";
   public static final String SHOW_ITEM_NAME = "showItem";
-  public static final String SHOW_ONE_TAB_NAME = "showOneTab";
+  public static final String SHOW_ONE_TAB_NAME = "panelTabbed";
   public static final String SIDE_BAR_NAME = "sideBar";
   public static final String SIDE_NAV_NAME = "sideNav";
   public static final String SINGLE_SELECTION_NAME = "singleSelection";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopConstants.java?rev=428081&r1=428080&r2=428081&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopConstants.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopConstants.java Wed Aug  2 11:34:29 2006
@@ -224,12 +224,12 @@
     
   // showOneTab style/icon constants
   public static final String AF_SELECT_ONE_TAB_SEPARATOR_ICON_NAME =
-    "af|showOneTab::separator-icon";
+    "af|panelTabbed::separator-icon";
     
 
   // ColorField style classes
   public static final String AF_SELECT_INPUT_COLOR_SWATCH_OVERLAY_ICON_STYLE_CLASS =
-    "af|selectInputColor::swatch-overlay";
+    "af|inputColor::swatch-overlay";
 
   // Header style classes
   // if icon attribute is set, this is the style for it.



Mime
View raw message