You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/03/04 23:02:06 UTC
svn commit: r919195 -
/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/
Author: werpu
Date: Thu Mar 4 22:02:06 2010
New Revision: 919195
URL: http://svn.apache.org/viewvc?rev=919195&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-40
We are going to transition the annotation scan from class names to classes
Modified:
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorRendererImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java?rev=919195&r1=919194&r2=919195&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java Thu Mar 4 22:02:06 2010
@@ -50,6 +50,11 @@
return annotation.equals(javax.faces.bean.ManagedBean.class.getName());
}
+ public boolean supportsAnnotation(Class annotation) {
+ return annotation.equals(javax.faces.bean.ManagedBean.class);
+ }
+
+
public void register(Class clazz, java.lang.annotation.Annotation ann) {
String annotationName = ann.getClass().getName();
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java?rev=919195&r1=919194&r2=919195&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java Thu Mar 4 22:02:06 2010
@@ -41,6 +41,11 @@
return annotation.equals(FacesBehavior.class.getName()); //To change body of implemented methods use File | Settings | File Templates.
}
+ public boolean supportsAnnotation(Class annotation) {
+ return annotation.equals(FacesBehavior.class); //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+
protected void addEntity(Class clazz, String val) {
if (log.isLoggable(Level.FINEST)) {
log.log(Level.FINEST, "addBehavior(" + val + ","
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorRendererImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorRendererImplementationListener.java?rev=919195&r1=919194&r2=919195&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorRendererImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorRendererImplementationListener.java Thu Mar 4 22:02:06 2010
@@ -135,6 +135,11 @@
return annotation.equals(FacesBehaviorRenderer.class.getName());
}
+ public boolean supportsAnnotation(Class annotation) {
+ return annotation.equals(FacesBehaviorRenderer.class);
+ }
+
+
private RenderKitFactory getRenderKitFactory() {
return (RenderKitFactory) FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java?rev=919195&r1=919194&r2=919195&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java Thu Mar 4 22:02:06 2010
@@ -41,6 +41,11 @@
return annotation.equals(FacesComponent.class.getName()); //To change body of implemented methods use File | Settings | File Templates.
}
+ public boolean supportsAnnotation(Class annotation) {
+ return annotation.equals(FacesComponent.class); //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+
protected void addEntity(Class clazz, String val) {
if (log.isLoggable(Level.FINEST)) {
log.log(Level.FINEST, "addComponent(" + val + "," + clazz.getName() + ")");
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java?rev=919195&r1=919194&r2=919195&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java Thu Mar 4 22:02:06 2010
@@ -129,6 +129,11 @@
return annotation.equals(FacesConverter.class.getName());
}
+ public boolean supportsAnnotation(Class annotation) {
+ return annotation.equals(FacesConverter.class);
+ }
+
+
@Override
public void purge(String className) {
super.purge(className);
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java?rev=919195&r1=919194&r2=919195&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java Thu Mar 4 22:02:06 2010
@@ -169,7 +169,7 @@
for (java.lang.annotation.Annotation ann : anns) {
for (ClassScanListener cListener : _listeners) {
AnnotationScanListener listener = (AnnotationScanListener) cListener;
- if (listener.supportsAnnotation(ann.annotationType().getName())) {
+ if (listener.supportsAnnotation(ann.annotationType())) {
listener.register(clazz, ann);
_registeredAnnotations.put(clazz.getName(), ann.annotationType().getName());
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java?rev=919195&r1=919194&r2=919195&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java Thu Mar 4 22:02:06 2010
@@ -113,6 +113,10 @@
return annotation.equals(FacesRenderer.class.getName());
}
+ public boolean supportsAnnotation(Class annotation) {
+ return annotation.equals(FacesRenderer.class);
+ }
+
@Override
protected void addEntity(Class clazz, Map<String, Object> params) {
String value = (String) params.get(PAR_FAMILY);
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java?rev=919195&r1=919194&r2=919195&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java Thu Mar 4 22:02:06 2010
@@ -107,6 +107,11 @@
return annotation.equals(FacesValidator.class.getName());
}
+ public boolean supportsAnnotation(Class annotation) {
+ return annotation.equals(FacesValidator.class);
+ }
+
+
@Override
protected void addEntity(Class clazz, Map<String, Object> params) {
String value = (String) params.get(PAR_VALUE);