Unwind uml package #263

amolenaar · 2020-02-05T15:38:34Z

What kind of change does this PR introduce?

The imports in the gaphor.UML module are very much entangled.

The imports happen more orderly. There are no cycles (except for elementdispatcher.py).

The UML Diagram class is now inlined in uml2.py
overrides are no longer directly imported in uml2.py
Added protocols to resolve cycles (e.g. between Element and ElementFactory)
The UML properties are only generic when needed (e.g. associations are abstracted behind a protocol)

Moved override definitions completely to uml2overrides.py

This prevents cyclic imports.

Associations are marked by a protocol, so no need to add generics there.

amolenaar added 12 commits February 1, 2020 10:23

Reduce imports done from uml2.py

3998dff

Moved override definitions completely to uml2overrides.py

Removed all import cycles, except for Diagram

7a731bf

Remove wrong overloads for umlproperty

583414b

Use super() for UML events

941e561

Reorder imports in UML module

6cd1c7a

Make build_uml executable

6fb47c9

Inline diagram code in uml2 module

f2a177c

This prevents cyclic imports.

Move element->presentation relation to presentation module

bee3c05

Be more specific which properties need to be generic

3692d4d

Associations are marked by a protocol, so no need to add generics there.

Remove import cycles from diagram package

0a7bc8f

Fix xunit format (for IDE's)

e955fef

Add some extra tests for Diagram

5a27d23

amolenaar requested a review from danyeaw February 5, 2020 15:42

amolenaar merged commit 29a9e03 into master Feb 6, 2020

amolenaar deleted the unwind-uml-package branch February 9, 2020 13:01

amolenaar added the chore Maintenance related PR label Feb 14, 2020

Provide feedback