You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/11/04 17:10:18 UTC
svn commit: r1768071 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-core/src/test/java/org/apache/myfaces/tobago/internal/...
Author: lofwyr
Date: Fri Nov 4 17:10:17 2016
New Revision: 1768071
URL: http://svn.apache.org/viewvc?rev=1768071&view=rev
Log:
TOBAGO-1617: New tag <tc:event> to be similar to <f:ajax> and to replace <tc:command> in facets
* removing <tc:command>
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/sheet-markup.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/75-resize/resize.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/menubar.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/z-index.xhtml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LinkRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java Fri Nov 4 17:10:17 2016
@@ -31,7 +31,6 @@ public enum RendererTypes {
Calendar,
Column,
ColumnSelector,
- Command,
Commands,
Date,
Event,
@@ -100,7 +99,6 @@ public enum RendererTypes {
public static final String CALENDAR = "Calendar";
public static final String COLUMN = "Column";
public static final String COLUMN_SELECTOR = "ColumnSelector";
- public static final String COMMAND = "Command";
public static final String COMMANDS = "Commands";
public static final String EVENT = "Event";
public static final String DATE = "Date";
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java Fri Nov 4 17:10:17 2016
@@ -23,7 +23,6 @@ import org.apache.myfaces.test.base.juni
import org.apache.myfaces.test.mock.MockFacesContext;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
import org.apache.myfaces.tobago.component.UIButton;
-import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.component.UIIn;
import org.apache.myfaces.tobago.component.UILink;
import org.apache.myfaces.tobago.component.UIOut;
@@ -95,7 +94,6 @@ public abstract class AbstractTobagoTest
application.addComponent(UIPanel.COMPONENT_TYPE, UIPanel.class.getName());
application.addComponent(
javax.faces.component.UICommand.COMPONENT_TYPE, javax.faces.component.UICommand.class.getName());
- application.addComponent(UICommand.COMPONENT_TYPE, UICommand.class.getName());
application.addComponent(UILink.COMPONENT_TYPE, UILink.class.getName());
application.addComponent(UIButton.COMPONENT_TYPE, UIButton.class.getName());
application.addComponent(UIPopup.COMPONENT_TYPE, UIPopup.class.getName());
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml Fri Nov 4 17:10:17 2016
@@ -88,9 +88,7 @@
<tc:selectOneChoice label="#{bundle.footerLanguage}"
value="#{controller.language}">
<f:selectItems value="#{controller.languages}"/>
- <f:facet name="change">
- <tc:command action="#{controller.languageChangedList}"/>
- </f:facet>
+ <tc:event action="#{controller.languageChangedList}"/>
</tc:selectOneChoice>
<!--
</tc:form>
@@ -102,9 +100,7 @@
-->
<tc:selectOneChoice label="#{bundle.footerTheme}" value="#{controller.theme}">
<f:selectItems value="#{controller.themeItems}"/>
- <f:facet name="change">
- <tc:command action="#{controller.themeChanged}"/>
- </f:facet>
+ <tc:event action="#{controller.themeChanged}"/>
</tc:selectOneChoice>
<!--
</tc:form>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/GroupController.java Fri Nov 4 17:10:17 2016
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.example.demo;
-import org.apache.myfaces.tobago.component.UICommand;
+import org.apache.myfaces.tobago.internal.component.AbstractUICommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -88,8 +88,8 @@ public class GroupController implements
LOG.info("AjaxBehaviorEvent called.");
- if (event != null && event.getComponent() instanceof UICommand) {
- UICommand command = (UICommand) event.getComponent();
+ if (event != null && event.getComponent() instanceof AbstractUICommand) {
+ AbstractUICommand command = (AbstractUICommand) event.getComponent();
sendTo = command.getLabel();
LOG.info("AjaxBehaviorEvent called. Current label: '{}'", sendTo);
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.xhtml?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.xhtml Fri Nov 4 17:10:17 2016
@@ -92,15 +92,15 @@
<tc:in id="isendtoc" placeholder="type a message">
<f:facet name="before">
<tc:button id="lsendtoc" label="#{groupController.sendTo}" omit="true">
- <tc:command label="SendTo: Peter">
+ <tc:link label="SendTo: Peter">
<f:ajax render="isendtoc" execute="isendtoc" listener="#{groupController.sendToListener}"/>
- </tc:command>
- <tc:command label="SendTo: Bob">
+ </tc:link>
+ <tc:link label="SendTo: Bob">
<f:ajax render="isendtoc" execute="isendtoc" listener="#{groupController.sendToListener}"/>
- </tc:command>
- <tc:command label="SendTo: All">
+ </tc:link>
+ <tc:link label="SendTo: All">
<f:ajax render="isendtoc" execute="isendtoc" listener="#{groupController.sendToListener}"/>
- </tc:command>
+ </tc:link>
</tc:button>
</f:facet>
</tc:in>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/sheet-markup.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/sheet-markup.xhtml?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/sheet-markup.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/sheet-markup.xhtml Fri Nov 4 17:10:17 2016
@@ -26,17 +26,13 @@
<p>This example, demonstrate the different markups defined for sheet.
These markups reflecting the styles from bootstrap.
<tc:selectOneRadio value="#{sheetController.automaticLayout}">
- <f:facet name="change">
- <tc:command/>
- </f:facet>
+ <tc:event/>
<tc:selectItem itemLabel="Automatic table layout" itemValue="true"/>
<tc:selectItem itemLabel="Managed table layout" itemValue="false"/>
</tc:selectOneRadio>
<tc:selectManyShuttle value="#{sheetController.markup}">
- <f:facet name="change">
- <tc:command/>
- </f:facet>
+ <tc:event/>
<tc:selectItem itemLabel="Inverse" itemValue="inverse"/>
<tc:selectItem itemLabel="Striped" itemValue="striped"/>
<tc:selectItem itemLabel="Bordered" itemValue="bordered"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/75-resize/resize.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/75-resize/resize.xhtml?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/75-resize/resize.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/75-resize/resize.xhtml Fri Nov 4 17:10:17 2016
@@ -24,7 +24,7 @@
<ui:param name="title" value="Resize Event"/>
<f:facet name="resize">
- <tc:command id="resize" action="#{resizeController.resize}"/>
+ <tc:link id="resize" action="#{resizeController.resize}"/>
</f:facet>
Todo: make nicer example
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/menubar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/menubar.xhtml?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/menubar.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/menubar.xhtml Fri Nov 4 17:10:17 2016
@@ -55,10 +55,10 @@
<tc:button label="One" omit="true"/>
<tc:button label="Two" omit="true"/>
<tc:button label="Three" omit="true">
- <tc:command label="Four"/>
- <tc:command label="Five"/>
+ <tc:link label="Four"/>
+ <tc:link label="Five"/>
<tc:separator/>
- <tc:command label="Six"/>
+ <tc:link label="Six"/>
</tc:button>
</tc:buttons>
</f:facet>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml Fri Nov 4 17:10:17 2016
@@ -39,61 +39,61 @@
<tc:commands id="commands">
- <tc:command id="config" label="#{overviewBundle.menu_config}" omit="true">
- <tc:command label="#{overviewBundle.menu_themes}" omit="true">
+ <tc:link id="config" label="#{overviewBundle.menu_config}" omit="true">
+ <tc:link label="#{overviewBundle.menu_themes}" omit="true">
<tc:selectOneRadio value="#{clientConfigController.theme}">
<f:facet name="change">
- <tc:command action="#{clientConfigController.submit}"/>
+ <tc:link action="#{clientConfigController.submit}"/>
</f:facet>
<tc:selectItems value="#{clientConfigController.themeItems}"/>
</tc:selectOneRadio>
- </tc:command>
- <tc:command label="#{overviewBundle.menu_locale}">
+ </tc:link>
+ <tc:link label="#{overviewBundle.menu_locale}">
<tc:selectOneRadio value="#{clientConfigController.locale}">
<f:facet name="change">
- <tc:command action="#{clientConfigController.submit}"/>
+ <tc:link action="#{clientConfigController.submit}"/>
</f:facet>
<tc:selectItems value="#{clientConfigController.localeItems}"/>
</tc:selectOneRadio>
- </tc:command>
- <tc:command action="#{demo.resetSession}" label="Reset"/>
- </tc:command>
+ </tc:link>
+ <tc:link action="#{demo.resetSession}" label="Reset"/>
+ </tc:link>
- <tc:command label="#{overviewBundle.menu_help}" omit="true">
- <tc:command label="#{overviewBundle.menu_about}" omit="true">
+ <tc:link label="#{overviewBundle.menu_help}" omit="true">
+ <tc:link label="#{overviewBundle.menu_about}" omit="true">
<tc:dataAttribute name="alert-text"
value="#{overviewBundle.pageTitle} - #{info.version} - #{overviewBundle.tobago_url}"/>
- </tc:command>
- <tc:command link="http://myfaces.apache.org/tobago" label="Tobago in the Web"/>
- <tc:command action="/server-info.xhtml" immediate="true" label="Server Info" disabled="#{! info.enabled}"/>
- <tc:command action="/logging-info.xhtml" immediate="true" label="Logging Info"
+ </tc:link>
+ <tc:link link="http://myfaces.apache.org/tobago" label="Tobago in the Web"/>
+ <tc:link action="/server-info.xhtml" immediate="true" label="Server Info" disabled="#{! info.enabled}"/>
+ <tc:link action="/logging-info.xhtml" immediate="true" label="Logging Info"
disabled="#{! info.enabled}"/>
<tc:separator/>
- <tc:command label="Sub-Menu" omit="true">
- <tc:command label="Sub 1" omit="true"/>
- <tc:command label="Sub 2" omit="true"/>
- <tc:command label="Sub 3" omit="true"/>
- <tc:command action="doit" label="Sub 4 ich kann auch selber was" omit="true">
- <tc:command label="Sub 4 1" omit="true"/>
- <tc:command label="Sub 4 2" omit="true"/>
- </tc:command>
- <tc:command label="Sub 5" omit="true">
- <tc:command label="Sub 5 1" omit="true"/>
- <tc:command label="Sub 5 2" omit="true"/>
- </tc:command>
- </tc:command>
- </tc:command>
+ <tc:link label="Sub-Menu" omit="true">
+ <tc:link label="Sub 1" omit="true"/>
+ <tc:link label="Sub 2" omit="true"/>
+ <tc:link label="Sub 3" omit="true"/>
+ <tc:link action="doit" label="Sub 4 ich kann auch selber was" omit="true">
+ <tc:link label="Sub 4 1" omit="true"/>
+ <tc:link label="Sub 4 2" omit="true"/>
+ </tc:link>
+ <tc:link label="Sub 5" omit="true">
+ <tc:link label="Sub 5 1" omit="true"/>
+ <tc:link label="Sub 5 2" omit="true"/>
+ </tc:link>
+ </tc:link>
+ </tc:link>
<!-- TBD: this is not nice: can we put tc:out or tc:label into the menu?
or we do that with a popup, oder a lighter variant of a popup -->
- <tc:command omit="true" label="Info">
- <tc:command omit="true" label="Theme: #{clientConfigController.localizedTheme}" disabled="true"/>
- <tc:command omit="true" label="Locale: #{clientConfigController.localizedLocale}"/>
- <tc:command omit="true" label="Project Stage: #{tobagoContext.tobagoConfig.projectStage}"/>
- <tc:command omit="true" label="CSP mode: #{tobagoContext.tobagoConfig.contentSecurityPolicy.mode}"/>
- <tc:command omit="true"
+ <tc:link omit="true" label="Info">
+ <tc:link omit="true" label="Theme: #{clientConfigController.localizedTheme}" disabled="true"/>
+ <tc:link omit="true" label="Locale: #{clientConfigController.localizedLocale}"/>
+ <tc:link omit="true" label="Project Stage: #{tobagoContext.tobagoConfig.projectStage}"/>
+ <tc:link omit="true" label="CSP mode: #{tobagoContext.tobagoConfig.contentSecurityPolicy.mode}"/>
+ <tc:link omit="true"
label="Requests: #{activityList.values[0].jsfRequest} / AJAX: #{activityList.values[0].ajaxRequest}"/>
- </tc:command>
+ </tc:link>
</tc:commands>
</tc:form>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/z-index.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/z-index.xhtml?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/z-index.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/test/popup/z-index.xhtml Fri Nov 4 17:10:17 2016
@@ -24,233 +24,233 @@
<tc:page width="800px" height="600px" id="page">
<f:facet name="menuBar">
<tc:bar>
-<tc:command label="space -> space -> space"/>
+<tc:link label="space -> space -> space"/>
-<tc:command label="Help">
-<tc:command label="Help 1">
- <tc:command label="Help 1 1">
- </tc:command>
+<tc:link label="Help">
+<tc:link label="Help 1">
+ <tc:link label="Help 1 1">
+ </tc:link>
<tc:separator/>
- <tc:command label="Help 1 2">
- </tc:command>
- <tc:command label="Help 1 3">
- </tc:command>
- <tc:command label="Help 1 4">
- </tc:command>
+ <tc:link label="Help 1 2">
+ </tc:link>
+ <tc:link label="Help 1 3">
+ </tc:link>
+ <tc:link label="Help 1 4">
+ </tc:link>
<tc:separator/>
- <tc:command label="Help 1 5">
- </tc:command>
- <tc:command label="Help 1 6">
- </tc:command>
- <tc:command label="Help 1 7">
- </tc:command>
+ <tc:link label="Help 1 5">
+ </tc:link>
+ <tc:link label="Help 1 6">
+ </tc:link>
+ <tc:link label="Help 1 7">
+ </tc:link>
<tc:separator/>
- <tc:command label="Help 1 8">
- </tc:command>
- <tc:command label="Help 1 9">
- </tc:command>
- <tc:command label="Help 1 10">
- </tc:command>
-</tc:command>
-<tc:command label="Help 2">
- <tc:command label="Help 2 1">
- </tc:command>
- <tc:command label="Help 2 2">
- </tc:command>
- <tc:command label="Help 2 3">
- </tc:command>
- <tc:command label="Help 2 4">
- </tc:command>
- <tc:command label="Help 2 5">
- </tc:command>
- <tc:command label="Help 2 6">
- </tc:command>
- <tc:command label="Help 2 7">
- </tc:command>
- <tc:command label="Help 2 8">
- </tc:command>
- <tc:command label="Help 2 9">
- </tc:command>
- <tc:command label="Help 2 10">
- </tc:command>
-</tc:command>
-<tc:command label="Help 3">
- <tc:command label="Help 3 1">
- </tc:command>
- <tc:command label="Help 3 2">
- </tc:command>
- <tc:command label="Help 3 3">
- </tc:command>
- <tc:command label="Help 3 4">
- </tc:command>
- <tc:command label="Help 3 5">
- </tc:command>
- <tc:command label="Help 3 6">
- </tc:command>
- <tc:command label="Help 3 7">
- </tc:command>
- <tc:command label="Help 3 8">
- </tc:command>
- <tc:command label="Help 3 9">
- </tc:command>
- <tc:command label="Help 3 10">
- </tc:command>
-</tc:command>
-<tc:command label="Help 4">
- <tc:command label="Help 4 1">
- </tc:command>
- <tc:command label="Help 4 2">
- </tc:command>
- <tc:command label="Help 4 3">
- </tc:command>
- <tc:command label="Help 4 4">
- </tc:command>
- <tc:command label="Help 4 5">
- </tc:command>
- <tc:command label="Help 4 6">
- </tc:command>
- <tc:command label="Help 4 7">
- </tc:command>
- <tc:command label="Help 4 8">
- </tc:command>
- <tc:command label="Help 4 9">
- </tc:command>
- <tc:command label="Help 4 10">
- </tc:command>
-</tc:command>
-<tc:command label="Help 5">
- <tc:command label="Help 5 1">
- </tc:command>
- <tc:command label="Help 5 2">
- </tc:command>
- <tc:command label="Help 5 3">
- </tc:command>
- <tc:command label="Help 5 4">
- </tc:command>
- <tc:command label="Help 5 5">
- </tc:command>
- <tc:command label="Help 5 6">
- </tc:command>
- <tc:command label="Help 5 7">
- </tc:command>
- <tc:command label="Help 5 8">
- </tc:command>
- <tc:command label="Help 5 9">
- </tc:command>
- <tc:command label="Help 5 10">
- </tc:command>
-</tc:command>
-<tc:command label="Help 6">
- <tc:command label="Help 6 1">
- </tc:command>
- <tc:command label="Help 6 2">
- </tc:command>
- <tc:command label="Help 6 3">
- </tc:command>
- <tc:command label="Help 6 4">
- </tc:command>
- <tc:command label="Help 6 5">
- </tc:command>
- <tc:command label="Help 6 6">
- </tc:command>
- <tc:command label="Help 6 7">
- </tc:command>
- <tc:command label="Help 6 8">
- </tc:command>
- <tc:command label="Help 6 9">
- </tc:command>
- <tc:command label="Help 6 10">
- </tc:command>
-</tc:command>
-<tc:command label="Help 7">
- <tc:command label="Help 7 1">
- </tc:command>
- <tc:command label="Help 7 2">
- </tc:command>
- <tc:command label="Help 7 3">
- </tc:command>
- <tc:command label="Help 7 4">
- </tc:command>
- <tc:command label="Help 7 5">
- </tc:command>
- <tc:command label="Help 7 6">
- </tc:command>
- <tc:command label="Help 7 7">
- </tc:command>
- <tc:command label="Help 7 8">
- </tc:command>
- <tc:command label="Help 7 9">
- </tc:command>
- <tc:command label="Help 7 10">
- </tc:command>
-</tc:command>
-<tc:command label="Help 8">
- <tc:command label="Help 8 1">
- </tc:command>
- <tc:command label="Help 8 2">
- </tc:command>
- <tc:command label="Help 8 3">
- </tc:command>
- <tc:command label="Help 8 4">
- </tc:command>
- <tc:command label="Help 8 5">
- </tc:command>
- <tc:command label="Help 8 6">
- </tc:command>
- <tc:command label="Help 8 7">
- </tc:command>
- <tc:command label="Help 8 8">
- </tc:command>
- <tc:command label="Help 8 9">
- </tc:command>
- <tc:command label="Help 8 10">
- </tc:command>
-</tc:command>
-<tc:command label="Help 9">
- <tc:command label="Help 9 1">
- </tc:command>
- <tc:command label="Help 9 2">
- </tc:command>
- <tc:command label="Help 9 3">
- </tc:command>
- <tc:command label="Help 9 4">
- </tc:command>
- <tc:command label="Help 9 5">
- </tc:command>
- <tc:command label="Help 9 6">
- </tc:command>
- <tc:command label="Help 9 7">
- </tc:command>
- <tc:command label="Help 9 8">
- </tc:command>
- <tc:command label="Help 9 9">
- </tc:command>
- <tc:command label="Help 9 10">
- </tc:command>
-</tc:command>
-<tc:command label="Help 10">
- <tc:command label="Help 10 1">
- </tc:command>
- <tc:command label="Help 10 2">
- </tc:command>
- <tc:command label="Help 10 3">
- </tc:command>
- <tc:command label="Help 10 4">
- </tc:command>
- <tc:command label="Help 10 5">
- </tc:command>
- <tc:command label="Help 10 6">
- </tc:command>
- <tc:command label="Help 10 7">
- </tc:command>
- <tc:command label="Help 10 8">
- </tc:command>
- <tc:command label="Help 10 9">
- </tc:command>
- <tc:command label="Help 10 10">
- </tc:command>
-</tc:command>
-</tc:command>
+ <tc:link label="Help 1 8">
+ </tc:link>
+ <tc:link label="Help 1 9">
+ </tc:link>
+ <tc:link label="Help 1 10">
+ </tc:link>
+</tc:link>
+<tc:link label="Help 2">
+ <tc:link label="Help 2 1">
+ </tc:link>
+ <tc:link label="Help 2 2">
+ </tc:link>
+ <tc:link label="Help 2 3">
+ </tc:link>
+ <tc:link label="Help 2 4">
+ </tc:link>
+ <tc:link label="Help 2 5">
+ </tc:link>
+ <tc:link label="Help 2 6">
+ </tc:link>
+ <tc:link label="Help 2 7">
+ </tc:link>
+ <tc:link label="Help 2 8">
+ </tc:link>
+ <tc:link label="Help 2 9">
+ </tc:link>
+ <tc:link label="Help 2 10">
+ </tc:link>
+</tc:link>
+<tc:link label="Help 3">
+ <tc:link label="Help 3 1">
+ </tc:link>
+ <tc:link label="Help 3 2">
+ </tc:link>
+ <tc:link label="Help 3 3">
+ </tc:link>
+ <tc:link label="Help 3 4">
+ </tc:link>
+ <tc:link label="Help 3 5">
+ </tc:link>
+ <tc:link label="Help 3 6">
+ </tc:link>
+ <tc:link label="Help 3 7">
+ </tc:link>
+ <tc:link label="Help 3 8">
+ </tc:link>
+ <tc:link label="Help 3 9">
+ </tc:link>
+ <tc:link label="Help 3 10">
+ </tc:link>
+</tc:link>
+<tc:link label="Help 4">
+ <tc:link label="Help 4 1">
+ </tc:link>
+ <tc:link label="Help 4 2">
+ </tc:link>
+ <tc:link label="Help 4 3">
+ </tc:link>
+ <tc:link label="Help 4 4">
+ </tc:link>
+ <tc:link label="Help 4 5">
+ </tc:link>
+ <tc:link label="Help 4 6">
+ </tc:link>
+ <tc:link label="Help 4 7">
+ </tc:link>
+ <tc:link label="Help 4 8">
+ </tc:link>
+ <tc:link label="Help 4 9">
+ </tc:link>
+ <tc:link label="Help 4 10">
+ </tc:link>
+</tc:link>
+<tc:link label="Help 5">
+ <tc:link label="Help 5 1">
+ </tc:link>
+ <tc:link label="Help 5 2">
+ </tc:link>
+ <tc:link label="Help 5 3">
+ </tc:link>
+ <tc:link label="Help 5 4">
+ </tc:link>
+ <tc:link label="Help 5 5">
+ </tc:link>
+ <tc:link label="Help 5 6">
+ </tc:link>
+ <tc:link label="Help 5 7">
+ </tc:link>
+ <tc:link label="Help 5 8">
+ </tc:link>
+ <tc:link label="Help 5 9">
+ </tc:link>
+ <tc:link label="Help 5 10">
+ </tc:link>
+</tc:link>
+<tc:link label="Help 6">
+ <tc:link label="Help 6 1">
+ </tc:link>
+ <tc:link label="Help 6 2">
+ </tc:link>
+ <tc:link label="Help 6 3">
+ </tc:link>
+ <tc:link label="Help 6 4">
+ </tc:link>
+ <tc:link label="Help 6 5">
+ </tc:link>
+ <tc:link label="Help 6 6">
+ </tc:link>
+ <tc:link label="Help 6 7">
+ </tc:link>
+ <tc:link label="Help 6 8">
+ </tc:link>
+ <tc:link label="Help 6 9">
+ </tc:link>
+ <tc:link label="Help 6 10">
+ </tc:link>
+</tc:link>
+<tc:link label="Help 7">
+ <tc:link label="Help 7 1">
+ </tc:link>
+ <tc:link label="Help 7 2">
+ </tc:link>
+ <tc:link label="Help 7 3">
+ </tc:link>
+ <tc:link label="Help 7 4">
+ </tc:link>
+ <tc:link label="Help 7 5">
+ </tc:link>
+ <tc:link label="Help 7 6">
+ </tc:link>
+ <tc:link label="Help 7 7">
+ </tc:link>
+ <tc:link label="Help 7 8">
+ </tc:link>
+ <tc:link label="Help 7 9">
+ </tc:link>
+ <tc:link label="Help 7 10">
+ </tc:link>
+</tc:link>
+<tc:link label="Help 8">
+ <tc:link label="Help 8 1">
+ </tc:link>
+ <tc:link label="Help 8 2">
+ </tc:link>
+ <tc:link label="Help 8 3">
+ </tc:link>
+ <tc:link label="Help 8 4">
+ </tc:link>
+ <tc:link label="Help 8 5">
+ </tc:link>
+ <tc:link label="Help 8 6">
+ </tc:link>
+ <tc:link label="Help 8 7">
+ </tc:link>
+ <tc:link label="Help 8 8">
+ </tc:link>
+ <tc:link label="Help 8 9">
+ </tc:link>
+ <tc:link label="Help 8 10">
+ </tc:link>
+</tc:link>
+<tc:link label="Help 9">
+ <tc:link label="Help 9 1">
+ </tc:link>
+ <tc:link label="Help 9 2">
+ </tc:link>
+ <tc:link label="Help 9 3">
+ </tc:link>
+ <tc:link label="Help 9 4">
+ </tc:link>
+ <tc:link label="Help 9 5">
+ </tc:link>
+ <tc:link label="Help 9 6">
+ </tc:link>
+ <tc:link label="Help 9 7">
+ </tc:link>
+ <tc:link label="Help 9 8">
+ </tc:link>
+ <tc:link label="Help 9 9">
+ </tc:link>
+ <tc:link label="Help 9 10">
+ </tc:link>
+</tc:link>
+<tc:link label="Help 10">
+ <tc:link label="Help 10 1">
+ </tc:link>
+ <tc:link label="Help 10 2">
+ </tc:link>
+ <tc:link label="Help 10 3">
+ </tc:link>
+ <tc:link label="Help 10 4">
+ </tc:link>
+ <tc:link label="Help 10 5">
+ </tc:link>
+ <tc:link label="Help 10 6">
+ </tc:link>
+ <tc:link label="Help 10 7">
+ </tc:link>
+ <tc:link label="Help 10 8">
+ </tc:link>
+ <tc:link label="Help 10 9">
+ </tc:link>
+ <tc:link label="Help 10 10">
+ </tc:link>
+</tc:link>
+</tc:link>
</tc:bar>
</f:facet>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java Fri Nov 4 17:10:17 2016
@@ -20,8 +20,8 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.UICommand;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
+import org.apache.myfaces.tobago.internal.component.AbstractUICommandBase;
import org.apache.myfaces.tobago.internal.component.AbstractUIImage;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
@@ -91,6 +91,7 @@ public class ImageRenderer extends Rende
private boolean isDisabled(final AbstractUIImage graphic) {
return graphic.isDisabled()
- || (graphic.getParent() instanceof UICommand && ((UICommand) graphic.getParent()).isDisabled());
+ || (graphic.getParent() instanceof AbstractUICommandBase
+ && ((AbstractUICommandBase) graphic.getParent()).isDisabled());
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LinkRenderer.java?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LinkRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LinkRenderer.java Fri Nov 4 17:10:17 2016
@@ -19,5 +19,5 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
-public class LinkRenderer extends CommandRenderer {
+public class LinkRenderer extends CommandRendererBase {
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java?rev=1768071&r1=1768070&r2=1768071&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java Fri Nov 4 17:10:17 2016
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.RendererTypes;
import org.apache.myfaces.tobago.component.UIColumnSelector;
-import org.apache.myfaces.tobago.component.UICommand;
+import org.apache.myfaces.tobago.component.UILink;
import org.apache.myfaces.tobago.component.UIOut;
import org.apache.myfaces.tobago.component.UIPanel;
import org.apache.myfaces.tobago.component.UIReload;
@@ -513,7 +513,7 @@ public class SheetRenderer extends Rende
// show row range
final Markup showRowRange = markupForLeftCenterRight(sheet.getShowRowRange());
if (showRowRange != Markup.NULL) {
- final UICommand command
+ final UILink command
= ensurePagingCommand(application, sheet, Facets.pagerRow.name(), PageAction.TO_ROW, false);
final String pagerCommandId = command.getClientId(facesContext);
@@ -604,7 +604,7 @@ public class SheetRenderer extends Rende
// show page range
final Markup showPageRange = markupForLeftCenterRight(sheet.getShowPageRange());
if (showPageRange != Markup.NULL) {
- final UICommand command
+ final UILink command
= ensurePagingCommand(application, sheet, Facets.pagerPage.name(), PageAction.TO_PAGE, false);
final String pagerCommandId = command.getClientId(facesContext);
@@ -802,12 +802,12 @@ public class SheetRenderer extends Rende
if (cell.getColumnSpan() == 1 && cellComponent instanceof UIOut) {
final boolean sortable = ComponentUtils.getBooleanAttribute(column, Attributes.sortable);
if (sortable) {
- UICommand sortCommand = (UICommand) ComponentUtils.getFacet(column, Facets.sorter);
+ UILink sortCommand = (UILink) ComponentUtils.getFacet(column, Facets.sorter);
if (sortCommand == null) {
final String columnId = column.getClientId(facesContext);
final String sorterId = columnId.substring(columnId.lastIndexOf(":") + 1) + "_" + UISheet.SORTER_ID;
- sortCommand = (UICommand) CreateComponentUtils.createComponent(
- facesContext, UICommand.COMPONENT_TYPE, RendererTypes.Link, sorterId);
+ sortCommand = (UILink) CreateComponentUtils.createComponent(
+ facesContext, UILink.COMPONENT_TYPE, RendererTypes.Link, sorterId);
final AjaxBehavior reloadBehavior = createReloadBehavior(sheet);
sortCommand.addClientBehavior("click", reloadBehavior);
ComponentUtils.setFacet(column, Facets.sorter, sortCommand);
@@ -992,7 +992,7 @@ public class SheetRenderer extends Rende
final String facet = action == PageAction.TO_PAGE || action == PageAction.TO_ROW
? action.getToken() + "-" + target
: action.getToken();
- final UICommand command = ensurePagingCommand(application, data, facet, action, disabled);
+ final UILink command = ensurePagingCommand(application, data, facet, action, disabled);
if (target != null) {
ComponentUtils.setAttribute(command, Attributes.pagingTarget, target);
}
@@ -1040,7 +1040,7 @@ public class SheetRenderer extends Rende
final FacesContext facesContext, final Application application, final UISheet sheet)
throws IOException {
- final UICommand command
+ final UILink command
= ensurePagingCommand(application, sheet, Facets.PAGER_PAGE_DIRECT, PageAction.TO_PAGE, false);
int linkCount = ComponentUtils.getIntAttribute(sheet, Attributes.directLinkCount);
linkCount--; // current page needs no link
@@ -1111,14 +1111,14 @@ public class SheetRenderer extends Rende
}
}
- private UICommand ensurePagingCommand(
+ private UILink ensurePagingCommand(
final Application application, final UISheet sheet, final String facet, final PageAction action,
final boolean disabled) {
final Map<String, UIComponent> facets = sheet.getFacets();
- UICommand command = (UICommand) facets.get(facet);
+ UILink command = (UILink) facets.get(facet);
if (command == null) {
- command = (UICommand) application.createComponent(UICommand.COMPONENT_TYPE);
+ command = (UILink) application.createComponent(UILink.COMPONENT_TYPE);
command.setRendererType(RendererTypes.SHEET_PAGE_COMMAND);
// command.addActionListener(new SheetActionListener()); XXX to activate: remove RendererType
command.setRendered(true);