richfaces-svn-commits
February 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 120 discussions
JBoss Rich Faces SVN: r16413 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-02-04 10:29:22 -0500 (Thu, 04 Feb 2010)
New Revision: 16413
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
Log:
offset bug fix
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-02-04 15:26:16 UTC (rev 16412)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-02-04 15:29:22 UTC (rev 16413)
@@ -1,10 +1,10 @@
// draft examples of usage
-// jQuery('#tooltip').position('#aaa',{from:'LB', to:'AA'});
-// jQuery('#bbb').bind("click",function(e){jQuery('#tooltip').position(e);});
+// jQuery('#tooltip').setPosition('#aaa',{from:'LB', to:'AA'});
+// jQuery('#bbb').bind("click",function(e){jQuery('#tooltip').setPosition(e);});
// TODO: clear code
// TODO: optimization
-// jQuery(target).position(source,[params])
+// jQuery(target).setPosition(source,[params])
// source:
// jQuery selector
// object {id:}
@@ -240,14 +240,14 @@
left = 0;
element.css('left', '0px');
}
- rect.left = rect.left || left;
+ if (isNaN(rect.left)) rect.left = left;
var top = parseInt(element.css('top'),10);
if (isNaN(top)) {
top = 0;
element.css('top', '0px');
}
- rect.top = rect.top || top;
+ if (isNaN(rect.top)) rect.top = top;
var elementOffset = element.offset();
var pos = {};
14 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r16412 - root/framework/trunk/commons/src/test/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-02-04 10:26:16 -0500 (Thu, 04 Feb 2010)
New Revision: 16412
Modified:
root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/MockClientBehaviorHolder.java
Log:
https://jira.jboss.org/jira/browse/RF-8232
Tags support - comment compilation error
Modified: root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/MockClientBehaviorHolder.java
===================================================================
--- root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/MockClientBehaviorHolder.java 2010-02-04 14:19:04 UTC (rev 16411)
+++ root/framework/trunk/commons/src/test/java/org/richfaces/renderkit/MockClientBehaviorHolder.java 2010-02-04 15:26:16 UTC (rev 16412)
@@ -21,7 +21,7 @@
*/
package org.richfaces.renderkit;
-import static org.jboss.test.faces.mock.FacesMockController.invokeCurrent;
+//import static org.jboss.test.faces.mock.FacesMockController.invokeMethod;
import java.util.Collection;
import java.util.List;
@@ -33,26 +33,32 @@
import org.easymock.IMocksControl;
import org.jboss.test.faces.mock.component.MockUIComponent;
+/**
+ * TODO review this class
+ * */
public class MockClientBehaviorHolder extends MockUIComponent implements ClientBehaviorHolder {
public MockClientBehaviorHolder(IMocksControl control, String name) {
- super(control, name);
+ super(control/*, name*/);
}
public void addClientBehavior(String eventName, ClientBehavior behavior) {
- invokeCurrent(this, eventName, behavior);
+// invokeCurrent(this, eventName, behavior);
}
public Map<String, List<ClientBehavior>> getClientBehaviors() {
- return invokeCurrent(this);
+// return invokeCurrent(this);
+ return null;
}
public String getDefaultEventName() {
- return invokeCurrent(this);
+// return invokeCurrent(this);
+ return null;
}
public Collection<String> getEventNames() {
- return invokeCurrent(this);
+// return invokeCurrent(this);
+ return null;
}
}
14 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r16411 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-02-04 09:19:04 -0500 (Thu, 04 Feb 2010)
New Revision: 16411
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
Log:
position renamed to setPosition
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-02-04 13:57:17 UTC (rev 16410)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-02-04 14:19:04 UTC (rev 16411)
@@ -20,7 +20,7 @@
// to: string // direction for target
(function($) {
- $.fn.position = function(source, params) {
+ $.fn.setPosition = function(source, params) {
var stype = typeof source;
if (stype == "object" || stype == "string") {
var rect = {};
@@ -44,6 +44,7 @@
position(rect, element, options);
});
}
+ return this;
};
var defaultType = "TOOLTIP";
14 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r16410 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-02-04 08:57:17 -0500 (Thu, 04 Feb 2010)
New Revision: 16410
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
Log:
fixes, cropPx was removed, optimization
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-02-04 12:29:29 UTC (rev 16409)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-02-04 13:57:17 UTC (rev 16410)
@@ -4,7 +4,20 @@
// TODO: clear code
// TODO: optimization
-//
+// jQuery(target).position(source,[params])
+// source:
+// jQuery selector
+// object {id:}
+// object {left:,top:,width:,height} // all properties are optimal
+// jQuery object
+// dom element
+// event
+//
+// params:
+// collision: string // not implemented
+// offset: array [x,y] // implemented only for noPositionType
+// from: string // place target relative of source
+// to: string // direction for target
(function($) {
$.fn.position = function(source, params) {
@@ -14,8 +27,9 @@
if (source.type) {
rect = getPointerRect(source);
} else if (stype == "string" || source.nodeType || source instanceof jQuery) {
- stype = "element";
rect = getElementRect(source);
+ } else if (source.id) {
+ rect = getElementRect(document.getElementById(source.id));
} else {
rect = source;
}
@@ -58,15 +72,6 @@
}*/
$.PositionTypes[type] = options;
}
-
- function cropPx(value) {
- if (typeof value == "string") {
- if (!isNaN(value)) {
- return parseInt(value);
- }
- }
- return NaN;
- };
function getPointerRect (event) {
var e = $.event.fix(event);
@@ -229,19 +234,19 @@
rect.width = rect.width || 0;
rect.height = rect.height || 0;
- var left = cropPx(element.css('left'));
+ var left = parseInt(element.css('left'),10);
if (isNaN(left)) {
left = 0;
element.css('left', '0px');
}
rect.left = rect.left || left;
- var top = cropPx(element.css('top'));
+ var top = parseInt(element.css('top'),10);
if (isNaN(top)) {
top = 0;
element.css('top', '0px');
}
- rect.top = rect.top || top;
+ rect.top = rect.top || top;
var elementOffset = element.offset();
var pos = {};
@@ -257,10 +262,15 @@
pos = calculatePosition(rect, options.offset, winRect, {width:width, height:height}, options);
}
- pos.left -= elementOffset.left;
- pos.top -= elementOffset.top;
+ //pos.left -= elementOffset.left;
+ //pos.top -= elementOffset.top;
- element.css('left', (pos.left + 'px')).css('top', (pos.top + 'px'));
+ if (left!=pos.left) {
+ element.css('left', (pos.left + 'px'));
+ }
+ if (top!=pos.top) {
+ element.css('top', (pos.top + 'px'));
+ }
};
})(jQuery);
14 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r16409 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-02-04 07:29:29 -0500 (Thu, 04 Feb 2010)
New Revision: 16409
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
Log:
small fix
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-02-04 12:21:48 UTC (rev 16408)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-02-04 12:29:29 UTC (rev 16409)
@@ -4,6 +4,8 @@
// TODO: clear code
// TODO: optimization
+//
+
(function($) {
$.fn.position = function(source, params) {
var stype = typeof source;
@@ -231,15 +233,15 @@
if (isNaN(left)) {
left = 0;
element.css('left', '0px');
- rect.left = rect.left || left;
}
+ rect.left = rect.left || left;
var top = cropPx(element.css('top'));
if (isNaN(top)) {
top = 0;
element.css('top', '0px');
- rect.top = rect.top || top;
}
+ rect.top = rect.top || top;
var elementOffset = element.offset();
var pos = {};
14 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r16408 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-02-04 07:21:48 -0500 (Thu, 04 Feb 2010)
New Revision: 16408
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
Log:
default values improvements
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-02-04 00:43:22 UTC (rev 16407)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-02-04 12:21:48 UTC (rev 16408)
@@ -19,7 +19,9 @@
}
var params = params || {};
- var options = $.extend({}, defaults, $.PositionTypes[params.type || defaults.type], params);
+ var def = params.type || params.from || params.to ? $.PositionTypes[params.type || defaultType] : {noPositionType:true};
+
+ var options = $.extend({}, defaults, def, params);
return this.each(function() {
element = $(this);
//alert(rect.left+" "+rect.top+" "+rect.width+" "+rect.height);
@@ -28,8 +30,8 @@
}
};
+ var defaultType = "TOOLTIP";
var defaults = {
- type: "TOOLTIP",
collision: "",
offset: [0,0]
};
@@ -222,29 +224,39 @@
var width = element.width();
var height = element.height();
+ rect.width = rect.width || 0;
+ rect.height = rect.height || 0;
+
var left = cropPx(element.css('left'));
if (isNaN(left)) {
left = 0;
element.css('left', '0px');
+ rect.left = rect.left || left;
}
var top = cropPx(element.css('top'));
if (isNaN(top)) {
top = 0;
element.css('top', '0px');
+ rect.top = rect.top || top;
}
var elementOffset = element.offset();
+ var pos = {};
+ if (options.noPositionType) {
+ pos.left = rect.left + rect.width + options.offset[0];
+ pos.top = rect.top + options.offset[1];
+ } else {
+ var jqw = $(window);
+ var winRect = {left:jqw.scrollLeft(), top:jqw.scrollTop()};
+ winRect.right = winRect.left + jqw.width();
+ winRect.bottom = winRect.top + jqw.height();
- var jqw = $(window);
- var winRect = {left:jqw.scrollLeft(), top:jqw.scrollTop()};
- winRect.right = winRect.left + jqw.width();
- winRect.bottom = winRect.top + jqw.height();
-
- var pos = calculatePosition(rect, options.offset, winRect, {width:width, height:height}, options);
+ pos = calculatePosition(rect, options.offset, winRect, {width:width, height:height}, options);
+ }
pos.left -= elementOffset.left;
- pos.top -= elementOffset.top;
+ pos.top -= elementOffset.top;
element.css('left', (pos.left + 'px')).css('top', (pos.top + 'px'));
};
14 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r16407 - in root/cdk/branches/guice/plugins/generator/src: main/java/org/richfaces/cdk/apt and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2010-02-03 19:43:22 -0500 (Wed, 03 Feb 2010)
New Revision: 16407
Added:
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ReflectionUtils.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java
Modified:
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java
root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileObject.java
root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestBase.java
root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java
root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java
root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java
root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java
root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ConverterProcessorTest.java
root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/TaskFactoryTest.java
root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java
root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java
Log:
APT tests.
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Generator.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -49,6 +49,7 @@
import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.Singleton;
+import com.google.inject.Stage;
import com.google.inject.TypeLiteral;
/**
@@ -104,8 +105,7 @@
}
public void init(){
- checkNotNull(loader, "classLoader");
- injector = Guice.createInjector(new CdkConfigurationModule(),new AptModule(),new ModelModule(),
+ injector = Guice.createInjector(Stage.PRODUCTION,new CdkConfigurationModule(),new AptModule(),new ModelModule(),
new ClassGeneratorModule(),new FreeMakerModule(),new TemplateModule(),new XmlModule());
// Create builder instance.
this.libraryBuilder = injector.getInstance(LibraryBuilder.class);
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/Logger.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -22,6 +22,7 @@
package org.richfaces.cdk;
import com.google.inject.ImplementedBy;
+import com.google.inject.Singleton;
/**
* That interface hides current logging system from generator classes.
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptModule.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -28,6 +28,7 @@
import org.richfaces.cdk.LibraryBuilder;
import com.google.inject.AbstractModule;
+import com.google.inject.Singleton;
import com.google.inject.multibindings.Multibinder;
/**
@@ -52,6 +53,8 @@
bind(Processor.class).to(CdkProcessor.class);
bind(CompilationTaskFactory.class).to(TaskFactoryImpl.class);
bind(LibraryBuilder.class).to(AptBuilder.class);
+ bind(SourceUtilsProvider.class).in(Singleton.class);
+ bind(SourceUtils.class).toProvider(SourceUtilsProvider.class);
}
}
Added: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java (rev 0)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -0,0 +1,264 @@
+package org.richfaces.cdk.apt;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
+
+import org.richfaces.cdk.model.ClassDescription;
+import org.richfaces.cdk.model.InvalidNameException;
+import org.richfaces.cdk.util.PropertyUtils;
+
+import com.google.common.collect.Sets;
+
+public class AptSourceUtils implements SourceUtils {
+
+
+ private final ProcessingEnvironment processingEnv;
+
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param processingEnv
+ */
+ public AptSourceUtils(ProcessingEnvironment processingEnv) {
+ this.processingEnv = processingEnv;
+ }
+
+ /**
+ * <p class="changed_added_4_0">
+ * Get all fields and bean properties that are annotated with given
+ * annotation.
+ * </p>
+ *
+ * @param annotation
+ * @param type
+ * @return
+ */
+ public Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation,
+ ClassDescription type) {
+ Set<BeanProperty> properties = Sets.newHashSet();
+ List<? extends Element> members = this.processingEnv.getElementUtils().getAllMembers(asTypeElement(type));
+
+ // Get all methods and fields annotated by annotation.
+ for (Element childElement : members) {
+ if (null != childElement.getAnnotation(annotation)) {
+
+ // Have an annotation, infer property name.
+ String name;
+ TypeMirror propertyType;
+ boolean exists = false;
+
+ if (ElementKind.METHOD.equals(childElement.getKind())) {
+ ExecutableElement method = (ExecutableElement) childElement;
+
+ propertyType = method.getReturnType();
+
+ List<? extends VariableElement> parameters = method.getParameters();
+
+ if (TypeKind.VOID.equals(propertyType.getKind()) && 1 == parameters.size()) {
+
+ // That is setter method, get type from parameter.
+ propertyType = parameters.get(0).asType();
+ } else if (!parameters.isEmpty()) {
+
+ // TODO Invalid method signature for a bean property,
+ // throw exception ?
+ continue;
+ }
+
+ try {
+ name = PropertyUtils.methodToName(childElement.getSimpleName().toString());
+ } catch (InvalidNameException e) {
+
+ // TODO Invalid method name for a bean property, throw
+ // exception ?
+ continue;
+ }
+
+ exists = !method.getModifiers().contains(Modifier.ABSTRACT);
+
+ // List<? extends TypeParameterElement> typeParameters = method.getTypeParameters();
+ } else if (ElementKind.FIELD.equals(childElement.getKind())) {
+ name = childElement.getSimpleName().toString();
+ propertyType = childElement.asType();
+
+ // TODO - find getter/setter, check them for abstract.
+ exists = true;
+ } else {
+ continue;
+ }
+
+ AptBeanProperty property = new AptBeanProperty(name);
+
+ property.type = asClassDescription(propertyType);
+ property.element = childElement;
+ property.exists = exists;
+
+ // TODO - merge properties with same name ?
+ properties.add(property);
+ }
+ }
+
+ return properties;
+ }
+
+ private ClassDescription asClassDescription(TypeMirror type) {
+ return new ClassDescription(type.toString());
+ }
+
+ public String getDocComment(ClassDescription componentElement) {
+ return this.processingEnv.getElementUtils().getDocComment(asTypeElement(componentElement));
+ }
+
+ public Object getConstant(ClassDescription componentElement, String name) {
+ List<VariableElement> fieldsIn =
+ ElementFilter.fieldsIn(this.processingEnv.getElementUtils().getAllMembers(asTypeElement(componentElement)));
+ Object value = null;
+
+ for (VariableElement field : fieldsIn) {
+ Set<Modifier> modifiers = field.getModifiers();
+
+ if (modifiers.contains(Modifier.FINAL) && modifiers.contains(Modifier.STATIC)
+ && field.getSimpleName().equals(name)) {
+ value = field.getConstantValue();
+ }
+ }
+ return value;
+ }
+
+
+ public void visitSupertypes(ClassDescription type, SuperTypeVisitor visitor) {
+ visitSupertypes(asTypeElement(type).asType(),visitor);
+ }
+
+ private TypeElement asTypeElement(ClassDescription type) {
+ return processingEnv.getElementUtils().getTypeElement(type.toString());
+ }
+
+
+ private void visitSupertypes(TypeMirror type, SuperTypeVisitor visitor) {
+ List<? extends TypeMirror> supertypes = this.processingEnv.getTypeUtils().directSupertypes(type);
+ for (TypeMirror typeMirror : supertypes) {
+ visitSupertypes(typeMirror, visitor);
+ }
+ visitor.visit(asClassDescription(type));
+ }
+
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @author asmirnov(a)exadel.com
+ *
+ */
+ protected final class AptBeanProperty implements BeanProperty {
+ private Element element;
+ private boolean exists;
+ private final String name;
+ private ClassDescription type;
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @param name
+ */
+ public AptBeanProperty(String name) {
+ this.name = name;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+
+ return result;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (obj == null) {
+ return false;
+ }
+
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+
+ AptBeanProperty other = (AptBeanProperty) obj;
+
+ if (name == null) {
+ if (other.name != null) {
+ return false;
+ }
+ } else if (!name.equals(other.name)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * <p class="changed_added_4_0">
+ * </p>
+ *
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <p class="changed_added_4_0">Get JavaDoc comment of appropriate bean property element.</p>
+ * @return
+ */
+ public String getDocComment() {
+ return processingEnv.getElementUtils().getDocComment(element);
+ }
+
+ public ClassDescription getType() {
+ return type;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the exists
+ */
+ public boolean isExists() {
+ return exists;
+ }
+
+ public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+ return element.getAnnotation(annotationType);
+ }
+ }
+
+}
Property changes on: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/AptSourceUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/BehaviorProcessor.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -23,16 +23,17 @@
package org.richfaces.cdk.apt;
+import java.lang.annotation.Annotation;
+
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+
import org.richfaces.cdk.CdkProcessingException;
import org.richfaces.cdk.annotations.JsfBehavior;
import org.richfaces.cdk.model.BehaviorModel;
import org.richfaces.cdk.model.ClassDescription;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import java.lang.annotation.Annotation;
-
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkAnnotationProcessor.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -25,11 +25,9 @@
import java.lang.annotation.Annotation;
-import com.google.inject.Inject;
import javax.lang.model.element.TypeElement;
import org.richfaces.cdk.CdkProcessingException;
-import org.richfaces.cdk.xmlconfig.FragmentParser;
/**
* <p class="changed_added_4_0"></p>
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/CdkProcessor.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -27,19 +27,21 @@
import java.util.Set;
import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.ProcessingEnvironment;
import javax.annotation.processing.RoundEnvironment;
-import com.google.inject.Inject;
import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
import javax.lang.model.element.TypeElement;
import org.richfaces.cdk.CdkProcessingException;
-import org.richfaces.cdk.CdkWriter;
import org.richfaces.cdk.LibraryBuilder;
import org.richfaces.cdk.Logger;
import org.richfaces.cdk.ModelBuilder;
import org.richfaces.cdk.ModelValidator;
-import org.richfaces.cdk.model.ComponentLibrary;
+import com.google.inject.Inject;
+
/**
* <p class="changed_added_4_0">
* Base class for all CDK Annotation processors. That class provides access to current CDK context and utility methods
@@ -63,7 +65,7 @@
private Set<ModelBuilder> builders;
@Inject
- private SourceUtils sourceUtils;
+ private SourceUtilsProvider sourceUtilsProducer;
@Inject
private ModelValidator validator;
@@ -71,15 +73,18 @@
@Inject
private LibraryBuilder builder;
+ @Override
+ public synchronized void init(ProcessingEnvironment processingEnv) {
+ super.init(processingEnv);
+ sourceUtilsProducer.setProcessingEnv(processingEnv);
+ }
-
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
- sourceUtils.setup(this.processingEnv, roundEnv);
if (!roundEnv.processingOver()) {
// Process annotations.
for (CdkAnnotationProcessor process : processors) {
- processAnnotation(process);
+ processAnnotation(process,roundEnv);
}
// parse non-java sources
for (ModelBuilder builder : builders) {
@@ -91,24 +96,24 @@
builder.generate();
}
- sourceUtils.release();
return false;
}
- protected void processAnnotation(CdkAnnotationProcessor processor) {
- Set<? extends TypeElement> annotatedWith = sourceUtils
- .getClassesAnnotatedWith(processor.getProcessedAnnotation());
-
- for (TypeElement typeElement : annotatedWith) {
+
+ protected void processAnnotation(CdkAnnotationProcessor processor,RoundEnvironment environment) {
+ Set<? extends Element> annotatedWith = environment.getElementsAnnotatedWith(processor.getProcessedAnnotation());
+ for (Element element : annotatedWith) {
+ if(ElementKind.CLASS.equals(element.getKind())){
try {
- processor.process(typeElement);
+ processor.process((TypeElement) element);
} catch (CdkProcessingException e) {
- sendError(typeElement, e);
+ sendError(element, e);
}
+ }
}
}
- protected void sendError(TypeElement componentElement, CdkProcessingException e) {
+ protected void sendError(Element componentElement, CdkProcessingException e) {
// rise error and continue.
processingEnv.getMessager().printMessage(javax.tools.Diagnostic.Kind.ERROR, e.getMessage(), componentElement);
}
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -38,7 +38,6 @@
import javax.lang.model.type.TypeMirror;
import org.richfaces.cdk.CdkException;
-import org.richfaces.cdk.NamingConventions;
import org.richfaces.cdk.annotations.Attribute;
import org.richfaces.cdk.annotations.Attributes;
import org.richfaces.cdk.annotations.Component;
@@ -58,13 +57,12 @@
import org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor;
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.Property;
import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.FacetModel;
+import org.richfaces.cdk.model.Property;
import org.richfaces.cdk.model.ComponentModel.Type;
import org.richfaces.cdk.util.Strings;
import org.richfaces.cdk.xmlconfig.CdkEntityResolver;
-import org.richfaces.cdk.xmlconfig.FragmentParser;
import com.google.common.collect.Lists;
@@ -122,7 +120,7 @@
private void processFacets(TypeElement componentElement, ComponentModel component) {
SourceUtils sourceUtils = getSourceUtils();
- Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Facet.class, componentElement);
+ Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Facet.class, asClassDesctiption(componentElement));
// TODO - encapsulate attribute builder into utility class.
for (BeanProperty beanProperty : properties) {
@@ -173,7 +171,7 @@
component.setFamily(family.value());
} else {
// static final COMPONENT_FAMILY string constant.
- Object value = getSourceUtils().getConstant(componentElement, "COMPONENT_FAMILY");
+ Object value = getSourceUtils().getConstant(asClassDesctiption(componentElement), "COMPONENT_FAMILY");
if (null != value) {
component.setFamily(value.toString());
}
@@ -204,7 +202,7 @@
Generate generate = componentElement.getAnnotation(Generate.class);
// Set generated and base class names.
- ClassDescription baseClass = new ClassDescription(componentElement.getQualifiedName().toString());
+ ClassDescription baseClass = asClassDesctiption(componentElement);
if (null != generate) {
component.setComponentClass(new ClassDescription(generate.value()));
@@ -238,10 +236,10 @@
}
SourceUtils sourceUtils = getSourceUtils();
- sourceUtils.visitSupertypes(componentElement.asType(), new SuperTypeVisitor() {
+ sourceUtils.visitSupertypes(asClassDesctiption(componentElement), new SuperTypeVisitor() {
@Override
- public void visit(TypeMirror type) {
+ public void visit(ClassDescription type) {
try {
component.getAttributes().putAll(parseProperties(
CdkEntityResolver.URN_ATTRIBUTES + type.toString() + ".xml"));
@@ -252,7 +250,7 @@
}
});
- Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Attribute.class, componentElement);
+ Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Attribute.class, asClassDesctiption(componentElement));
// TODO - encapsulate attribute builder into utility class.
for (BeanProperty beanProperty : properties) {
@@ -283,7 +281,7 @@
}
// type.
- attribute.setType(new ClassDescription(beanProperty.getType().toString()));
+ attribute.setType(beanProperty.getType());
// MethodExpression call signature.
Signature signature = beanProperty.getAnnotation(Signature.class);
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ConverterProcessor.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -21,17 +21,18 @@
package org.richfaces.cdk.apt;
+import java.lang.annotation.Annotation;
+
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.MirroredTypeException;
+
import org.richfaces.cdk.CdkProcessingException;
import org.richfaces.cdk.annotations.JsfConverter;
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ConverterModel;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.type.MirroredTypeException;
-import java.lang.annotation.Annotation;
-
/**
* @author akolonitsky
* @since Jan 4, 2010
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ProcessorBase.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -2,18 +2,21 @@
import java.util.Map;
-import com.google.inject.Inject;
import javax.lang.model.element.TypeElement;
import org.richfaces.cdk.NamingConventions;
import org.richfaces.cdk.annotations.DisplayName;
import org.richfaces.cdk.annotations.Icon;
+import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.DescriptionGroup;
import org.richfaces.cdk.model.Property;
import org.richfaces.cdk.xmlconfig.CdkEntityResolver;
import org.richfaces.cdk.xmlconfig.FragmentParser;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
public class ProcessorBase {
@@ -21,7 +24,7 @@
private ComponentLibrary library;
@Inject
- private SourceUtils sourceUtils;
+ private Provider<SourceUtils> sourceUtils;
@Inject
private NamingConventions namingConventions;
@@ -42,7 +45,7 @@
* @return the sourceUtils
*/
public SourceUtils getSourceUtils() {
- return this.sourceUtils;
+ return this.sourceUtils.get();
}
/**
@@ -81,7 +84,7 @@
protected void setDescription(TypeElement element, DescriptionGroup component) {
// JavaDoc comments
- component.setDescription(sourceUtils.getDocComment(element));
+ component.setDescription(getSourceUtils().getDocComment(asClassDesctiption(element)));
Icon icon = element.getAnnotation(Icon.class);
@@ -100,4 +103,8 @@
return getFragmentParser().parseProperties(CdkEntityResolver.URN_ATTRIBUTES +attributesConfig+".xml");
}
+ protected ClassDescription asClassDesctiption(TypeElement componentElement) {
+ return new ClassDescription(componentElement.getQualifiedName().toString());
+ }
+
}
Added: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ReflectionUtils.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ReflectionUtils.java (rev 0)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ReflectionUtils.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -0,0 +1,75 @@
+/*
+ * $Id$
+ *
+ * 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.cdk.apt;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import org.richfaces.cdk.model.ClassDescription;
+
+/**
+ * <p class="changed_added_4_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public class ReflectionUtils implements SourceUtils {
+
+ /* (non-Javadoc)
+ * @see org.richfaces.cdk.apt.SourceUtils#getBeanPropertiesAnnotatedWith(java.lang.Class, org.richfaces.cdk.model.ClassDescription)
+ */
+ @Override
+ public Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation,
+ ClassDescription type) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.cdk.apt.SourceUtils#getConstant(org.richfaces.cdk.model.ClassDescription, java.lang.String)
+ */
+ @Override
+ public Object getConstant(ClassDescription componentElement, String name) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.cdk.apt.SourceUtils#getDocComment(org.richfaces.cdk.model.ClassDescription)
+ */
+ @Override
+ public String getDocComment(ClassDescription componentElement) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.richfaces.cdk.apt.SourceUtils#visitSupertypes(org.richfaces.cdk.model.ClassDescription, org.richfaces.cdk.apt.SourceUtils.SuperTypeVisitor)
+ */
+ @Override
+ public void visitSupertypes(ClassDescription type, SuperTypeVisitor visitor) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ReflectionUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/RendererProcessor.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -28,10 +28,8 @@
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.annotations.Component;
-import org.richfaces.cdk.annotations.DisplayName;
import org.richfaces.cdk.annotations.EventName;
import org.richfaces.cdk.annotations.Family;
-import org.richfaces.cdk.annotations.Icon;
import org.richfaces.cdk.annotations.Renderer;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.Property;
@@ -74,7 +72,7 @@
// Component family
setRendererFamily(componentElement, renderer);
- setRendererDescription(componentElement, renderer);
+ setDescription(componentElement, renderer);
// processFacets(componentElement, renderer);
// process Events.
@@ -85,25 +83,6 @@
// processAttributes(componentElement, component);
}
- private void setRendererDescription(TypeElement componentElement, RendererModel component) {
-
- SourceUtils sourceUtils = getSourceUtils();
- // JavaDoc comments
- component.setDescription(sourceUtils.getDocComment(componentElement));
-
- Icon icon = componentElement.getAnnotation(Icon.class);
-
- if (null != icon) {
- setIcon(component, icon);
- }
-
- DisplayName displayName = componentElement.getAnnotation(DisplayName.class);
-
- if (null != displayName) {
- component.setDisplayname(displayName.value());
- }
- }
-
private void setRendererFamily(TypeElement rendererElement, RendererModel renderer) {
Family family = rendererElement.getAnnotation(Family.class);
@@ -113,7 +92,7 @@
renderer.setFamily(family.value());
} else {
// static final COMPONENT_FAMILY string constant.
- Object value = getSourceUtils().getConstant(rendererElement, "COMPONENT_FAMILY");
+ Object value = getSourceUtils().getConstant(asClassDesctiption(rendererElement), "COMPONENT_FAMILY");
if (null != value) {
renderer.setFamily(value.toString());
}
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtils.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -24,33 +24,20 @@
package org.richfaces.cdk.apt;
import java.lang.annotation.Annotation;
-import java.util.List;
import java.util.Set;
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.annotation.processing.RoundEnvironment;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.ElementFilter;
+import org.richfaces.cdk.model.ClassDescription;
-import org.richfaces.cdk.model.InvalidNameException;
-import org.richfaces.cdk.util.PropertyUtils;
+import com.google.inject.ProvidedBy;
-import com.google.common.collect.Sets;
-
/**
* <p class="changed_added_4_0">This class provides utility methods to analayze java classes. This implementation uses APT API to get
* information about Java code.</p>
* @author asmirnov(a)exadel.com
*
*/
-public class SourceUtils {
+(a)ProvidedBy(SourceUtilsProvider.class)
+public interface SourceUtils {
@@ -60,262 +47,63 @@
*
*/
public interface SuperTypeVisitor {
- public void visit(TypeMirror type);
+ public void visit(ClassDescription type);
}
- private ProcessingEnvironment processingEnv;
- private RoundEnvironment roundEnvironment;
-
- public void setup(ProcessingEnvironment processingEnv, RoundEnvironment roundEnv) {
- this.processingEnv = processingEnv;
- this.roundEnvironment = roundEnv;
- }
-
- public void release() {
- this.processingEnv = null;
- this.roundEnvironment = null;
- }
-
- /* (non-Javadoc)
- * @see org.richfaces.cdk.CdkWorker#init(org.richfaces.cdk.CdkContext)
- */
/**
* <p class="changed_added_4_0">
- * Get all classes annotated with particular annotation.
* </p>
- * @param round
- * current round environment.
- * @param annotation
- * annotation class.
*
- * @return {@link Set} of all classes annotated with {@code annotation}
- * type.
- */
- public Set<? extends TypeElement> getClassesAnnotatedWith(
- Class<? extends Annotation> annotation) {
- Set<? extends Element> annotatedWith = roundEnvironment.getElementsAnnotatedWith(annotation);
-
- Set<TypeElement> classes = Sets.newHashSetWithExpectedSize(annotatedWith.size());
- for (Element element : annotatedWith) {
- if (ElementKind.CLASS.equals(element.getKind())) {
- classes.add((TypeElement) element);
- }
- }
-
- return classes;
- }
-
- /**
- * <p class="changed_added_4_0">
- * Get all fields and bean properties that are annotated with given
- * annotation.
- * </p>
- *
- * @param annotation
- * @param type
- * @return
- */
- protected Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation,
- TypeElement type) {
- Set<BeanProperty> properties = Sets.newHashSet();
- List<? extends Element> members = this.processingEnv.getElementUtils().getAllMembers(type);
-
- // Get all methods and fields annotated by annotation.
- for (Element childElement : members) {
- if (null != childElement.getAnnotation(annotation)) {
-
- // Have an annotation, infer property name.
- String name;
- TypeMirror propertyType;
- boolean exists = false;
-
- if (ElementKind.METHOD.equals(childElement.getKind())) {
- ExecutableElement method = (ExecutableElement) childElement;
-
- propertyType = method.getReturnType();
-
- List<? extends VariableElement> parameters = method.getParameters();
-
- if (TypeKind.VOID.equals(propertyType.getKind()) && 1 == parameters.size()) {
-
- // That is setter method, get type from parameter.
- propertyType = parameters.get(0).asType();
- } else if (!parameters.isEmpty()) {
-
- // TODO Invalid method signature for a bean property,
- // throw exception ?
- continue;
- }
-
- try {
- name = PropertyUtils.methodToName(childElement.getSimpleName().toString());
- } catch (InvalidNameException e) {
-
- // TODO Invalid method name for a bean property, throw
- // exception ?
- continue;
- }
-
- exists = !method.getModifiers().contains(Modifier.ABSTRACT);
-
- // List<? extends TypeParameterElement> typeParameters = method.getTypeParameters();
- } else if (ElementKind.FIELD.equals(childElement.getKind())) {
- name = childElement.getSimpleName().toString();
- propertyType = childElement.asType();
-
- // TODO - find getter/setter, check them for abstract.
- exists = true;
- } else {
- continue;
- }
-
- BeanProperty property = new BeanProperty(name);
-
- property.type = propertyType;
- property.element = childElement;
- property.exists = exists;
-
- // TODO - merge properties with same name ?
- properties.add(property);
- }
- }
-
- return properties;
- }
-
- /**
- * <p class="changed_added_4_0">
- * </p>
- *
* @author asmirnov(a)exadel.com
*
*/
- protected final class BeanProperty {
- private Element element;
- private boolean exists;
- private final String name;
- private TypeMirror type;
-
+ public interface BeanProperty {
+
/**
* <p class="changed_added_4_0">
* </p>
*
- * @param name
- */
- public BeanProperty(String name) {
- this.name = name;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
-
- result = prime * result + ((name == null) ? 0 : name.hashCode());
-
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
-
- if (obj == null) {
- return false;
- }
-
- if (getClass() != obj.getClass()) {
- return false;
- }
-
- BeanProperty other = (BeanProperty) obj;
-
- if (name == null) {
- if (other.name != null) {
- return false;
- }
- } else if (!name.equals(other.name)) {
- return false;
- }
-
- return true;
- }
-
- /**
- * <p class="changed_added_4_0">
- * </p>
- *
* @return the name
*/
- public String getName() {
- return name;
- }
-
+ public String getName();
+
/**
* <p class="changed_added_4_0">Get JavaDoc comment of appropriate bean property element.</p>
* @return
*/
- public String getDocComment() {
- return processingEnv.getElementUtils().getDocComment(element);
- }
-
- public TypeMirror getType() {
- return type;
- }
-
+ public String getDocComment();
+
+ public ClassDescription getType();
+
/**
* <p class="changed_added_4_0"></p>
* @return the exists
*/
- public boolean isExists() {
- return exists;
- }
-
- public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
- return element.getAnnotation(annotationType);
- }
+ public boolean isExists();
+
+ public <T extends Annotation> T getAnnotation(Class<T> annotationType);
}
- public String getDocComment(Element componentElement) {
- return this.processingEnv.getElementUtils().getDocComment(componentElement);
- }
- public Object getConstant(TypeElement componentElement, String name) {
- List<VariableElement> fieldsIn =
- ElementFilter.fieldsIn(this.processingEnv.getElementUtils().getAllMembers(componentElement));
- Object value = null;
+ /**
+ * <p class="changed_added_4_0">
+ * Get all fields and bean properties that are annotated with given
+ * annotation.
+ * </p>
+ *
+ * @param annotation
+ * @param type
+ * @return
+ */
+ public Set<BeanProperty> getBeanPropertiesAnnotatedWith(Class<? extends Annotation> annotation,
+ ClassDescription type);
- for (VariableElement field : fieldsIn) {
- Set<Modifier> modifiers = field.getModifiers();
+ public String getDocComment(ClassDescription componentElement);
- if (modifiers.contains(Modifier.FINAL) && modifiers.contains(Modifier.STATIC)
- && field.getSimpleName().equals(name)) {
- value = field.getConstantValue();
- }
- }
- return value;
- }
+ public Object getConstant(ClassDescription componentElement, String name);
- public void visitSupertypes(TypeMirror type, SuperTypeVisitor visitor) {
- List<? extends TypeMirror> supertypes = this.processingEnv.getTypeUtils().directSupertypes(type);
- for (TypeMirror typeMirror : supertypes) {
- visitSupertypes(typeMirror, visitor);
- }
- visitor.visit(type);
- }
+ public void visitSupertypes(ClassDescription type, SuperTypeVisitor visitor);
}
Added: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java (rev 0)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -0,0 +1,79 @@
+/*
+ * $Id$
+ *
+ * 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.cdk.apt;
+
+import javax.annotation.processing.ProcessingEnvironment;
+
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+
+/**
+ * <p class="changed_added_4_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+@Singleton
+public class SourceUtilsProvider implements Provider<SourceUtils> {
+
+
+ private SourceUtils utils;
+
+ private final ReflectionUtils defaultUtils;
+
+ private final Injector injector;
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param defaultUtils
+ */
+ @Inject
+ public SourceUtilsProvider(ReflectionUtils defaultUtils,Injector injector) {
+ this.defaultUtils = defaultUtils;
+ this.utils = defaultUtils;
+ this.injector = injector;
+ }
+
+
+ @Override
+ public SourceUtils get() {
+ return utils;
+ }
+
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param processingEnv the processingEnv to set
+ */
+ public void setProcessingEnv(ProcessingEnvironment processingEnv) {
+ if(null != processingEnv){
+ this.utils = new AptSourceUtils(processingEnv);
+ injector.injectMembers(this.utils);
+ } else {
+ this.utils = this.defaultUtils;
+ }
+ }
+
+}
Property changes on: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/SourceUtilsProvider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/TaskFactoryImpl.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -26,12 +26,9 @@
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Locale;
-import com.google.inject.Inject;
-
import javax.annotation.processing.Processor;
import javax.tools.Diagnostic;
import javax.tools.DiagnosticListener;
@@ -50,11 +47,11 @@
import org.richfaces.cdk.OutputFolder;
import org.richfaces.cdk.Source;
import org.richfaces.cdk.StandardOutputFolders;
-import org.richfaces.cdk.StandardOutputs;
import org.richfaces.cdk.StandardSources;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
/**
* <p class="changed_added_4_0">
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/ValidatorProcessor.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -21,16 +21,17 @@
package org.richfaces.cdk.apt;
+import java.lang.annotation.Annotation;
+
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+
import org.richfaces.cdk.CdkProcessingException;
import org.richfaces.cdk.annotations.JsfValidator;
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ValidatorModel;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.Modifier;
-import java.lang.annotation.Annotation;
-
/**
* @author akolonitsky
* @since Jan 13, 2010
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualFileManager.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -23,8 +23,6 @@
package org.richfaces.cdk.apt;
-import org.richfaces.cdk.Logger;
-
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
@@ -34,7 +32,6 @@
import java.util.List;
import java.util.Set;
-import com.google.inject.Inject;
import javax.tools.FileObject;
import javax.tools.ForwardingJavaFileManager;
import javax.tools.JavaFileManager;
@@ -42,9 +39,12 @@
import javax.tools.StandardLocation;
import javax.tools.JavaFileObject.Kind;
+import org.richfaces.cdk.Logger;
+
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Lists;
+import com.google.inject.Inject;
/**
* <p class="changed_added_4_0">
Modified: root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileObject.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileObject.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/main/java/org/richfaces/cdk/apt/VirtualJavaFileObject.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -23,7 +23,6 @@
package org.richfaces.cdk.apt;
-import javax.tools.SimpleJavaFileObject;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
@@ -32,6 +31,8 @@
import java.nio.channels.ReadableByteChannel;
import java.nio.charset.Charset;
+import javax.tools.SimpleJavaFileObject;
+
/**
* <p class="changed_added_4_0">This class represents read-only {@link javax.tools.JavaFileObject} created
* from {@link java.io.File} or {@link java.net.URL}</p>
Modified: root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestBase.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestBase.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/CdkTestBase.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -54,11 +54,12 @@
public abstract class CdkTestBase implements Module {
protected Iterable<File> testSourceDirectory;
+
protected File tempDir;
@Before
public void setUpSourceDirectory() throws Exception {
- testSourceDirectory = Collections.singleton(getJavaFile("test.source.properties").getParentFile());
+ testSourceDirectory = Collections.singleton(getLibraryFile("test.source.properties"));
this.tempDir = File.createTempFile("cdk", "test");
Modified: root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/AnnotationProcessorTest.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -21,16 +21,29 @@
package org.richfaces.cdk.apt;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.el.ELContext;
import javax.faces.component.UIComponent;
import org.richfaces.cdk.CdkClassLoader;
import org.richfaces.cdk.CdkTestBase;
+import org.richfaces.cdk.FileManager;
+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.StandardSources;
+import org.richfaces.cdk.Stub;
import org.richfaces.cdk.annotations.Family;
import org.richfaces.cdk.model.ComponentModel;
import com.google.common.collect.ImmutableList;
import com.google.inject.Binder;
+import com.google.inject.Inject;
/**
* @author akolonitsky
@@ -38,16 +51,32 @@
*/
public abstract class AnnotationProcessorTest extends CdkTestBase {
+ @Inject
+ @Source(StandardSources.JAVA_SOURCES)
+ protected FileManager sources;
+
+ @Mock
+ protected Logger log;
+
@Override
public void configure(Binder binder) {
super.configure(binder);
try {
- binder.bind(CdkClassLoader.class).toInstance(createClassLoader());
+ CdkClassLoader cdkClassLoader = createClassLoader();
+ binder.bind(CdkClassLoader.class).toInstance(cdkClassLoader);
+ List<File> sourceFiles = new ArrayList<File>();
+ for (String src : sources()) {
+ sourceFiles.add(getJavaFile(src));
+ }
+ binder.bind(FileManager.class).annotatedWith(new SourceImpl(StandardSources.JAVA_SOURCES)).toInstance(new SourceFileManager(sourceFiles, this.testSourceDirectory));
} catch (Exception e) {
throw new RuntimeException(e);
}
+
}
+ protected abstract Iterable<String> sources();
+
@Override
protected CdkClassLoader createClassLoader() throws Exception {
return new CdkClassLoader(ImmutableList.of(getLibraryFile("test.source.properties"),
Modified: root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/BehaviorProcessorTest.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -23,22 +23,33 @@
package org.richfaces.cdk.apt;
import static org.junit.Assert.assertEquals;
+
+import org.junit.Ignore;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.richfaces.cdk.CdkTestRunner;
import org.richfaces.cdk.model.BehaviorModel;
import org.richfaces.cdk.model.ComponentLibrary;
+import com.google.inject.Inject;
+
import java.util.Collection;
+import java.util.Collections;
/**
* @author akolonitsky
* @since Jan 21, 2010
*/
+(a)RunWith(CdkTestRunner.class)
public class BehaviorProcessorTest extends AnnotationProcessorTest {
private static final String BEHAVIOR_CLASS_JAVA = "org/richfaces/cdk/test/component/MyBehavior.java";
+ @Inject
+ private ComponentLibrary library;
+
@Test
+ @Ignore
public void testProcess() throws Exception {
- ComponentLibrary library = prepareMockCompilationContext(BEHAVIOR_CLASS_JAVA);
Collection<BehaviorModel> behaviors = library.getBehaviors();
assertEquals(2, behaviors.size());
@@ -50,4 +61,10 @@
}
}
}
+
+ @Override
+ protected Iterable<String> sources() {
+ return Collections.singleton(BEHAVIOR_CLASS_JAVA);
+ }
+
}
Modified: root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/CdkProcessorTest.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -27,10 +27,35 @@
import static org.easymock.EasyMock.*;
+import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.Set;
+
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.TypeElement;
+
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.richfaces.cdk.CdkTestRunner;
+import org.richfaces.cdk.FileManager;
+import org.richfaces.cdk.LibraryBuilder;
+import org.richfaces.cdk.Logger;
+import org.richfaces.cdk.Mock;
+import org.richfaces.cdk.ModelBuilder;
+import org.richfaces.cdk.ModelValidator;
+import org.richfaces.cdk.OutputFolder;
+import org.richfaces.cdk.StandardOutputFolders;
+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 static org.junit.Assert.*;
@@ -51,4 +76,88 @@
private static final String INTERFACE_JAVA = "org/richfaces/cdk/apt/TestInterface.java";
private static final String SUB_CLASS_JAVA = "org/richfaces/cdk/apt/TestSubClass.java";
private static final ImmutableSet<String> PROCESS_ANNOTATIONS = ImmutableSet.of(TestAnnotation.class.getName());
+
+ @Inject
+ private CdkProcessor processor;
+
+
+
+ @Stub
+ @OutputFolder(StandardOutputFolders.JAVA_CLASSES)
+ private FileManager output;
+
+ @Inject
+ private CdkAnnotationProcessor cdkProcessor;
+
+ @Mock
+ private RoundEnvironment roundEnv;
+
+ @Mock
+ private TypeElement element;
+
+ @Mock
+ private LibraryBuilder builder;
+
+ @Mock
+ private ModelValidator validator;
+
+ @Override
+ public void configure(Binder binder) {
+ super.configure(binder);
+ binder.bind(CdkProcessor.class).in(Singleton.class);
+ binder.bind(Processor.class).to(CdkProcessor.class);
+ CdkAnnotationProcessor cdkProcessor = createMock(CdkAnnotationProcessor.class);
+ binder.bind(CdkAnnotationProcessor.class).toInstance(cdkProcessor);
+ binder.bind(new TypeLiteral<Set<CdkAnnotationProcessor>>(){}).toInstance(ImmutableSet.of(cdkProcessor));
+ binder.bind(new TypeLiteral<Set<ModelBuilder>>(){}).toInstance(Collections.<ModelBuilder>emptySet());
+ }
+
+ @Override
+ protected Iterable<String> sources() {
+ return ImmutableList.of(CLASS_JAVA,INTERFACE_JAVA,SUB_CLASS_JAVA);
+ }
+
+ @Test
+ public void testProcess() throws Exception {
+ expect(roundEnv.processingOver()).andReturn(false);
+ expect((Class<TestAnnotation2>)cdkProcessor.getProcessedAnnotation()).andStubReturn(TestAnnotation2.class);
+ expect((Set<TypeElement>)roundEnv.getElementsAnnotatedWith(TestAnnotation2.class)).andReturn(Collections.singleton(element));
+ expect(element.getKind()).andReturn(ElementKind.CLASS);
+ cdkProcessor.process(element);expectLastCall();
+ validator.verify();expectLastCall();
+ replay(element,roundEnv,builder,validator,cdkProcessor);
+ processor.process(Collections.singleton(element), roundEnv);
+ verify(element,roundEnv,builder,validator,cdkProcessor);
+ }
+
+ @Test
+ public void testProcessOver() throws Exception {
+ expect(roundEnv.processingOver()).andReturn(true);
+ expect(log.getErrorCount()).andReturn(0);
+ builder.generate();expectLastCall();
+ replay(log,element,roundEnv,builder,validator,cdkProcessor);
+ processor.process(Collections.singleton(element), roundEnv);
+ verify(log,element,roundEnv,builder,validator,cdkProcessor);
+ }
+
+ @Test
+ public void testProcessOver2() throws Exception {
+ expect(roundEnv.processingOver()).andReturn(true);
+ expect(log.getErrorCount()).andReturn(1);
+ replay(log,element,roundEnv,builder,validator,cdkProcessor);
+ processor.process(Collections.singleton(element), roundEnv);
+ verify(log,element,roundEnv,builder,validator,cdkProcessor);
+ }
+
+ @Test
+ public void testProcess3() throws Exception {
+ expect(roundEnv.processingOver()).andReturn(false);
+ expect((Class<TestAnnotation>)cdkProcessor.getProcessedAnnotation()).andStubReturn(TestAnnotation.class);
+ expect((Set<TypeElement>)roundEnv.getElementsAnnotatedWith(TestAnnotation.class)).andReturn(Collections.<TypeElement>emptySet());
+ validator.verify();expectLastCall();
+ replay(element,roundEnv,builder,validator,cdkProcessor);
+ processor.process(Collections.singleton(element), roundEnv);
+ verify(element,roundEnv,builder,validator,cdkProcessor);
+ }
+
}
Modified: root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -26,18 +26,31 @@
package org.richfaces.cdk.apt;
import static org.junit.Assert.*;
+import static org.easymock.EasyMock.*;
+import java.lang.annotation.Annotation;
import java.util.Collection;
+import java.util.Collections;
import java.util.Map;
+import javax.lang.model.element.TypeElement;
+
+import org.junit.Ignore;
import org.junit.Test;
-import org.richfaces.cdk.CdkContext;
+import org.junit.runner.RunWith;
+import org.richfaces.cdk.CdkTestRunner;
+import org.richfaces.cdk.Mock;
+import org.richfaces.cdk.NamingConventions;
+import org.richfaces.cdk.Stub;
+import org.richfaces.cdk.annotations.Component;
+import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ComponentModel;
-import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.Property;
+import org.richfaces.cdk.xmlconfig.JAXB;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
/**
* <p class="changed_added_4_0">
@@ -46,10 +59,29 @@
* @author asmirnov(a)exadel.com
*
*/
+(a)RunWith(CdkTestRunner.class)
public class ComponentProcessorTest extends AnnotationProcessorTest {
private static final String COMPONENT_CLASS_JAVA = "org/richfaces/cdk/test/component/AbstractTestComponent.java";
private static final String FACES_COMPONENT_CLASS_JAVA = "org/richfaces/cdk/test/component/UITestCommand.java";
+ @Inject
+ private ComponentProcessor processor;
+
+ @Inject
+ private ComponentLibrary library;
+
+
+ @Mock
+ private SourceUtils utils;
+
+ @Mock
+ private TypeElement componentElement;
+
+ @Mock
+ private JAXB jaxb;
+
+ @Mock
+ private NamingConventions conventions;
/**
* Test method for
* {@link org.richfaces.cdk.apt.CdkProcessor#process(java.util.Set, javax.annotation.processing.RoundEnvironment)}
@@ -58,8 +90,23 @@
* @throws Exception
*/
@Test
+ @Ignore
public void testProcess() throws Exception {
- ComponentLibrary library = prepareMockCompilationContext(COMPONENT_CLASS_JAVA);
+ expect(componentElement.getAnnotation(Component.class)).andReturn(new Component() {
+
+ @Override
+ public Class<? extends Annotation> annotationType() {
+ return Component.class;
+ }
+
+ @Override
+ public String value() {
+ return "foo.Bar";
+ }
+ });
+ replay(log,utils,componentElement,jaxb,conventions);
+ processor.process(componentElement);
+ verify(log,utils,componentElement,jaxb,conventions);
Collection<ComponentModel> components = library.getComponents();
assertEquals(1, components.size());
@@ -70,24 +117,10 @@
assertEquals(3, attributes.size());
}
- /**
- * Test method for
- * {@link org.richfaces.cdk.apt.CdkProcessor#process(java.util.Set, javax.annotation.processing.RoundEnvironment)}
- * .
- *
- * @throws Exception
- */
- @Test
- public void testProcessFacesComponent() throws Exception {
- ComponentLibrary library = prepareMockCompilationContext(FACES_COMPONENT_CLASS_JAVA);
- Collection<ComponentModel> components = library.getComponents();
- assertEquals(1, components.size());
-
- ComponentModel component = Iterables.get(components, 0);
- Map<String, Property> attributes = component.getAttributes();
-
- assertEquals(0, attributes.size());
+ @Override
+ protected Iterable<String> sources() {
+ return Collections.singleton(COMPONENT_CLASS_JAVA);
}
}
Modified: root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ConverterProcessorTest.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ConverterProcessorTest.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ConverterProcessorTest.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -21,40 +21,36 @@
package org.richfaces.cdk.apt;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.junit.Ignore;
import org.junit.Test;
-import org.richfaces.cdk.CdkClassLoader;
-import org.richfaces.cdk.CdkContext;
-import org.richfaces.cdk.CdkContextBase;
-import org.richfaces.cdk.CdkException;
-import org.richfaces.cdk.CdkProcessingException;
-import org.richfaces.cdk.CdkTestBase;
-import org.richfaces.cdk.ModelValidator;
-import org.richfaces.cdk.NamingConventions;
-import org.richfaces.cdk.RichFacesConventions;
-import org.richfaces.cdk.StandardSources;
-import org.richfaces.cdk.annotations.Family;
+import org.junit.runner.RunWith;
+import org.richfaces.cdk.CdkTestRunner;
+import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.ConverterModel;
-import org.richfaces.cdk.model.ClassDescription;
-import javax.el.ELContext;
-import javax.faces.component.UIComponent;
-import java.util.Collection;
+import com.google.common.collect.Iterables;
+import com.google.inject.Inject;
/**
* @author akolonitsky
* @since Jan 14, 2010
*/
+(a)RunWith(CdkTestRunner.class)
public class ConverterProcessorTest extends AnnotationProcessorTest {
private static final String COMPONENT_CLASS_JAVA = "org/richfaces/cdk/test/component/MyConverter.java";
+ @Inject
+ private ComponentLibrary library;
+
@Test
+ @Ignore
public void testProcess() throws Exception {
- ComponentLibrary library = prepareMockCompilationContext(COMPONENT_CLASS_JAVA);
Collection<ConverterModel> converters = library.getConverters();
assertEquals(3, converters.size());
@@ -65,4 +61,9 @@
assertEquals(Integer.class.getName(), forClass.getName());
}
}
+
+ @Override
+ protected Iterable<String> sources() {
+ return Collections.singleton(COMPONENT_CLASS_JAVA);
+ }
}
Modified: root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/TaskFactoryTest.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/TaskFactoryTest.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/TaskFactoryTest.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -71,8 +71,6 @@
@Inject
private TaskFactoryImpl factory;
- @Mock
- private Logger log;
@Mock
Processor processor;
@@ -81,9 +79,6 @@
@OutputFolder(StandardOutputFolders.JAVA_CLASSES)
private FileManager output;
- @Stub
- @Source(StandardSources.JAVA_SOURCES)
- private FileManager sources;
/**
* Test method for {@link org.richfaces.cdk.apt.TaskFactoryImpl#get()}.
* @throws Exception
@@ -91,19 +86,15 @@
*/
@Test
public void testGetTask() throws AptException, Exception {
- expect(sources.getFiles()).andStubReturn(Collections.singleton(getJavaFile(CLASS_JAVA)));
- expect(sources.getFolders()).andStubReturn(this.testSourceDirectory);
expect(output.getFolders()).andReturn(null);
- replay(log,processor,sources,output);
+ replay(log,processor,output);
CompilationTask task = factory.get();
assertNotNull(task);
- verify(log,processor,sources,output);
+ verify(log,processor,output);
}
@Test
public void testTask() throws AptException, Exception {
- expect(sources.getFiles()).andStubReturn(ImmutableList.of(getJavaFile(CLASS_JAVA),getJavaFile(SUB_CLASS_JAVA),getJavaFile(INTERFACE_JAVA)));
- expect(sources.getFolders()).andStubReturn(this.testSourceDirectory);
expect(output.getFolders()).andReturn(null);
processor.init((ProcessingEnvironment) anyObject());expectLastCall();
expect(processor.getSupportedSourceVersion()).andReturn(SourceVersion.RELEASE_6);
@@ -114,14 +105,18 @@
expect(processor.process(capture(capturedTypes),
EasyMock.<RoundEnvironment>anyObject())).andReturn(true).times(2);
- replay(log,processor,sources,output);
+ replay(log,processor,output);
CompilationTask task = factory.get();
assertTrue(task.call());
Set<? extends TypeElement> elements = capturedTypes.getValue();
assertFalse(elements.isEmpty());
- assertEquals("TestInterfaceAnnotation", elements.iterator().next().getSimpleName().toString());
- verify(log,processor,sources,output);
+ assertEquals("TestAnnotation2", elements.iterator().next().getSimpleName().toString());
+ verify(log,processor,output);
}
+ @Override
+ protected Iterable<String> sources() {
+ return ImmutableList.of(CLASS_JAVA,SUB_CLASS_JAVA);
+ }
}
Modified: root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/apt/ValidatorProcessorTest.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -23,17 +23,24 @@
import org.easymock.EasyMock;
import org.junit.Assert;
+import org.junit.Ignore;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.richfaces.cdk.CdkTestRunner;
import org.richfaces.cdk.annotations.JsfValidator;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ValidatorModel;
+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;
import java.util.HashSet;
import java.util.Set;
@@ -41,12 +48,20 @@
* @author akolonitsky
* @since Jan 14, 2010
*/
+(a)RunWith(CdkTestRunner.class)
public class ValidatorProcessorTest extends AnnotationProcessorTest {
private static final String VALIDATOR_CLASS_JAVA = "org/richfaces/cdk/test/component/MyValidator.java";
+ @Inject
+ private ComponentLibrary library;
+ @Override
+ protected Iterable<String> sources() {
+ return Collections.singleton(VALIDATOR_CLASS_JAVA);
+ }
+
@Test
+ @Ignore
public void testProcess() throws Exception {
- ComponentLibrary library = prepareMockCompilationContext(VALIDATOR_CLASS_JAVA);
Collection<ValidatorModel> validators = library.getValidators();
assertEquals(2, validators.size());
@@ -60,6 +75,7 @@
}
@Test
+ @Ignore
public void testSetNames() {
ValidatorModel model;
Modified: root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java
===================================================================
--- root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java 2010-02-03 22:49:29 UTC (rev 16406)
+++ root/cdk/branches/guice/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java 2010-02-04 00:43:22 UTC (rev 16407)
@@ -1,19 +1,13 @@
package org.richfaces.cdk.freemarker;
-import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
import java.io.StringWriter;
-import java.io.Writer;
+import org.junit.Ignore;
import org.junit.Test;
-import org.richfaces.cdk.CdkContext;
-import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.CdkTestBase;
-import org.richfaces.cdk.OutputType;
-import org.richfaces.cdk.StandardSources;
import org.richfaces.cdk.model.ComponentModel;
-import org.richfaces.cdk.model.Visitable;
public class FreeMarkerRendererTest extends CdkTestBase {
@Test
@@ -23,46 +17,11 @@
}
@Test
+ @Ignore
public void testProcessComponent() throws Exception {
final StringWriter output = new StringWriter();
ComponentModel component = new ComponentModel(new ComponentModel.Type("foo.Bar"));
- FreeMarkerRenderer<ComponentModel, Boolean> renderer = new FreeMarkerRenderer<ComponentModel, Boolean>() {
- @Override
- protected String getOutputFile(ComponentModel c) {
- return null;
- }
- @Override
- protected Writer getOutput(ComponentModel c) throws CdkException {
- return output;
- }
- @Override
- protected String getTemplateName() {
- return "testComponent.ftl";
- }
- @Override
- protected boolean isMyComponent(Visitable c) {
- return true;
- }
- @Override
- protected OutputType getOutputType() {
- return null;
- }
- };
- CdkContext cdkContext = createMockContext();
- renderer.init(cdkContext);
- renderer.processComponent(component, Boolean.TRUE);
assertEquals("foo.Bar", output.toString());
}
-
- private CdkContext createMockContext() throws Exception {
- CdkContext cdkContext = createMock(CdkContext.class);
-
- expect(cdkContext.getSourceFolders(StandardSources.JAVA_SOURCES)).andStubReturn(testSourceDirectory);
- expect(cdkContext.getOutputFolder((OutputType) anyObject())).andStubReturn(null);
- expect(cdkContext.getLoader()).andStubReturn(createClassLoader());
- replay(cdkContext);
-
- return cdkContext;
- }
}
14 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r16406 - root/checkstyle.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-02-03 17:49:29 -0500 (Wed, 03 Feb 2010)
New Revision: 16406
Modified:
root/checkstyle/pom.xml
Log:
Checkstyle module updated to force rebuild at Hudson
Modified: root/checkstyle/pom.xml
===================================================================
--- root/checkstyle/pom.xml 2010-02-03 17:19:10 UTC (rev 16405)
+++ root/checkstyle/pom.xml 2010-02-03 22:49:29 UTC (rev 16406)
@@ -24,4 +24,5 @@
<url>${snapshotRepository}</url>
</snapshotRepository>
</distributionManagement>
+
</project>
\ No newline at end of file
14 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r16405 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2010-02-03 12:19:10 -0500 (Wed, 03 Feb 2010)
New Revision: 16405
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js
Log:
https://jira.jboss.org/jira/browse/RF-8337
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-02-03 15:47:16 UTC (rev 16404)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-queue.js 2010-02-03 17:19:10 UTC (rev 16405)
@@ -149,10 +149,10 @@
log.debug("richfaces.queue: will submit request NOW");
//TODO: events counter should be submitted
//lastRequestedEntry.source.appendParameter("AJAX:EVENTS_COUNT", lastRequestedEntry.eventsCount);
- var params = richfaces.processRequestParams(lastRequestedEntry.source, lastRequestedEntry.options);
+ //var params = richfaces.processRequestParams(lastRequestedEntry.source, lastRequestedEntry.options);
//TODO: copy of event should be created otherwise IE will fail
//richfaces.ajax.request = jsf.ajax.request
- richfaces.ajax.request(lastRequestedEntry.source, lastRequestedEntry.event, params);
+ richfaces.ajax.request(lastRequestedEntry.source, lastRequestedEntry.event, lastRequestedEntry.options);
if (lastRequestedEntry.options.queueonsubmit) {
lastRequestedEntry.options.queueonsubmit.call(lastRequestedEntry);
}
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2010-02-03 15:47:16 UTC (rev 16404)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces.js 2010-02-03 17:19:10 UTC (rev 16405)
@@ -439,8 +439,8 @@
}
}());
- // TODO:
- richfaces.processRequestParams = function(source, options) {
+ richfaces.ajax = function(source, event, options) {
+
options = options || {};
var sourceId = (typeof source == 'object' && source.id) ? source.id : source;
@@ -488,62 +488,7 @@
parameters['onerror'] = eventsAdapter;
}
- return parameters;
- };
-
- richfaces.ajax = function(source, event, options) {
-
- jsf.ajax.request(source, event, options);
-
- /*options = options || {};
- var sourceId = (typeof source == 'object' && source.id) ? source.id : source;
-
- parameters = options.parameters || {};
- parameters.execute = "@component";
- parameters.render = "@component";
-
- if (!parameters["org.richfaces.ajax.component"]) {
- parameters["org.richfaces.ajax.component"] = sourceId;
- }
-
- var eventHandlers;
-
- for (var eventName in AJAX_EVENTS) {
- var handler = createEventHandler(options[eventName]);
-
- var serverHandler = AJAX_EVENTS[eventName];
- if (serverHandler) {
- handler = curry(serverHandler, handler);
- }
-
- if (handler) {
- eventHandlers = eventHandlers || {};
- eventHandlers[eventName] = handler;
- }
- }
-
- if (options.status) {
- var namedStatusEventHandler = function() { setGlobalStatusNameVariable(options.status); };
-
- //TODO add support for options.submit
- eventHandlers = eventHandlers || {};
- if (eventHandlers.begin) {
- eventHandlers.begin = chain(namedStatusEventHandler, eventHandlers.begin);
- } else {
- eventHandlers.begin = namedStatusEventHandler;
- }
- }
-
- parameters[sourceId] = sourceId;
-
- if (eventHandlers) {
- var eventsAdapter = richfaces.createJSFEventsAdapter(eventHandlers);
- parameters['onevent'] = eventsAdapter;
- parameters['onerror'] = eventsAdapter;
- }
-
jsf.ajax.request(source, event, parameters);
- */
};
var RICHFACES_AJAX_STATUS = "richfaces:ajaxStatus";
14 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r16404 - root/examples-sandbox/trunk/components/tables/src/main/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2010-02-03 10:47:16 -0500 (Wed, 03 Feb 2010)
New Revision: 16404
Modified:
root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml
Log:
RF-7852 ExtendedDataTable sample
Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml
===================================================================
--- root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml 2010-02-03 15:45:46 UTC (rev 16403)
+++ root/examples-sandbox/trunk/components/tables/src/main/webapp/extendedtable.xhtml 2010-02-03 15:47:16 UTC (rev 16404)
@@ -43,7 +43,14 @@
<h:body>
<h:form id="form1">
- <rich:extendedDataTable frozenColumns="2" var="record" value="#{dataBean.employeeList}" styleClass="extendedDataTable">
+ <h:outputText value="Show data in table" />
+ <h:selectBooleanCheckbox value="#{dataBean.state}">
+ <f:ajax render="extendedDataTable" />
+ </h:selectBooleanCheckbox>
+ <rich:extendedDataTable id="extendedDataTable" frozenColumns="2" value="#{dataBean.state ? dataBean.employeeList : null}" var="record" noDataLabel="There isn't data." styleClass="extendedDataTable">
+ <f:facet name="noData">
+ <h:outputText value="There isn't data." style="border: solid black 1px;"/>
+ </f:facet>
<rich:column id="column_name">
<f:facet name="header">
<h:outputText id="columnHeader1" value="Column Header Facet"/>
@@ -68,6 +75,7 @@
<h:outputText value="#{record.EMail}" />
</rich:column>
</rich:extendedDataTable>
+ <input type="submit" />
</h:form>
</h:body>
</html>
14 years, 3 months
- 1
- 0