felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1634955 - in /felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto: ComponentConfigurationDTO.java ReferenceDTO.java
Date Tue, 28 Oct 2014 19:27:03 GMT
Author: djencks
Date: Tue Oct 28 19:27:03 2014
New Revision: 1634955

URL: http://svn.apache.org/r1634955
Log:
FELIX-4401 update spec DTO classes to latest revision

Modified:
    felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto/ComponentConfigurationDTO.java
    felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto/ReferenceDTO.java

Modified: felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto/ComponentConfigurationDTO.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto/ComponentConfigurationDTO.java?rev=1634955&r1=1634954&r2=1634955&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto/ComponentConfigurationDTO.java
(original)
+++ felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto/ComponentConfigurationDTO.java
Tue Oct 28 19:27:03 2014
@@ -26,7 +26,7 @@ import org.osgi.service.component.Compon
  * 
  * @since 1.3
  * @NotThreadSafe
- * @author $Id: f519b5fddd8002ffc252d039856acc8ba6f422d6 $
+ * @author $Id: a3e98bbac97a1d79805f9be0ed7f2ae811f112d0 $
  */
 public class ComponentConfigurationDTO extends DTO {
 	/**
@@ -65,22 +65,24 @@ public class ComponentConfigurationDTO e
 	public ComponentDescriptionDTO	description;
 
 	/**
-	 * The id of the component configuration.
+	 * The current state of the component configuration.
 	 * 
 	 * <p>
-	 * The id is a non-persistent, unique value assigned at runtime. The id is
-	 * also available as the {@code component.id} component property.
+	 * This is one of {@link #UNSATISFIED_CONFIGURATION},
+	 * {@link #UNSATISFIED_REFERENCE}, {@link #SATISFIED} or {@link #ACTIVE}.
 	 */
-	public long						id;
+	public int							state;
 
 	/**
-	 * The current state of the component configuration.
+	 * The id of the component configuration.
 	 * 
 	 * <p>
-	 * This is one of {@link #UNSATISFIED_CONFIGURATION},
-	 * {@link #UNSATISFIED_REFERENCE}, {@link #SATISFIED} or {@link #ACTIVE}.
+	 * The id is a non-persistent, unique value assigned at runtime. The id is
+	 * also available as the {@code component.id} component property. The value
+	 * of this field is unspecified if the state of this component configuration
+	 * is unsatisfied.
 	 */
-	public int					state;
+	public long							id;
 
 	/**
 	 * The component properties for the component configuration.

Modified: felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto/ReferenceDTO.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto/ReferenceDTO.java?rev=1634955&r1=1634954&r2=1634955&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto/ReferenceDTO.java
(original)
+++ felix/trunk/scr/src/main/java/org/osgi/service/component/runtime/dto/ReferenceDTO.java
Tue Oct 28 19:27:03 2014
@@ -23,7 +23,7 @@ import org.osgi.dto.DTO;
  * 
  * @since 1.3
  * @NotThreadSafe
- * @author $Id: a02ee5ad7b783a19bf7e1d8f9dcc6f44685ccd41 $
+ * @author $Id: 906b26512776b149670ec3048a8714dc99ff447a $
  */
 public class ReferenceDTO extends DTO {
 
@@ -32,28 +32,28 @@ public class ReferenceDTO extends DTO {
 	 * 
 	 * @see #strategy
 	 */
-	String			STRATEGY_LOOKUP			= "LOOKUP";
+	public static final String	STRATEGY_LOOKUP			= "LOOKUP";
 
 	/**
 	 * Constant for the method strategy
 	 * 
 	 * @see #strategy
 	 */
-	String			STRATEGY_METHOD			= "METHOD";
+	public static final String	STRATEGY_METHOD			= "METHOD";
 
 	/**
 	 * Constant for the field replace strategy
 	 * 
 	 * @see #strategy
 	 */
-	String			STRATEGY_FIELD_REPLACE	= "FIELD_REPLACE";
+	public static final String	STRATEGY_FIELD_REPLACE	= "FIELD_REPLACE";
 
 	/**
 	 * Constant for the field update strategy
 	 * 
 	 * @see #strategy
 	 */
-	String			STRATEGY_FIELD_UPDATE	= "FIELD_UPDATE";
+	public static final String	STRATEGY_FIELD_UPDATE	= "FIELD_UPDATE";
 
 	/**
 	 * The strategy of the reference.



Mime
View raw message