svn commit: r385812 - /incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java

[jb...@apache.org]

Author: jboynes
Date: Tue Mar 14 06:56:10 2006
New Revision: 385812

URL: http://svn.apache.org/viewcvs?rev=385812&view=rev
Log:
load property's override option

Modified:
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java?rev=385812&r1=385811&r2=385812&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java Tue Mar 14 06:56:10 2006
@@ -31,11 +31,13 @@
 import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.COMPONENT;
 import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.PROPERTIES;
 import static org.apache.tuscany.core.loader.assembly.AssemblyConstants.REFERENCES;
+import org.apache.tuscany.core.loader.StAXUtil;
 import org.apache.tuscany.model.assembly.AssemblyModelObject;
 import org.apache.tuscany.model.assembly.Component;
 import org.apache.tuscany.model.assembly.ComponentImplementation;
 import org.apache.tuscany.model.assembly.ConfiguredProperty;
 import org.apache.tuscany.model.assembly.ConfiguredReference;
+import org.apache.tuscany.model.assembly.OverrideOption;
 
 /**
  * @version $Rev$ $Date$
@@ -85,10 +87,11 @@
             case START_ELEMENT:
                 String name = reader.getLocalName();
                 String value = reader.getElementText();
+                OverrideOption override = StAXUtil.overrideOption(reader.getAttributeValue(null, "override"), OverrideOption.NO);
                 ConfiguredProperty configuredProperty = factory.createConfiguredProperty();
-                // todo set property override
                 configuredProperty.setName(name);
                 configuredProperty.setValue(value);
+                configuredProperty.setOverrideOption(override);
                 configuredProperties.add(configuredProperty);
                 break;
             case END_ELEMENT: