From eea411c73b7fbde3b6ec4fb5ce2496986b09f80a Mon Sep 17 00:00:00 2001
From: IgorFilimonov <st087840@student.spbu.ru>
Date: Wed, 9 Oct 2024 22:07:59 +0300
Subject: [PATCH 1/4] Now transitions view are inherited from
 BasicTransitionView

---
 .../constructor/view/BasicTransitionView.kt   | 25 +++++++++++++++++++
 .../constructor/view/TableTransitionView.kt   | 22 +---------------
 .../constructor/view/TransitionView.kt        | 19 ++------------
 3 files changed, 28 insertions(+), 38 deletions(-)
 create mode 100644 src/main/kotlin/automaton/constructor/view/BasicTransitionView.kt

diff --git a/src/main/kotlin/automaton/constructor/view/BasicTransitionView.kt b/src/main/kotlin/automaton/constructor/view/BasicTransitionView.kt
new file mode 100644
index 0000000..9e5c5f3
--- /dev/null
+++ b/src/main/kotlin/automaton/constructor/view/BasicTransitionView.kt
@@ -0,0 +1,25 @@
+package automaton.constructor.view
+
+import automaton.constructor.model.element.Transition
+import automaton.constructor.utils.I18N
+import automaton.constructor.utils.Setting
+import automaton.constructor.utils.SettingGroup
+import automaton.constructor.utils.createUnmodifiableSettingControl
+import tornadofx.toProperty
+
+open class BasicTransitionView(val transition: Transition): AutomatonElementView(transition) {
+    override fun getSettings() = listOf(
+        SettingGroup(
+            I18N.messages.getString("TransitionView.Transition").toProperty(), listOf(
+                Setting(
+                    I18N.messages.getString("TransitionView.Source"),
+                    createUnmodifiableSettingControl(transition.source.nameProperty)
+                ),
+                Setting(
+                    I18N.messages.getString("TransitionView.Target"),
+                    createUnmodifiableSettingControl(transition.target.nameProperty)
+                )
+            )
+        )
+    ) + super.getSettings()
+}
diff --git a/src/main/kotlin/automaton/constructor/view/TableTransitionView.kt b/src/main/kotlin/automaton/constructor/view/TableTransitionView.kt
index 7fd1c07..73f203e 100644
--- a/src/main/kotlin/automaton/constructor/view/TableTransitionView.kt
+++ b/src/main/kotlin/automaton/constructor/view/TableTransitionView.kt
@@ -1,25 +1,5 @@
 package automaton.constructor.view
 
 import automaton.constructor.model.element.Transition
-import automaton.constructor.utils.I18N
-import automaton.constructor.utils.Setting
-import automaton.constructor.utils.SettingGroup
-import automaton.constructor.utils.createUnmodifiableSettingControl
-import tornadofx.toProperty
 
-open class TableTransitionView(val transition: Transition): AutomatonElementView(transition) {
-    override fun getSettings() = listOf(
-        SettingGroup(
-            I18N.messages.getString("TransitionView.Transition").toProperty(), listOf(
-                Setting(
-                    I18N.messages.getString("TransitionView.Source"),
-                    createUnmodifiableSettingControl(transition.source.nameProperty)
-                ),
-                Setting(
-                    I18N.messages.getString("TransitionView.Target"),
-                    createUnmodifiableSettingControl(transition.target.nameProperty)
-                )
-            )
-        )
-    ) + super.getSettings()
-}
\ No newline at end of file
+open class TableTransitionView(transition: Transition): BasicTransitionView(transition)
diff --git a/src/main/kotlin/automaton/constructor/view/TransitionView.kt b/src/main/kotlin/automaton/constructor/view/TransitionView.kt
index 7b1e162..e85773b 100644
--- a/src/main/kotlin/automaton/constructor/view/TransitionView.kt
+++ b/src/main/kotlin/automaton/constructor/view/TransitionView.kt
@@ -9,9 +9,9 @@ import javafx.scene.text.Font
 import tornadofx.*
 
 class TransitionView(
-    val transition: Transition,
+    transition: Transition,
     index: Int
-) : AutomatonElementView(transition) {
+) : BasicTransitionView(transition) {
     val indexProperty = index.toProperty()
     var index by indexProperty
     val xProperty: DoubleProperty
@@ -21,21 +21,6 @@ class TransitionView(
         if (selected) Color.BLUE else Color.BLACK
     }
 
-    override fun getSettings() = listOf(
-        SettingGroup(
-            I18N.messages.getString("TransitionView.Transition").toProperty(), listOf(
-                Setting(
-                    I18N.messages.getString("TransitionView.Source"),
-                    createUnmodifiableSettingControl(transition.source.nameProperty)
-                ),
-                Setting(
-                    I18N.messages.getString("TransitionView.Target"),
-                    createUnmodifiableSettingControl(transition.target.nameProperty)
-                )
-            )
-        )
-    ) + super.getSettings()
-
     init {
         val text = text {
             fillProperty().bind(colorProperty)

From 72b4eb871d995cbaaede72a3447be1e56ceb53d6 Mon Sep 17 00:00:00 2001
From: IgorFilimonov <st087840@student.spbu.ru>
Date: Thu, 10 Oct 2024 18:23:12 +0300
Subject: [PATCH 2/4] Separated elements views from the others

---
 .../constructor/controller/AutomatonGraphController.kt   | 2 ++
 .../automaton/constructor/view/AutomatonEdgeView.kt      | 8 +++++---
 .../view/automaton/AutomatonAdjacencyMatrixView.kt       | 2 +-
 .../constructor/view/automaton/AutomatonGraphView.kt     | 2 +-
 .../constructor/view/automaton/AutomatonTableView.kt     | 4 ++--
 .../view/automaton/AutomatonTransitionTableView.kt       | 2 +-
 .../{ => elements/transition}/BasicTransitionView.kt     | 3 ++-
 .../{ => elements/transition}/TableTransitionView.kt     | 3 ++-
 .../transition}/TransitionTableTransitionView.kt         | 4 ++--
 .../view/{ => elements/transition}/TransitionView.kt     | 3 ++-
 .../vertex}/AdjacencyMatrixTransitionView.kt             | 5 +++--
 .../{ => elements/vertex}/AutomatonBasicVertexView.kt    | 9 ++-------
 .../{ => elements/vertex}/AutomatonTableVertexView.kt    | 2 +-
 .../view/{ => elements/vertex}/AutomatonVertexView.kt    | 7 ++++---
 .../view/module/executor/tree/ExecutionNodeView.kt       | 2 +-
 15 files changed, 31 insertions(+), 27 deletions(-)
 rename src/main/kotlin/automaton/constructor/view/{ => elements/transition}/BasicTransitionView.kt (89%)
 rename src/main/kotlin/automaton/constructor/view/{ => elements/transition}/TableTransitionView.kt (52%)
 rename src/main/kotlin/automaton/constructor/view/{ => elements/transition}/TransitionTableTransitionView.kt (92%)
 rename src/main/kotlin/automaton/constructor/view/{ => elements/transition}/TransitionView.kt (88%)
 rename src/main/kotlin/automaton/constructor/view/{ => elements/vertex}/AdjacencyMatrixTransitionView.kt (73%)
 rename src/main/kotlin/automaton/constructor/view/{ => elements/vertex}/AutomatonBasicVertexView.kt (78%)
 rename src/main/kotlin/automaton/constructor/view/{ => elements/vertex}/AutomatonTableVertexView.kt (98%)
 rename src/main/kotlin/automaton/constructor/view/{ => elements/vertex}/AutomatonVertexView.kt (94%)

diff --git a/src/main/kotlin/automaton/constructor/controller/AutomatonGraphController.kt b/src/main/kotlin/automaton/constructor/controller/AutomatonGraphController.kt
index 604bfbb..d6cfb52 100644
--- a/src/main/kotlin/automaton/constructor/controller/AutomatonGraphController.kt
+++ b/src/main/kotlin/automaton/constructor/controller/AutomatonGraphController.kt
@@ -7,6 +7,8 @@ import automaton.constructor.model.element.*
 import automaton.constructor.utils.*
 import automaton.constructor.view.*
 import automaton.constructor.view.automaton.AutomatonGraphView
+import automaton.constructor.view.elements.vertex.AutomatonVertexView
+import automaton.constructor.view.elements.transition.TransitionView
 import javafx.geometry.Point2D
 import javafx.scene.control.ContextMenu
 import javafx.scene.input.KeyCode
diff --git a/src/main/kotlin/automaton/constructor/view/AutomatonEdgeView.kt b/src/main/kotlin/automaton/constructor/view/AutomatonEdgeView.kt
index 6e7812c..294831f 100644
--- a/src/main/kotlin/automaton/constructor/view/AutomatonEdgeView.kt
+++ b/src/main/kotlin/automaton/constructor/view/AutomatonEdgeView.kt
@@ -4,9 +4,11 @@ import automaton.constructor.model.element.AutomatonEdge
 import automaton.constructor.model.element.AutomatonVertex.Companion.RADIUS
 import automaton.constructor.model.element.Transition
 import automaton.constructor.utils.*
-import automaton.constructor.view.AutomatonVertexView.ShapeType
-import automaton.constructor.view.AutomatonVertexView.ShapeType.CIRCLE
-import automaton.constructor.view.AutomatonVertexView.ShapeType.SQUARE
+import automaton.constructor.view.elements.vertex.AutomatonVertexView
+import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType
+import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType.CIRCLE
+import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType.SQUARE
+import automaton.constructor.view.elements.transition.TransitionView
 import javafx.beans.binding.Bindings.isNotNull
 import javafx.beans.value.ObservableBooleanValue
 import javafx.beans.value.ObservableDoubleValue
diff --git a/src/main/kotlin/automaton/constructor/view/automaton/AutomatonAdjacencyMatrixView.kt b/src/main/kotlin/automaton/constructor/view/automaton/AutomatonAdjacencyMatrixView.kt
index ce1bdcb..b1da3a2 100644
--- a/src/main/kotlin/automaton/constructor/view/automaton/AutomatonAdjacencyMatrixView.kt
+++ b/src/main/kotlin/automaton/constructor/view/automaton/AutomatonAdjacencyMatrixView.kt
@@ -4,7 +4,7 @@ import automaton.constructor.model.automaton.Automaton
 import automaton.constructor.model.element.AutomatonVertex
 import automaton.constructor.model.element.Transition
 import automaton.constructor.utils.I18N
-import automaton.constructor.view.AdjacencyMatrixTransitionView
+import automaton.constructor.view.elements.vertex.AdjacencyMatrixTransitionView
 import automaton.constructor.view.AutomatonViewContext
 import javafx.beans.property.ReadOnlyDoubleProperty
 import javafx.beans.property.SimpleObjectProperty
diff --git a/src/main/kotlin/automaton/constructor/view/automaton/AutomatonGraphView.kt b/src/main/kotlin/automaton/constructor/view/automaton/AutomatonGraphView.kt
index 6464d90..97e5140 100644
--- a/src/main/kotlin/automaton/constructor/view/automaton/AutomatonGraphView.kt
+++ b/src/main/kotlin/automaton/constructor/view/automaton/AutomatonGraphView.kt
@@ -10,7 +10,7 @@ import automaton.constructor.model.element.State
 import automaton.constructor.utils.hoverableTooltip
 import automaton.constructor.utils.subPane
 import automaton.constructor.view.AutomatonEdgeView
-import automaton.constructor.view.AutomatonVertexView
+import automaton.constructor.view.elements.vertex.AutomatonVertexView
 import automaton.constructor.view.AutomatonViewContext
 import automaton.constructor.view.module.executor.executionStatesTooltip
 import javafx.collections.MapChangeListener
diff --git a/src/main/kotlin/automaton/constructor/view/automaton/AutomatonTableView.kt b/src/main/kotlin/automaton/constructor/view/automaton/AutomatonTableView.kt
index 477d8fb..0c8f240 100644
--- a/src/main/kotlin/automaton/constructor/view/automaton/AutomatonTableView.kt
+++ b/src/main/kotlin/automaton/constructor/view/automaton/AutomatonTableView.kt
@@ -10,9 +10,9 @@ import automaton.constructor.model.element.Transition
 import automaton.constructor.utils.I18N
 import automaton.constructor.utils.addOnSuccess
 import automaton.constructor.utils.hoverableTooltip
-import automaton.constructor.view.AutomatonTableVertexView
+import automaton.constructor.view.elements.vertex.AutomatonTableVertexView
 import automaton.constructor.view.AutomatonViewContext
-import automaton.constructor.view.TableTransitionView
+import automaton.constructor.view.elements.transition.TableTransitionView
 import javafx.beans.property.ReadOnlyDoubleProperty
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.property.SimpleStringProperty
diff --git a/src/main/kotlin/automaton/constructor/view/automaton/AutomatonTransitionTableView.kt b/src/main/kotlin/automaton/constructor/view/automaton/AutomatonTransitionTableView.kt
index 93777c1..ea68f1f 100644
--- a/src/main/kotlin/automaton/constructor/view/automaton/AutomatonTransitionTableView.kt
+++ b/src/main/kotlin/automaton/constructor/view/automaton/AutomatonTransitionTableView.kt
@@ -5,7 +5,7 @@ import automaton.constructor.model.element.AutomatonVertex
 import automaton.constructor.model.element.Transition
 import automaton.constructor.utils.I18N
 import automaton.constructor.view.AutomatonViewContext
-import automaton.constructor.view.TransitionTableTransitionView
+import automaton.constructor.view.elements.transition.TransitionTableTransitionView
 import javafx.beans.property.ReadOnlyDoubleProperty
 import javafx.beans.property.SimpleObjectProperty
 import javafx.scene.control.*
diff --git a/src/main/kotlin/automaton/constructor/view/BasicTransitionView.kt b/src/main/kotlin/automaton/constructor/view/elements/transition/BasicTransitionView.kt
similarity index 89%
rename from src/main/kotlin/automaton/constructor/view/BasicTransitionView.kt
rename to src/main/kotlin/automaton/constructor/view/elements/transition/BasicTransitionView.kt
index 9e5c5f3..80b0e70 100644
--- a/src/main/kotlin/automaton/constructor/view/BasicTransitionView.kt
+++ b/src/main/kotlin/automaton/constructor/view/elements/transition/BasicTransitionView.kt
@@ -1,10 +1,11 @@
-package automaton.constructor.view
+package automaton.constructor.view.elements.transition
 
 import automaton.constructor.model.element.Transition
 import automaton.constructor.utils.I18N
 import automaton.constructor.utils.Setting
 import automaton.constructor.utils.SettingGroup
 import automaton.constructor.utils.createUnmodifiableSettingControl
+import automaton.constructor.view.AutomatonElementView
 import tornadofx.toProperty
 
 open class BasicTransitionView(val transition: Transition): AutomatonElementView(transition) {
diff --git a/src/main/kotlin/automaton/constructor/view/TableTransitionView.kt b/src/main/kotlin/automaton/constructor/view/elements/transition/TableTransitionView.kt
similarity index 52%
rename from src/main/kotlin/automaton/constructor/view/TableTransitionView.kt
rename to src/main/kotlin/automaton/constructor/view/elements/transition/TableTransitionView.kt
index 73f203e..9717589 100644
--- a/src/main/kotlin/automaton/constructor/view/TableTransitionView.kt
+++ b/src/main/kotlin/automaton/constructor/view/elements/transition/TableTransitionView.kt
@@ -1,5 +1,6 @@
-package automaton.constructor.view
+package automaton.constructor.view.elements.transition
 
 import automaton.constructor.model.element.Transition
+import automaton.constructor.view.elements.transition.BasicTransitionView
 
 open class TableTransitionView(transition: Transition): BasicTransitionView(transition)
diff --git a/src/main/kotlin/automaton/constructor/view/TransitionTableTransitionView.kt b/src/main/kotlin/automaton/constructor/view/elements/transition/TransitionTableTransitionView.kt
similarity index 92%
rename from src/main/kotlin/automaton/constructor/view/TransitionTableTransitionView.kt
rename to src/main/kotlin/automaton/constructor/view/elements/transition/TransitionTableTransitionView.kt
index 199eb47..85a3a83 100644
--- a/src/main/kotlin/automaton/constructor/view/TransitionTableTransitionView.kt
+++ b/src/main/kotlin/automaton/constructor/view/elements/transition/TransitionTableTransitionView.kt
@@ -1,4 +1,4 @@
-package automaton.constructor.view
+package automaton.constructor.view.elements.transition
 
 import automaton.constructor.model.element.Transition
 import javafx.scene.paint.Color
@@ -22,4 +22,4 @@ class TransitionTableTransitionView(transition: Transition): TableTransitionView
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/automaton/constructor/view/TransitionView.kt b/src/main/kotlin/automaton/constructor/view/elements/transition/TransitionView.kt
similarity index 88%
rename from src/main/kotlin/automaton/constructor/view/TransitionView.kt
rename to src/main/kotlin/automaton/constructor/view/elements/transition/TransitionView.kt
index e85773b..76db5fe 100644
--- a/src/main/kotlin/automaton/constructor/view/TransitionView.kt
+++ b/src/main/kotlin/automaton/constructor/view/elements/transition/TransitionView.kt
@@ -1,7 +1,8 @@
-package automaton.constructor.view
+package automaton.constructor.view.elements.transition
 
 import automaton.constructor.model.element.Transition
 import automaton.constructor.utils.*
+import automaton.constructor.view.elements.transition.BasicTransitionView
 import javafx.beans.binding.Binding
 import javafx.beans.property.DoubleProperty
 import javafx.scene.paint.Color
diff --git a/src/main/kotlin/automaton/constructor/view/AdjacencyMatrixTransitionView.kt b/src/main/kotlin/automaton/constructor/view/elements/vertex/AdjacencyMatrixTransitionView.kt
similarity index 73%
rename from src/main/kotlin/automaton/constructor/view/AdjacencyMatrixTransitionView.kt
rename to src/main/kotlin/automaton/constructor/view/elements/vertex/AdjacencyMatrixTransitionView.kt
index 4a30baf..628f801 100644
--- a/src/main/kotlin/automaton/constructor/view/AdjacencyMatrixTransitionView.kt
+++ b/src/main/kotlin/automaton/constructor/view/elements/vertex/AdjacencyMatrixTransitionView.kt
@@ -1,6 +1,7 @@
-package automaton.constructor.view
+package automaton.constructor.view.elements.vertex
 
 import automaton.constructor.model.element.Transition
+import automaton.constructor.view.elements.transition.TableTransitionView
 import javafx.scene.paint.Color
 import tornadofx.label
 
@@ -11,4 +12,4 @@ class AdjacencyMatrixTransitionView(transition: Transition): TableTransitionView
             textFill = Color.BLACK
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/automaton/constructor/view/AutomatonBasicVertexView.kt b/src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonBasicVertexView.kt
similarity index 78%
rename from src/main/kotlin/automaton/constructor/view/AutomatonBasicVertexView.kt
rename to src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonBasicVertexView.kt
index 31deb62..cafaf00 100644
--- a/src/main/kotlin/automaton/constructor/view/AutomatonBasicVertexView.kt
+++ b/src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonBasicVertexView.kt
@@ -1,17 +1,12 @@
-package automaton.constructor.view
+package automaton.constructor.view.elements.vertex
 
 import automaton.constructor.model.element.AutomatonVertex
-import automaton.constructor.model.element.BuildingBlock
-import automaton.constructor.model.module.hasProblems
-import automaton.constructor.model.module.hasProblemsBinding
 import automaton.constructor.utils.I18N
 import automaton.constructor.utils.Setting
 import automaton.constructor.utils.SettingGroup
-import javafx.beans.property.SimpleIntegerProperty
-import javafx.beans.property.SimpleStringProperty
+import automaton.constructor.view.AutomatonElementView
 import javafx.scene.control.CheckBox
 import javafx.scene.control.TextField
-import javafx.scene.paint.Color
 import tornadofx.*
 
 open class AutomatonBasicVertexView(val vertex: AutomatonVertex) : AutomatonElementView(vertex) {
diff --git a/src/main/kotlin/automaton/constructor/view/AutomatonTableVertexView.kt b/src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonTableVertexView.kt
similarity index 98%
rename from src/main/kotlin/automaton/constructor/view/AutomatonTableVertexView.kt
rename to src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonTableVertexView.kt
index 4d3df1c..edfe375 100644
--- a/src/main/kotlin/automaton/constructor/view/AutomatonTableVertexView.kt
+++ b/src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonTableVertexView.kt
@@ -1,4 +1,4 @@
-package automaton.constructor.view
+package automaton.constructor.view.elements.vertex
 
 import automaton.constructor.model.element.AutomatonVertex
 import automaton.constructor.model.element.BuildingBlock
diff --git a/src/main/kotlin/automaton/constructor/view/AutomatonVertexView.kt b/src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonVertexView.kt
similarity index 94%
rename from src/main/kotlin/automaton/constructor/view/AutomatonVertexView.kt
rename to src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonVertexView.kt
index 55cfd79..af62b57 100644
--- a/src/main/kotlin/automaton/constructor/view/AutomatonVertexView.kt
+++ b/src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonVertexView.kt
@@ -1,4 +1,4 @@
-package automaton.constructor.view
+package automaton.constructor.view.elements.vertex
 
 import automaton.constructor.model.element.AutomatonVertex
 import automaton.constructor.model.element.AutomatonVertex.Companion.RADIUS
@@ -7,8 +7,9 @@ import automaton.constructor.model.element.State
 import automaton.constructor.model.module.hasProblems
 import automaton.constructor.model.module.hasProblemsBinding
 import automaton.constructor.utils.*
-import automaton.constructor.view.AutomatonVertexView.ShapeType.CIRCLE
-import automaton.constructor.view.AutomatonVertexView.ShapeType.SQUARE
+import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType.CIRCLE
+import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType.SQUARE
+import automaton.constructor.view.elements.vertex.AutomatonBasicVertexView
 import javafx.beans.property.Property
 import javafx.geometry.Point2D
 import javafx.geometry.VPos
diff --git a/src/main/kotlin/automaton/constructor/view/module/executor/tree/ExecutionNodeView.kt b/src/main/kotlin/automaton/constructor/view/module/executor/tree/ExecutionNodeView.kt
index 21bfc20..364f6e2 100644
--- a/src/main/kotlin/automaton/constructor/view/module/executor/tree/ExecutionNodeView.kt
+++ b/src/main/kotlin/automaton/constructor/view/module/executor/tree/ExecutionNodeView.kt
@@ -6,7 +6,7 @@ import automaton.constructor.model.module.executor.SimpleExecutionState
 import automaton.constructor.model.module.executor.SuperExecutionState
 import automaton.constructor.utils.*
 import automaton.constructor.view.AutomatonEdgeView
-import automaton.constructor.view.AutomatonVertexView
+import automaton.constructor.view.elements.vertex.AutomatonVertexView
 import automaton.constructor.view.TransitionLabelPosition
 import automaton.constructor.view.module.executor.color
 import automaton.constructor.view.module.executor.simpleTooltipContent

From 73737306169bf07c743316249f3f4faed3dfeb3b Mon Sep 17 00:00:00 2001
From: IgorFilimonov <st087840@student.spbu.ru>
Date: Thu, 10 Oct 2024 18:43:09 +0300
Subject: [PATCH 3/4] Optimized imports

---
 .../constructor/view/elements/vertex/AutomatonVertexView.kt  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonVertexView.kt b/src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonVertexView.kt
index af62b57..a21d31a 100644
--- a/src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonVertexView.kt
+++ b/src/main/kotlin/automaton/constructor/view/elements/vertex/AutomatonVertexView.kt
@@ -6,10 +6,11 @@ import automaton.constructor.model.element.BuildingBlock
 import automaton.constructor.model.element.State
 import automaton.constructor.model.module.hasProblems
 import automaton.constructor.model.module.hasProblemsBinding
-import automaton.constructor.utils.*
+import automaton.constructor.utils.nonNullObjectBinding
+import automaton.constructor.utils.x
+import automaton.constructor.utils.y
 import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType.CIRCLE
 import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType.SQUARE
-import automaton.constructor.view.elements.vertex.AutomatonBasicVertexView
 import javafx.beans.property.Property
 import javafx.geometry.Point2D
 import javafx.geometry.VPos

From 8eb0409a30753b1bddc809ea68d39f88dc9fb70b Mon Sep 17 00:00:00 2001
From: IgorFilimonov <st087840@student.spbu.ru>
Date: Thu, 10 Oct 2024 19:46:02 +0300
Subject: [PATCH 4/4] Moved AdjacencyMatrixTransitionView to other transitions
 views

---
 .../constructor/view/automaton/AutomatonAdjacencyMatrixView.kt  | 2 +-
 .../{vertex => transition}/AdjacencyMatrixTransitionView.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/main/kotlin/automaton/constructor/view/elements/{vertex => transition}/AdjacencyMatrixTransitionView.kt (88%)

diff --git a/src/main/kotlin/automaton/constructor/view/automaton/AutomatonAdjacencyMatrixView.kt b/src/main/kotlin/automaton/constructor/view/automaton/AutomatonAdjacencyMatrixView.kt
index b1da3a2..81d323c 100644
--- a/src/main/kotlin/automaton/constructor/view/automaton/AutomatonAdjacencyMatrixView.kt
+++ b/src/main/kotlin/automaton/constructor/view/automaton/AutomatonAdjacencyMatrixView.kt
@@ -4,7 +4,7 @@ import automaton.constructor.model.automaton.Automaton
 import automaton.constructor.model.element.AutomatonVertex
 import automaton.constructor.model.element.Transition
 import automaton.constructor.utils.I18N
-import automaton.constructor.view.elements.vertex.AdjacencyMatrixTransitionView
+import automaton.constructor.view.elements.transition.AdjacencyMatrixTransitionView
 import automaton.constructor.view.AutomatonViewContext
 import javafx.beans.property.ReadOnlyDoubleProperty
 import javafx.beans.property.SimpleObjectProperty
diff --git a/src/main/kotlin/automaton/constructor/view/elements/vertex/AdjacencyMatrixTransitionView.kt b/src/main/kotlin/automaton/constructor/view/elements/transition/AdjacencyMatrixTransitionView.kt
similarity index 88%
rename from src/main/kotlin/automaton/constructor/view/elements/vertex/AdjacencyMatrixTransitionView.kt
rename to src/main/kotlin/automaton/constructor/view/elements/transition/AdjacencyMatrixTransitionView.kt
index 628f801..16ad760 100644
--- a/src/main/kotlin/automaton/constructor/view/elements/vertex/AdjacencyMatrixTransitionView.kt
+++ b/src/main/kotlin/automaton/constructor/view/elements/transition/AdjacencyMatrixTransitionView.kt
@@ -1,4 +1,4 @@
-package automaton.constructor.view.elements.vertex
+package automaton.constructor.view.elements.transition
 
 import automaton.constructor.model.element.Transition
 import automaton.constructor.view.elements.transition.TableTransitionView