You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/01/01 14:42:58 UTC

svn commit: r491569 - in /incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi: component/Component.java extension/AbstractComponentExtension.java

Author: meerajk
Date: Mon Jan  1 05:42:58 2007
New Revision: 491569

URL: http://svn.apache.org/viewvc?view=rev&rev=491569
Log:
Replaced getComponentDefinition by getDefaultPropertyValues.

Modified:
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java?view=diff&rev=491569&r1=491568&r2=491569
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/Component.java Mon Jan  1 05:42:58 2007
@@ -22,8 +22,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tuscany.spi.model.ComponentDefinition;
 import org.apache.tuscany.spi.model.Operation;
+import org.apache.tuscany.spi.model.PropertyValue;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.OutboundWire;
 import org.apache.tuscany.spi.wire.TargetInvoker;
@@ -76,21 +76,17 @@
         throws TargetInvokerCreationException;
 
     /**
-     * Gets the component definition associated with the component.
+     * Gets the default property values associated with the component.
      *
-     * @return Definition associated with the component.
+     * @return Default property values associated with the component.
      */
-    ComponentDefinition getComponentDefinition();
+    Map<String, PropertyValue<?>> getDefaultPropertyValues();
 
     /**
-     * Gets the component definition associated with the component.
+     * Gets the default property values associated with the component.
      *
-     * @param definition Definition associated with the component.
-     * TODO This shouldn't be mutable, rather set during
-     *                   construction. However, passing it in the constructor of the implementing class has implications
-     *                   in the usage of various types in the inheritance tree.
-     * @deprecated Remove this when immutability is enforced in the implemenation tree.
+     * @param defaultPropertyValues Default property values associated with the component.
      */
-    void setComponentDefinition(ComponentDefinition definition);
+    void setDefaultPropertyValues(Map<String, PropertyValue<?>> defaultPropertyValues);
 
 }

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java?view=diff&rev=491569&r1=491568&r2=491569
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AbstractComponentExtension.java Mon Jan  1 05:42:58 2007
@@ -18,10 +18,12 @@
  */
 package org.apache.tuscany.spi.extension;
 
+import java.util.Map;
+
 import org.apache.tuscany.spi.component.AbstractSCAObject;
 import org.apache.tuscany.spi.component.Component;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.model.ComponentDefinition;
+import org.apache.tuscany.spi.model.PropertyValue;
 
 /**
  * 
@@ -30,45 +32,32 @@
  */
 public abstract class AbstractComponentExtension extends AbstractSCAObject implements Component {
 
-    /** Component Definition */
-    private ComponentDefinition componentDefinition;
-    
-    /**
-     * Initializes component name and parent.
-     * 
-     * @param name Name of the component.
-     * @param parent Parent of the component.
-     * @param componentDefinition Definition of this component.
-     */
-    public AbstractComponentExtension(String name, CompositeComponent parent, ComponentDefinition componentDefinition) {
-        super(name, parent);
-        this.componentDefinition = componentDefinition;
-    }
+    /** Default property values. */
+    private Map<String, PropertyValue<?>> defaultPropertyValues;
     
     /**
      * Initializes component name and parent.
      * 
      * @param name Name of the component.
      * @param parent Parent of the component.
-     * @param componentDefinition Definition of this component.
-     * @deprecated Use <code>AbstractComponentExtension(String name, CompositeComponent parent, ComponentDefinition<Implementation<?>> componentDefinition)</code>. 
+     * @param componentDefinition Definition of this component. 
      */
     public AbstractComponentExtension(String name, CompositeComponent parent) {
         super(name, parent);
     }
 
     /**
-     * @see org.apache.tuscany.spi.component.Component#getComponentDefinition()
+     * @see org.apache.tuscany.spi.component.Component#getDefaultPropertyValues()
      */
-    public ComponentDefinition getComponentDefinition() {
-        return componentDefinition;
+    public Map<String, PropertyValue<?>> getDefaultPropertyValues() {
+        return defaultPropertyValues;
     }
 
     /**
-     * @see org.apache.tuscany.spi.component.Component#setComponentDefinition(org.apache.tuscany.spi.model.ComponentDefinition)
+     * @see org.apache.tuscany.spi.component.Component#setDefaultPropertyValues(java.util.Map)
      */
-    public void setComponentDefinition(ComponentDefinition componentDefinition) {
-        this.componentDefinition = componentDefinition;
+    public void setDefaultPropertyValues(Map<String, PropertyValue<?>> defaultPropertyValues) {
+        this.defaultPropertyValues = defaultPropertyValues;
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org