Author: Alex.Kolonitsky
Date: 2010-04-22 06:17:07 -0400 (Thu, 22 Apr 2010)
New Revision: 16794
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute_accessors.ftl
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxFunction.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxLog.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxStatus.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandButton.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.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/AbstractOutputPanel.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractQueue.java
Log:
RF-7826 Migrate A1 components to new CDK
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/NamingConventions.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -83,6 +83,8 @@
public String inferRendererTypeByRendererClass(ClassName rendererClass);
+ public String inferRendererTypeByComponentType(FacesId componentType);
+
public String inferComponentFamily(RendererModel.Type type);
public String inferTemplate(RendererModel.Type type);
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/RichFacesConventions.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -150,6 +150,11 @@
return "";
}
+ @Override
+ public String inferRendererTypeByComponentType(FacesId componentType) {
+ return componentType + "Renderer";
+ }
+
public String inferComponentFamily(RendererModel.Type type) {
return null;
}
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/AttributesProcessorImpl.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -68,6 +68,13 @@
if (attributeAnnotarion == null) {
attribute.setGenerate(!beanProperty.isExists());
attribute.setDescription(beanProperty.getDocComment());
+
+ if (attribute.getType().isPrimitive()) {
+ String value = getPimitiveDefaultValue(attribute.getType().getName());
+ if (value != null) {
+ attribute.setDefaultValue(value);
+ }
+ }
} else {
attribute.setHidden(attributeAnnotarion.hidden());
attribute.setLiteral(attributeAnnotarion.literal());
@@ -111,25 +118,10 @@
String defaultValue = attributeAnnotarion.defaultValue();
if (Strings.isEmpty(defaultValue)) {
if (attribute.getType().isPrimitive()) {
- if (isInstace(attribute, byte.class)) {
- defaultValue = String.valueOf(false);
- } else if (isInstace(attribute, int.class)) {
- defaultValue = String.valueOf(Integer.MIN_VALUE);
- } else if (isInstace(attribute, long.class)) {
- defaultValue = String.valueOf(Long.MIN_VALUE);
- } else if (isInstace(attribute, byte.class)) {
- defaultValue = String.valueOf(Byte.MIN_VALUE);
- } else if (isInstace(attribute, short.class)) {
- defaultValue = String.valueOf(Short.MIN_VALUE);
- } else if (isInstace(attribute, float.class)) {
- defaultValue = String.valueOf(Float.MIN_VALUE);
- } else if (isInstace(attribute, double.class)) {
- defaultValue = String.valueOf(Double.MIN_VALUE);
- } else if (isInstace(attribute, char.class)) {
- defaultValue = String.valueOf(Character.MIN_VALUE);
+ String pimitiveDefaultValue =
getPimitiveDefaultValue(attribute.getType().getName());
+ if (pimitiveDefaultValue != null) {
+ attribute.setDefaultValue(pimitiveDefaultValue);
}
-
- attribute.setDefaultValue(defaultValue);
}
} else {
if (STRING_NAME.equals(attribute.getType().toString())) {
@@ -139,10 +131,32 @@
}
}
- private boolean isInstace(PropertyBase attribute, Class<?> byteClass) {
- return byteClass.getSimpleName().equals(attribute.getType().getName());
+ private String getPimitiveDefaultValue(String typeName) {
+ if (isInstace(boolean.class, typeName)) {
+ return String.valueOf(false);
+ } else if (isInstace(int.class, typeName)) {
+ return String.valueOf(Integer.MIN_VALUE);
+ } else if (isInstace(long.class, typeName)) {
+ return String.valueOf(Long.MIN_VALUE);
+ } else if (isInstace(byte.class, typeName)) {
+ return String.valueOf(Byte.MIN_VALUE);
+ } else if (isInstace(short.class, typeName)) {
+ return String.valueOf(Short.MIN_VALUE);
+ } else if (isInstace(float.class, typeName)) {
+ return String.valueOf(Float.MIN_VALUE);
+ } else if (isInstace(double.class, typeName)) {
+ return String.valueOf(Double.MIN_VALUE);
+ } else if (isInstace(char.class, typeName)) {
+ return String.valueOf(Character.MIN_VALUE);
+ }
+
+ return null;
}
+ private boolean isInstace(Class<?> byteClass, String typeName) {
+ return byteClass.getSimpleName().equals(typeName);
+ }
+
private List<ClassName> getSignature(Signature signature, AnnotationValue
signatureMirror) {
if (signature == null) {
return null;
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/ComponentProcessor.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -121,10 +121,14 @@
private void setRendererType(ComponentModel component, JsfRenderer jsfRenderer) {
// TODO if jsfRenderer.empty set by naming convention
-
+
+ String type;
if (jsfRenderer != null && !Strings.isEmpty(jsfRenderer.type())) {
- component.setRendererType(new RendererModel.Type(jsfRenderer.type()));
+ type = jsfRenderer.type();
+ } else {
+ type =
getNamingConventions().inferRendererTypeByComponentType(component.getType());
}
+ component.setRendererType(new RendererModel.Type(type));
}
private void processAttributes(TypeElement componentElement, ComponentModel
component, JsfComponent annotation) {
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentModel.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -73,7 +73,7 @@
}
// one or both types are null, compare classes.
- return null != getComponentClass() &&
getComponentClass().equals(other.getComponentClass());
+ return null != getTargetClass() &&
getTargetClass().equals(other.getTargetClass());
}
/**
* <p class="changed_added_4_0"></p>
@@ -99,7 +99,7 @@
/**
* <p class="changed_added_4_0"></p>
- * @param rendererType the rendererType to set
+ * @param renderer the rendererType to set
*/
public void setRendererType(Type renderer) {
this.rendererType = renderer;
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/validator/ValidatorImpl.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -107,8 +107,8 @@
protected void verifyComponent(ComponentModel component) {
// Check JsfComponent type.
if (null == component.getType()) {
- if (null != component.getComponentClass()) {
-
component.setType(namingConventions.inferComponentType(component.getComponentClass()));
+ if (null != component.getTargetClass()) {
+
component.setType(namingConventions.inferComponentType(component.getTargetClass()));
} else if (null != component.getBaseClass()) {
component.setType(namingConventions.inferComponentType(component.getBaseClass()));
} else {
@@ -122,10 +122,10 @@
if (null == component.getBaseClass()) {
log.error("Base class for generated component is not set :" +
component.getType());
// return;
- } else if (null == component.getComponentClass()) {
+ } else if (null == component.getTargetClass()) {
component.setTargetClass(namingConventions.inferUIComponentClass(component.getType()));
}
- } else if (null == component.getComponentClass()) {
+ } else if (null == component.getTargetClass()) {
if (null != component.getBaseClass()) {
component.setTargetClass(component.getBaseClass());
} else {
Modified:
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute_accessors.ftl
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute_accessors.ftl 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute_accessors.ftl 2010-04-22
10:17:07 UTC (rev 16794)
@@ -2,6 +2,8 @@
public ${attribute.simpleTypeName} ${attribute.getterName}() {
<#if attribute.typeForCasting?contains("Boolean")>
return Boolean.valueOf(getStateHelper().eval(Properties.${attribute.name}<#if
attribute.defaultValue?exists>, ${attribute.defaultValue}</#if>).toString());
+ <#elseif attribute.typeForCasting?contains("Object") >
+ return getStateHelper().get(Properties.${attribute.name});
<#elseif attribute.bindingAttribute >
return (${attribute.typeForCasting})
getStateHelper().get(Properties.${attribute.name});
<#else>
Modified:
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2010-04-22
10:17:07 UTC (rev 16794)
@@ -3,7 +3,7 @@
</#macro>
<#include "_copyright.ftl">
-package ${componentClass.package};
+package ${targetClass.package};
import javax.annotation.Generated;
import java.io.IOException;
@@ -31,7 +31,7 @@
<#assign implemented=interfaces>
</#if>
@Generated({"RichFaces CDK", "4.0.0-SNAPSHOT"})
-public class ${componentClass.simpleName} extends ${baseClass.simpleName}
+public class ${targetClass.simpleName} extends ${baseClass.simpleName}
<#if (implemented?size > 0)>implements <@concat seq=implemented ;
interface>${interface}</@concat></#if> {
public static final String COMPONENT_TYPE="${type}";
@@ -44,6 +44,10 @@
return COMPONENT_FAMILY;
}</#if>
+ public ${targetClass.simpleName}() {
+ setRendererType("${rendererType}");
+ }
+
<#if (eventNames?size > 0)>
private static final Collection<String> EVENT_NAMES =
Collections.unmodifiableCollection(Arrays.asList(
<@concat seq=eventNames delimiter=",\n ";
event>"${event.name}"</@concat>
Modified:
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -37,6 +37,7 @@
import org.richfaces.cdk.model.EventName;
import org.richfaces.cdk.model.FacesId;
import org.richfaces.cdk.model.PropertyBase;
+import org.richfaces.cdk.model.RendererModel;
import javax.el.MethodExpression;
import javax.faces.component.UIOutput;
@@ -91,6 +92,7 @@
component.setGenerate(true);
component.setTargetClass(ClassName.parseName("org.richfaces.cdk.generate.java.GeneratedComponent"));
component.setBaseClass(ClassName.parseName(UIOutput.class.getName()));
+ component.setRendererType(new RendererModel.Type("foo.barRenderer"));
PropertyBase attribute = component.getOrCreateAttribute("testValue");
attribute.setType(new ClassName(Object.class));
Modified:
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -97,7 +97,7 @@
assertEquals("javax.faces.Panel", component.getType().toString());
assertEquals("javax.faces.Panel", component.getFamily());
- assertEquals("javax.faces.component.UIPanel",
component.getComponentClass().getName());
+ assertEquals("javax.faces.component.UIPanel",
component.getTargetClass().getName());
assertEquals("panel.gif", component.getIcon().getSmallIcon());
assertEquals("panel-large.gif", component.getIcon().getLargeIcon());
assertEquals("Panel component", component.getDescription());
Modified:
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedComponent.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -52,6 +52,10 @@
+ public GeneratedComponent() {
+ setRendererType("foo.barRenderer");
+ }
+
private static final Collection<String> EVENT_NAMES =
Collections.unmodifiableCollection(Arrays.asList(
"id",
"action"
@@ -128,7 +132,7 @@
}
public Object getTestValue() {
- return (Object) getStateHelper().eval(Properties.testValue);
+ return getStateHelper().get(Properties.testValue);
}
public void setTestValue(Object testValue) {
Modified:
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/generate/java/GeneratedConverter.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -80,7 +80,7 @@
}
public Object getTestObject() {
- return (Object) getStateHelper().eval(Properties.testObject);
+ return getStateHelper().get(Properties.testObject);
}
public void setTestObject(Object testObject) {
Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxFunction.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxFunction.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxFunction.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -44,10 +44,6 @@
public static final String COMPONENT_TYPE = "org.richfaces.Function";
- public AbstractAjaxFunction() {
- setRendererType("org.richfaces.FunctionRenderer");
- }
-
public abstract boolean isLimitRender();
@Attribute(required = true)
Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxLog.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxLog.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxLog.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -50,16 +50,6 @@
public static final String COMPONENT_FAMILY = "org.richfaces.AjaxLog";
-
- public AbstractAjaxLog() {
- setRendererType("org.richfaces.AjaxLogRenderer");
- }
-
- @Override
- public String getFamily() {
- return COMPONENT_FAMILY;
- }
-
@Attribute(defaultValue = "")
public abstract String getStyle();
Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxStatus.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxStatus.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractAjaxStatus.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -40,10 +40,6 @@
public static final String COMPONENT_FAMILY = "org.richfaces.Status";
- public AbstractAjaxStatus() {
- setRendererType("org.richfaces.StatusRenderer");
- }
-
@Attribute(events = @EventName("start"))
public abstract String getOnstart();
Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandButton.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandButton.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandButton.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -40,10 +40,6 @@
public static final String COMPONENT_FAMILY =
"org.richfaces.CommandButton";
- public AbstractCommandButton() {
- setRendererType("org.richfaces.CommandButtonRenderer");
- }
-
@Attribute(events = {@EventName("click"), @EventName(value =
"action", defaultEvent = true)})
public abstract String getOnclick();
@@ -80,6 +76,5 @@
@Attribute(defaultValue = "")
public abstract String getStyleClass();
- @Attribute(defaultValue = "Boolean.FALSE")
public abstract boolean isLimitRender();
}
Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractCommandLink.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -38,10 +38,6 @@
public static final String COMPONENT_FAMILY = "org.richfaces.CommandLink";
- public AbstractCommandLink() {
- setRendererType("org.richfaces.CommandLinkRenderer");
- }
-
@Attribute(events = {@EventName("click"), @EventName(value =
"action", defaultEvent = true)})
public abstract String getOnclick();
@@ -78,6 +74,5 @@
@Attribute(defaultValue = "")
public abstract String getStyleClass();
- @Attribute(defaultValue = "Boolean.FALSE")
public abstract boolean isLimitRender();
}
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-04-21
17:29:01 UTC (rev 16793)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractMediaOutput.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -145,7 +145,6 @@
public abstract String getBorder();
- @Attribute(defaultValue = "Boolean.FALSE")
public abstract boolean isCacheable();
public abstract String getCharset();
@@ -172,7 +171,6 @@
public abstract String getHspace();
- @Attribute(defaultValue = "Boolean.FALSE")
public abstract boolean isIsmap();
public abstract String getLang();
Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractOutputPanel.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractOutputPanel.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractOutputPanel.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -42,14 +42,8 @@
public static final String COMPONENT_FAMILY = "javax.faces.Panel";
- public AbstractOutputPanel() {
- setRendererType("org.richfaces.OutputPanelRenderer");
- }
-
- @Attribute(defaultValue = "Boolean.FALSE")
public abstract boolean isAjaxRendered();
- @Attribute(defaultValue = "Boolean.FALSE")
public abstract boolean isKeepTransient();
@Attribute(defaultValue = "inline")
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-04-21
17:29:01 UTC (rev 16793)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractPush.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -122,7 +122,6 @@
@Attribute(defaultValue = "1000")
public abstract int getInterval();
- @Attribute(defaultValue = "Boolean.TRUE")
public abstract boolean isEnabled();
// TODO what wrong with that name?
Modified:
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractQueue.java
===================================================================
---
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractQueue.java 2010-04-21
17:29:01 UTC (rev 16793)
+++
root/ui/trunk/components/core/src/main/java/org/richfaces/component/AbstractQueue.java 2010-04-22
10:17:07 UTC (rev 16794)
@@ -21,7 +21,6 @@
*/
package org.richfaces.component;
-import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.JsfComponent;
import javax.faces.component.UIComponentBase;
@@ -39,11 +38,6 @@
public static final String COMPONENT_FAMILY = "org.richfaces.Queue";
- public AbstractQueue() {
- setRendererType("org.richfaces.QueueRenderer");
- }
-
- @Attribute(defaultValue = "Integer.MIN_VALUE")
public abstract int getRequestDelay();
public abstract String getStatus();