Changeset 2087 for gaphor/trunk/utils

Timestamp:

09/05/07 03:16:26 (1 year ago)

Author:

arj..@yirdis.nl

Message:

separated parser and writer code for associations.

Files:

• gaphor/trunk/utils/command/gen_uml.py (modified) (7 diffs)

gaphor/trunk/utils/command/gen_uml.py

@@ -85 +85 @@
-
-    def write_classdef(self, clazz):
-
+
+
-        First the parent classes are examined. After that its own definition
-        is written. It is ensured that class definitions are only written
@@ -102 +103 @@
-
-    def write_property(self, full_name, value):
-
+
+
-        overridden value. full_name should be like Class.attribute. value is
-        free format text.
@@ -110 +112 @@
-
-    def write_attribute(self, a, enumerations={}):
-
+
+
-        of enumerations, indexed by ID. These are used to identify enums.
-        """
@@ -169 +172 @@
-
-    def write_association(self, head, tail):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        # Derived unions and redefines are handled separately
-if derived or redefines:
-    return False
-
-
-
-
-
-
-get('aggregation') == 'composite'
+assert not head.derived
+assert not head.redefines
+
+head.
+head.
+head.
+head.
+head.
+composite
-            a += ', composite=True'
-
-        # Add the opposite property if the head itself is navigable:
-
-
+
-            try:
-                #o_derived, o_name = parse_association_name(tail['name'])
-                o_name = tail.name
-int(tail.isDerived or 0)
+tail.derived
-            except KeyError:
-                msg('ERROR! no name, but navigable: %s (%s.%s)' %
-                    (tail.id, tail.class_name, tail.name))
-            else:
-
+head.
-                a += ", opposite='%s'" % o_name
-
-
-
+head.
+
-
-    def write_derivedunion(self, d):
-
+
+
-        is issued. The derivedunion is still created though.
+
-        Derived unions may be created for associations that were returned
-
+
+
-        subs = ''
-        for u in d.union:
@@ -263 +230 @@
-
-    def write_redefine(self, r):
-
-
+
+
+
+
-        self.write_property("%s.%s" % (r.class_name, r.name),
-                            "redefine('%s', %s, %s)" % (r.name, r.opposite_class_name, r.redefines))
@@ -311 +280 @@
-    #print 'found', subsets, redefines
-    return subsets, redefines
+
+def parse_association_end(head, tail):
+    """
+    The head association end is enriched with the following attributes:
+
+        derived - association is a derived union or not
+        name - name of the association end (name of head is found on tail)
+        class_name - name of the class this association belongs to
+        opposite_class_name - name of the class at the other end of the assoc.
+        lower - lower multiplicity
+        upper - upper multiplicity
+        composite - if the association has a composite relation to the other end
+        subsets - derived unions that use the association
+        redefines - redefines existing associations
+    """
+    head.navigable = head.get('class_')
+    if not head.navigable:
+        # from this side, the association is not navigable
+        return
+
+    name = head.name
+    if name is None:
+        raise ValueError('ERROR! no name, but navigable: %s (%s.%s)' % (head.id, head.class_name, head.name))
+
+    #print head.id, head.lowerValue
+    upper = head.upperValue and head.upperValue.value or '*'
+    lower = head.lowerValue and head.lowerValue.value or upper
+    if lower == '*':
+        lower = 0
+    subsets, redefines = parse_association_tags(head.taggedValue)
+
+    # Add the values found. These are used later to generate derived unions.
+    head.class_name = head.class_['name']
+    head.opposite_class_name = head.type['name']
+    head.lower = lower
+    head.upper = upper
+    head.subsets = subsets
+    head.composite = head.get('aggregation') == 'composite'
+    head.derived = int(head.isDerived or 0)
+    head.redefines = redefines
+
-
-def generate(filename, outfile=None, overridesfile=None):
@@ -417 +427 @@
-
-        for e1, e2 in ((ends[0], ends[1]), (ends[1], ends[0])):
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-