aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r941486 - in /incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb: Tblueprint.java Tcomponent.java TreferenceList.java
Date Wed, 05 May 2010 21:01:25 GMT
Author: linsun
Date: Wed May  5 21:01:24 2010
New Revision: 941486

URL: http://svn.apache.org/viewvc?rev=941486&view=rev
Log:
[blueprint annotation] update TreferenceList to use correct root element, allow users to set
null dependsOn on Tcomponent, and avoid NPE on type converters

Modified:
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/Tblueprint.java
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/Tcomponent.java
    incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/TreferenceList.java

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/Tblueprint.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/Tblueprint.java?rev=941486&r1=941485&r2=941486&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/Tblueprint.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/Tblueprint.java
Wed May  5 21:01:24 2010
@@ -123,6 +123,9 @@ public class Tblueprint {
      *     
      */
     public TtypeConverters getTypeConverters() {
+        if (typeConverters == null) {
+            typeConverters = new TtypeConverters();
+        }
         return typeConverters;
     }
 

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/Tcomponent.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/Tcomponent.java?rev=941486&r1=941485&r2=941486&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/Tcomponent.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/Tcomponent.java
Wed May  5 21:01:24 2010
@@ -143,10 +143,15 @@ public abstract class Tcomponent {
      * 
      */
     public List<String> getDependsOn() {
-        if (dependsOn == null) {
-            dependsOn = new Vector<String>();
-        }
+        //if (dependsOn == null) {
+        //    dependsOn = new Vector<String>();
+        //}
         return this.dependsOn;
     }
+    
+    public void setDependsOn(List<String> dependsOn) {
+        this.dependsOn = dependsOn;
+    }
+    
 
 }

Modified: incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/TreferenceList.java
URL: http://svn.apache.org/viewvc/incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/TreferenceList.java?rev=941486&r1=941485&r2=941486&view=diff
==============================================================================
--- incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/TreferenceList.java
(original)
+++ incubator/aries/sandbox/linsun/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/jaxb/TreferenceList.java
Wed May  5 21:01:24 2010
@@ -57,7 +57,7 @@ import javax.xml.bind.annotation.adapter
 @XmlSeeAlso({
     TinlinedReferenceList.class
 })
-@XmlRootElement(name = "referenceList")
+@XmlRootElement(name = "reference-list")
 public class TreferenceList
     extends TserviceReference
 {



Mime
View raw message