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 2009/07/02 15:04:53 UTC
svn commit: r790577 - in /felix/trunk:
scr-annotations/src/main/java/org/apache/felix/scr/annotations/
scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/
Author: cziegeler
Date: Thu Jul 2 13:04:52 2009
New Revision: 790577
URL: http://svn.apache.org/viewvc?rev=790577&view=rev
Log:
FELIX-1294 : Remove checked attribute from reference annotation.
Modified:
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java?rev=790577&r1=790576&r2=790577&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java Thu Jul 2 13:04:52 2009
@@ -23,6 +23,7 @@
/**
* Defines a {@link Property} option.
*/
+@Property(options=@PropertyOption(name="you",value="something"))
@Target(ElementType.ANNOTATION_TYPE)
@Retention(RetentionPolicy.SOURCE)
@Documented
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java?rev=790577&r1=790576&r2=790577&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java Thu Jul 2 13:04:52 2009
@@ -95,14 +95,11 @@
String unbind() default "";
/**
- * TODO: parameter documentation missing
- */
- boolean checked() default false;
-
- /**
- * TODO: parameter documentation missing
- * @since 1.0.9
+ * The reference strategy for the reference. This can either be
+ * {@link ReferenceStrategy#EVENT} in which case the bind and unbind
+ * methods are used or it can be {@link ReferenceStrategy#LOOKUP}
+ * in which case the reference is looked up through the
+ * component context.
*/
ReferenceStrategy strategy() default ReferenceStrategy.EVENT;
-
}
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java?rev=790577&r1=790576&r2=790577&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java Thu Jul 2 13:04:52 2009
@@ -52,10 +52,6 @@
return Util.getEnumValue(annotation, "cardinality", ReferenceCardinality.class, Reference.class);
}
- public boolean checked() {
- return Util.getBooleanValue(annotation, "checked", Reference.class);
- }
-
public String name() {
return Util.getStringValue(annotation, desc, "name", Reference.class);
}
@@ -107,7 +103,6 @@
map.put(Constants.REFERENCE_TARGET, emptyToNull(this.annotation.target()));
map.put(Constants.REFERENCE_BIND, emptyToNull(this.annotation.bind()));
map.put(Constants.REFERENCE_UNDBIND, emptyToNull(this.annotation.unbind()));
- map.put(Constants.REFERENCE_CHECKED, String.valueOf(this.annotation.checked()));
map.put(Constants.REFERENCE_STRATEGY, this.annotation.strategy().getStrategyString());
return map;