Author: manaRH Date: 2012-05-16 16:42:18 -0400 (Wed, 16 May 2012) New Revision: 14696 Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIButton.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationName.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFragment.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIRemote.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIStyle.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ButtonRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DivRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DownloadRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FormattedTextRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FragmentRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/LinkRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/RemoteRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ResourceRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/SpanRendererBase.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/TokenRendererBase.java Log: JBSEAM-4875 - fixed generation of renderers for Seam UI taglib Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIButton.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIButton.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIButton.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -34,7 +34,8 @@ */ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Button&quot;,value=&quot;A link that supports invocation of an action with control over conversation propagation"), family="org.jboss.seam.ui.Button", type="org.jboss.seam.ui.Button",generate="org.jboss.seam.ui.component.html.HtmlButton", - tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="button"), renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.ButtonRendererBase", family="org.jboss.seam.ui.ButtonRenderer"), + tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="button"), + renderer = @JsfRenderer(type="org.jboss.seam.ui.ButtonRenderer", family="org.jboss.seam.ui.ButtonRenderer"), attributes = {"command-button-props.xml", "javax.faces.component.UICommand.xml", "javax.faces.component.ValueHolder.xml", "i18n-props.xml", "accesskey-props.xml", "button.xml" }) public abstract class UIButton extends UISeamCommandBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UICache.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -37,7 +37,8 @@ */ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Cache&quot;,value=&quot;Cache the rendered page fragment using the installed cache provider."), family="org.jboss.seam.ui.Cache", type="org.jboss.seam.ui.Cache",generate="org.jboss.seam.ui.component.html.HtmlCache", -tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="cache"), renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.ButtonRendererBase", family="org.jboss.seam.ui.ButtonRenderer"), +tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="cache"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.ButtonRenderer", family="org.jboss.seam.ui.ButtonRenderer"), attributes = {"base-props.xml", "cache.xml" }) public abstract class UICache extends UIComponentBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationName.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationName.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationName.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -18,7 +18,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.ConversationName&quot;,value=&quot;Set the conversation name for a command link or button (or similar JSF control)."), family="org.jboss.seam.ui.ConversationName", type="org.jboss.seam.ui.ConversationName",generate="org.jboss.seam.ui.component.html.HtmlConversationName", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="conversationName", handler="org.jboss.seam.ui.handler.CommandButtonParameterComponentHandler"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.ConversationNameRendererBase", family="org.jboss.seam.ui.ConversationNameRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.ConversationNameRenderer", family="org.jboss.seam.ui.ConversationNameRenderer"), attributes = {"conversationName.xml" }) public abstract class UIConversationName extends UIParameter { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -37,7 +37,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.ConversationPropagation&quot;,value=&quot;Customize the conversation propagation for a command link or button (or similar JSF control)."), family="org.jboss.seam.ui.ConversationPropagation", type="org.jboss.seam.ui.ConversationPropagation",generate="org.jboss.seam.ui.component.html.HtmlConversationPropagation", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="conversationPropagation"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.ConversationPropagationRendererBase", family="org.jboss.seam.ui.ConversationPropagationRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.ConversationPropagationRenderer", family="org.jboss.seam.ui.ConversationPropagationRenderer"), attributes = {"conversationPropagation.xml" }) public abstract class UIConversationPropagation extends UIParameter { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -16,7 +16,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Decorate&quot;,value=&quot;\&quot;Decorate\&quot; a JSF input field when validation fails or when required=\"true\" is set."), family="org.jboss.seam.ui.Decorate", type="org.jboss.seam.ui.Decorate",generate="org.jboss.seam.ui.component.html.HtmlDecorate", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="decorate", handler="org.jboss.seam.ui.handler.DecorateHandler"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.DecorateRendererBase", family="org.jboss.seam.ui.DecorateRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.DecorateRenderer", family="org.jboss.seam.ui.DecorateRenderer"), attributes = {"decorate.xml" }) public abstract class UIDecorate extends UIComponentBase implements NamingContainer { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIDownload.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -14,7 +14,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Download&quot;,value=&quot;Link for downloading a file"), family="org.jboss.seam.ui.Download", type="org.jboss.seam.ui.Download",generate="org.jboss.seam.ui.component.html.HtmlDownload", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="download"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.DownloadRendererBase", family="org.jboss.seam.ui.DownloadRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.DownloadRenderer", family="org.jboss.seam.ui.DownloadRenderer"), attributes = {"core-props.xml", "link.xml", "download.xml" }) public abstract class UIDownload extends UILink { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -16,7 +16,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.EqualityValidator&quot;,value=&quot;Validate all child JSF input fields against the bound propertys using Hibernate Validator."), family="org.jboss.seam.ui.EqualityValidator", type="org.jboss.seam.ui.EqualityValidator",generate="org.jboss.seam.ui.component.html.HtmlEqualityValidator", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="equalityValidator"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.EqualityValidatorRenderer", family="org.jboss.seam.ui.EqualityValidatorRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.EqualityValidatorRenderer", family="org.jboss.seam.ui.EqualityValidatorRenderer"), attributes = {"equalityValidator.xml" }) public abstract class UIEqualityValidator extends UIComponentBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -21,7 +21,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.FileUpload&quot;,value=&quot;Renders a file upload control. This control must be used within a form with an encoding type of multipart/form-data"), family="org.jboss.seam.ui.FileUpload", type="org.jboss.seam.ui.FileUpload",generate="org.jboss.seam.ui.component.html.HtmlButton", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="fileUpload"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.FileUploadRendererBase", family="org.jboss.seam.ui.FileUploadRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.renderkit.FileUploadRendererBase", family="org.jboss.seam.ui.FileUploadRenderer"), attributes = {"fileUpload.xml" }) public abstract class UIFileUpload extends UIInput { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -32,6 +32,7 @@ import org.jboss.seam.text.SeamTextParser; import org.richfaces.cdk.annotations.Description; import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; import antlr.ANTLRException; @@ -44,6 +45,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.FormattedText&quot;,value=&quot;Output Seam Text. Parse errors generate WARN level log messages."), family="org.jboss.seam.ui.FormattedText", type="org.jboss.seam.ui.FormattedText",generate="org.jboss.seam.ui.component.html.HtmlFormattedText", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="formattedText"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.FormattedTextRenderer", family="org.jboss.seam.ui.FormattedTextRenderer"), attributes = {"formattedText.xml" }) public abstract class UIFormattedText extends UIOutput { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFragment.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFragment.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIFragment.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -36,7 +36,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Fragment&quot;,value=&quot;Surround a page fragment, allows you to apply render/not render without any html output."), family="org.jboss.seam.ui.Fragment", type="org.jboss.seam.ui.Fragment",generate="org.jboss.seam.ui.component.html.HtmlFragment", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="fragment"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.FragmentRendererBase", family="org.jboss.seam.ui.FragmentRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.renderkit.FragmentRendererBase", family="org.jboss.seam.ui.FragmentRenderer"), attributes = {"javax.faces.component.UIComponent.xml" }) public abstract class UIFragment extends UIComponentBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UILink.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -34,8 +34,8 @@ */ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Link&quot;,value=&quot;A link that supports invocation of an action with control over conversation propagation. Does not submit the form."), family="org.jboss.seam.ui.Link", type="org.jboss.seam.ui.Link",generate="org.jboss.seam.ui.component.html.HtmlLink", -tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="link"), renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.LinkRendererBase", -family="org.jboss.seam.ui.LinkRenderer"), +tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="link"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.LinkRenderer",family="org.jboss.seam.ui.LinkRenderer"), attributes = {"command-button-props.xml", "javax.faces.component.UICommand.xml", "javax.faces.component.ValueHolder.xml", "i18n-props.xml", "accesskey-props.xml", "button.xml" }) public abstract class UILink extends UISeamCommandBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIRemote.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIRemote.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIRemote.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -16,7 +16,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Remote&quot;,value=&quot;Write out script element for use with Seam Remote"), family="org.jboss.seam.ui.Remote", type="org.jboss.seam.ui.Remote",generate="org.jboss.seam.ui.component.html.HtmlRemote", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="remote"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.RemoteRendererBase", family="org.jboss.seam.ui.RemoteRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.RemoteRenderer", family="org.jboss.seam.ui.RemoteRenderer"), attributes = {"remote.xml" }) public abstract class UIRemote extends UIComponentBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIResource.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -18,7 +18,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Resource&quot;,value=&quot;Given a data in form of an inputstream, java.util.File or byte[] and a content-type, this tag sends the data to the browser"), family="org.jboss.seam.ui.Resource", type="org.jboss.seam.ui.Resource",generate="org.jboss.seam.ui.component.html.HtmlResource", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="resource"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.ResourceRendererBase", family="org.jboss.seam.ui.ResourceRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.ResourceRenderer", family="org.jboss.seam.ui.ResourceRenderer"), attributes = {"resource.xml" }) public abstract class UIResource extends UIComponentBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -5,6 +5,7 @@ import java.util.Map; import java.util.Set; +import javax.el.MethodExpression; import javax.el.ValueExpression; import javax.faces.component.ActionSource2; import javax.faces.component.UIComponent; @@ -12,6 +13,7 @@ import javax.faces.component.UIOutput; import javax.faces.component.UIParameter; import javax.faces.context.FacesContext; +import javax.faces.el.MethodBinding; import javax.faces.event.ActionListener; import javax.faces.model.DataModel; @@ -214,13 +216,37 @@ @Deprecated public void setAction(javax.faces.el.MethodBinding methodBinding) { - setActionExpression(new MethodBindingToMethodExpression(methodBinding)); + // setActionExpression(new MethodBindingToMethodExpression(methodBinding)); + + com.sun.faces.application.MethodExpressionMethodBindingAdapter adapter; + if (null != methodBinding) { + adapter = new com.sun.faces.application.MethodExpressionMethodBindingAdapter(methodBinding); + setActionExpression(adapter); + } else { + setActionExpression(null); + } } @Deprecated public javax.faces.el.MethodBinding getAction() { - return new org.jboss.seam.ui.util.cdk.MethodExpressionToMethodBinding(getActionExpression()); + //return new org.jboss.seam.ui.util.cdk.MethodExpressionToMethodBinding(getActionExpression()); + + MethodBinding result = null; + MethodExpression me; + + if (null != (me = getActionExpression())) { + // if the MethodExpression is an instance of our private + // wrapper class. + if (me.getClass().equals(com.sun.faces.application.MethodExpressionMethodBindingAdapter.class)) { + result = ((com.sun.faces.application.MethodExpressionMethodBindingAdapter) me).getWrapped(); + } else { + // otherwise, this is a real MethodExpression. Wrap it + // in a MethodBinding. + result = new com.sun.faces.application.MethodBindingMethodExpressionAdapter(me); + } + } + return result; } private static boolean isPortletRequest(FacesContext facesContext) Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISpan.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -9,7 +9,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Span&quot;,value=&quot;Render a HTML <span>"), family="org.jboss.seam.ui.Span", type="org.jboss.seam.ui.Span",generate="org.jboss.seam.ui.component.html.HtmlSpan", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="span"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.SpanRendererBase", family="org.jboss.seam.ui.SpanRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.SpanRenderer", family="org.jboss.seam.ui.SpanRenderer"), attributes = {"core-props.xml", "span.xml"}) public abstract class UISpan extends UIStyle { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIStyle.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIStyle.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIStyle.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -2,12 +2,22 @@ import javax.faces.component.UIComponentBase; +import org.richfaces.cdk.annotations.Attribute; +import org.richfaces.cdk.annotations.Description; +import org.richfaces.cdk.annotations.JsfComponent; +import org.richfaces.cdk.annotations.JsfRenderer; +import org.richfaces.cdk.annotations.Tag; +@JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Div&quot;,value=&quot;&lt;![CDATA[Render a HTML <div>.]]>"), +family="org.jboss.seam.ui.Div", type="org.jboss.seam.ui.Div",generate="org.jboss.seam.ui.component.html.HtmlDiv", +tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="div"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.DivRenderer", family="org.jboss.seam.ui.DivRenderer")) public abstract class UIStyle extends UIComponentBase { - + @Attribute public abstract String getStyleClass(); + @Attribute public abstract String getStyle(); public abstract void setStyleClass(String styleClass); Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIToken.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -69,7 +69,7 @@ @JsfComponent(description=(a)Description(displayName=&quot;org.jboss.seam.ui.Token&quot;,value=&quot;Render a secure token in the parent form that is validated on postback to guard against CSRF attacks"), family="org.jboss.seam.ui.Token", type="org.jboss.seam.ui.Token",generate="org.jboss.seam.ui.component.html.HtmlToken", tag = @Tag(baseClass="org.jboss.seam.ui.util.cdk.UIComponentTagBase", name="token"), -renderer = @JsfRenderer(generate="false",type="org.jboss.seam.ui.renderkit.TokenRendererBase", family="org.jboss.seam.ui.TokenRenderer"), +renderer = @JsfRenderer(type="org.jboss.seam.ui.TokenRenderer", family="org.jboss.seam.ui.TokenRenderer"), attributes = {"token.xml" }) public abstract class UIToken extends UIOutput { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ButtonRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ButtonRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ButtonRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -11,7 +11,9 @@ import org.jboss.seam.ui.component.UIButton; import org.jboss.seam.ui.util.HTML; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.ButtonRenderer&quot;, family="org.jboss.seam.ui.ButtonRenderer") public class ButtonRendererBase extends RendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -12,7 +12,9 @@ import org.jboss.seam.log.Logging; import org.jboss.seam.ui.component.UICache; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.ButtonRenderer&quot;, family="org.jboss.seam.ui.ButtonRenderer") public class CacheRendererBase extends RendererBase { private static final LogProvider log = Logging.getLogProvider(UICache.class); Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -16,6 +16,7 @@ import org.jboss.seam.log.LogProvider; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; /** * @author Pete Muir Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -5,11 +5,13 @@ import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; import org.jboss.seam.ui.component.UIConversationName; +import org.richfaces.cdk.annotations.JsfRenderer; /** * @author Pete Muir * */ +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.ConversationNameRenderer&quot;, family="org.jboss.seam.ui.ConversationNameRenderer") public class ConversationNameRendererBase extends CommandButtonParameterRendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -8,11 +8,13 @@ import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; import org.jboss.seam.ui.component.UIConversationPropagation; +import org.richfaces.cdk.annotations.JsfRenderer; /** * @author Pete Muir * */ +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.ConversationPropagationRenderer&quot;, family="org.jboss.seam.ui.ConversationPropagationRenderer") public class ConversationPropagationRendererBase extends CommandButtonParameterRendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -14,7 +14,9 @@ import org.jboss.seam.ui.util.Decoration; import org.jboss.seam.ui.util.HTML; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.DecorateRenderer&quot;, family="org.jboss.seam.ui.DecorateRenderer") public class DecorateRendererBase extends RendererBase { // Place the attributes you want to store away Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DivRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DivRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DivRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -5,7 +5,10 @@ import javax.faces.context.ResponseWriter; import org.jboss.seam.ui.component.UIStyle; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.DivRenderer&quot;, +family="org.jboss.seam.ui.DivRenderer") public class DivRendererBase extends StyleRendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DownloadRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DownloadRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/DownloadRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -11,7 +11,9 @@ import org.jboss.seam.ui.util.HTML; import org.jboss.seam.ui.util.ViewUrlBuilder; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.DownloadRenderer&quot;, family="org.jboss.seam.ui.DownloadRenderer") public class DownloadRendererBase extends RendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -12,6 +12,7 @@ import org.jboss.seam.ui.component.UIEqualityValidator; import org.jboss.seam.ui.util.cdk.RendererBase; import org.jboss.seam.ui.validator.EqualityValidator; +import org.richfaces.cdk.annotations.JsfRenderer; /** * This class mainly does some validation "hook-in" @@ -21,6 +22,7 @@ * */ @ListenerFor(systemEventClass = PostAddToViewEvent.class) +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.EqualityValidatorRenderer&quot;, family="org.jboss.seam.ui.EqualityValidatorRenderer") public class EqualityValidatorRendererBase extends RendererBase implements ComponentSystemEventListener { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -14,7 +14,9 @@ import org.jboss.seam.ui.util.HTML; import org.jboss.seam.ui.util.cdk.RendererBase; import org.jboss.seam.web.MultipartRequest; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.renderkit.FileUploadRendererBase&quot;, family="org.jboss.seam.ui.FileUploadRenderer") public class FileUploadRendererBase extends RendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FormattedTextRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FormattedTextRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FormattedTextRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -8,7 +8,9 @@ import org.jboss.seam.ui.component.UIFormattedText; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.FormattedTextRenderer&quot;, family="org.jboss.seam.ui.FormattedTextRenderer") public class FormattedTextRendererBase extends RendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FragmentRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FragmentRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/FragmentRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -8,7 +8,9 @@ import org.jboss.seam.ui.component.UIFragment; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.renderkit.FragmentRendererBase&quot;, family="org.jboss.seam.ui.FragmentRenderer") public class FragmentRendererBase extends RendererBase { @Override Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/LinkRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/LinkRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/LinkRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -9,7 +9,9 @@ import org.jboss.seam.ui.component.UILink; import org.jboss.seam.ui.util.HTML; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.LinkRenderer&quot;,family=&quot;org.jboss.seam.ui.LinkRenderer&quot;) public class LinkRendererBase extends RendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/RemoteRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/RemoteRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/RemoteRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -9,12 +9,14 @@ import org.jboss.seam.ui.component.UIRemote; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; /** * Renderer for rendering the required &lt;script&gt; tags for Seam Remoting * * @author Shane Bryzak */ +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.RemoteRenderer&quot;, family="org.jboss.seam.ui.RemoteRenderer") public class RemoteRendererBase extends RendererBase { @Override Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ResourceRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ResourceRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/ResourceRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -8,7 +8,9 @@ import org.jboss.seam.ui.DocumentStoreUtils; import org.jboss.seam.ui.component.UIResource; import org.jboss.seam.ui.util.cdk.RendererBase; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.ResourceRenderer&quot;, family="org.jboss.seam.ui.ResourceRenderer") public class ResourceRendererBase extends RendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/SpanRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/SpanRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/SpanRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -8,7 +8,9 @@ import org.jboss.seam.ui.component.UISpan; import org.jboss.seam.ui.component.UIStyle; +import org.richfaces.cdk.annotations.JsfRenderer; +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.SpanRenderer&quot;, family="org.jboss.seam.ui.SpanRenderer") public class SpanRendererBase extends StyleRendererBase { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/TokenRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/TokenRendererBase.java 2012-05-16 20:41:47 UTC (rev 14695) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/renderkit/TokenRendererBase.java 2012-05-16 20:42:18 UTC (rev 14696) @@ -17,6 +17,7 @@ import org.jboss.seam.ui.util.cdk.RendererBase; import org.jboss.seam.util.Base64; import org.jboss.seam.util.RandomStringUtils; +import org.richfaces.cdk.annotations.JsfRenderer; /** * <p> @@ -71,6 +72,7 @@ * @author Stuart Douglas * @see UnauthorizedCommandException */ +(a)JsfRenderer(type=&quot;org.jboss.seam.ui.TokenRenderer&quot;, family="org.jboss.seam.ui.TokenRenderer") public class TokenRendererBase extends RendererBase { public static final String FORM_SIGNATURE_PARAM = "javax.faces.FormSignature";