svn commit: r822910 - /tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java

[rf...@apache.org]

Author: rfeng
Date: Wed Oct  7 20:57:13 2009
New Revision: 822910

URL: http://svn.apache.org/viewvc?rev=822910&view=rev
Log:
Add some comments

Modified:
    tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java

Modified: tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java?rev=822910&r1=822909&r2=822910&view=diff
==============================================================================
--- tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java (original)
+++ tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java Wed Oct  7 20:57:13 2009
@@ -77,6 +77,7 @@
         for (Object model : models) {
             if (model instanceof PolicySubject) {
                 PolicySubject subject = (PolicySubject)model;
+                // FIXME: We should ignore the mutually exclusive intents from different levels
                 policySubject.getRequiredIntents().addAll(subject.getRequiredIntents());
                 policySubject.getPolicySets().addAll(subject.getPolicySets());
             }
@@ -300,9 +301,11 @@
         }
 
         for (Component component : composite.getComponents()) {
+            // Check component against implementation
             checkMutualExclusion(component, component.getImplementation(), monitor);
 
             for (ComponentService componentService : component.getServices()) {
+                // Check component/service against componentType/service 
                 checkMutualExclusion(componentService, componentService.getService(), monitor);
 
                 if (componentService.getInterfaceContract() != null && componentService.getService() != null) {
@@ -349,6 +352,7 @@
             }
 
             for (ComponentReference componentReference : component.getReferences()) {
+                // Check component/reference against componentType/reference
                 checkMutualExclusion(componentReference, componentReference.getReference(), monitor);
 
                 if (componentReference.getInterfaceContract() != null && componentReference.getReference() != null) {
@@ -397,6 +401,9 @@
             }
 
             Implementation implementation = component.getImplementation();
+            if (implementation != null) {
+                inherit(implementation, component, composite);
+            }
             // How to deal with implementation level policySets/intents
         }
     }