[richfaces-svn-commits] JBoss Rich Faces SVN: r16272 - in root: cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt and 4 other directories.

Author: alexsmirnov Date: 2010-01-12 20:02:45 -0500 (Tue, 12 Jan 2010) New Revision: 16272 Added: root/DEADJOE root/examples-sandbox/trunk/components/tables/src/main/webapp/WEB-INF/lib/ root/framework/trunk/impl/src/main/java/META-INF/ root/framework/trunk/impl/src/main/java/META-INF/MANIFEST.MF Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 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/ConverterProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java Log: Restore APT tests, fix checkstyle errors. Added: root/DEADJOE =================================================================== --- root/DEADJOE (rev 0) +++ root/DEADJOE 2010-01-13 01:02:45 UTC (rev 16272) @@ -0,0 +1,71 @@ + +*** These modified files were found in JOE when it aborted on Mon Aug 3 18:27:46 2009 +*** JOE was aborted by UNIX signal 1 + +*** File '/home/asmirnov/.zshrc' +# +# .zshrc is sourced in interactive shells. +# It should contain commands to set up aliases, +# functions, options, key bindings, etc. +# + +autoload -U compinit +compinit + +#allow tab completion in the middle of a word +setopt COMPLETE_IN_WORD + +## keep background processes at full speed +#setopt NOBGNICE +## restart running processes on exit +#setopt HUP + +## history +#setopt APPEND_HISTORY +## for sharing history between zsh processes +setopt INC_APPEND_HISTORY +setopt SHARE_HISTORY + +## never ever beep ever +setopt NO_BEEP + +## automatically decide when to page a list of completions +#LISTMAX=0 + +## disable mail checking +MAILCHECK=0 + +autoload -U colors +colors + +alias -g rf4=~/work/jsf/jsf2.0-workspace/root +alias -g rf=~/work/richfaces/richfaces +alias -g jfx=~/work/JavaFX +*** File '(Unnamed)' +clean install +(arg|ARG)/:arg: + +*** File '(Unnamed)' +deploy +docs +port +portlet +Collections.< +emptyList +jquery +firefox +arg/:arg: +java.net + +*** File '(Unnamed)' +pom.xml +pom.xml +pom.xml +pom.xml +mock/pom.xml +mock/pom.xml +pom.xml +stage/pom.xml +/home/asmirnov/.m2t/settings.xml +pom.xml +/home/asmirnov/.zshrc Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2010-01-13 00:13:03 UTC (rev 16271) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2010-01-13 01:02:45 UTC (rev 16272) @@ -27,7 +27,6 @@ import javax.lang.model.element.TypeElement; -import org.richfaces.cdk.CdkContext; import org.richfaces.cdk.CdkProcessingException; import org.richfaces.cdk.annotations.Behavior; 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 2010-01-13 00:13:03 UTC (rev 16271) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2010-01-13 01:02:45 UTC (rev 16272) @@ -23,28 +23,24 @@ package org.richfaces.cdk.apt; -import com.google.common.collect.ImmutableList; +import java.util.Collections; +import java.util.Set; + +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.TypeElement; + import org.richfaces.cdk.CdkContext; -import org.richfaces.cdk.CdkContext.OutputType; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkProcessingException; import org.richfaces.cdk.CdkWorker; import org.richfaces.cdk.ModelValidator; import org.richfaces.cdk.StandardOutputs; import org.richfaces.cdk.StandardSources; -import org.richfaces.cdk.annotations.Behavior; -import org.richfaces.cdk.annotations.Component; -import org.richfaces.cdk.annotations.Converter; -import org.richfaces.cdk.util.Pair; +import org.richfaces.cdk.CdkContext.OutputType; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.RoundEnvironment; -import javax.faces.component.FacesComponent; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.TypeElement; -import java.lang.annotation.Annotation; -import java.util.Collections; -import java.util.Set; +import com.google.common.collect.ImmutableList; /** * <p class="changed_added_4_0"> Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java 2010-01-13 00:13:03 UTC (rev 16271) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java 2010-01-13 01:02:45 UTC (rev 16272) @@ -23,16 +23,13 @@ import java.lang.annotation.Annotation; -import org.richfaces.cdk.CdkContext; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.element.TypeElement; + import org.richfaces.cdk.CdkProcessingException; import org.richfaces.cdk.annotations.Converter; -import org.richfaces.cdk.annotations.DisplayName; -import org.richfaces.cdk.annotations.Icon; import org.richfaces.cdk.model.ConverterModel; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.lang.model.element.TypeElement; - /** * @author akolonitsky * @since Jan 4, 2010 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java 2010-01-13 00:13:03 UTC (rev 16271) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java 2010-01-13 01:02:45 UTC (rev 16272) @@ -21,7 +21,12 @@ package org.richfaces.cdk.apt; -import org.richfaces.cdk.CdkContext; +import java.lang.annotation.Annotation; +import java.util.Map; + +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.element.TypeElement; + import org.richfaces.cdk.CdkException; import org.richfaces.cdk.NamingConventions; import org.richfaces.cdk.annotations.Component; @@ -31,18 +36,11 @@ import org.richfaces.cdk.annotations.Icon; import org.richfaces.cdk.annotations.Renderer; import org.richfaces.cdk.model.ComponentLibrary; -import org.richfaces.cdk.model.DescriptionGroup; import org.richfaces.cdk.model.Property; import org.richfaces.cdk.model.RendererModel; import org.richfaces.cdk.xmlconfig.CdkEntityResolver; import org.richfaces.cdk.xmlconfig.FragmentParser; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.lang.model.element.TypeElement; - -import java.lang.annotation.Annotation; -import java.util.Map; - /** * @author akolonitsky * @since Dec 30, 2009 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-01-13 00:13:03 UTC (rev 16271) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-01-13 01:02:45 UTC (rev 16272) @@ -21,17 +21,27 @@ package org.richfaces.cdk.xmlconfig.model; +import java.util.List; + import org.richfaces.cdk.model.ComponentLibrary; import org.richfaces.cdk.model.ConfigExtension; +import com.google.common.collect.Lists; + +import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * @author akolonitsky * @since Jan 6, 2010 */ -public class ConverterBean extends ExtensibleBean<ConfigExtension> { +@XmlType(name = "faces-config-converterType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, + propOrder={"converterId", "converterForClass", "converterClass", + "attributes", "extension"}) +(a)XmlJavaTypeAdapter(ConverterAdapter.class) +public class ConverterBean extends ExtensibleBean<ConverterBean.ConverterExtension> { private String converterId; @@ -39,6 +49,8 @@ private String converterClass; + private List<PropertyBase> attributes = Lists.newArrayList(); + @XmlElement(name = "converter-id", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) public String getConverterId() { return converterId; @@ -68,12 +80,45 @@ @XmlElement(name = "converter-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE) @Override - public ConfigExtension getExtension() { + public ConverterExtension getExtension() { return super.getExtension(); } + /** + * <p class="changed_added_4_0"></p> + * + * @return the attributes + */ + @XmlElements({@XmlElement( + name = "property", + namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, + type = PropertyBean.class + ), @XmlElement( + name = "attribute", + namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, + type = AttributeBean.class + )}) + + public List<PropertyBase> getAttributes() { + return attributes; + } + + /** + * <p class="changed_added_4_0"></p> + * + * @param attributes the attributes to set + */ + public void setAttributes(List<PropertyBase> property) { + this.attributes = property; + } + @Override - public void setExtension(ConfigExtension extension) { + public void setExtension(ConverterExtension extension) { super.setExtension(extension); } + + public static class ConverterExtension extends ConfigExtension { + + } + } Added: root/framework/trunk/impl/src/main/java/META-INF/MANIFEST.MF =================================================================== --- root/framework/trunk/impl/src/main/java/META-INF/MANIFEST.MF (rev 0) +++ root/framework/trunk/impl/src/main/java/META-INF/MANIFEST.MF 2010-01-13 01:02:45 UTC (rev 16272) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: root/framework/trunk/impl/src/main/java/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain