From 2a03cd5ced6fb5d05bfdd11aae06ea1c2159b409 Mon Sep 17 00:00:00 2001
From: ewuerger <ernst.wuerger@gmail.com>
Date: Fri, 23 Aug 2024 12:38:33 +0200
Subject: [PATCH] fix: Fix imports

---
 capellambse_context_diagrams/__init__.py                    | 5 ++---
 capellambse_context_diagrams/collectors/dataflow_view.py    | 2 +-
 capellambse_context_diagrams/collectors/default.py          | 2 +-
 capellambse_context_diagrams/collectors/exchanges.py        | 2 +-
 capellambse_context_diagrams/collectors/generic.py          | 2 +-
 capellambse_context_diagrams/collectors/realization_view.py | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/capellambse_context_diagrams/__init__.py b/capellambse_context_diagrams/__init__.py
index 01ce7cbe..5f755c9c 100644
--- a/capellambse_context_diagrams/__init__.py
+++ b/capellambse_context_diagrams/__init__.py
@@ -24,11 +24,10 @@
 from importlib import metadata
 
 from capellambse.diagram import COLORS, CSSdef, capstyle
-from capellambse.metamodel import fa, information
 from capellambse.model import common
+from capellambse.model.crosslayer import fa, information
 from capellambse.model.layers import ctx, la, oa, pa
 from capellambse.model.modeltypes import DiagramType
-from capellambse.svg import decorations
 
 from . import _elkjs, context, styling
 
@@ -144,7 +143,7 @@ def patch_styles(classes: cabc.Iterable[SupportedClass]) -> None:
 
     See Also
     --------
-    [capstyle.get_style][capellambse.diagram.get_style] : Default
+    [capstyle.get_style][capellambse.aird.capstyle.get_style] : Default
         style getter.
     """
     cap: dict[str, CSSdef] = {
diff --git a/capellambse_context_diagrams/collectors/dataflow_view.py b/capellambse_context_diagrams/collectors/dataflow_view.py
index 86cc37f9..633bcf39 100644
--- a/capellambse_context_diagrams/collectors/dataflow_view.py
+++ b/capellambse_context_diagrams/collectors/dataflow_view.py
@@ -10,8 +10,8 @@
 import typing as t
 from itertools import chain
 
-from capellambse.metamodel import fa
 from capellambse.model import modeltypes
+from capellambse.model.crosslayer import fa
 from capellambse.model.layers import oa
 
 from .. import _elkjs, context
diff --git a/capellambse_context_diagrams/collectors/default.py b/capellambse_context_diagrams/collectors/default.py
index 29c812a2..76f6c8dc 100644
--- a/capellambse_context_diagrams/collectors/default.py
+++ b/capellambse_context_diagrams/collectors/default.py
@@ -11,8 +11,8 @@
 from itertools import chain
 
 from capellambse import helpers
-from capellambse.metamodel import cs, fa
 from capellambse.model import common
+from capellambse.model.crosslayer import cs, fa
 from capellambse.model.layers import ctx as sa
 from capellambse.model.layers import la
 from capellambse.model.modeltypes import DiagramType as DT
diff --git a/capellambse_context_diagrams/collectors/exchanges.py b/capellambse_context_diagrams/collectors/exchanges.py
index 4ccc15aa..a7baae83 100644
--- a/capellambse_context_diagrams/collectors/exchanges.py
+++ b/capellambse_context_diagrams/collectors/exchanges.py
@@ -9,8 +9,8 @@
 import operator
 import typing as t
 
-from capellambse.metamodel import cs, fa
 from capellambse.model import common
+from capellambse.model.crosslayer import cs, fa
 from capellambse.model.modeltypes import DiagramType as DT
 
 from .. import _elkjs, context
diff --git a/capellambse_context_diagrams/collectors/generic.py b/capellambse_context_diagrams/collectors/generic.py
index 9031e690..81b0f2b9 100644
--- a/capellambse_context_diagrams/collectors/generic.py
+++ b/capellambse_context_diagrams/collectors/generic.py
@@ -11,8 +11,8 @@
 import logging
 import typing as t
 
-from capellambse.metamodel import interaction
 from capellambse.model import common, layers
+from capellambse.model.crosslayer import interaction
 from capellambse.model.modeltypes import DiagramType as DT
 
 from .. import _elkjs, context, filters
diff --git a/capellambse_context_diagrams/collectors/realization_view.py b/capellambse_context_diagrams/collectors/realization_view.py
index 5f350459..26f0d694 100644
--- a/capellambse_context_diagrams/collectors/realization_view.py
+++ b/capellambse_context_diagrams/collectors/realization_view.py
@@ -9,8 +9,8 @@
 import re
 import typing as t
 
-from capellambse.metamodel import cs, fa
 from capellambse.model import common, crosslayer
+from capellambse.model.crosslayer import cs, fa
 from capellambse.model.layers import oa
 
 from .. import _elkjs, context