richfaces-svn-commits
December 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 201 discussions
JBoss Rich Faces SVN: r16231 - in root/ui-sandbox/trunk/components/tables/ui/src/main: resources/META-INF/resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-12-30 13:06:28 -0500 (Wed, 30 Dec 2009)
New Revision: 16231
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
Log:
RF-7868
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2009-12-29 21:52:25 UTC (rev 16230)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2009-12-30 18:06:28 UTC (rev 16231)
@@ -138,6 +138,10 @@
writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":d", null);
writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-drag", null);
writer.endElement(HTML.DIV_ELEM);
+ writer.startElement(HTML.INPUT_ELEM, component);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":wi", null);
+ writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN, null);
+ writer.endElement(HTML.INPUT_ELEM);
writer.startElement(HTML.SCRIPT_ELEM, component);
writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
writer.write("new RichFaces.ExtendedDataTable('" + component.getClientId(context) + "');");
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2009-12-29 21:52:25 UTC (rev 16230)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2009-12-30 18:06:28 UTC (rev 16231)
@@ -45,6 +45,7 @@
var dataTableElement = contentElement.lastChild;//TODO this.dataTableElement = Richfaces.lastDescendant(this.contentElement);
var frozenHeaderPartElement = document.getElementById(id + ":frozenHeader");
var dragElement = document.getElementById(id + ":d");
+ var widthInput = document.getElementById(id + ":wi");
var normalPartStyle = richfaces.getCSSRule(".rich-extable-part-width").style;
var resizerHolders = jQuery(element).children(".rich-extable-header").find(".rich-extable-resizer-holder").get();
@@ -57,6 +58,7 @@
var scrollElement = document.getElementById(id + idSuffixs[2]);
var resizeData = {};
+ var newWidths = {};
var updateLayout = function() {
var offsetWidth = frozenHeaderPartElement ? frozenHeaderPartElement.offsetWidth : 0;
@@ -74,7 +76,7 @@
var height = element.clientHeight;
var el = element.firstChild;
while (el) {
- if(el.nodeName.toUpperCase() == "DIV" && el != bodyElement) {
+ if(el.nodeName && el.nodeName.toUpperCase() == "DIV" && el != bodyElement) {
height -= el.offsetHeight;
}
el = el.nextSibling;
@@ -134,18 +136,19 @@
};
var drag = function(event) {
- dragElement.style.left = Math.max(resizeData.left + MIN_WIDTH, event.clientX);
+ dragElement.style.left = (Math.max(resizeData.left + MIN_WIDTH, event.pageX) - jQuery(dragElement).offsetParent().offset().left) + "px";
return false;
};
var beginResize = function(event) {
var parts = this.id.split(":");
+ var thisElement = jQuery(this);
resizeData = {
id : parts[parts.length - 2],
- left : jQuery(this.parentNode).offset().left
+ left : thisElement.parent().offset().left
};
- dragElement.style.top = jQuery(this).offset().top;
- dragElement.style.left = event.clientX;
- dragElement.style.height = element.clientHeight;
+ dragElement.style.height = element.clientHeight + "px";
+ dragElement.style.top = thisElement.offset().top - thisElement.offsetParent().offset().top + "px";
+ dragElement.style.left = (event.pageX - jQuery(element).offsetParent().offset().left) + "px";
dragElement.style.display = "block";
jQuery(document).bind("mousemove", drag);
jQuery(document).one("mouseup", endResize);
@@ -155,7 +158,14 @@
var endResize = function(event) {
jQuery(document).unbind("mousemove", drag);
dragElement.style.display = "none";
- richfaces.getCSSRule(WIDTH_CLASS_NAME_BASE + resizeData.id).style.width = Math.max(MIN_WIDTH, event.clientX - resizeData.left) + "px";
+ var width = Math.max(MIN_WIDTH, event.pageX - resizeData.left) + "px";
+ richfaces.getCSSRule(WIDTH_CLASS_NAME_BASE + resizeData.id).style.width = width;
+ newWidths[resizeData.id] = width;
+ var widthsArray = new Array();
+ for (var id in newWidths) {
+ widthsArray.push(id + ":" + newWidths[id]);
+ }
+ widthInput.value = widthsArray.toString();
updateLayout();
adjustResizers();
};
15 years
- 1
- 0
JBoss Rich Faces SVN: r16230 - root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-12-29 16:52:25 -0500 (Tue, 29 Dec 2009)
New Revision: 16230
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java
Log:
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2009-12-29 21:36:27 UTC (rev 16229)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/java/org/richfaces/cdk/test/component/AbstractTestComponent.java 2009-12-29 21:52:25 UTC (rev 16230)
@@ -26,12 +26,14 @@
import java.util.List;
import javax.faces.component.UIComponentBase;
+import javax.faces.component.ValueHolder;
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.Component;
import org.richfaces.cdk.annotations.Family;
import org.richfaces.cdk.annotations.Fires;
import org.richfaces.cdk.annotations.Generate;
+import org.richfaces.cdk.annotations.Icon;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.test.event.TestEvent;
@@ -47,7 +49,8 @@
@Family("org.richfaces.cdk.test.Test")
@Fires(TestEvent.class)
@Tag(name = "test")
-public abstract class AbstractTestComponent extends UIComponentBase {
+@Icon(large="large.jpg",small="small.gif")
+public abstract class AbstractTestComponent extends UIComponentBase /*implements ValueHolder */{
@Attribute
private int foo;
15 years
- 1
- 0
JBoss Rich Faces SVN: r16229 - in root/cdk/trunk/plugins/generator/src/main: resources/META-INF/templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-12-29 16:36:27 -0500 (Tue, 29 Dec 2009)
New Revision: 16229
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl
Log:
Fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-12-29 21:36:21 UTC (rev 16228)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2009-12-29 21:36:27 UTC (rev 16229)
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk.apt;
import java.lang.annotation.Annotation;
@@ -51,21 +49,20 @@
/**
* <p class="changed_added_4_0">
- * Base class for all CDK Annotation processors. That class provides access to
- * current CDK context and utility methods for Java source models.
+ * Base class for all CDK Annotation processors. That class provides access to current CDK context and utility methods
+ * for Java source models.
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
public class CdkProcessor extends AbstractProcessor implements CdkWorker {
private static final Set<String> ANY_ANNOTATION = Collections.singleton("*");
private static final ImmutableList<Pair<? extends Class<? extends Annotation>, ? extends Class<? extends CdkAnnotationProcessor>>> PROCESSORS = ImmutableList
- .of(Pair.of(Component.class, ComponentProcessor.class),
- Pair.of(FacesComponent.class, FacesComponentProcessor.class),
- Pair.of(Behavior.class, BehaviorProcessor.class));
+ .of(Pair.of(Component.class, ComponentProcessor.class), Pair.of(FacesComponent.class,
+ FacesComponentProcessor.class), Pair.of(Behavior.class, BehaviorProcessor.class));
/**
* <p class="changed_added_4_0">
@@ -77,22 +74,21 @@
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @param context
* current CDK context
- * @throws CdkException
+ * @throws CdkException
*/
public void init(CdkContext context) throws CdkException {
this.context = context;
}
-
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
- SourceUtils sourceUtils = new SourceUtils(this.processingEnv,roundEnv);
+ SourceUtils sourceUtils = new SourceUtils(this.processingEnv, roundEnv);
sourceUtils.init(getContext());
getContext().setWorker(SourceUtils.class, sourceUtils);
- if(!roundEnv.processingOver()){
+ if (!roundEnv.processingOver()) {
// Process annotations.
for (Pair<? extends Class<? extends Annotation>, ? extends Class<? extends CdkAnnotationProcessor>> process : PROCESSORS) {
processAnnotation(process.getFirst(), process.getSecond());
@@ -101,7 +97,7 @@
getContext().getBuilderFor(StandardSources.FACES_CONFIGS).build();
getContext().getBuilderFor(StandardSources.RENDERER_TEMPLATES).build();
getContext().getWorker(ModelValidator.class).verify(getContext().getLibrary());
- } else if(!getContext().getErrors().iterator().hasNext()){
+ } else if (!getContext().getErrors().iterator().hasNext()) {
// processing over, generate files.
for (OutputType type : StandardOutputs.values()) {
getContext().getGeneratorFor(type).render();
@@ -112,8 +108,10 @@
return false;
}
- protected void processAnnotation(Class<? extends Annotation> annotation, Class<? extends CdkAnnotationProcessor> processor){
- Set<? extends TypeElement> annotatedWith = getContext().getWorker(SourceUtils.class).getClassesAnnotatedWith(annotation);
+ protected void processAnnotation(Class<? extends Annotation> annotation,
+ Class<? extends CdkAnnotationProcessor> processor) {
+ Set<? extends TypeElement> annotatedWith = getContext().getWorker(SourceUtils.class).getClassesAnnotatedWith(
+ annotation);
CdkAnnotationProcessor cdkAnnotationProcessor = getContext().getWorker(processor);
for (TypeElement typeElement : annotatedWith) {
try {
@@ -126,14 +124,14 @@
protected void sendError(TypeElement componentElement, CdkProcessingException e) {
// rise error and continue.
- processingEnv.getMessager().printMessage(javax.tools.Diagnostic.Kind.ERROR, e.getMessage(),
- componentElement);
+ processingEnv.getMessager().printMessage(javax.tools.Diagnostic.Kind.ERROR, e.getMessage(), componentElement);
getContext().sendError(e);
}
+
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @return the context
*/
protected CdkContext getContext() {
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 2009-12-29 21:36:21 UTC (rev 16228)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2009-12-29 21:36:27 UTC (rev 16229)
@@ -1,6 +1,6 @@
<#macro concat seq delimiter=",">
<#list seq as item>
- <#nested item/><#if item_has_next>${delimiter}</#if>
+ <#nested item/><#if item_has_next>${delimiter}</#if>
</#list>
</#macro>
/*
@@ -45,24 +45,24 @@
* ${description?if_exists}
**/
@Generated({"RichFaces CDK", "4.0.0-SNAPSHOT"})
-public class ${componentClass.simpleName} extends ${baseClass} <#if (eventNames?size > 0)>implements ClientBehaviorHolder</#if> {
+public class ${componentClass.simpleName} extends ${baseClass} <#if (eventNames?size > 0)>implements ClientBehaviorHolder</#if> {
- public static final String COMPONENT_TYPE="${type}";
-
- <#if family?exists>
- public static final String COMPONENT_FAMILY="${family}";
-
- @Override
- public String getFamily() {
+ public static final String COMPONENT_TYPE="${type}";
+
+ <#if family?exists>
+ public static final String COMPONENT_FAMILY="${family}";
+
+ @Override
+ public String getFamily() {
return (COMPONENT_FAMILY);
}
- </#if>
-
- <#if (eventNames?size > 0)>
- private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList(
- <@concat seq=eventNames ; event>"${event.name}"</@concat>
- ));
+ </#if>
+
+ <#if (eventNames?size > 0)>
+ private static final Collection<String> EVENT_NAMES = Collections.unmodifiableCollection(Arrays.asList(
+ <@concat seq=eventNames ; event>"${event.name}"</@concat>
+ ));
public Collection<String> getEventNames() {
return EVENT_NAMES; }
@@ -70,26 +70,26 @@
public String getDefaultEventName() {
return <#if defaultEvent?exists>"${defaultEvent.name}"<#else>null</#if>;
}
- </#if>
- protected enum Properties {
- <@concat seq=generatedAttributes ; attribute>${attribute.name}</@concat>
- ;
- }
+ </#if>
+ protected enum Properties {
+ <@concat seq=generatedAttributes ; attribute>${attribute.name}</@concat>
+ ;
+ }
- <#list generatedAttributes as attribute>
- /**
- * ${attribute.description?if_exists}
- **/
- public ${attribute.type} ${attribute.getterName}(){
- return (${attribute.type})getStateHelper().eval(Properties.${attribute.name});
- }
+ <#list generatedAttributes as attribute>
+ /**
+ * ${attribute.description?if_exists}
+ **/
+ public ${attribute.type} ${attribute.getterName}(){
+ return (${attribute.type})getStateHelper().eval(Properties.${attribute.name});
+ }
- /**
- * Setter for ${attribute.name}
- **/
- public void ${attribute.setterName}(${attribute.type} ${attribute.name}){
- getStateHelper().put(Properties.${attribute.name},${attribute.name});
- }
- </#list>
+ /**
+ * Setter for ${attribute.name}
+ **/
+ public void ${attribute.setterName}(${attribute.type} ${attribute.name}){
+ getStateHelper().put(Properties.${attribute.name},${attribute.name});
+ }
+ </#list>
}
\ No newline at end of file
15 years
- 1
- 0
JBoss Rich Faces SVN: r16228 - root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-12-29 16:36:21 -0500 (Tue, 29 Dec 2009)
New Revision: 16228
Modified:
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Alias.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attribute.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attributes.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Component.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DefaultValue.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DisplayName.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Event.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventName.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventNames.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facet.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facets.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Family.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Fires.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Generate.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Renderer.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplate.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplates.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Signature.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SuggestedValue.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Test.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java
root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/package-info.java
Log:
Fix checkstyle errors
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Alias.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Alias.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Alias.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -30,13 +30,15 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0">Attribute aliases. CDK will generate getters/setters for these aliases which
- * delegate calls to the original attribute methods. </p>
- *
+ * <p class="changed_added_4_0">
+ * Attribute aliases. CDK will generate getters/setters for these aliases which delegate calls to the original attribute
+ * methods.
+ * </p>
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.METHOD, ElementType.FIELD})
+@Target( { ElementType.METHOD, ElementType.FIELD })
@Inherited
public @interface Alias {
@@ -44,8 +46,9 @@
/**
* <p class="changed_added_4_0">
- * Attribute aliases. This is mandatory parameter</p>
- *
+ * Attribute aliases. This is mandatory parameter
+ * </p>
+ *
* @return attribute aliases.
*/
public String[] value();
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attribute.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attribute.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attribute.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk.annotations;
import java.lang.annotation.ElementType;
@@ -32,39 +30,50 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.FIELD, ElementType.METHOD})
+@Target( { ElementType.FIELD, ElementType.METHOD })
@Inherited
public @interface Attribute {
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return
*/
boolean literal() default false;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return
*/
boolean hidden() default false;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return
*/
boolean readOnly() default false;
-// boolean transient() default false;
+ // boolean transient() default false;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return
*/
boolean passThrough() default false;
+
boolean required() default false;
}
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attributes.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attributes.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Attributes.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -32,7 +32,7 @@
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -44,12 +44,11 @@
/**
* <p class="changed_added_4_0">
- * To avoid copy/paste routine for standard or other useful attributes, their definitions could be
- * stored in faces-config.xml extensions and reused from different
- * components.
+ * To avoid copy/paste routine for standard or other useful attributes, their definitions could be stored in
+ * faces-config.xml extensions and reused from different components.
* </p>
- *
- * @return URL's of the XML files that contain attribute definitions.
+ *
+ * @return URL's of the XML files that contain attribute definitions.
*/
public String[] value();
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Behavior.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -32,7 +32,7 @@
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -44,12 +44,12 @@
/**
* <p class="changed_added_4_0">
- * behavior-id with which instances of implementation class can be created b JSF Application implementation.
- * If this value an empty, behavior-id will be inferred from class name. </p>
- *
+ * behavior-id with which instances of implementation class can be created b JSF Application implementation. If this
+ * value an empty, behavior-id will be inferred from class name.
+ * </p>
+ *
* @return converter type.
*/
public String value();
-
}
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Component.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Component.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Component.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -31,15 +31,13 @@
/**
* <p class="changed_added_4_0">
- * That annotation marks class as JSF component. The difference with JSF 2.0
- * @{@link javax.faces.component.FacesComponent} annotation is what this one could marks abstaract
- * class from which a real UI-component implementation will be generated. The
- * value of default {@link #value()} attribute is taken to be
- * <em>component type</em>. The fully qualified class name becomes a component
- * class unless that class is abstract or final component class is defined by
- * the {@link Generate} annotation value.
+ * That annotation marks class as JSF component. The difference with JSF 2.0 @
+ * {@link javax.faces.component.FacesComponent} annotation is what this one could marks abstaract class from which a
+ * real UI-component implementation will be generated. The value of default {@link #value()} attribute is taken to be
+ * <em>component type</em>. The fully qualified class name becomes a component class unless that class is abstract or
+ * final component class is defined by the {@link Generate} annotation value.
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -48,20 +46,21 @@
public @interface Component {
/**
- * <p class="changed_added_4_0">Annotation class name to use as key for annotation processor class.</p>
+ * <p class="changed_added_4_0">
+ * Annotation class name to use as key for annotation processor class.
+ * </p>
*/
public static final String NAME = "org.richfaces.cdk.annotations.Component";
/**
* <p class="changed_added_4_0">
- * Type of the component. Currently this is mandatory parameter because CDK
- * uses <em>component-type</em> as primary key for components library model.
+ * Type of the component. Currently this is mandatory parameter because CDK uses <em>component-type</em> as primary
+ * key for components library model.
* </p>
* <p class="todo">
- * TODO if this value is an empty, component type will be inferred from
- * class name.
+ * TODO if this value is an empty, component type will be inferred from class name.
* </p>
- *
+ *
* @return component type.
*/
public String value() default "";
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Converter.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -32,7 +32,7 @@
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -46,7 +46,7 @@
* <p class="changed_added_4_0">
* Type of the renderer. If this value an empty, component type will be inferred from class name.
* </p>
- *
+ *
* @return converter type.
*/
public String id() default "";
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DefaultValue.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DefaultValue.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DefaultValue.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk.annotations;
import java.lang.annotation.ElementType;
@@ -32,12 +30,14 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.METHOD, ElementType.FIELD})
+@Target( { ElementType.METHOD, ElementType.FIELD })
@Inherited
public @interface DefaultValue {
String value();
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DisplayName.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DisplayName.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/DisplayName.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -30,13 +30,14 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0">Defines name that would be used in IDE to display.
+ * <p class="changed_added_4_0">
+ * Defines name that would be used in IDE to display.
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.TYPE, ElementType.METHOD})
+@Target( { ElementType.TYPE, ElementType.METHOD })
@Inherited
public @interface DisplayName {
@@ -46,11 +47,9 @@
* <p class="changed_added_4_0">
* IDE display name.
* </p>
- *
+ *
* @return Icon url.
*/
public String value();
-
-
}
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Event.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Event.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Event.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -30,14 +30,15 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0">This annotation tells CDK to generate event-related classes:
+ * <p class="changed_added_4_0">
+ * This annotation tells CDK to generate event-related classes:
* <ul>
* <li>Event listener interface</li>
* <li>Event source interface</li>
* <li>Event tag handler and binding wrapper.</li>
* </ul>
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -51,7 +52,7 @@
* <p class="changed_added_4_0">
* Name of the listener interface class.
* </p>
- *
+ *
* @return name of generated listener interface..
*/
public String listener() default "";
@@ -60,7 +61,7 @@
* <p class="changed_added_4_0">
* Name of the listener interface class.
* </p>
- *
+ *
* @return name of generated source interface..
*/
public String source() default "";
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventName.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventName.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventName.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk.annotations;
import java.lang.annotation.ElementType;
@@ -32,23 +30,29 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.METHOD, ElementType.FIELD})
+@Target( { ElementType.METHOD, ElementType.FIELD })
@Inherited
public @interface EventName {
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return
*/
public String value() default "";
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return
*/
public boolean defaultEvent() default false;
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventNames.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventNames.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/EventNames.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk.annotations;
import java.lang.annotation.ElementType;
@@ -32,17 +30,21 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.METHOD, ElementType.FIELD})
+@Target( { ElementType.METHOD, ElementType.FIELD })
@Inherited
public @interface EventNames {
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @return
*/
public EventName[] value();
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facet.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facet.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facet.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -30,8 +30,9 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0"></p>
- *
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -42,8 +43,10 @@
public static final String NAME = "org.richfaces.cdk.annotations.Facet";
/**
- * <p class="changed_added_4_0">The name of that facet.</p>
- *
+ * <p class="changed_added_4_0">
+ * The name of that facet.
+ * </p>
+ *
* @return
*/
String value() default "";
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facets.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facets.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Facets.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -32,7 +32,7 @@
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -44,11 +44,10 @@
/**
* <p class="changed_added_4_0">
- * To avoid copy/paste routine for standard or other useful attributes, their definitions could be
- * stored in faces-config.xml extensions and reused from different
- * components.
+ * To avoid copy/paste routine for standard or other useful attributes, their definitions could be stored in
+ * faces-config.xml extensions and reused from different components.
* </p>
- *
+ *
* @return references to XML files that contain attributes definitions.
*/
public Facet[] value();
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Family.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Family.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Family.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -30,8 +30,10 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0">Defines family of the JSF component or renderer.</p>
- *
+ * <p class="changed_added_4_0">
+ * Defines family of the JSF component or renderer.
+ * </p>
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -40,15 +42,19 @@
public @interface Family {
/**
- * <p class="changed_added_4_0">Annotation class name to use as key for annotation processor class.</p>
+ * <p class="changed_added_4_0">
+ * Annotation class name to use as key for annotation processor class.
+ * </p>
*/
public static final String NAME = "org.richfaces.cdk.annotations.Family";
/**
* <p class="changed_added_4_0">
- * The value of this annotation attribute is taken to be <em>component-family</em> for annotated JSF component or renderer class. If this value an empty, it will be inferred from component type or <code>COMPONENT_FAMILY</code> constant.
+ * The value of this annotation attribute is taken to be <em>component-family</em> for annotated JSF component or
+ * renderer class. If this value an empty, it will be inferred from component type or <code>COMPONENT_FAMILY</code>
+ * constant.
* </p>
- *
+ *
* @return component family.
*/
public String value() default "";
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Fires.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Fires.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Fires.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk.annotations;
import java.lang.annotation.ElementType;
@@ -34,8 +32,10 @@
import javax.faces.event.FacesEvent;
/**
- * <p class="changed_added_4_0">This annotation defines events that are fired by component.</p>
- *
+ * <p class="changed_added_4_0">
+ * This annotation defines events that are fired by component.
+ * </p>
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -44,9 +44,10 @@
public @interface Fires {
/**
- * <p class="changed_added_4_0">Array of all {@link FacesEvent} inherited classes that could be fired
- * by component.</p>
- *
+ * <p class="changed_added_4_0">
+ * Array of all {@link FacesEvent} inherited classes that could be fired by component.
+ * </p>
+ *
* @return
*/
public Class<? extends FacesEvent>[] value();
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Generate.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Generate.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Generate.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -31,14 +31,14 @@
/**
* <p class="changed_added_4_0">
- * The presence of this annotation tells CDK to generate class or method
- * implementation even though target does not have the {@code abstract} modifier.
+ * The presence of this annotation tells CDK to generate class or method implementation even though target does not have
+ * the {@code abstract} modifier.
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.TYPE, ElementType.METHOD})
+@Target( { ElementType.TYPE, ElementType.METHOD })
@Inherited
public @interface Generate {
@@ -50,7 +50,7 @@
* <p class="changed_added_4_0">
* Name of the generated class. If this value was an empty, name will be inferred by CDK.
* </p>
- *
+ *
* @return generated object type.
*/
public String value() default "";
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Icon.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -30,13 +30,14 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0">Icon used that would be used in IDE to display.
+ * <p class="changed_added_4_0">
+ * Icon used that would be used in IDE to display.
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
@Inherited
public @interface Icon {
@@ -46,12 +47,11 @@
* <p class="changed_added_4_0">
* URL that defines IDE icon.
* </p>
- *
+ *
* @return Icon url.
*/
public String small() default "";
public String large() default "";
-
}
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Renderer.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Renderer.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Renderer.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -30,9 +30,10 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0">The presence of this annotation in the JSF component class associated particular
- * renderer with component. </p>
- *
+ * <p class="changed_added_4_0">
+ * The presence of this annotation in the JSF component class associated particular renderer with component.
+ * </p>
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -47,10 +48,9 @@
* The value of this annotation attribute is taken to be JSF <em>renderer-type</em>. If this value was empty,
* component type will be inferred from by the CDK.
* </p>
- *
+ *
* @return JSF <em>renderer-type</em>.
*/
public String value() default "";
-
}
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplate.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplate.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplate.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -32,7 +32,7 @@
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -46,10 +46,9 @@
* <p class="changed_added_4_0">
* Reference to renderer template used with that component.
* </p>
- *
+ *
* @return template url.
*/
public String value();
-
}
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplates.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplates.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/RendererTemplates.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -32,7 +32,7 @@
/**
* <p class="changed_added_4_0">
* </p>
- *
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
@@ -44,11 +44,10 @@
/**
* <p class="changed_added_4_0">
- * To avoid copy/paste routine for standard or other useful attributes, their definitions could be
- * stored in faces-config.xml extensions and reused from different
- * components.
+ * To avoid copy/paste routine for standard or other useful attributes, their definitions could be stored in
+ * faces-config.xml extensions and reused from different components.
* </p>
- *
+ *
* @return references to XML files that contain attributes definitions.
*/
public RendererTemplate[] value();
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Signature.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Signature.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Signature.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk.annotations;
import java.lang.annotation.ElementType;
@@ -32,23 +30,32 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0">This annotation defines a Java method signature for attributes that hold EL {@code MethodExpression} values.</p>
+ * <p class="changed_added_4_0">
+ * This annotation defines a Java method signature for attributes that hold EL {@code MethodExpression} values.
+ * </p>
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.METHOD, ElementType.FIELD})
+@Target( { ElementType.METHOD, ElementType.FIELD })
@Inherited
public @interface Signature {
/**
- * <p class="changed_added_4_0">Method return type. Default is {@code Object}</p>
+ * <p class="changed_added_4_0">
+ * Method return type. Default is {@code Object}
+ * </p>
+ *
* @return
*/
public Class<?> returnType() default Object.class;
/**
- * <p class="changed_added_4_0">Method parameters. Default is no-argument method.</p>
+ * <p class="changed_added_4_0">
+ * Method parameters. Default is no-argument method.
+ * </p>
+ *
* @return
*/
public Class<?>[] parameters() default {};
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SuggestedValue.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SuggestedValue.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/SuggestedValue.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -21,8 +21,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk.annotations;
import java.lang.annotation.ElementType;
@@ -32,12 +30,14 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.METHOD, ElementType.FIELD})
+@Target( { ElementType.METHOD, ElementType.FIELD })
@Inherited
public @interface SuggestedValue {
String value();
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Test.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Test.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/Test.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -30,14 +30,17 @@
import java.lang.annotation.Target;
/**
- * <p class="changed_added_4_0">Mark component class or method for automated testing.</p>
- * <p class="todo">TODO: introduce additional parameters to refine generated test.
+ * <p class="changed_added_4_0">
+ * Mark component class or method for automated testing.
* </p>
- *
+ * <p class="todo">
+ * TODO: introduce additional parameters to refine generated test.
+ * </p>
+ *
* @author asmirnov(a)exadel.com
*/
@Retention(RetentionPolicy.CLASS)
-(a)Target({ElementType.TYPE, ElementType.METHOD})
+@Target( { ElementType.TYPE, ElementType.METHOD })
@Inherited
public @interface Test {
@@ -45,26 +48,30 @@
/**
* <p class="changed_added_4_0">
- * Name of the generated unit test class. Currently that is mandatory</p>
- * <p class="todo">TODO: if this value is an empty, class will be inferred from the base class name.
+ * Name of the generated unit test class. Currently that is mandatory
* </p>
- *
+ * <p class="todo">
+ * TODO: if this value is an empty, class will be inferred from the base class name.
+ * </p>
+ *
* @return name of the generated test class.
*/
public String testClass();
/**
- * <p class="changed_added_4_0">The value of this annotation attribute is taken to be a name of the generated
- * test method.</p>
- *
+ * <p class="changed_added_4_0">
+ * The value of this annotation attribute is taken to be a name of the generated test method.
+ * </p>
+ *
* @return
*/
public String testMethod() default "";
/**
- * <p class="changed_added_4_0">The value of this annotation attribute tells CDK what kind of tests should be
- * generated.</p>
- *
+ * <p class="changed_added_4_0">
+ * The value of this annotation attribute tells CDK what kind of tests should be generated.
+ * </p>
+ *
* @return
*/
public TestType type() default TestType.ALL;
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TestType.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -21,29 +21,35 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk.annotations;
/**
- * <p class="changed_added_4_0">Types of automatically generated tests.</p>
+ * <p class="changed_added_4_0">
+ * Types of automatically generated tests.
+ * </p>
+ *
* @author asmirnov(a)exadel.com
- *
+ *
*/
public enum TestType {
/**
- * <p class="changed_added_4_0">Generate tests for JSF <b>RENDER_RESPONSE</b> phase.</p>
+ * <p class="changed_added_4_0">
+ * Generate tests for JSF <b>RENDER_RESPONSE</b> phase.
+ * </p>
*/
RENDER,
/**
- * <p class="changed_added_4_0"></p>
+ * <p class="changed_added_4_0">
+ * </p>
*/
DECODE,
/**
- * <p class="changed_added_4_0">Generate all possible tests.</p>
+ * <p class="changed_added_4_0">
+ * Generate all possible tests.
+ * </p>
*/
ALL
}
Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/package-info.java
===================================================================
--- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/package-info.java 2009-12-29 19:23:05 UTC (rev 16227)
+++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/package-info.java 2009-12-29 21:36:21 UTC (rev 16228)
@@ -1,4 +1,3 @@
-
/**
* <h1>Java annotations used by the CDK.</h1>
* <h2>Class-level annotations:</h2>
@@ -32,3 +31,4 @@
*
*/
package org.richfaces.cdk.annotations;
+
15 years
- 1
- 0
JBoss Rich Faces SVN: r16227 - root/framework/trunk/commons.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-12-29 14:23:05 -0500 (Tue, 29 Dec 2009)
New Revision: 16227
Added:
root/framework/trunk/commons/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-8233
Added: root/framework/trunk/commons/pom.xml
===================================================================
--- root/framework/trunk/commons/pom.xml (rev 0)
+++ root/framework/trunk/commons/pom.xml 2009-12-29 19:23:05 UTC (rev 16227)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>framework</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-commons</artifactId>
+ <name>RichFaces commons classes</name>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <javadocVersion>1.5</javadocVersion>
+ <aggregate>true</aggregate>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-javadoc</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
15 years
- 1
- 0
JBoss Rich Faces SVN: r16226 - in root: framework/trunk/api and 9 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-12-29 14:22:17 -0500 (Tue, 29 Dec 2009)
New Revision: 16226
Added:
root/framework/trunk/commons/
root/framework/trunk/commons/src/
root/framework/trunk/commons/src/main/
root/framework/trunk/commons/src/main/java/
root/framework/trunk/commons/src/main/java/org/
root/framework/trunk/commons/src/main/java/org/richfaces/
root/framework/trunk/commons/src/main/java/org/richfaces/renderkit/
root/framework/trunk/commons/src/main/java/org/richfaces/renderkit/ComponentAttribute.java
Modified:
root/framework/trunk/api/pom.xml
root/framework/trunk/pom.xml
root/ui/trunk/components/core/pom.xml
root/ui/trunk/version-matrix/pom.xml
Log:
https://jira.jboss.org/jira/browse/RF-8233
Added CDK/annotations project as UI modules dependency
Modified: root/framework/trunk/api/pom.xml
===================================================================
--- root/framework/trunk/api/pom.xml 2009-12-29 19:16:11 UTC (rev 16225)
+++ root/framework/trunk/api/pom.xml 2009-12-29 19:22:17 UTC (rev 16226)
@@ -17,6 +17,10 @@
<dependencies>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>richfaces-commons</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Property changes on: root/framework/trunk/commons
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Added: root/framework/trunk/commons/src/main/java/org/richfaces/renderkit/ComponentAttribute.java
===================================================================
--- root/framework/trunk/commons/src/main/java/org/richfaces/renderkit/ComponentAttribute.java (rev 0)
+++ root/framework/trunk/commons/src/main/java/org/richfaces/renderkit/ComponentAttribute.java 2009-12-29 19:22:17 UTC (rev 16226)
@@ -0,0 +1,56 @@
+package org.richfaces.renderkit;
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+/**
+ * @author Nick Belaevski
+ */
+public class ComponentAttribute {
+
+ private final String name;
+
+ private final String[] eventNames;
+
+ public ComponentAttribute(String name) {
+ this(name, null);
+ }
+
+ public ComponentAttribute(String name, String[] eventNames) {
+ super();
+ this.name = name;
+ this.eventNames = eventNames;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the eventNames
+ */
+ public String[] getEventNames() {
+ return eventNames;
+ }
+}
Modified: root/framework/trunk/pom.xml
===================================================================
--- root/framework/trunk/pom.xml 2009-12-29 19:16:11 UTC (rev 16225)
+++ root/framework/trunk/pom.xml 2009-12-29 19:22:17 UTC (rev 16226)
@@ -20,6 +20,7 @@
<modules>
<module>version-matrix</module>
+ <module>commons</module>
<module>api</module>
<module>impl</module>
<module>test-base</module>
@@ -29,6 +30,11 @@
<dependencies>
<dependency>
<groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
<version>${project.version}</version>
</dependency>
Modified: root/ui/trunk/components/core/pom.xml
===================================================================
--- root/ui/trunk/components/core/pom.xml 2009-12-29 19:16:11 UTC (rev 16225)
+++ root/ui/trunk/components/core/pom.xml 2009-12-29 19:22:17 UTC (rev 16226)
@@ -45,6 +45,11 @@
<dependencies>
<dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
</dependency>
Modified: root/ui/trunk/version-matrix/pom.xml
===================================================================
--- root/ui/trunk/version-matrix/pom.xml 2009-12-29 19:16:11 UTC (rev 16225)
+++ root/ui/trunk/version-matrix/pom.xml 2009-12-29 19:22:17 UTC (rev 16226)
@@ -85,7 +85,17 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-commons</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
<version>4.0.0-SNAPSHOT</version>
</dependency>
15 years
- 1
- 0
JBoss Rich Faces SVN: r16225 - in root: ui/trunk/components/core/src/main/java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-12-29 14:16:11 -0500 (Tue, 29 Dec 2009)
New Revision: 16225
Removed:
root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/CommandRendererBase.java
root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.jspx
root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.jspx
root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.jspx
Modified:
root/examples/trunk/pom.xml
Log:
Removed legacy code from components/core
JSTL scope for "examples" changed from "provided" to "compile"
Modified: root/examples/trunk/pom.xml
===================================================================
--- root/examples/trunk/pom.xml 2009-12-29 19:11:56 UTC (rev 16224)
+++ root/examples/trunk/pom.xml 2009-12-29 19:16:11 UTC (rev 16225)
@@ -83,7 +83,6 @@
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
- <scope>provided</scope>
</dependency>
</dependencies>
Deleted: root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/CommandRendererBase.java
===================================================================
--- root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/CommandRendererBase.java 2009-12-29 19:11:56 UTC (rev 16224)
+++ root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/CommandRendererBase.java 2009-12-29 19:16:11 UTC (rev 16225)
@@ -1,46 +0,0 @@
-/**
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-
-package org.richfaces.renderkit;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.render.Renderer;
-
-/**
- * @author Nick Belaevski
- *
- */
-public class CommandRendererBase extends Renderer {
-
- /*
- * (non-Javadoc)
- * @see javax.faces.render.Renderer#decode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
- */
- @Override
- public void decode(FacesContext context, UIComponent component) {
-
- // TODO Auto-generated method stub
- super.decode(context, component);
- }
-}
Deleted: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.jspx
===================================================================
--- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.jspx 2009-12-29 19:11:56 UTC (rev 16224)
+++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.jspx 2009-12-29 19:16:11 UTC (rev 16225)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:root
- xmlns:f="http://jsf.exadel.com/template"
- xmlns:c=" http://java.sun.com/jsf/core"
- xmlns:ui=" http://jsf.exadel.com/ui"
- xmlns:vcp=" http://jsf.exadel.com/vcp"
- xmlns:u=" http://jsf.exadel.com/vcp"
- xmlns:x=" http://jsf.exadel.com/vcp"
- class="org.ajax4jsf.renderkit.html.CommandButtonRenderer"
- baseclass="org.ajax4jsf.renderkit.AjaxCommandRendererBase"
- component="org.ajax4jsf.component.UIAjaxCommandButton"
- xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" >
- <jsp:directive.page import="javax.faces.context.FacesContext,javax.faces.component.UIComponent"/>
- <f:clientid var="clientId"/>
- <jsp:declaration><![CDATA[
- public void encodeTypeAndImage(FacesContext context, UIComponent uiComponent) throws IOException {
- ResponseWriter writer = context.getResponseWriter();
- String type = (String)uiComponent.getAttributes().get("type");
- String image = (String)uiComponent.getAttributes().get("image");
- if(image != null){
- image = context.getApplication().getViewHandler().getResourceURL(context,image);
- image = context.getExternalContext().encodeResourceURL(image);
- writer.writeAttribute("type","image","image");
- writer.writeURIAttribute("src",image,"image");
- Object value;
- if (null == uiComponent.getAttributes().get("alt") && null != (value = uiComponent.getAttributes().get("value")) ) {
- writer.writeAttribute("alt",value,"value");
- }
- } else {
- if(null != type ){
- writer.writeAttribute("type",type.toLowerCase(),"type");
- } else {
- writer.writeAttribute("type","button","type");
- }
- }
- }
- ]]></jsp:declaration>
- <input
- id="#{clientId}"
- name="#{clientId}"
- value=""
- x:value="#{this:getValue(component)}"
- x:passThruWithExclusions="value,name,onclick,type,id,class"
- onclick="#{this:getOnClick(context,component)}"
- class="#{component.attributes['styleClass']}"
- >
- <jsp:scriptlet>encodeTypeAndImage(context,component);</jsp:scriptlet>
-</input>
-
-</f:root>
Deleted: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.jspx
===================================================================
--- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.jspx 2009-12-29 19:11:56 UTC (rev 16224)
+++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.jspx 2009-12-29 19:16:11 UTC (rev 16225)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:root
- xmlns:f="http://jsf.exadel.com/template"
- xmlns:c=" http://java.sun.com/jsf/core"
- xmlns:ui=" http://jsf.exadel.com/ui"
- xmlns:vcp=" http://jsf.exadel.com/vcp"
- xmlns:u=" http://jsf.exadel.com/vcp"
- xmlns:x=" http://jsf.exadel.com/vcp"
- class="org.ajax4jsf.renderkit.html.FunctionRenderer"
- baseclass="org.ajax4jsf.renderkit.AjaxFunctionRendererBase"
- component="org.ajax4jsf.component.UIAjaxFunction"
- xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" >
- <jsp:directive.page import="javax.faces.context.FacesContext,javax.faces.component.UIComponent"/>
- <f:clientid var="clientId"/>
- <script
- id="#{clientId}"
- type="text/javascript"
- >
- <vcp:body />
- //<![CDATA[
- #{this:getFunction(context,component)};
- //]]>
- </script>
-</f:root>
Deleted: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.jspx
===================================================================
--- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.jspx 2009-12-29 19:11:56 UTC (rev 16224)
+++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.jspx 2009-12-29 19:16:11 UTC (rev 16225)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:root
- xmlns:f="http://jsf.exadel.com/template"
- xmlns:c=" http://java.sun.com/jsf/core"
- xmlns:ui=" http://jsf.exadel.com/ui"
- xmlns:vcp=" http://jsf.exadel.com/vcp"
- xmlns:u=" http://jsf.exadel.com/vcp"
- xmlns:x=" http://jsf.exadel.com/vcp"
- class="org.ajax4jsf.renderkit.html.CommandLinkRenderer"
- baseclass="org.ajax4jsf.renderkit.AjaxCommandRendererBase"
- component="org.ajax4jsf.component.UIAjaxCommandLink"
- xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0" >
- <jsp:directive.page import="javax.faces.context.FacesContext,javax.faces.component.UIComponent"/>
- <f:clientid var="clientId"/>
- <a
- id="#{clientId}"
- name="#{clientId}"
- type="#{component.attributes['type']}"
- x:passThruWithExclusions="value,name,onclick,type,href,id"
- onclick="#{this:getOnClick(context,component)}"
- href="#"
- class="#{component.attributes['styleClass']}"
- >
- #{this:getValue(component)}
- <vcp:body>
- <f:call name="renderChildren" />
- </vcp:body>
- </a>
-
-</f:root>
15 years
- 1
- 0
JBoss Rich Faces SVN: r16224 - in root: ui/trunk/components/core/src/main/config and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-12-29 14:11:56 -0500 (Tue, 29 Dec 2009)
New Revision: 16224
Added:
root/examples/trunk/components/core-demo/src/main/webapp/queue.xhtml
root/ui/trunk/components/core/src/main/java/org/richfaces/component/UIQueue.java
root/ui/trunk/components/core/src/main/java/org/richfaces/component/html/HtmlQueue.java
root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java
Modified:
root/examples/trunk/components/core-demo/src/main/webapp/welcome.xhtml
root/ui/trunk/components/core/src/main/config/faces-config.xml
root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml
Log:
https://jira.jboss.org/jira/browse/RF-7896
Added: root/examples/trunk/components/core-demo/src/main/webapp/queue.xhtml
===================================================================
--- root/examples/trunk/components/core-demo/src/main/webapp/queue.xhtml (rev 0)
+++ root/examples/trunk/components/core-demo/src/main/webapp/queue.xhtml 2009-12-29 19:11:56 UTC (rev 16224)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j">
+<f:view>
+ <h:head>
+ </h:head>
+ <h:body>
+ <a4j:queue />
+
+ <h:form>
+ <h:commandLink value="Common link" />
+ </h:form>
+ </h:body>
+</f:view>
+</html>
\ No newline at end of file
Modified: root/examples/trunk/components/core-demo/src/main/webapp/welcome.xhtml
===================================================================
--- root/examples/trunk/components/core-demo/src/main/webapp/welcome.xhtml 2009-12-29 18:05:21 UTC (rev 16223)
+++ root/examples/trunk/components/core-demo/src/main/webapp/welcome.xhtml 2009-12-29 19:11:56 UTC (rev 16224)
@@ -39,6 +39,9 @@
<li>
<h:outputLink value="#{facesContext.externalContext.requestContextPath}/dynamicExecute.jsf">Server side execute/render</h:outputLink>
</li>
+<li>
+<h:outputLink value="#{facesContext.externalContext.requestContextPath}/queue.jsf">a4j:queue</h:outputLink>
+</li>
</ul>
</center>
</h:body>
Modified: root/ui/trunk/components/core/src/main/config/faces-config.xml
===================================================================
--- root/ui/trunk/components/core/src/main/config/faces-config.xml 2009-12-29 18:05:21 UTC (rev 16223)
+++ root/ui/trunk/components/core/src/main/config/faces-config.xml 2009-12-29 19:11:56 UTC (rev 16224)
@@ -67,6 +67,14 @@
</component-extension>
</component>
+ <component>
+ <component-type>org.richfaces.Queue</component-type>
+ <component-class>org.richfaces.component.html.HtmlQueue</component-class>
+ <component-extension>
+ <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cdk:generate>
+ </component-extension>
+ </component>
+
<render-kit>
<render-kit-id>HTML_BASIC</render-kit-id>
<renderer>
@@ -89,5 +97,10 @@
<renderer-type>org.richfaces.StatusRenderer</renderer-type>
<renderer-class>org.richfaces.renderkit.html.AjaxStatusRenderer</renderer-class>
</renderer>
+ <renderer>
+ <component-family>org.richfaces.Queue</component-family>
+ <renderer-type>org.richfaces.QueueRenderer</renderer-type>
+ <renderer-class>org.richfaces.renderkit.html.QueueRenderer</renderer-class>
+ </renderer>
</render-kit>
</faces-config>
\ No newline at end of file
Added: root/ui/trunk/components/core/src/main/java/org/richfaces/component/UIQueue.java
===================================================================
--- root/ui/trunk/components/core/src/main/java/org/richfaces/component/UIQueue.java (rev 0)
+++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/UIQueue.java 2009-12-29 19:11:56 UTC (rev 16224)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.richfaces.component;
+
+import javax.faces.component.UIComponentBase;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public class UIQueue extends UIComponentBase {
+
+ public static final String GLOBAL_QUEUE_NAME = "org.richfaces.queue.global";
+
+ public static final String COMPONENT_TYPE = "org.richfaces.Queue";
+
+ public static final String COMPONENT_FAMILY = "org.richfaces.Queue";
+
+ private enum PropertyKeys {
+ requestDelay, status
+ }
+
+ public UIQueue() {
+ setRendererType("org.richfaces.QueueRenderer");
+ }
+
+ public int getRequestDelay() {
+ return (Integer) getStateHelper().eval(PropertyKeys.requestDelay, Integer.MIN_VALUE);
+ }
+
+ public void setRequestDelay(int requestDelay) {
+ getStateHelper().put(PropertyKeys.requestDelay, requestDelay);
+ }
+
+ public String getStatus() {
+ return (String) getStateHelper().eval(PropertyKeys.status);
+ }
+
+ public void setStatus(String status) {
+ getStateHelper().put(PropertyKeys.status, status);
+ }
+
+ @Override
+ public String getFamily() {
+ return COMPONENT_FAMILY;
+ }
+
+}
Added: root/ui/trunk/components/core/src/main/java/org/richfaces/component/html/HtmlQueue.java
===================================================================
--- root/ui/trunk/components/core/src/main/java/org/richfaces/component/html/HtmlQueue.java (rev 0)
+++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/html/HtmlQueue.java 2009-12-29 19:11:56 UTC (rev 16224)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.richfaces.component.html;
+
+import org.richfaces.component.UIQueue;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public class HtmlQueue extends UIQueue {
+
+ public static final String COMPONENT_TYPE = "org.richfaces.Queue";
+
+ public static final String COMPONENT_FAMILY = "org.richfaces.Queue";
+
+ private enum PropertyKeys {
+ onsubmit, oncomplete, onbeforedomupdate, onerror, onevent, onrequestqueue, onrequestdequeue
+ }
+
+ public HtmlQueue() {
+ setRendererType("org.richfaces.QueueRenderer");
+ }
+
+ public String getOnsubmit() {
+ return (String) getStateHelper().eval(PropertyKeys.onsubmit);
+ }
+
+ public void setOnsubmit(String onsubmit) {
+ getStateHelper().put(PropertyKeys.onsubmit, onsubmit);
+ }
+
+ public String getOncomplete() {
+ return (String) getStateHelper().eval(PropertyKeys.oncomplete);
+ }
+
+ public void setOncomplete(String oncomplete) {
+ getStateHelper().put(PropertyKeys.oncomplete, oncomplete);
+ }
+
+ public String getOnbeforedomupdate() {
+ return (String) getStateHelper().eval(PropertyKeys.onbeforedomupdate);
+ }
+
+ public void setOnbeforedomupdate(String onbeforedomupdate) {
+ getStateHelper().put(PropertyKeys.onbeforedomupdate, onbeforedomupdate);
+ }
+
+ public String getOnerror() {
+ return (String) getStateHelper().eval(PropertyKeys.onerror);
+ }
+
+ public void setOnerror(String onerror) {
+ getStateHelper().put(PropertyKeys.onerror, onerror);
+ }
+
+ public String getOnevent() {
+ return (String) getStateHelper().eval(PropertyKeys.onevent);
+ }
+
+ public void setOnevent(String onevent) {
+ getStateHelper().put(PropertyKeys.onevent, onevent);
+ }
+
+ public String getOnrequestqueue() {
+ return (String) getStateHelper().eval(PropertyKeys.onrequestqueue);
+ }
+
+ public void setOnrequestqueue(String onrequestqueue) {
+ getStateHelper().put(PropertyKeys.onrequestqueue, onrequestqueue);
+ }
+
+ public String getOnrequestdequeue() {
+ return (String) getStateHelper().eval(PropertyKeys.onrequestdequeue);
+ }
+
+ public void setOnrequestdequeue(String onrequestdequeue) {
+ getStateHelper().put(PropertyKeys.onrequestdequeue, onrequestdequeue);
+ }
+
+}
Added: root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java
===================================================================
--- root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java (rev 0)
+++ root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java 2009-12-29 19:11:56 UTC (rev 16224)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.richfaces.renderkit.html;
+
+import javax.faces.application.ResourceDependencies;
+import javax.faces.application.ResourceDependency;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ComponentSystemEvent;
+import javax.faces.event.ComponentSystemEventListener;
+import javax.faces.event.ListenerFor;
+import javax.faces.event.PostAddToViewEvent;
+import javax.faces.render.Renderer;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+@ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf.js"),
+ @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"),
+ @ResourceDependency(name = "richfaces-queue.js")
+ })
+@ListenerFor(systemEventClass = PostAddToViewEvent.class)
+public class QueueRenderer extends Renderer implements ComponentSystemEventListener {
+
+ public void processEvent(ComponentSystemEvent event) throws AbortProcessingException {
+ //TODO encode queue settings
+ }
+}
Modified: root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml
===================================================================
--- root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml 2009-12-29 18:05:21 UTC (rev 16223)
+++ root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml 2009-12-29 19:11:56 UTC (rev 16224)
@@ -61,6 +61,13 @@
<renderer-type>org.richfaces.CommandButtonRenderer</renderer-type>
</component>
</tag>
+ <tag>
+ <tag-name>queue</tag-name>
+ <component>
+ <component-type>org.richfaces.Queue</component-type>
+ <renderer-type>org.richfaces.QueueRenderer</renderer-type>
+ </component>
+ </tag>
<tag>
<tag-name>ajax</tag-name>
15 years
- 1
- 0
JBoss Rich Faces SVN: r16223 - in root/cdk/trunk/plugins/generator: src/main/java/org/richfaces/cdk/templatecompiler and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-12-29 13:05:21 -0500 (Tue, 29 Dec 2009)
New Revision: 16223
Modified:
root/cdk/trunk/plugins/generator/pom.xml
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd
Log:
https://jira.jboss.org/jira/browse/RF-8235
Modified: root/cdk/trunk/plugins/generator/pom.xml
===================================================================
--- root/cdk/trunk/plugins/generator/pom.xml 2009-12-29 18:02:00 UTC (rev 16222)
+++ root/cdk/trunk/plugins/generator/pom.xml 2009-12-29 18:05:21 UTC (rev 16223)
@@ -43,7 +43,7 @@
<configuration>
<properties>
<sourceSchema>src/main/resources/META-INF/schema/xhtml-el.xsd</sourceSchema>
- <targetNamespace>http://richfaces.org/xhtml-el</targetNamespace>
+ <targetNamespace>http://richfaces.org/cdk/xhtml-el</targetNamespace>
<outputFile>META-INF/cdk/attributes/xhtml-el.xml</outputFile>
</properties>
<classpath>
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-12-29 18:02:00 UTC (rev 16222)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-12-29 18:05:21 UTC (rev 16223)
@@ -116,10 +116,12 @@
private static final Logger LOG = LoggerFactory.getLogger();
+ private static final String XHTML_EL_NAMESPACE = "http://richfaces.org/cdk/xhtml-el";
+
private static final Set<String> DEFAULT_NAMESPACES = new HashSet<String>();
static {
- DEFAULT_NAMESPACES.add("http://richfaces.org/xhtml-el");
+ DEFAULT_NAMESPACES.add(XHTML_EL_NAMESPACE);
DEFAULT_NAMESPACES.add("http://www.w3.org/1999/xhtml");
}
@@ -143,7 +145,7 @@
this.classLoader = classLoader;
SchemaSet schemaSet = jaxbBinding.unmarshal("urn:attributes:xhtml-el.xml", null, SchemaSet.class);
- this.attributesSchema = schemaSet.getSchemas().get("http://richfaces.org/xhtml-el");
+ this.attributesSchema = schemaSet.getSchemas().get(XHTML_EL_NAMESPACE);
}
private void initializeJavaClass() {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2009-12-29 18:02:00 UTC (rev 16222)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2009-12-29 18:05:21 UTC (rev 16223)
@@ -34,11 +34,11 @@
@XmlRootElement(name = "root", namespace = Template.CDK_NAMESPACE)
public class Template {
- public static final String JSTL_CORE_NAMESPACE = "http://java.sun.com/jsp/jstl/core";
+ public static final String JSTL_CORE_NAMESPACE = "http://richfaces.org/cdk/jstl/core";
- public static final String CDK_NAMESPACE = "http://richfaces.org/cdk";
+ public static final String CDK_NAMESPACE = "http://richfaces.org/cdk/core";
- public static final String COMPOSITE_NAMESPACE = "http://java.sun.com/jsf/composite";
+ public static final String COMPOSITE_NAMESPACE = "http://richfaces.org/cdk/jsf/composite";
private CompositeInterface compositeInterface;
Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd 2009-12-29 18:02:00 UTC (rev 16222)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-composite.xsd 2009-12-29 18:05:21 UTC (rev 16223)
@@ -25,8 +25,8 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<xs:schema targetNamespace="http://java.sun.com/jsf/composite"
- xmlns:cc="http://java.sun.com/jsf/composite" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<xs:schema targetNamespace="http://richfaces.org/cdk/jsf/composite"
+ xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xml="http://www.w3.org/XML/1998/namespace" elementFormDefault="qualified"
attributeFormDefault="unqualified">
Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd 2009-12-29 18:02:00 UTC (rev 16222)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd 2009-12-29 18:05:21 UTC (rev 16223)
@@ -25,8 +25,8 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://java.sun.com/jsp/jstl/core" xmlns="http://java.sun.com/jsp/jstl/core"
- xmlns:cdk="http://richfaces.org/cdk"
+ targetNamespace="http://richfaces.org/cdk/jstl/core" xmlns="http://richfaces.org/cdk/jstl/core"
+ xmlns:cdk="http://richfaces.org/cdk/core"
elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation>
@@ -36,7 +36,7 @@
</xs:documentation>
</xs:annotation>
- <xs:import schemaLocation="cdk-template.xsd" namespace="http://richfaces.org/cdk" />
+ <xs:import schemaLocation="cdk-template.xsd" namespace="http://richfaces.org/cdk/core" />
<xs:attributeGroup name="testGroup">
<xs:attribute name="test" form="unqualified" use="required"
Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2009-12-29 18:02:00 UTC (rev 16222)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-template.xsd 2009-12-29 18:05:21 UTC (rev 16223)
@@ -25,14 +25,14 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://richfaces.org/cdk" xmlns="http://richfaces.org/cdk"
+ targetNamespace="http://richfaces.org/cdk/core" xmlns="http://richfaces.org/cdk/core"
elementFormDefault="qualified" attributeFormDefault="unqualified"
- xmlns:xhtml="http://richfaces.org/xhtml-el" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite">
+ xmlns:xhtml="http://richfaces.org/cdk/xhtml-el" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite">
<xs:import schemaLocation="web-facesuicomponent_2_0.xsd" namespace="http://java.sun.com/xml/ns/javaee" />
- <xs:import schemaLocation="cdk-composite.xsd" namespace="http://java.sun.com/jsf/composite" />
- <xs:import schemaLocation="cdk-jstl-core.xsd" namespace="http://java.sun.com/jsp/jstl/core" />
+ <xs:import schemaLocation="cdk-composite.xsd" namespace="http://richfaces.org/cdk/jsf/composite" />
+ <xs:import schemaLocation="cdk-jstl-core.xsd" namespace="http://richfaces.org/cdk/jstl/core" />
<xs:simpleType name="elStrictExpression">
<xs:restriction base="xs:string">
Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd 2009-12-29 18:02:00 UTC (rev 16222)
+++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/xhtml-el.xsd 2009-12-29 18:05:21 UTC (rev 16223)
@@ -25,12 +25,12 @@
-->
<xs:schema version="1.0" xml:lang="en"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://richfaces.org/xhtml-el"
- xmlns="http://richfaces.org/xhtml-el" xmlns:xml="http://www.w3.org/XML/1998/namespace"
- elementFormDefault="qualified" xmlns:cdk="http://richfaces.org/cdk"
- xmlns:cdk-schema-info="http://richfaces.org/cdk-schema-info">
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://richfaces.org/cdk/xhtml-el"
+ xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ elementFormDefault="qualified" xmlns:cdk="http://richfaces.org/cdk/core"
+ xmlns:cdk-addinfo="http://richfaces.org/cdk/additional-attributes-info">
- <xs:import schemaLocation="cdk-template.xsd" namespace="http://richfaces.org/cdk" />
+ <xs:import schemaLocation="cdk-template.xsd" namespace="http://richfaces.org/cdk/core" />
<xs:annotation>
<xs:documentation>
@@ -1640,7 +1640,7 @@
<xs:attribute name="dir" use="required">
<xs:annotation>
<xs:appinfo>
- <cdk-schema-info:default-value>ltr</cdk-schema-info:default-value>
+ <cdk-addinfo:default-value>ltr</cdk-addinfo:default-value>
</xs:appinfo>
</xs:annotation>
<xs:simpleType>
15 years
- 1
- 0
JBoss Rich Faces SVN: r16222 - in root: cdk/trunk/plugins/generator/src/main/xsd and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-12-29 13:02:00 -0500 (Tue, 29 Dec 2009)
New Revision: 16222
Modified:
root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessorNamespaceContext.groovy
root/cdk/trunk/plugins/generator/src/main/xsd/cdk.xsd
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/model/TemplateTest.java
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml
root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml
root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml
root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml
root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml
root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml
Log:
https://jira.jboss.org/jira/browse/RF-8235
Modified: root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessorNamespaceContext.groovy
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessorNamespaceContext.groovy 2009-12-29 16:53:57 UTC (rev 16221)
+++ root/cdk/trunk/plugins/generator/src/main/script/SchemaProcessorNamespaceContext.groovy 2009-12-29 18:02:00 UTC (rev 16222)
@@ -37,7 +37,7 @@
SchemaProcessorNamespaceContext() {
biMap = HashBiMap.create();
biMap.put("http://www.w3.org/2001/XMLSchema", "xs");
- biMap.put("http://richfaces.org/cdk-schema-info", "cdk-schema-info");
+ biMap.put("http://richfaces.org/cdk/additional-attributes-info", "cdk-schema-info");
}
@Override
Modified: root/cdk/trunk/plugins/generator/src/main/xsd/cdk.xsd
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/xsd/cdk.xsd 2009-12-29 16:53:57 UTC (rev 16221)
+++ root/cdk/trunk/plugins/generator/src/main/xsd/cdk.xsd 2009-12-29 18:02:00 UTC (rev 16222)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema targetNamespace="http://richfaces.org/cdk"
elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:cdk="http://richfaces.org/cdk" attributeFormDefault="unqualified">
+ xmlns:cdk="http://richfaces.org/cdk/core" attributeFormDefault="unqualified">
<xsd:annotation>
<xsd:documentation>$Id$</xsd:documentation>
</xsd:annotation>
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/model/TemplateTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/model/TemplateTest.java 2009-12-29 16:53:57 UTC (rev 16221)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/templatecompiler/model/TemplateTest.java 2009-12-29 18:02:00 UTC (rev 16222)
@@ -45,7 +45,7 @@
private static final String TEMPLATE_EPILOG = "</cc:implementation></cdk:root>";
private static final String TEMPLATE_MIDDLE = "</cc:interface><cc:implementation>";
- public static final String TEMPLATE_PROLOG = "<cdk:root xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:cdk=\"http://richfaces.org/cdk\" xmlns:c=\"http://java.sun.com/jsp/jstl/core\" xmlns:cc=\"http://java.sun.com/jsf/composite\"><cc:interface>";
+ public static final String TEMPLATE_PROLOG = "<cdk:root xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:cdk=\"http://richfaces.org/cdk/core\" xmlns:c=\"http://richfaces.org/cdk/jstl/core\" xmlns:cc=\"http://richfaces.org/cdk/jsf/composite\"><cc:interface>";
private static final Object DEFAULT_ATTRIBUTE_TYPE = Object.class.getName();
@Test
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2009-12-29 16:53:57 UTC (rev 16221)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/annotated-component/src/main/templates/testComponent.xml 2009-12-29 18:02:00 UTC (rev 16222)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdk:root xmlns="http://www.w3.org/1999/xhtml" xmlns:cdk="http://richfaces.org/cdk"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite">
+<cdk:root xmlns="http://www.w3.org/1999/xhtml" xmlns:cdk="http://richfaces.org/cdk/core"
+ xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite">
<cc:interface>
<cdk:class>org.richfaces.cdk.test.renderkit.rf4_xhtml.TestRenderer</cdk:class>
<cdk:superclass>javax.faces.render.Renderer</cdk:superclass>
Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml
===================================================================
--- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml 2009-12-29 16:53:57 UTC (rev 16221)
+++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml 2009-12-29 18:02:00 UTC (rev 16222)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdk:root xmlns="http://www.w3.org/1999/xhtml" xmlns:cdk="http://richfaces.org/cdk"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite">
+<cdk:root xmlns="http://www.w3.org/1999/xhtml" xmlns:cdk="http://richfaces.org/cdk/core"
+ xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite">
<cc:interface>
<cdk:class>org.richfaces.cdk.renderkit.html.TestPanelRenderer</cdk:class>
<cdk:superclass>org.richfaces.cdk.renderkit.AbstractTestPanelRenderer</cdk:superclass>
Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml
===================================================================
--- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml 2009-12-29 16:53:57 UTC (rev 16221)
+++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/button.template.xml 2009-12-29 18:02:00 UTC (rev 16222)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite"
+<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core"
+ xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite"
xmlns:javaee="http://java.sun.com/xml/ns/javaee">
<cc:interface>
Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml
===================================================================
--- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml 2009-12-29 16:53:57 UTC (rev 16221)
+++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/function.template.xml 2009-12-29 18:02:00 UTC (rev 16222)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:cc="http://java.sun.com/jsf/composite" xmlns:javaee="http://java.sun.com/xml/ns/javaee">
+<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core"
+ xmlns:c="http://richfaces.org/cdk/jstl/core"
+ xmlns:cc="http://richfaces.org/cdk/jsf/composite" xmlns:javaee="http://java.sun.com/xml/ns/javaee">
<cc:interface>
<cdk:class>org.richfaces.renderkit.html.AjaxFunctionRenderer</cdk:class>
Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml
===================================================================
--- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2009-12-29 16:53:57 UTC (rev 16221)
+++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/link.template.xml 2009-12-29 18:02:00 UTC (rev 16222)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite"
+<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core"
+ xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite"
xmlns:javaee="http://java.sun.com/xml/ns/javaee">
<cc:interface>
Modified: root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml
===================================================================
--- root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml 2009-12-29 16:53:57 UTC (rev 16221)
+++ root/ui/trunk/components/core/src/main/templates/org/ajax4jsf/renderkit/html/log.template.xml 2009-12-29 18:02:00 UTC (rev 16222)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite"
+<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core"
+ xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite"
xmlns:javaee="http://java.sun.com/xml/ns/javaee">
<cc:interface>
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml 2009-12-29 16:53:57 UTC (rev 16221)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml 2009-12-29 18:02:00 UTC (rev 16222)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite"
+<cdk:root xmlns="http://richfaces.org/cdk/xhtml-el" xmlns:cdk="http://richfaces.org/cdk/core"
+ xmlns:c="http://richfaces.org/cdk/jstl/core" xmlns:cc="http://richfaces.org/cdk/jsf/composite"
xmlns:javaee="http://java.sun.com/xml/ns/javaee">
<cc:interface>
15 years
- 1
- 0