You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2011/08/17 15:53:25 UTC
svn commit: r1158706 - in /felix/trunk/scrplugin/annotations: changelog.txt
src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
Author: cziegeler
Date: Wed Aug 17 13:53:25 2011
New Revision: 1158706
URL: http://svn.apache.org/viewvc?rev=1158706&view=rev
Log:
FELIX-3077 : Abstract class is not detected as abstract
Modified:
felix/trunk/scrplugin/annotations/changelog.txt
felix/trunk/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
Modified: felix/trunk/scrplugin/annotations/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/annotations/changelog.txt?rev=1158706&r1=1158705&r2=1158706&view=diff
==============================================================================
--- felix/trunk/scrplugin/annotations/changelog.txt (original)
+++ felix/trunk/scrplugin/annotations/changelog.txt Wed Aug 17 13:53:25 2011
@@ -2,6 +2,13 @@ Changes from 1.5.0 to 1.6.0
---------------------------
** Bug
+ * [FELIX-3077] - Abstract class is not detected as abstract
+
+
+Changes from 1.5.0 to 1.6.0
+---------------------------
+
+** Bug
* [FELIX-2957] - Filter scope should be an array
* [FELIX-2943] - Component generated by @SlingServlet does not match default settings of @Component
Modified: felix/trunk/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java?rev=1158706&r1=1158705&r2=1158706&view=diff
==============================================================================
--- felix/trunk/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java (original)
+++ felix/trunk/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java Wed Aug 17 13:53:25 2011
@@ -46,7 +46,12 @@ public class ComponentTag extends Abstra
this.annotation = new Component() {
public boolean componentAbstract() {
- return Util.getBooleanValue(annotation, desc, "componentAbstract", Component.class);
+ final String[] sValues = Util.getAnnotationValues(annotation, "componentAbstract", desc);
+ if ( sValues != null )
+ {
+ return Boolean.valueOf(sValues[0]);
+ }
+ return desc.isAbstract();
}
public boolean createPid() {