Changeset 757

Timestamp:

02/06/06 00:52:49 (3 years ago)

Author:

wrobell

Message:

- provided and required interfaces of component realizing classifiers are

visible in Component.{provided,required} derived associations

- support for automatic realization dependencies between components and

interfaces

Files:

• trunk/gaphor/ChangeLog (modified) (1 diff)
• trunk/gaphor/NEWS (modified) (1 diff)
• trunk/gaphor/gaphor/UML/uml2.override (modified) (2 diffs)
• trunk/gaphor/gaphor/UML/util.py (added)
• trunk/gaphor/gaphor/diagram/dependency.py (modified) (5 diffs)

trunk/gaphor/ChangeLog

@@ +1 @@
+2006-02-06  wrobell <wrobell@pld-linux.org>
+        * gaphor/UML/uml2.override: provided and required interfaces of
+        component realizing classifiers are visible in Component.{provided,required}
+        derived associations
+        * gaphor/UML/util.py: added utility functions for getting provided and
+        required interfaces of classifier/component
+        * gaphor/diagram/dependency.py: support for automatic realization
+        dependencies between components and interfaces
+
-2006-01-16  wrobell <wrobell@pld-linux.org>
-        * gaphor/diagram/commentline.py: allow_connect_handle does not throw an

trunk/gaphor/NEWS

@@ -1 +1 @@
-0.8.1
------
-
+
+
+
+
+
-
-0.8.0

trunk/gaphor/gaphor/UML/uml2.override

@@ -181 +181 @@
-override Component.provided
-def component_provided(self):
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-Component.provided = property(component_provided, doc = \
@@ -193 +201 @@
-override Component.required
-def component_required(self):
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-Component.required = property(component_required, doc = \

trunk/gaphor/gaphor/diagram/dependency.py

@@ -35 +35 @@
-    dependencies to an interface, it will probably not be very explaining
-    (esp. Usage dependencies).
+
+    Function get_dependency_type should be used to determine automatically
+    type of a dependency.
-
-    TODO (see also InterfaceItem): When a Usage dependency is drawn and is
@@ -150 +153 @@
-        """See RelationshipItem.find_relationship().
-        """
-
-
-
+
+
+
+
+
+
-
-    def allow_connect_handle(self, handle, connecting_to):
@@ -177 +183 @@
-
-        if self.auto_dependency:
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-        if c1 and c2:
@@ -189 +198 @@
-            if not relation:
-                relation = resource(UML.ElementFactory).create(self.dependency_type)
-
-
+
+
+
+
+
+
-            self.subject = relation
-
@@ -200 +213 @@
-        self.set_subject(None)
-
+
+
+def is_usage(s):
+    """
+    Return true if dependency should be usage dependency.
+    """
+    return isinstance(s, UML.Interface)
+
+
+def is_component_realization(ts, hs):
+    """
+    Return true if dependency should be realization dependency.
+    """
+    return isinstance(ts, UML.Classifier) and isinstance(hs, UML.Component)
+
+
+def get_dependency_type(ts, hs):
+    """
+    Determine dependency type:
+    - check if it is usage
+    - check if it is realization
+    - if none of above, then it is normal dependency
+
+    The checks should be performed in above order. For example if ts and hs
+    are Interface and Component, then we have two choices:
+    - claim it is an usage (as ts is an Interface)
+    - or claim it is a realization (as Interface is Classifier, too)
+    In this case we want usage to win over realization.
+    """
+    dt = UML.Dependency
+    if is_usage(ts):
+        dt = UML.Usage
+    elif is_component_realization(ts, hs):
+        dt = UML.Realization
+    return dt
+
+
-initialize_item(DependencyItem, UML.Dependency)