Now transitions view are inherited from BasicTransitionView

spbu-se · Oct 9, 2024 · eea411c · eea411c
1 parent 2235480
commit eea411c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 38 deletions.
diff --git a/src/main/kotlin/automaton/constructor/view/BasicTransitionView.kt 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
@@ -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()
-}
+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
@@ -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)