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 2017/03/22 14:53:28 UTC
svn commit: r1788116 - in /myfaces/tobago/branches/TOBAGO-1719: ./
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
tobago-core/src/main/java/org/apache/myfa...
Author: lofwyr
Date: Wed Mar 22 14:53:27 2017
New Revision: 1788116
URL: http://svn.apache.org/viewvc?rev=1788116&view=rev
Log:
Merged from trunk
warn comment [from revision 1788112]
TOBAGO-1725: Generator should support more than one rendererType per component tag [from revision 1788115]
Added:
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceAlternativeInRenderer.java
- copied unchanged from r1788115, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceAlternativeInRenderer.java
Modified:
myfaces/tobago/branches/TOBAGO-1719/ (props changed)
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss (contents, props changed)
myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java
myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java
myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/RendererInfo.java
myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java
myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
Propchange: myfaces/tobago/branches/TOBAGO-1719/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 22 14:53:27 2017
@@ -1,4 +1,4 @@
/myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
/myfaces/tobago/branches/tobago-3.0.x:1781306,1781310,1781380
/myfaces/tobago/branches/tobago-tree-table:1226794-1341423
-/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664
,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219,1787403,1787422,1787443,1787651,1787780,1787926
+/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664
,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219,1787403,1787422,1787443,1787651,1787780,1787926,1788112,1788115
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java?rev=1788116&r1=1788115&r2=1788116&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java Wed Mar 22 14:53:27 2017
@@ -64,6 +64,7 @@ public enum RendererTypes {
SelectManyListbox,
SelectManyShuttle,
SelectOneChoice,
+ SelectOneChoiceAlternativeIn,
SelectOneRadio,
SelectOneListbox,
SelectReference,
@@ -127,6 +128,7 @@ public enum RendererTypes {
public static final String SELECT_MANY_LISTBOX = "SelectManyListbox";
public static final String SELECT_MANY_SHUTTLE = "SelectManyShuttle";
public static final String SELECT_ONE_CHOICE = "SelectOneChoice";
+ public static final String SELECT_ONE_CHOICE_ALTERNATIVE_IN = "SelectOneChoiceAlternativeIn";
public static final String SELECT_ONE_RADIO = "SelectOneRadio";
public static final String SELECT_ONE_LISTBOX = "SelectOneListbox";
public static final String SELECT_REFERENCE = "SelectReference";
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java?rev=1788116&r1=1788115&r2=1788116&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectOneChoiceTagDeclaration.java Wed Mar 22 14:53:27 2017
@@ -58,7 +58,7 @@ import javax.faces.component.UISelectOne
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISelectOneChoice",
uiComponentFacesClass = "javax.faces.component.UISelectOne",
componentFamily = UISelectOne.COMPONENT_FAMILY,
- rendererType = RendererTypes.SELECT_ONE_CHOICE,
+ rendererType = {RendererTypes.SELECT_ONE_CHOICE, RendererTypes.SELECT_ONE_CHOICE_ALTERNATIVE_IN},
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss?rev=1788116&r1=1788115&r2=1788116&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss Wed Mar 22 14:53:27 2017
@@ -16,7 +16,7 @@
*/
/*
-used variables: only for the IDE, should not really used by the build system.
+XXX used variables: only for the IDE, should not really used by the build system.
*/
$brand-info: #00f !default;
$zindex-dropdown: 1000 !default;
Propchange: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 22 14:53:27 2017
@@ -1,4 +1,4 @@
/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css:1356585,1357124
/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css:1226794-1341423
-/myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss:1787403,1787422
+/myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss:1787403,1787422,1788112
/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,16755
88-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java?rev=1788116&r1=1788115&r2=1788116&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/UIComponentTag.java Wed Mar 22 14:53:27 2017
@@ -39,7 +39,7 @@ public @interface UIComponentTag {
String componentFamily() default "";
- String rendererType() default "";
+ String[] rendererType() default {};
String faceletHandler() default "org.apache.myfaces.tobago.facelets.TobagoComponentHandler";
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java?rev=1788116&r1=1788115&r2=1788116&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java Wed Mar 22 14:53:27 2017
@@ -47,7 +47,7 @@ public class ComponentInfo extends TagIn
@Deprecated
public ComponentInfo(final String sourceClass, final String qualifiedName, final String rendererType) {
- super(sourceClass, qualifiedName, rendererType);
+ super(sourceClass, qualifiedName, new String[]{rendererType});
}
public void addPropertyInfo(final ComponentPropertyInfo propertyInfo) {
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/RendererInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/RendererInfo.java?rev=1788116&r1=1788115&r2=1788116&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/RendererInfo.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/RendererInfo.java Wed Mar 22 14:53:27 2017
@@ -20,21 +20,18 @@
package org.apache.myfaces.tobago.apt.generate;
public class RendererInfo extends ClassInfo {
- private String rendererType;
+ private String[] rendererTypes;
public RendererInfo(final String sourceClass, final String qualifiedName) {
super(sourceClass, qualifiedName);
}
- public RendererInfo(final String sourceClass, final String qualifiedName, final String rendererType) {
+ public RendererInfo(final String sourceClass, final String qualifiedName, final String[] rendererTypes) {
super(sourceClass, qualifiedName);
- this.rendererType = rendererType;
+ this.rendererTypes = rendererTypes;
}
- public String getRendererType() {
- if (rendererType != null && rendererType.length() == 0) {
- return null;
- }
- return rendererType;
+ public String[] getRendererType() {
+ return rendererTypes;
}
}
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java?rev=1788116&r1=1788115&r2=1788116&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java Wed Mar 22 14:53:27 2017
@@ -31,7 +31,7 @@ public class TagInfo extends RendererInf
private PropertyInfo bodyContent;
private boolean checkBodyContent;
- public TagInfo(final String sourceClass, final String qualifiedName, final String rendererType) {
+ public TagInfo(final String sourceClass, final String qualifiedName, final String[] rendererType) {
super(sourceClass, qualifiedName, rendererType);
}
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java?rev=1788116&r1=1788115&r2=1788116&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java Wed Mar 22 14:53:27 2017
@@ -358,8 +358,7 @@ public class FacesConfigGenerator extend
final ComponentInfo componentInfo, final UIComponentTag componentTag, final List<org.jdom.Element> renderer,
final Namespace namespace)
throws IOException, NoSuchFieldException, IllegalAccessException {
- final String rendererType = componentTag.rendererType();
- if (rendererType != null && rendererType.length() > 0) {
+ for (final String rendererType : componentTag.rendererType()) {
final org.jdom.Element element = new org.jdom.Element(RENDERER, namespace);
String displayName = componentTag.displayName();
if (displayName.equals("")) {
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java?rev=1788116&r1=1788115&r2=1788116&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java Wed Mar 22 14:53:27 2017
@@ -339,7 +339,18 @@ public class TaglibGenerator extends Abs
description.append(componentTag.uiComponent());
description.append("</p>");
description.append("<p><b>RendererType: </b>");
- description.append(componentTag.rendererType());
+ description.append("<ul>");
+ boolean first = true;
+ for (String rendererType : componentTag.rendererType()) {
+ description.append("<li>");
+ description.append(rendererType);
+ if (first) {
+ description.append(" (default)");
+ }
+ description.append("</li>");
+ first = false;
+ }
+ description.append("</ul>");
description.append("</p>");
final Facet[] facets = componentTag.facets();
if (facets.length > 0) {
@@ -466,8 +477,8 @@ public class TaglibGenerator extends Abs
tagElement.appendChild(componentElement);
addLeafTextElement(
AnnotationUtils.componentType(componentTag), "component-type", componentElement, document);
- if (StringUtils.isNotBlank(componentTag.rendererType())) {
- addLeafTextElement(componentTag.rendererType(), "renderer-type", componentElement, document);
+ if (componentTag.rendererType().length > 0) {
+ addLeafTextElement(componentTag.rendererType()[0], "renderer-type", componentElement, document);
}
addLeafTextElement(componentTag.faceletHandler(), "handler-class", componentElement, document);
}