JBoss Rich Faces SVN: r16620 - root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-18 11:53:08 -0400 (Thu, 18 Mar 2010)
New Revision: 16620
Modified:
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ConverterProcessorTest.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ConverterProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ConverterProcessorTest.java 2010-03-18 15:52:28 UTC (rev 16619)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ConverterProcessorTest.java 2010-03-18 15:53:08 UTC (rev 16620)
@@ -21,11 +21,9 @@
package org.richfaces.cdk.apt;
-import static org.junit.Assert.*;
-
-import java.util.Collection;
-import java.util.Collections;
-
+import com.google.common.collect.Iterables;
+import com.google.inject.Inject;
+import static org.junit.Assert.assertEquals;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,8 +32,8 @@
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConverterModel;
-import com.google.common.collect.Iterables;
-import com.google.inject.Inject;
+import java.util.Collection;
+import java.util.Collections;
/**
* @author akolonitsky
14 years, 9 months
JBoss Rich Faces SVN: r16619 - root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-18 11:52:28 -0400 (Thu, 18 Mar 2010)
New Revision: 16619
Modified:
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-03-18 15:52:03 UTC (rev 16618)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-03-18 15:52:28 UTC (rev 16619)
@@ -25,7 +25,9 @@
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
import org.junit.Ignore;
import org.junit.Test;
14 years, 9 months
JBoss Rich Faces SVN: r16618 - root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-18 11:52:03 -0400 (Thu, 18 Mar 2010)
New Revision: 16618
Modified:
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java 2010-03-18 15:51:33 UTC (rev 16617)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java 2010-03-18 15:52:03 UTC (rev 16618)
@@ -23,16 +23,17 @@
package org.richfaces.cdk.apt;
-import static org.easymock.EasyMock.*;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.annotation.processing.Processor;
-import javax.annotation.processing.RoundEnvironment;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.TypeElement;
-
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Binder;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.TypeLiteral;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.richfaces.cdk.CdkTestRunner;
@@ -45,12 +46,12 @@
import org.richfaces.cdk.Outputs;
import org.richfaces.cdk.Stub;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Binder;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-import com.google.inject.TypeLiteral;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.TypeElement;
+import java.util.Collections;
+import java.util.Set;
/**
* <p class="changed_added_4_0">
14 years, 9 months
JBoss Rich Faces SVN: r16617 - root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-18 11:51:33 -0400 (Thu, 18 Mar 2010)
New Revision: 16617
Modified:
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java 2010-03-18 15:43:54 UTC (rev 16616)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java 2010-03-18 15:51:33 UTC (rev 16617)
@@ -22,16 +22,15 @@
package org.richfaces.cdk.apt;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.Name;
-import javax.lang.model.element.TypeElement;
-
+import com.google.inject.Inject;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.richfaces.cdk.CdkTestRunner;
@@ -49,7 +48,11 @@
import org.richfaces.cdk.model.FacesId;
import org.richfaces.cdk.xmlconfig.JAXB;
-import com.google.inject.Inject;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.Name;
+import javax.lang.model.element.TypeElement;
+import java.util.Collection;
+import java.util.Collections;
/**
* @author akolonitsky
@@ -90,7 +93,7 @@
@Test
-
+ @Ignore
public void testProcess() throws Exception {
expect(componentElement.getAnnotation(JsfBehavior.class)).andStubReturn(behaviorAnnotation);
14 years, 9 months
JBoss Rich Faces SVN: r16616 - root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-18 11:43:54 -0400 (Thu, 18 Mar 2010)
New Revision: 16616
Modified:
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java 2010-03-18 15:43:04 UTC (rev 16615)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java 2010-03-18 15:43:54 UTC (rev 16616)
@@ -21,25 +21,30 @@
package org.richfaces.cdk.apt;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Arrays;
-
-import javax.el.ELContext;
-import javax.faces.component.UIComponent;
-
-import org.richfaces.cdk.*;
-import org.richfaces.cdk.annotations.Family;
-import org.richfaces.cdk.model.ComponentModel;
-import org.richfaces.cdk.model.ComponentLibrary;
-import org.apache.maven.plugin.MojoExecutionException;
-
import com.google.common.collect.ImmutableList;
import com.google.inject.Binder;
import com.google.inject.Inject;
import com.google.inject.Injector;
+import org.richfaces.cdk.CdkClassLoader;
+import org.richfaces.cdk.CdkTestBase;
+import org.richfaces.cdk.FileManager;
+import org.richfaces.cdk.Generator;
+import org.richfaces.cdk.LibraryBuilder;
+import org.richfaces.cdk.Logger;
+import org.richfaces.cdk.Mock;
+import org.richfaces.cdk.Source;
+import org.richfaces.cdk.SourceFileManager;
+import org.richfaces.cdk.SourceImpl;
+import org.richfaces.cdk.Sources;
+import org.richfaces.cdk.annotations.Family;
+import org.richfaces.cdk.model.ComponentModel;
+import javax.el.ELContext;
+import javax.faces.component.UIComponent;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author akolonitsky
* @since Jan 14, 2010
14 years, 9 months
JBoss Rich Faces SVN: r16615 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-18 11:43:04 -0400 (Thu, 18 Mar 2010)
New Revision: 16615
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ValidatorModel.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ValidatorModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ValidatorModel.java 2010-03-18 15:41:26 UTC (rev 16614)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ValidatorModel.java 2010-03-18 15:43:04 UTC (rev 16615)
@@ -23,8 +23,6 @@
package org.richfaces.cdk.model;
-import org.richfaces.cdk.CdkException;
-
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
@@ -40,12 +38,6 @@
setId(validatorId);
}
-
- @Override
- public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException {
- return visitor.visit(this, param);
- }
-
public void accept(Visitor visitor) {
visitor.visitValidator(this);
}
14 years, 9 months
JBoss Rich Faces SVN: r16614 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-18 11:41:26 -0400 (Thu, 18 Mar 2010)
New Revision: 16614
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java 2010-03-18 15:40:46 UTC (rev 16613)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RenderKitModel.java 2010-03-18 15:41:26 UTC (rev 16614)
@@ -25,12 +25,9 @@
package org.richfaces.cdk.model;
+import javax.faces.render.RenderKitFactory;
import java.util.Collection;
-import javax.faces.render.RenderKitFactory;
-
-import org.richfaces.cdk.CdkException;
-
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
@@ -80,24 +77,18 @@
return behaviorRenderers;
}
- /*
- * (non-Javadoc)
- * @see org.richfaces.cdk.model.ModelElement#accept(org.richfaces.cdk.model.LibraryVisitor, java.lang.Object)
- */
- @Override
- public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException {
- R result = visitor.visit(this, param);
-
- return ComponentLibrary.accept(renderers, visitor, param, result);
- }
-
public void accept(Visitor visitor) {
visitor.visitRenderKit(this);
+
+ renderers.accept(visitor);
+ behaviorRenderers.accept(visitor);
}
@Override
public void merge(RenderKitModel other) {
- ComponentLibrary.merge(renderers,other.renderers);
+ ComponentLibrary.merge(renderers, other.renderers);
+ ComponentLibrary.merge(behaviorRenderers, other.behaviorRenderers);
+
ComponentLibrary.merge(this, other);
}
14 years, 9 months
JBoss Rich Faces SVN: r16613 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-18 11:40:46 -0400 (Thu, 18 Mar 2010)
New Revision: 16613
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitable.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitable.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitable.java 2010-03-18 15:36:43 UTC (rev 16612)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Visitable.java 2010-03-18 15:40:46 UTC (rev 16613)
@@ -1,22 +1,6 @@
package org.richfaces.cdk.model;
-import org.richfaces.cdk.CdkException;
+public interface Visitable<V> {
-public interface Visitable {
-
- /**
- * <p class="changed_added_4_0"></p>
- *
- * @param <R>
- * @param <P>
- * @param visitor
- * @param param
- *
- * @throws org.richfaces.cdk.CdkException
- *
- * @return
- */
- public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException;
-
public void accept(Visitor visitor);
}
14 years, 9 months
JBoss Rich Faces SVN: r16612 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-18 11:36:43 -0400 (Thu, 18 Mar 2010)
New Revision: 16612
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java 2010-03-18 15:36:00 UTC (rev 16611)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/RendererModel.java 2010-03-18 15:36:43 UTC (rev 16612)
@@ -25,7 +25,6 @@
package org.richfaces.cdk.model;
-import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.templatecompiler.model.Template;
/**
@@ -33,7 +32,6 @@
* @author asmirnov(a)exadel.com
*
*/
-//@SuppressWarnings("serial")
public class RendererModel extends BeanModelBase implements ModelElement<RendererModel> {
private static final long serialVersionUID = -5802466539382148578L;
@@ -164,11 +162,6 @@
this.templatePath = templatePath;
}
- @Override
- public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException {
- return visitor.visit(this, param);
- }
-
public void accept(Visitor visitor) {
visitor.visitRender(this);
}
14 years, 9 months
JBoss Rich Faces SVN: r16611 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-03-18 11:36:00 -0400 (Thu, 18 Mar 2010)
New Revision: 16611
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java
Log:
RF-8232 Tags support
remove visitor
fix checkstyle errors
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2010-03-18 15:29:58 UTC (rev 16610)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Property.java 2010-03-18 15:36:00 UTC (rev 16611)
@@ -23,15 +23,13 @@
package org.richfaces.cdk.model;
-import java.util.List;
-import java.util.Set;
-
-import org.richfaces.cdk.CdkException;
-import org.richfaces.cdk.util.ComparatorUtils;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import org.richfaces.cdk.util.ComparatorUtils;
+import java.util.List;
+import java.util.Set;
+
/**
* That class represents JSF component property.
* @author asmirnov(a)exadel.com
@@ -279,11 +277,6 @@
setGenerate(generate || other.isGenerate());
}
- @Override
- public <R, P> R accept(LibraryVisitor<R, P> visitor, P param) throws CdkException {
- return visitor.visit(this, param);
- }
-
public void accept(Visitor visitor) {
visitor.visitProperty(this);
}
14 years, 9 months