Move ElementFactory to gaphor.core.modeling

docs/services.md

@@ -33,7 +33,7 @@ emitted are with `UML.Elements`. Those classes, or more specifically, the
 properties, send notifications every time their state changes.
 
 ```eval_rst
-.. autoclass:: gaphor.UML.elementfactory.ElementFactory
+.. autoclass:: gaphor.core.modeling.ElementFactory
 ```
 
 ## Plugins

gaphor/UML/__init__.py

@@ -1,7 +1,6 @@
 # Here, order matters
 from gaphor.UML.uml2 import *  # noqa: isort:skip
 from gaphor.UML.presentation import Presentation  # noqa: isort:skip
-from gaphor.UML.elementfactory import ElementFactory  # noqa: isort:skip
 from gaphor.UML import modelfactory as model  # noqa: isort:skip
 
 from gaphor.UML.umlfmt import format

gaphor/UML/tests/test_diagram.py

@@ -1,9 +1,9 @@
 import gaphas
 import pytest
 
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
 from gaphor.UML import Diagram
-from gaphor.UML.elementfactory import ElementFactory
 from gaphor.UML.presentation import Presentation
 
 

gaphor/UML/tests/test_modelfactory.py

@@ -1,13 +1,14 @@
 import pytest
 
 from gaphor import UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
 
 
 @pytest.fixture
 def factory():
     event_manager = EventManager()
-    return UML.ElementFactory(event_manager)
+    return ElementFactory(event_manager)
 
 
 def test_stereotype_name(factory):

gaphor/UML/tests/test_uml2.py

@@ -1,13 +1,14 @@
 import pytest
 
 import gaphor.UML as UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
 
 
 @pytest.fixture
 def factory():
     event_manager = EventManager()
-    return UML.ElementFactory(event_manager)
+    return ElementFactory(event_manager)
 
 
 def test_association(factory):

gaphor/UML/tests/test_umlfmt.py

@@ -5,9 +5,9 @@ Formatting of UML model elements into text tests.
 import pytest
 
 import gaphor.UML.uml2 as UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
 from gaphor.UML import model
-from gaphor.UML.elementfactory import ElementFactory
 from gaphor.UML.umlfmt import format
 from gaphor.UML.umllex import parse
 

gaphor/UML/tests/test_umllex.py

@@ -5,8 +5,8 @@ Parsing of UML model elements from string tests.
 import pytest
 
 from gaphor import UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
-from gaphor.UML.elementfactory import ElementFactory
 from gaphor.UML.umllex import attribute_pat, operation_pat, parameter_pat
 
 

gaphor/core/modeling/__init__.py

@@ -0,0 +1 @@
+from gaphor.core.modeling.elementfactory import ElementFactory

gaphor/core/modeling/elementfactory.py

@@ -17,8 +17,8 @@ from typing import (
 )
 
 from gaphor.abc import Service
+from gaphor.core.modeling.elementdispatcher import ElementDispatcher, EventWatcher
 from gaphor.UML.element import Element, UnlinkEvent
-from gaphor.UML.elementdispatcher import ElementDispatcher, EventWatcher
 from gaphor.UML.event import ElementCreated, ElementDeleted, ModelFlushed, ModelReady
 from gaphor.UML.uml2 import Diagram
 

gaphor/core/modeling/tests/test_elementdispatcher.py

@@ -1,11 +1,11 @@
 import pytest
 
 from gaphor import UML
+from gaphor.core.modeling import ElementFactory
+from gaphor.core.modeling.elementdispatcher import ElementDispatcher, EventWatcher
 from gaphor.services.eventmanager import EventManager
 from gaphor.tests import TestCase
 from gaphor.UML import Element
-from gaphor.UML.elementdispatcher import ElementDispatcher, EventWatcher
-from gaphor.UML.elementfactory import ElementFactory
 from gaphor.UML.properties import association
 
 

gaphor/core/modeling/tests/test_elementfactory.py

@@ -4,9 +4,9 @@ import pytest
 
 from gaphor.application import Session
 from gaphor.core import event_handler
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
 from gaphor.UML import Parameter
-from gaphor.UML.elementfactory import ElementFactory
 from gaphor.UML.event import (
     ElementCreated,
     ElementDeleted,

gaphor/diagram/general/tests/test_propertypages.py

@@ -1,9 +1,9 @@
 import pytest
 
 from gaphor import UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.diagram.general.generalpropertypages import CommentItemPropertyPage
 from gaphor.services.eventmanager import EventManager
-from gaphor.UML.elementfactory import ElementFactory
 
 
 @pytest.fixture

gaphor/diagram/tests/fixtures.py

@@ -5,11 +5,11 @@ from gaphas.aspect import ConnectionSink
 from gaphas.aspect import Connector as ConnectorAspect
 
 from gaphor import UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.diagram.connectors import Connector
 from gaphor.misc.xmlwriter import XMLWriter
 from gaphor.services.eventmanager import EventManager
 from gaphor.storage import storage
-from gaphor.UML.elementfactory import ElementFactory
 
 
 @pytest.fixture

gaphor/plugins/xmiexport/tests/test_exportmodel.py

@@ -1,8 +1,8 @@
 import pytest
 
 from gaphor import UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.plugins.xmiexport.exportmodel import XMIExport
-from gaphor.UML.elementfactory import ElementFactory
 
 
 @pytest.fixture

gaphor/services/tests/test_undomanager.py

@@ -3,11 +3,11 @@ Test the UndoManager.
 """
 
 from gaphor.core import event_handler
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
 from gaphor.services.undomanager import UndoManager
 from gaphor.tests.testcase import TestCase
 from gaphor.transaction import Transaction
-from gaphor.UML.elementfactory import ElementFactory
 
 
 class TestUndoManager(TestCase):

gaphor/storage/tests/conftest.py

@@ -3,9 +3,9 @@ from io import StringIO
 import pytest
 
 from gaphor import UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
 from gaphor.storage import storage
-from gaphor.UML.elementfactory import ElementFactory
 
 
 @pytest.fixture

gaphor/storage/tests/test_storage_upgrades.py

@@ -1,10 +1,10 @@
 import pytest
 
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
 from gaphor.storage import diagramitems
 from gaphor.storage.parser import canvas, canvasitem, element
 from gaphor.storage.storage import load_elements
-from gaphor.UML.elementfactory import ElementFactory
 
 
 @pytest.fixture

gaphor/storage/tests/test_verify.py

@@ -1,10 +1,11 @@
 from gaphor import UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
 from gaphor.storage.verify import orphan_references
 
 
 def test_verifier():
-    factory = UML.ElementFactory(EventManager())
+    factory = ElementFactory(EventManager())
     c = factory.create(UML.Class)
     p = factory.create(UML.Property)
     c.ownedAttribute = p

gaphor/ui/namespace.py

@@ -27,7 +27,7 @@ from gaphor.UML.event import (
 )
 
 if TYPE_CHECKING:
-    from gaphor.UML.elementfactory import ElementFactory
+    from gaphor.core.modeling import ElementFactory
     from gaphor.services.eventmanager import EventManager
 
 # The following items will be shown in the treeview, although they

gaphor/ui/tests/test_diagrampage_tools.py

@@ -2,12 +2,12 @@ import pytest
 from gi.repository import Gtk
 
 from gaphor import UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.diagram.diagramtoolbox import TOOLBOX_ACTIONS
 from gaphor.services.eventmanager import EventManager
 from gaphor.services.properties import Properties
 from gaphor.tests.testcase import TestCase
 from gaphor.ui.diagrampage import DiagramPage
-from gaphor.UML import ElementFactory
 
 
 @pytest.fixture

gaphor/ui/tests/test_elementeditor.py

@@ -1,9 +1,9 @@
 import pytest
 
+from gaphor.core.modeling import ElementFactory
 from gaphor.services.eventmanager import EventManager
 from gaphor.ui.elementeditor import ElementEditor
 from gaphor.ui.mainwindow import Diagrams
-from gaphor.UML.elementfactory import ElementFactory
 
 
 @pytest.fixture

gaphor/ui/tests/test_namespace.py

@@ -1,8 +1,8 @@
 import pytest
 
-import gaphor.services.componentregistry
 import gaphor.services.eventmanager
 import gaphor.UML as UML
+from gaphor.core.modeling import ElementFactory
 from gaphor.ui.namespace import Namespace
 
 
@@ -13,12 +13,7 @@ def event_manager():
 
 @pytest.fixture
 def element_factory(event_manager):
-    return UML.elementfactory.ElementFactory(event_manager)
-
-
-@pytest.fixture
-def component_registry():
-    return gaphor.services.componentregistry.ComponentRegistry()
+    return ElementFactory(event_manager)
 
 
 @pytest.fixture

pyproject.toml

@@ -70,7 +70,7 @@ gaphorconvert = 'gaphor.tools.gaphorconvert:main'
 "event_manager" = "gaphor.services.eventmanager:EventManager"
 "properties" = "gaphor.services.properties:Properties"
 "undo_manager" = "gaphor.services.undomanager:UndoManager"
-"element_factory" = "gaphor.UML.elementfactory:ElementFactory"
+"element_factory" = "gaphor.core.modeling:ElementFactory"
 "file_manager" = "gaphor.ui.filemanager:FileManager"
 "recent_files" = "gaphor.ui.recentfiles:RecentFiles"
 "main_window" = "gaphor.ui.mainwindow:MainWindow"

tests/test_undo.py

@@ -4,10 +4,10 @@ from gaphas.aspect import ConnectionSink, Connector
 from gaphor import UML
 from gaphor.application import Application
 from gaphor.core import transactional
+from gaphor.core.modeling import ElementFactory
 from gaphor.diagram.classes import AssociationItem, ClassItem
 from gaphor.services.eventmanager import EventManager
 from gaphor.services.undomanager import UndoManager
-from gaphor.UML.elementfactory import ElementFactory
 
 
 @pytest.fixture

utils/compare.py

@@ -8,9 +8,9 @@ This file is part of Gaphor.
 
 __all__ = ["Compare"]
 
+import gaphor.core.modeling
 import gaphor.storage
 import gaphor.storage.parser
-import gaphor.UML
 
 
 class Compare:
@@ -78,7 +78,7 @@ class Compare:
         A tuple (elements, factory) is returned.
         """
         elements = gaphor.storage.parser.parse(filename)
-        factory = gaphor.UML.ElementFactory()
+        factory = gaphor.core.modleing.ElementFactory()
         try:
             gaphor.storage.load_elements(elements, factory)
         except Exception as e:

win-installer/gaphor-script.py

@@ -1,7 +1,7 @@
 if __name__ == "__main__":
     import gaphor
     from gaphor import core
-    from gaphor.UML.elementfactory import ElementFactory
+    from gaphor.core.modeling import ElementFactory
     from gaphor.plugins.console import ConsoleWindow
     from gaphor.plugins.diagramexport import DiagramExport
     from gaphor.plugins.xmiexport import XMIExport