Author: Alex.Kolonitsky
Date: 2010-03-04 08:58:58 -0500 (Thu, 04 Mar 2010)
New Revision: 16526
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java
root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/AbstractPoll.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java
root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-8232
Tags support - fix checkstyle
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-03-04
11:40:16 UTC (rev 16525)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-03-04
13:58:58 UTC (rev 16526)
@@ -197,17 +197,18 @@
protected void setClassNames(TypeElement componentElement, ModelElementBase
modelElement,
String generatedClass, String baseClass) {
-// if (generatedClass == null || generatedClass.isEmpty() ||
baseClass.equals(generatedClass)) {
- if (componentElement.getModifiers().contains(Modifier.ABSTRACT)) {
- modelElement.setGenerate(true);
-// generatedClass =
namingConventions.inferUIComponentClass(modelElement.getId(), null, baseClass, true);
-// modelElement.setClassNames(generatedClass, baseClass);
-// } else {
-// modelElement.setClassNames(baseClass, null);
+ if (generatedClass == null || generatedClass.isEmpty() ||
baseClass.equals(generatedClass)) {
+ if (componentElement.getModifiers().contains(Modifier.ABSTRACT)) {
+ modelElement.setGenerate(true);
+ //namingConventions.inferUIComponentClass(modelElement.getId(), null,
baseClass, true);
+ generatedClass = componentElement.getQualifiedName().toString() +
"Generated";
+ modelElement.setClassNames(generatedClass, baseClass);
+ } else {
+ modelElement.setClassNames(baseClass, null);
+ }
+ } else {
+ modelElement.setClassNames(generatedClass, baseClass);
}
-// } else {
- modelElement.setClassNames(generatedClass, baseClass);
-// }
}
protected Map<String, Property> parseProperties(String attributesConfig) {
Modified:
root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/AbstractPoll.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/AbstractPoll.java 2010-03-04
11:40:16 UTC (rev 16525)
+++
root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/AbstractPoll.java 2010-03-04
13:58:58 UTC (rev 16526)
@@ -26,14 +26,13 @@
import javax.faces.context.FacesContext;
import org.ajax4jsf.context.AjaxContext;
-import org.richfaces.cdk.annotations.Component;
/**
* Component for periodically call AJAX events on server ( poll actions )
* @author shura
*
*/
-@Component
+//@Component
public abstract class AbstractPoll extends AjaxActionComponent {
public static final String COMPONENT_TYPE = "org.ajax4jsf.Poll";
Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2010-03-04
11:40:16 UTC (rev 16525)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2010-03-04
13:58:58 UTC (rev 16526)
@@ -27,6 +27,7 @@
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.Component;
import org.richfaces.cdk.annotations.Signature;
+import org.richfaces.cdk.annotations.Tag;
import org.richfaces.resource.MediaOutputResource;
import org.richfaces.webapp.taglib.MethodBindingMethodExpressionAdaptor;
import org.richfaces.webapp.taglib.MethodExpressionMethodBindingAdaptor;
@@ -43,7 +44,10 @@
* @author shura
*
*/
-@Component
+@Component(
+ value = "org.richfaces.MediaOutput",
+ tag = @Tag(name = "mediaOutput", handlerName =
"org.richfaces.taghandler.html.PushMediaOutput")
+)
public abstract class AbstractMediaOutput extends UIOutput implements ResourceComponent2
{
public static final String COMPONENT_TYPE = "org.richfaces.MediaOutput";
Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java 2010-03-04
11:40:16 UTC (rev 16525)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java 2010-03-04
13:58:58 UTC (rev 16526)
@@ -26,6 +26,7 @@
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.Component;
import org.richfaces.cdk.annotations.Signature;
+import org.richfaces.cdk.annotations.Tag;
import javax.el.MethodExpression;
import javax.faces.component.NamingContainer;
@@ -44,6 +45,7 @@
*/
@Component(
value = "org.richfaces.Push",
+ tag = @Tag(name = "push", handlerName =
"org.richfaces.taghandler.html.PushTagHandler"),
generate = false
)
public class AbstractPush extends UICommand {
Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java 2010-03-04
11:40:16 UTC (rev 16525)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxPushRenderer.java 2010-03-04
13:58:58 UTC (rev 16526)
@@ -32,6 +32,7 @@
import org.richfaces.component.AbstractPush;
import org.richfaces.component.html.HtmlPush;
import org.richfaces.resource.PushResource;
+import org.richfaces.cdk.annotations.Renderer;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
@@ -51,6 +52,7 @@
@ResourceDependency(name = "jquery.js"),
@ResourceDependency(name = "richfaces.js")
})
+@Renderer
public class AjaxPushRenderer extends RendererBase {
public static final String PUSH_INTERVAL_PARAMETER =
"A4J.AJAX.Push.INTERVAL";