incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r427215 - in /incubator/adffaces/branches/matzew-component-renaming/trinidad: trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/ trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/tr...
Date Mon, 31 Jul 2006 19:08:48 GMT
Author: matzew
Date: Mon Jul 31 12:08:47 2006
New Revision: 427215

URL: http://svn.apache.org/viewvc?rev=427215&view=rev
Log:
navigationLevel now is a navigationPane

Added:
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationPane.xml
      - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationLevel.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/NavigationPane.xml
      - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/NavigationLevel.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationPane.jspx
      - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationLevel.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
      - copied, changed from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java
Removed:
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationLevel.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/NavigationLevel.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationLevel.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java
Modified:
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/commandNavigationItem.jspx
    incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationPath.jspx

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationPane.xml
(from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationLevel.xml)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationPane.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationPane.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationLevel.xml&r1=426992&r2=427215&rev=427215&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationLevel.xml
(original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationPane.xml
Mon Jul 31 12:08:47 2006
@@ -19,13 +19,13 @@
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
               xmlns:xi="http://www.w3.org/2001/XInclude">
   <component>
-    <description><![CDATA[The navigationLevel component creates a series of navigation
items representing one level in a navigation hierarchy.]]>
+    <description><![CDATA[The navigationPane component creates a series of navigation
items representing one level in a navigation hierarchy.]]>
     </description>
     <icon>
-      <small-icon>/org/apache/myfaces/trinidad/metadata/icons/navigationLevel.png</small-icon>
+      <small-icon>/org/apache/myfaces/trinidad/metadata/icons/navigationPane.png</small-icon>
     </icon>
-    <component-type>org.apache.myfaces.trinidad.CoreNavigationLevel</component-type>
-    <component-class>org.apache.myfaces.trinidad.component.core.nav.CoreNavigationLevel</component-class>
+    <component-type>org.apache.myfaces.trinidad.CoreNavigationPane</component-type>
+    <component-class>org.apache.myfaces.trinidad.component.core.nav.CoreNavigationPane</component-class>
 
     <xi:include href="includes/CommonAttrs.xml" xpointer="/faces-config/component/*"/>
     <xi:include href="includes/CoreJSEvents.xml" xpointer="/faces-config/component/*"/>
@@ -61,11 +61,11 @@
 
     <component-extension>
       <mfp:component-supertype>org.apache.myfaces.trinidad.NavigationLevel</mfp:component-supertype>
-      <mfp:renderer-type>org.apache.myfaces.trinidad.Level</mfp:renderer-type>
-      <mfp:tag-name>tr:navigationLevel</mfp:tag-name>
-      <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.nav.CoreNavigationLevelTag</mfp:tag-class>
+      <mfp:renderer-type>org.apache.myfaces.trinidad.Pane</mfp:renderer-type>
+      <mfp:tag-name>tr:navigationPane</mfp:tag-name>
+      <mfp:tag-class>org.apache.myfaces.trinidadinternal.taglib.core.nav.CoreNavigationPaneTag</mfp:tag-class>
       <mfp:long-description><![CDATA[<html:p>
-          The navigationLevel component creates a series of navigation items representing
one level in a navigation hierarchy. These items may either be added as children or a menu
model may be bound to the navigationLevel component. If a menu model is bound, of class 
+          The navigationPane component creates a series of navigation items representing
one level in a navigation hierarchy. These items may either be added as children or a menu
model may be bound to the navigationPane component. If a menu model is bound, of class 
           <html:code>org.apache.myfaces.trinidad.model.MenuModel</html:code>,
a level along the focus path, or the next level down, will be rendered. A node that is on
the focus path will be rendered as &quot;selected&quot;.
           </html:p>
           <html:p>
@@ -77,14 +77,14 @@
           </html:p>]]>
       </mfp:long-description>
       <mfp:example>
-        <mfp:source-code><![CDATA[<tr:navigationLevel var="foo" value="#{menuModel.model}">
+        <mfp:source-code><![CDATA[<tr:navigationPane var="foo" value="#{menuModel.model}">
   <f:facet name="nodeStamp">
     <tr:commandNavigationItem
       text="#{foo.label}"
       action="#{foo.action}"
       destination="#{foo.destination}"/>
   </f:facet>
-</tr:navigationLevel>]]>
+</tr:navigationPane>]]>
         </mfp:source-code>
       </mfp:example>
       <mfp:author>Adam Winer, Blake Sullivan, Gabrielle Crawford</mfp:author>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml?rev=427215&r1=427214&r2=427215&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml
(original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPage.xml
Mon Jul 31 12:08:47 2006
@@ -162,7 +162,7 @@
       <facet-extension>
         <mfp:facet-metadata>
           <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:navigationLevel</mfp:preferred-children>
+          <mfp:preferred-children>tr:navigationPane</mfp:preferred-children>
         </mfp:facet-metadata>
       </facet-extension>
     </facet>
@@ -171,7 +171,7 @@
       <facet-name>navigation2</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
-          <mfp:preferred-children>tr:navigationLevel</mfp:preferred-children>
+          <mfp:preferred-children>tr:navigationPane</mfp:preferred-children>
         </mfp:facet-metadata>
       </facet-extension>
     </facet>
@@ -180,7 +180,7 @@
       <facet-name>navigation3</facet-name>
       <facet-extension>
         <mfp:facet-metadata>
-          <mfp:preferred-children>tr:navigationLevel tr:navigationTree</mfp:preferred-children>
+          <mfp:preferred-children>tr:navigationPane tr:navigationTree</mfp:preferred-children>
         </mfp:facet-metadata>
         <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
       </facet-extension>
@@ -191,7 +191,7 @@
       <facet-extension>
         <mfp:facet-metadata>
           <mfp:preferred>true</mfp:preferred>
-          <mfp:preferred-children>tr:navigationLevel</mfp:preferred-children>
+          <mfp:preferred-children>tr:navigationPane</mfp:preferred-children>
         </mfp:facet-metadata>
       </facet-extension>
     </facet>
@@ -287,7 +287,7 @@
               </tr:navigationPath>
             </f:facet>
             <f:facet name="navigation1">
-              <tr:navigationLevel>
+              <tr:navigationPane>
                 <tr:commandNavigationItem text="tab 1" action="guide.navigationLevel"/>
                 <tr:commandNavigationItem text="tab 2" action="guide.navigationLevel"

                   selected="true"/>
@@ -296,31 +296,31 @@
                 <tr:commandNavigationItem text="tab 5" action="guide.navigationLevel"/>
                 <tr:commandNavigationItem text="tab 6" action="guide.navigationLevel"
                   disabled="true"/>
-              </tr:navigationLevel>
+              </tr:navigationPane>
             </f:facet>
             <f:facet name="navigation2">
-              <tr:navigationLevel>
+              <tr:navigationPane>
                 <tr:commandNavigationItem text="item 1" action="guide.navigationLevel"

                   selected="true"/>
                 <tr:commandNavigationItem text="item 2" action="guide.navigationLevel"
                   disabled="true"/>
                 <tr:commandNavigationItem text="item 3" action="guide.navigationLevel"/>
                 <tr:commandNavigationItem text="item 4" action="guide.navigationLevel"/>
-              </tr:navigationLevel>
+              </tr:navigationPane>
             </f:facet>
             <f:facet name="navigation3">
-              <tr:navigationLevel>
+              <tr:navigationPane>
                 <tr:commandNavigationItem text="item 1" action="guide.navigationLevel"/>
                 <tr:commandNavigationItem text="item 2" action="guide.navigationLevel"/>
                 <tr:commandNavigationItem text="item 3" action="guide.navigationLevel"/>
-              </tr:navigationLevel>
+              </tr:navigationPane>
             </f:facet>
             <f:facet name="navigationGlobal">
-              <tr:navigationLevel>
+              <tr:navigationPane>
                 <tr:commandNavigationItem text="Home" action="guide.navigationLevel"/>
                 <tr:commandNavigationItem text="Help" action="guide.navigationLevel"/>
                 <tr:commandNavigationItem text="Sign Out" action="guide.navigationLevel"/>
-              </tr:navigationLevel>
+              </tr:navigationPane>
             </f:facet>
             <tr:outputText value="Content here"/>
           </tr:panelPage>]]>

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/NavigationPane.xml
(from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/NavigationLevel.xml)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/NavigationPane.xml?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/NavigationPane.xml&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/NavigationLevel.xml&r1=426992&r2=427215&rev=427215&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/NavigationLevel.xml
(original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/NavigationPane.xml
Mon Jul 31 12:08:47 2006
@@ -20,10 +20,10 @@
     <render-kit-id>org.apache.myfaces.trinidadinternal.core</render-kit-id>
     <renderer>
       <component-family>org.apache.myfaces.trinidad.NavigationLevel</component-family>
-      <renderer-type>org.apache.myfaces.trinidad.Level</renderer-type>
-      <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.NavigationLevelRenderer</renderer-class>
+      <renderer-type>org.apache.myfaces.trinidad.Pane</renderer-type>
+      <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.NavigationPaneRenderer</renderer-class>
       <renderer-extension>
-        <mfp:component-type>org.apache.myfaces.trinidad.CoreNavigationLevel</mfp:component-type>
+        <mfp:component-type>org.apache.myfaces.trinidad.CoreNavigationPane</mfp:component-type>
       </renderer-extension>
     </renderer>
   </render-kit>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=427215&r1=427214&r2=427215&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/WEB-INF/faces-config.xml
Mon Jul 31 12:08:47 2006
@@ -768,7 +768,7 @@
         <value>menuTabs.jspx</value>
         <value>message.jspx</value>
         <value>messages.jspx</value>
-        <value>navigationLevel.jspx</value>
+        <value>navigationPane.jspx</value>
         <value>navigationPath.jspx</value>
         <value>navigationTree.jspx</value>
         <value>icon.jspx</value>
@@ -1894,8 +1894,8 @@
     </navigation-case>
 
     <navigation-case>
-      <from-outcome>guide.navigationLevel</from-outcome>
-      <to-view-id>/components/navigationLevel.jspx</to-view-id>
+      <from-outcome>guide.navigationPane</from-outcome>
+      <to-view-id>/components/navigationPane.jspx</to-view-id>
       <redirect/>
     </navigation-case>
 

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/commandNavigationItem.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/commandNavigationItem.jspx?rev=427215&r1=427214&r2=427215&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/commandNavigationItem.jspx
(original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/commandNavigationItem.jspx
Mon Jul 31 12:08:47 2006
@@ -26,7 +26,7 @@
           <f:facet name="separator">
             <tr:separator/>
           </f:facet>
-          <tr:navigationLevel hint="buttons">
+          <tr:navigationPane hint="buttons">
             <tr:commandNavigationItem immediate="true" text="Component Guide"
               action="guide"/>
             <tr:commandNavigationItem immediate="true" text="Page Hierarchy Demo"
@@ -37,12 +37,12 @@
               action="guide.navigationPath"/>
             <tr:commandNavigationItem immediate="true" text="PanelPage Demo"
               action="guide.panelPage"/>
-          </tr:navigationLevel>
+          </tr:navigationPane>
           <tr:outputFormatted styleUsage="instruction" value="&lt;b>A commandNavigationItem&lt;/b>"/>
           <tr:panelGroupLayout layout="vertical">
             <tr:outputFormatted
               value="&lt;b>commandNavigationItem's inside of a navigationLevel with
hint=&quot;tabs&quot;&lt;/b>"/>
-            <tr:navigationLevel hint="tabs" shortDesc="Select Page"
+            <tr:navigationPane hint="tabs" shortDesc="Select Page"
               id="editorExample">
               <tr:commandNavigationItem
                 binding="#{editor.component}"
@@ -67,14 +67,14 @@
                 text="Apache"
                 shortDesc="Apache's website"
                 destination="http://www.apache.org/"/>
-            </tr:navigationLevel>
+            </tr:navigationPane>
           </tr:panelGroupLayout>
           <jsp:directive.include file="editor.jspf"/>
 
           <tr:panelGroupLayout layout="vertical">
             <tr:outputFormatted
               value="&lt;b>commandNavigationItem's inside of a navigationLevel with
hint=&quot;bar&quot;&lt;/b>"/>
-            <tr:navigationLevel hint="bar" id="barExample">
+            <tr:navigationPane hint="bar" id="barExample">
               <tr:commandNavigationItem text="Component Guide" action="guide"
                 shortDesc="Return to the component guide"/>
               <tr:commandNavigationItem text="Selected Item"
@@ -92,13 +92,13 @@
                 destination="http://www.apache.org/"/>
               <tr:commandNavigationItem text="Apache"
                 destination="http://www.apache.org/"/>
-            </tr:navigationLevel>
+            </tr:navigationPane>
           </tr:panelGroupLayout>
 
           <tr:panelGroupLayout layout="vertical">
             <tr:outputFormatted
               value="&lt;b>commandNavigationItem's inside of a navigationLevel with
hint=&quot;list&quot;&lt;/b>"/>
-            <tr:navigationLevel hint="list" id="listExample">
+            <tr:navigationPane hint="list" id="listExample">
               <tr:commandNavigationItem text="Component Guide" action="guide"
                 shortDesc="Return to the component guide"/>
               <tr:commandNavigationItem text="Selected Item"
@@ -116,13 +116,13 @@
                 destination="http://www.apache.org/"/>
               <tr:commandNavigationItem text="Apache"
                 destination="http://www.apache.org/"/>
-            </tr:navigationLevel>
+            </tr:navigationPane>
           </tr:panelGroupLayout>
 
           <tr:panelGroupLayout layout="vertical">
             <tr:outputFormatted
               value="&lt;b>commandNavigationItem's inside of a navigationLevel with
hint=&quot;buttons&quot;&lt;/b>"/>
-            <tr:navigationLevel hint="buttons" id="buttonsExample">
+            <tr:navigationPane hint="buttons" id="buttonsExample">
               <tr:commandNavigationItem text="Component Guide" action="guide"
                 shortDesc="Return to the component guide"/>
               <tr:commandNavigationItem text="Selected Item"
@@ -140,13 +140,13 @@
                 destination="http://www.apache.org/"/>
               <tr:commandNavigationItem text="Apache"
                 destination="http://www.apache.org/"/>
-            </tr:navigationLevel>
+            </tr:navigationPane>
           </tr:panelGroupLayout>
 
           <tr:panelGroupLayout layout="vertical">
             <tr:outputFormatted
               value="&lt;b>commandNavigationItem's inside of a navigationLevel with
hint=&quot;choice&quot;&lt;/b>"/>
-            <tr:navigationLevel hint="choice" shortDesc="Switch application"
+            <tr:navigationPane hint="choice" shortDesc="Switch application"
               id="choiceExample">
               <tr:commandNavigationItem text="Component Guide" action="guide"
                 shortDesc="Return to the component guide"/>
@@ -165,7 +165,7 @@
                 destination="http://www.apache.org/"/>
               <tr:commandNavigationItem text="Apache"
                 destination="http://www.apache.org/"/>
-            </tr:navigationLevel>
+            </tr:navigationPane>
           </tr:panelGroupLayout>
 
           <tr:panelGroupLayout layout="vertical">

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationPane.jspx
(from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationLevel.jspx)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationPane.jspx?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationPane.jspx&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationLevel.jspx&r1=426992&r2=427215&rev=427215&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationLevel.jspx
(original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationPane.jspx
Mon Jul 31 12:08:47 2006
@@ -26,7 +26,7 @@
           <f:facet name="separator">
             <tr:separator/>
           </f:facet>
-          <tr:navigationLevel hint="buttons">
+          <tr:navigationPane hint="buttons">
             <tr:commandNavigationItem immediate="true" text="Component Guide"
               action="guide"/>
             <tr:commandNavigationItem immediate="true" text="Page Hierarchy Demo"
@@ -37,9 +37,9 @@
               action="guide.commandNavigationItem"/>
             <tr:commandNavigationItem immediate="true" text="PanelPage Demo"
               action="guide.panelPage"/>
-          </tr:navigationLevel>
+          </tr:navigationPane>
           <tr:outputFormatted styleUsage="instruction" value="&lt;b>A navigationLevel&lt;/b>"/>
-          <tr:navigationLevel id="menuItemContainer" hint="tabs"
+          <tr:navigationPane id="menuItemContainer" hint="tabs"
             binding="#{editor.component}" shortDesc="Select Page">
             <tr:commandNavigationItem text="Page 1" id="item1" partialSubmit="true"
               actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
@@ -52,12 +52,12 @@
               actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
             <tr:commandNavigationItem text="Page 5" id="item5" partialSubmit="true"
               actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
-          </tr:navigationLevel>
+          </tr:navigationPane>
           <jsp:directive.include file="editor.jspf"/>
           <tr:panelGroupLayout layout="vertical">
             <tr:outputFormatted 
               value="&lt;b>navigationLevel with 'bar' hint&lt;/b>"/>
-            <tr:navigationLevel hint="bar" id="barExample">
+            <tr:navigationPane hint="bar" id="barExample">
               <tr:commandNavigationItem text="Bar Item 1" partialSubmit="true"
                 actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
               <tr:commandNavigationItem text="Bar Item 2" partialSubmit="true"
@@ -70,7 +70,7 @@
                 actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
               <tr:commandNavigationItem text="Component Guide"
                 immediate="true" action="guide"/>
-            </tr:navigationLevel>
+            </tr:navigationPane>
           </tr:panelGroupLayout>
           <tr:panelGroupLayout layout="vertical">
             <tr:outputFormatted 
@@ -78,7 +78,7 @@
             <tr:panelGroupLayout styleClass="RichPanelPage"
               inlineStyle="position: relative; height: auto;">
               <tr:panelGroupLayout styleClass="RichPanelPageNavigationGlobal">
-                <tr:navigationLevel hint="buttons" id="buttonsExample">
+                <tr:navigationPane hint="buttons" id="buttonsExample">
                   <tr:commandNavigationItem text="Button 1" partialSubmit="true"
                     actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
                   <tr:commandNavigationItem text="Button 2" partialSubmit="true"
@@ -91,14 +91,14 @@
                     actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
                   <tr:commandNavigationItem text="Component Guide"
                     immediate="true" action="guide"/>
-                </tr:navigationLevel>
+                </tr:navigationPane>
               </tr:panelGroupLayout>
             </tr:panelGroupLayout>
           </tr:panelGroupLayout>
           <tr:panelGroupLayout layout="vertical">
             <tr:outputFormatted 
               value="&lt;b>navigationLevel with 'choice' hint&lt;/b>"/>
-            <tr:navigationLevel hint="choice" id="choiceExample">
+            <tr:navigationPane hint="choice" id="choiceExample">
               <tr:commandNavigationItem text="Choice 1" partialSubmit="true"
                 actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
               <tr:commandNavigationItem text="Choice 2" partialSubmit="true"
@@ -111,12 +111,12 @@
                 actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
               <tr:commandNavigationItem text="Component Guide"
                 immediate="true" action="guide"/>
-            </tr:navigationLevel>
+            </tr:navigationPane>
           </tr:panelGroupLayout>
           <tr:panelGroupLayout layout="vertical">
             <tr:outputFormatted 
               value="&lt;b>navigationLevel with 'list' hint&lt;/b>"/>
-            <tr:navigationLevel hint="list" id="listExample">
+            <tr:navigationPane hint="list" id="listExample">
               <tr:commandNavigationItem text="List Item 1" partialSubmit="true"
                 actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
               <tr:commandNavigationItem text="List Item 2" partialSubmit="true"
@@ -129,12 +129,12 @@
                 actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
               <tr:commandNavigationItem text="Component Guide"
                 immediate="true" action="guide"/>
-            </tr:navigationLevel>
+            </tr:navigationPane>
           </tr:panelGroupLayout>
           <tr:panelGroupLayout layout="vertical">
             <tr:outputFormatted 
               value="&lt;b>navigationLevel with 'tabs' hint&lt;/b>"/>
-            <tr:navigationLevel hint="tabs" id="tabsExample">
+            <tr:navigationPane hint="tabs" id="tabsExample">
               <tr:commandNavigationItem text="Tab 1" partialSubmit="true"
                 actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
               <tr:commandNavigationItem text="Tab 2" partialSubmit="true"
@@ -147,7 +147,7 @@
                 actionListener="#{demoCommandNavigationItem.navigationItemAction}"/>
               <tr:commandNavigationItem text="Component Guide"
                 immediate="true" action="guide"/>
-            </tr:navigationLevel>
+            </tr:navigationPane>
           </tr:panelGroupLayout>
         </tr:panelGroupLayout>
       </tr:form>

Modified: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationPath.jspx
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationPath.jspx?rev=427215&r1=427214&r2=427215&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationPath.jspx
(original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-demo/src/main/webapp/components/navigationPath.jspx
Mon Jul 31 12:08:47 2006
@@ -26,7 +26,7 @@
           <f:facet name="separator">
             <tr:separator/>
           </f:facet>
-          <tr:navigationLevel hint="buttons">
+          <tr:navigationPane hint="buttons">
             <tr:commandNavigationItem immediate="true" text="Component Guide"
               action="guide"/>
             <tr:commandNavigationItem immediate="true" text="Page Hierarchy Demo"
@@ -37,7 +37,7 @@
               action="guide.commandNavigationItem"/>
             <tr:commandNavigationItem immediate="true" text="PanelPage Demo"
               action="guide.panelPage"/>
-          </tr:navigationLevel>
+          </tr:navigationPane>
           <tr:outputFormatted styleUsage="instruction" value="&lt;b>A navigationPath&lt;/b>"/>
           <tr:navigationPath binding="#{editor.component}">
             <tr:commandNavigationItem text="NavigationPath Demo" action="guide.navigationPath"/>

Copied: incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
(from r426992, incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java)
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java?p2=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java&p1=incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java&r1=426992&r2=427215&rev=427215&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationLevelRenderer.java
(original)
+++ incubator/adffaces/branches/matzew-component-renaming/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
Mon Jul 31 12:08:47 2006
@@ -33,18 +33,18 @@
 import org.apache.myfaces.trinidad.bean.PropertyKey;
 import org.apache.myfaces.trinidad.component.UIXCommand;
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
-import org.apache.myfaces.trinidad.component.core.nav.CoreNavigationLevel;
+import org.apache.myfaces.trinidad.component.core.nav.CoreNavigationPane;
 import org.apache.myfaces.trinidad.context.Agent;
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 
-public class NavigationLevelRenderer extends XhtmlRenderer
+public class NavigationPaneRenderer extends XhtmlRenderer
 {
-  public NavigationLevelRenderer()
+  public NavigationPaneRenderer()
   {
-    super(CoreNavigationLevel.TYPE);
+    super(CoreNavigationPane.TYPE);
   }
 
   protected void findTypeConstants(FacesBean.Type type)
@@ -149,7 +149,7 @@
       ResponseWriter rw = context.getResponseWriter();
       boolean isRtl = arc.getLocaleContext().isRightToLeft();
       boolean isChoiceHint =
-        (NavigationLevelRenderer._HINT_CHOICE.equals(renderingHint));
+        (NavigationPaneRenderer._HINT_CHOICE.equals(renderingHint));
       String choiceSelectId = null;
       if (isChoiceHint)
       {
@@ -220,12 +220,12 @@
     FacesBean           bean) throws IOException
   {
     String renderingHint = _getHint(bean);
-    if (NavigationLevelRenderer._HINT_TABS.equals(renderingHint))
+    if (NavigationPaneRenderer._HINT_TABS.equals(renderingHint))
     {
       renderStyleAttributes(context, arc, bean, 
                             XhtmlConstants.AF_NAVIGATION_LEVEL_TABS_STYLE_CLASS);
     }
-    else if (NavigationLevelRenderer._HINT_BAR.equals(renderingHint))
+    else if (NavigationPaneRenderer._HINT_BAR.equals(renderingHint))
     {
       renderStyleAttributes(context, arc, bean, 
                             XhtmlConstants.AF_NAVIGATION_LEVEL_BAR_STYLE_CLASS);
@@ -1305,7 +1305,7 @@
   static private final String _HINT_LIST = "list";
   static private final String _HINT_BUTTONS = "buttons";
   static private final String _HINT_CHOICE = "choice";
-  static private final String _HINT_DEFAULT = NavigationLevelRenderer._HINT_TABS;
+  static private final String _HINT_DEFAULT = NavigationPaneRenderer._HINT_TABS;
 
   private static final String _CHOICE_SELECT_ID_SUFFIX =
     "_af_choice_select";
@@ -1315,5 +1315,5 @@
   static private final Object _EXTRA_SUBMIT_PARAMS_KEY = new Object();
 
   private static final TrinidadLogger _LOG =
-    TrinidadLogger.createTrinidadLogger(NavigationLevelRenderer.class);
+    TrinidadLogger.createTrinidadLogger(NavigationPaneRenderer.class);
 }



Mime
View raw message