From 1420943d2fba9f256c7386cc6dc219bd760e6fd2 Mon Sep 17 00:00:00 2001 From: Alireza Ghasemi Date: Sun, 28 Mar 2021 21:46:08 +0430 Subject: [PATCH] Changed project group name `com.github.agcom` to `io.github.agcom`. This also affected the base package name. --- build.gradle | 2 +- .../agcom/quadtree/nodes/FakeFocus.java | 2 +- .../quadtree/nodes/LabeledSeparator.java | 2 +- .../agcom/quadtree/nodes/NodeSwitcher.java | 2 +- .../agcom/quadtree/quadtree/geometry/Point.kt | 3 - .../github/agcom/quadtree/Launcher.kt | 6 +- .../quadtree/controllers/HomeController.kt | 18 +++--- .../controllers/QuadTreeController.kt | 56 ++++++++++-------- .../github/agcom/quadtree/nodes/AreaShape.kt | 4 +- .../github/agcom/quadtree/nodes/Extensions.kt | 10 ++-- .../github/agcom/quadtree/nodes/IntField.kt | 2 +- .../agcom/quadtree/quadtree/QuadTree.kt | 10 ++-- .../quadtree/quadtree/QueryStatistics.kt | 2 +- .../quadtree/SimpleQueryStatistics.kt | 2 +- .../agcom/quadtree/quadtree/geometry/Area.kt | 2 +- .../quadtree/quadtree/geometry/Circle.kt | 4 +- .../agcom/quadtree/quadtree/geometry/Point.kt | 3 + .../quadtree/quadtree/geometry/Rectangle.kt | 2 +- .../github/agcom/quadtree/utils/Concurrent.kt | 2 +- .../github/agcom/quadtree/utils/Extensions.kt | 4 +- .../github/agcom/quadtree/images/launcher.png | Bin .../github/agcom/quadtree/layouts/home.fxml | 14 ++--- .../agcom/quadtree/layouts/quadtree.fxml | 4 +- .../github/agcom/quadtree/styles/global.css | 0 .../github/agcom/quadtree/styles/home.css | 0 .../github/agcom/quadtree/styles/quadtree.css | 0 26 files changed, 82 insertions(+), 74 deletions(-) rename src/main/java/{com => io}/github/agcom/quadtree/nodes/FakeFocus.java (93%) rename src/main/java/{com => io}/github/agcom/quadtree/nodes/LabeledSeparator.java (96%) rename src/main/java/{com => io}/github/agcom/quadtree/nodes/NodeSwitcher.java (97%) delete mode 100755 src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Point.kt rename src/main/kotlin/{com => io}/github/agcom/quadtree/Launcher.kt (83%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/controllers/HomeController.kt (91%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/controllers/QuadTreeController.kt (80%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/nodes/AreaShape.kt (56%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/nodes/Extensions.kt (89%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/nodes/IntField.kt (93%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/quadtree/QuadTree.kt (94%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/quadtree/QueryStatistics.kt (87%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/quadtree/SimpleQueryStatistics.kt (94%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/quadtree/geometry/Area.kt (67%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/quadtree/geometry/Circle.kt (91%) create mode 100755 src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Point.kt rename src/main/kotlin/{com => io}/github/agcom/quadtree/quadtree/geometry/Rectangle.kt (90%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/utils/Concurrent.kt (89%) rename src/main/kotlin/{com => io}/github/agcom/quadtree/utils/Extensions.kt (92%) rename src/main/resources/{com => io}/github/agcom/quadtree/images/launcher.png (100%) rename src/main/resources/{com => io}/github/agcom/quadtree/layouts/home.fxml (88%) rename src/main/resources/{com => io}/github/agcom/quadtree/layouts/quadtree.fxml (85%) rename src/main/resources/{com => io}/github/agcom/quadtree/styles/global.css (100%) rename src/main/resources/{com => io}/github/agcom/quadtree/styles/home.css (100%) rename src/main/resources/{com => io}/github/agcom/quadtree/styles/quadtree.css (100%) diff --git a/build.gradle b/build.gradle index ebf8fbb..b3e5b88 100755 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'org.openjfx.javafxplugin' version "$javafx_plugin_version" } -group = 'com.github.agcom' +group = 'io.github.agcom' version = '1.0.0' application { diff --git a/src/main/java/com/github/agcom/quadtree/nodes/FakeFocus.java b/src/main/java/io/github/agcom/quadtree/nodes/FakeFocus.java similarity index 93% rename from src/main/java/com/github/agcom/quadtree/nodes/FakeFocus.java rename to src/main/java/io/github/agcom/quadtree/nodes/FakeFocus.java index c2b63e1..4d903b7 100755 --- a/src/main/java/com/github/agcom/quadtree/nodes/FakeFocus.java +++ b/src/main/java/io/github/agcom/quadtree/nodes/FakeFocus.java @@ -1,4 +1,4 @@ -package com.github.agcom.quadtree.nodes; +package io.github.agcom.quadtree.nodes; import javafx.scene.control.TextField; import javafx.scene.control.TextFormatter; diff --git a/src/main/java/com/github/agcom/quadtree/nodes/LabeledSeparator.java b/src/main/java/io/github/agcom/quadtree/nodes/LabeledSeparator.java similarity index 96% rename from src/main/java/com/github/agcom/quadtree/nodes/LabeledSeparator.java rename to src/main/java/io/github/agcom/quadtree/nodes/LabeledSeparator.java index 23bf95d..207c9e1 100755 --- a/src/main/java/com/github/agcom/quadtree/nodes/LabeledSeparator.java +++ b/src/main/java/io/github/agcom/quadtree/nodes/LabeledSeparator.java @@ -1,4 +1,4 @@ -package com.github.agcom.quadtree.nodes; +package io.github.agcom.quadtree.nodes; import javafx.beans.NamedArg; import javafx.beans.property.SimpleStringProperty; diff --git a/src/main/java/com/github/agcom/quadtree/nodes/NodeSwitcher.java b/src/main/java/io/github/agcom/quadtree/nodes/NodeSwitcher.java similarity index 97% rename from src/main/java/com/github/agcom/quadtree/nodes/NodeSwitcher.java rename to src/main/java/io/github/agcom/quadtree/nodes/NodeSwitcher.java index d50e30c..2bfd94c 100755 --- a/src/main/java/com/github/agcom/quadtree/nodes/NodeSwitcher.java +++ b/src/main/java/io/github/agcom/quadtree/nodes/NodeSwitcher.java @@ -1,4 +1,4 @@ -package com.github.agcom.quadtree.nodes; +package io.github.agcom.quadtree.nodes; import javafx.beans.NamedArg; import javafx.beans.binding.Bindings; diff --git a/src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Point.kt b/src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Point.kt deleted file mode 100755 index 6e9a02f..0000000 --- a/src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Point.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.agcom.quadtree.quadtree.geometry - -data class Point(val x: Int, val y: Int) \ No newline at end of file diff --git a/src/main/kotlin/com/github/agcom/quadtree/Launcher.kt b/src/main/kotlin/io/github/agcom/quadtree/Launcher.kt similarity index 83% rename from src/main/kotlin/com/github/agcom/quadtree/Launcher.kt rename to src/main/kotlin/io/github/agcom/quadtree/Launcher.kt index 6cef5e3..4286880 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/Launcher.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/Launcher.kt @@ -1,12 +1,12 @@ -package com.github.agcom.quadtree +package io.github.agcom.quadtree import io.reactivex.plugins.RxJavaPlugins import javafx.application.Application import javafx.scene.Scene import javafx.scene.image.Image import javafx.stage.Stage -import com.github.agcom.quadtree.utils.loadFXML -import com.github.agcom.quadtree.utils.toStream +import io.github.agcom.quadtree.utils.loadFXML +import io.github.agcom.quadtree.utils.toStream @JvmName("Launcher") fun main(args: Array) = Application.launch(*args) //for compatibility diff --git a/src/main/kotlin/com/github/agcom/quadtree/controllers/HomeController.kt b/src/main/kotlin/io/github/agcom/quadtree/controllers/HomeController.kt similarity index 91% rename from src/main/kotlin/com/github/agcom/quadtree/controllers/HomeController.kt rename to src/main/kotlin/io/github/agcom/quadtree/controllers/HomeController.kt index fde7024..4a7a1ac 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/controllers/HomeController.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/controllers/HomeController.kt @@ -1,4 +1,4 @@ -package com.github.agcom.quadtree.controllers +package io.github.agcom.quadtree.controllers import com.jfoenix.controls.JFXCheckBox import com.jfoenix.controls.JFXRadioButton @@ -13,14 +13,14 @@ import javafx.fxml.Initializable import javafx.scene.control.TextArea import javafx.scene.control.ToggleGroup import javafx.scene.layout.VBox -import com.github.agcom.quadtree.nodes.IntField -import com.github.agcom.quadtree.nodes.NodeSwitcher -import com.github.agcom.quadtree.nodes.getAreaShape -import com.github.agcom.quadtree.quadtree.QuadTree -import com.github.agcom.quadtree.quadtree.SimpleQueryStatistics -import com.github.agcom.quadtree.quadtree.geometry.Circle -import com.github.agcom.quadtree.quadtree.geometry.Point -import com.github.agcom.quadtree.quadtree.geometry.Rectangle +import io.github.agcom.quadtree.nodes.IntField +import io.github.agcom.quadtree.nodes.NodeSwitcher +import io.github.agcom.quadtree.nodes.getAreaShape +import io.github.agcom.quadtree.quadtree.QuadTree +import io.github.agcom.quadtree.quadtree.SimpleQueryStatistics +import io.github.agcom.quadtree.quadtree.geometry.Circle +import io.github.agcom.quadtree.quadtree.geometry.Point +import io.github.agcom.quadtree.quadtree.geometry.Rectangle import java.net.URL import java.util.* import java.util.concurrent.Callable diff --git a/src/main/kotlin/com/github/agcom/quadtree/controllers/QuadTreeController.kt b/src/main/kotlin/io/github/agcom/quadtree/controllers/QuadTreeController.kt similarity index 80% rename from src/main/kotlin/com/github/agcom/quadtree/controllers/QuadTreeController.kt rename to src/main/kotlin/io/github/agcom/quadtree/controllers/QuadTreeController.kt index e0ee6c9..26faafa 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/controllers/QuadTreeController.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/controllers/QuadTreeController.kt @@ -1,5 +1,14 @@ -package com.github.agcom.quadtree.controllers - +package io.github.agcom.quadtree.controllers + +import io.github.agcom.quadtree.nodes.AreaShape +import io.github.agcom.quadtree.nodes.clear +import io.github.agcom.quadtree.nodes.draw +import io.github.agcom.quadtree.quadtree.QuadTree +import io.github.agcom.quadtree.quadtree.QueryStatistics +import io.github.agcom.quadtree.quadtree.geometry.Point +import io.github.agcom.quadtree.quadtree.geometry.Rectangle +import io.github.agcom.quadtree.utils.executor +import io.github.agcom.quadtree.utils.quadTreeModif import io.reactivex.Completable import io.reactivex.disposables.Disposable import io.reactivex.rxjavafx.schedulers.JavaFxScheduler @@ -13,21 +22,13 @@ import javafx.scene.input.MouseEvent import javafx.scene.layout.BorderPane import javafx.scene.layout.StackPane import javafx.scene.paint.Color -import com.github.agcom.quadtree.nodes.* -import com.github.agcom.quadtree.quadtree.QuadTree -import com.github.agcom.quadtree.quadtree.QueryStatistics -import com.github.agcom.quadtree.quadtree.geometry.Point -import com.github.agcom.quadtree.quadtree.geometry.Rectangle -import com.github.agcom.quadtree.utils.executor -import com.github.agcom.quadtree.utils.quadTreeModif import java.net.URL import java.util.* import java.util.concurrent.TimeUnit -import kotlin.ConcurrentModificationException import kotlin.time.ExperimentalTime @ExperimentalTime -class QuadTreeController: Initializable { +class QuadTreeController : Initializable { val quadTree = SimpleObjectProperty() val query = SimpleObjectProperty() @@ -39,10 +40,14 @@ class QuadTreeController: Initializable { private val width = SimpleIntegerProperty() private val height = SimpleIntegerProperty() - @FXML private lateinit var queryCanvas: Canvas - @FXML private lateinit var quadTreeCanvas: Canvas - @FXML private lateinit var queryArea: BorderPane - @FXML private lateinit var sizePane: StackPane + @FXML + private lateinit var queryCanvas: Canvas + @FXML + private lateinit var quadTreeCanvas: Canvas + @FXML + private lateinit var queryArea: BorderPane + @FXML + private lateinit var sizePane: StackPane constructor(quadTree: QuadTree) { @@ -130,7 +135,7 @@ class QuadTreeController: Initializable { var queryStatistics = SimpleObjectProperty(null) private fun query() { - if(queryDisposable != null) { + if (queryDisposable != null) { queryDisposable?.dispose() queryDisposable = null @@ -139,13 +144,13 @@ class QuadTreeController: Initializable { } - if(query.value == null) return + if (query.value == null) return queryDisposable = quadTree.value.query(query.value!!.area, queryStatistics.value) .delaySubscription(queryDelay.value ?: 10, TimeUnit.MILLISECONDS) .subscribe({ it.draw(queryCanvas, paint = Color.RED) }, { - if(it is ConcurrentModificationException) { + if (it is ConcurrentModificationException) { println("Expected exception") query() @@ -169,7 +174,7 @@ class QuadTreeController: Initializable { private var drawDisposable: Disposable? = null fun quadTreeModified() { - if(drawDisposable != null) { + if (drawDisposable != null) { drawDisposable?.dispose() drawDisposable = null @@ -187,9 +192,10 @@ class QuadTreeController: Initializable { } - @FXML private fun onMouseClicked(event: MouseEvent) { + @FXML + private fun onMouseClicked(event: MouseEvent) { - if(erase.value) { + if (erase.value) { erase() @@ -203,18 +209,20 @@ class QuadTreeController: Initializable { } - @FXML private fun onMouseMoved(event: MouseEvent) { + @FXML + private fun onMouseMoved(event: MouseEvent) { mouseX.value = event.x mouseY.value = event.y } - @FXML private fun onMouseDragged(event: MouseEvent) { + @FXML + private fun onMouseDragged(event: MouseEvent) { onMouseMoved(event) - if(erase.value) erase() + if (erase.value) erase() else onMouseClicked(event) } diff --git a/src/main/kotlin/com/github/agcom/quadtree/nodes/AreaShape.kt b/src/main/kotlin/io/github/agcom/quadtree/nodes/AreaShape.kt similarity index 56% rename from src/main/kotlin/com/github/agcom/quadtree/nodes/AreaShape.kt rename to src/main/kotlin/io/github/agcom/quadtree/nodes/AreaShape.kt index 1384519..8959955 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/nodes/AreaShape.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/nodes/AreaShape.kt @@ -1,7 +1,7 @@ -package com.github.agcom.quadtree.nodes +package io.github.agcom.quadtree.nodes import javafx.scene.Node -import com.github.agcom.quadtree.quadtree.geometry.Area +import io.github.agcom.quadtree.quadtree.geometry.Area abstract class AreaShape(val area: Area, val node: Node) { diff --git a/src/main/kotlin/com/github/agcom/quadtree/nodes/Extensions.kt b/src/main/kotlin/io/github/agcom/quadtree/nodes/Extensions.kt similarity index 89% rename from src/main/kotlin/com/github/agcom/quadtree/nodes/Extensions.kt rename to src/main/kotlin/io/github/agcom/quadtree/nodes/Extensions.kt index 895d405..03f2b7a 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/nodes/Extensions.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/nodes/Extensions.kt @@ -1,12 +1,12 @@ -package com.github.agcom.quadtree.nodes +package io.github.agcom.quadtree.nodes import javafx.scene.canvas.Canvas import javafx.scene.paint.Color import javafx.scene.paint.Paint -import com.github.agcom.quadtree.quadtree.QuadTree -import com.github.agcom.quadtree.quadtree.geometry.Circle -import com.github.agcom.quadtree.quadtree.geometry.Point -import com.github.agcom.quadtree.quadtree.geometry.Rectangle +import io.github.agcom.quadtree.quadtree.QuadTree +import io.github.agcom.quadtree.quadtree.geometry.Circle +import io.github.agcom.quadtree.quadtree.geometry.Point +import io.github.agcom.quadtree.quadtree.geometry.Rectangle import kotlin.time.ExperimentalTime fun Point.draw(canvas: Canvas, radius: Double = 4.0, paint: Paint = Color.BLACK) { diff --git a/src/main/kotlin/com/github/agcom/quadtree/nodes/IntField.kt b/src/main/kotlin/io/github/agcom/quadtree/nodes/IntField.kt similarity index 93% rename from src/main/kotlin/com/github/agcom/quadtree/nodes/IntField.kt rename to src/main/kotlin/io/github/agcom/quadtree/nodes/IntField.kt index 8ec4b2b..32ca16d 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/nodes/IntField.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/nodes/IntField.kt @@ -1,4 +1,4 @@ -package com.github.agcom.quadtree.nodes +package io.github.agcom.quadtree.nodes import com.jfoenix.controls.JFXTextField import javafx.scene.control.TextFormatter diff --git a/src/main/kotlin/com/github/agcom/quadtree/quadtree/QuadTree.kt b/src/main/kotlin/io/github/agcom/quadtree/quadtree/QuadTree.kt similarity index 94% rename from src/main/kotlin/com/github/agcom/quadtree/quadtree/QuadTree.kt rename to src/main/kotlin/io/github/agcom/quadtree/quadtree/QuadTree.kt index ca5d898..534583c 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/quadtree/QuadTree.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/quadtree/QuadTree.kt @@ -1,12 +1,12 @@ -package com.github.agcom.quadtree.quadtree +package io.github.agcom.quadtree.quadtree import io.reactivex.* import io.reactivex.rxjavafx.schedulers.JavaFxScheduler import io.reactivex.schedulers.Schedulers -import com.github.agcom.quadtree.quadtree.geometry.Area -import com.github.agcom.quadtree.quadtree.geometry.Point -import com.github.agcom.quadtree.quadtree.geometry.Rectangle -import com.github.agcom.quadtree.utils.lazyPlus +import io.github.agcom.quadtree.quadtree.geometry.Area +import io.github.agcom.quadtree.quadtree.geometry.Point +import io.github.agcom.quadtree.quadtree.geometry.Rectangle +import io.github.agcom.quadtree.utils.lazyPlus import java.lang.RuntimeException import kotlin.time.ExperimentalTime import kotlin.time.measureTime diff --git a/src/main/kotlin/com/github/agcom/quadtree/quadtree/QueryStatistics.kt b/src/main/kotlin/io/github/agcom/quadtree/quadtree/QueryStatistics.kt similarity index 87% rename from src/main/kotlin/com/github/agcom/quadtree/quadtree/QueryStatistics.kt rename to src/main/kotlin/io/github/agcom/quadtree/quadtree/QueryStatistics.kt index 5e6c200..f6acec3 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/quadtree/QueryStatistics.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/quadtree/QueryStatistics.kt @@ -1,4 +1,4 @@ -package com.github.agcom.quadtree.quadtree +package io.github.agcom.quadtree.quadtree import kotlin.time.Duration import kotlin.time.ExperimentalTime diff --git a/src/main/kotlin/com/github/agcom/quadtree/quadtree/SimpleQueryStatistics.kt b/src/main/kotlin/io/github/agcom/quadtree/quadtree/SimpleQueryStatistics.kt similarity index 94% rename from src/main/kotlin/com/github/agcom/quadtree/quadtree/SimpleQueryStatistics.kt rename to src/main/kotlin/io/github/agcom/quadtree/quadtree/SimpleQueryStatistics.kt index 8cedea1..fd9444b 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/quadtree/SimpleQueryStatistics.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/quadtree/SimpleQueryStatistics.kt @@ -1,4 +1,4 @@ -package com.github.agcom.quadtree.quadtree +package io.github.agcom.quadtree.quadtree import kotlin.time.Duration import kotlin.time.ExperimentalTime diff --git a/src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Area.kt b/src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Area.kt similarity index 67% rename from src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Area.kt rename to src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Area.kt index 9eb5bc2..235b230 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Area.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Area.kt @@ -1,4 +1,4 @@ -package com.github.agcom.quadtree.quadtree.geometry +package io.github.agcom.quadtree.quadtree.geometry interface Area { diff --git a/src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Circle.kt b/src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Circle.kt similarity index 91% rename from src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Circle.kt rename to src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Circle.kt index 7a73a1f..38a24a4 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Circle.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Circle.kt @@ -1,6 +1,6 @@ -package com.github.agcom.quadtree.quadtree.geometry +package io.github.agcom.quadtree.quadtree.geometry -import com.github.agcom.quadtree.utils.pow +import io.github.agcom.quadtree.utils.pow import kotlin.math.abs import kotlin.math.sqrt diff --git a/src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Point.kt b/src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Point.kt new file mode 100755 index 0000000..491c9f8 --- /dev/null +++ b/src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Point.kt @@ -0,0 +1,3 @@ +package io.github.agcom.quadtree.quadtree.geometry + +data class Point(val x: Int, val y: Int) \ No newline at end of file diff --git a/src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Rectangle.kt b/src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Rectangle.kt similarity index 90% rename from src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Rectangle.kt rename to src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Rectangle.kt index 9e44ac8..792e6cb 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/quadtree/geometry/Rectangle.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/quadtree/geometry/Rectangle.kt @@ -1,4 +1,4 @@ -package com.github.agcom.quadtree.quadtree.geometry +package io.github.agcom.quadtree.quadtree.geometry data class Rectangle(var x: Int, var y: Int, val width: Int, val height: Int) : Area { diff --git a/src/main/kotlin/com/github/agcom/quadtree/utils/Concurrent.kt b/src/main/kotlin/io/github/agcom/quadtree/utils/Concurrent.kt similarity index 89% rename from src/main/kotlin/com/github/agcom/quadtree/utils/Concurrent.kt rename to src/main/kotlin/io/github/agcom/quadtree/utils/Concurrent.kt index eb1903f..766fbd5 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/utils/Concurrent.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/utils/Concurrent.kt @@ -1,4 +1,4 @@ -package com.github.agcom.quadtree.utils +package io.github.agcom.quadtree.utils import java.util.concurrent.Executors diff --git a/src/main/kotlin/com/github/agcom/quadtree/utils/Extensions.kt b/src/main/kotlin/io/github/agcom/quadtree/utils/Extensions.kt similarity index 92% rename from src/main/kotlin/com/github/agcom/quadtree/utils/Extensions.kt rename to src/main/kotlin/io/github/agcom/quadtree/utils/Extensions.kt index 20043c3..4697415 100755 --- a/src/main/kotlin/com/github/agcom/quadtree/utils/Extensions.kt +++ b/src/main/kotlin/io/github/agcom/quadtree/utils/Extensions.kt @@ -1,6 +1,6 @@ -package com.github.agcom.quadtree.utils +package io.github.agcom.quadtree.utils -import com.github.agcom.quadtree.Launcher +import io.github.agcom.quadtree.Launcher import javafx.fxml.FXMLLoader import java.io.InputStream import java.net.URL diff --git a/src/main/resources/com/github/agcom/quadtree/images/launcher.png b/src/main/resources/io/github/agcom/quadtree/images/launcher.png similarity index 100% rename from src/main/resources/com/github/agcom/quadtree/images/launcher.png rename to src/main/resources/io/github/agcom/quadtree/images/launcher.png diff --git a/src/main/resources/com/github/agcom/quadtree/layouts/home.fxml b/src/main/resources/io/github/agcom/quadtree/layouts/home.fxml similarity index 88% rename from src/main/resources/com/github/agcom/quadtree/layouts/home.fxml rename to src/main/resources/io/github/agcom/quadtree/layouts/home.fxml index ddcc7c0..fd6d27b 100755 --- a/src/main/resources/com/github/agcom/quadtree/layouts/home.fxml +++ b/src/main/resources/io/github/agcom/quadtree/layouts/home.fxml @@ -7,24 +7,24 @@ - + - + - - + + - - + + diff --git a/src/main/resources/com/github/agcom/quadtree/layouts/quadtree.fxml b/src/main/resources/io/github/agcom/quadtree/layouts/quadtree.fxml similarity index 85% rename from src/main/resources/com/github/agcom/quadtree/layouts/quadtree.fxml rename to src/main/resources/io/github/agcom/quadtree/layouts/quadtree.fxml index 0b9b18b..f3f33aa 100755 --- a/src/main/resources/com/github/agcom/quadtree/layouts/quadtree.fxml +++ b/src/main/resources/io/github/agcom/quadtree/layouts/quadtree.fxml @@ -10,8 +10,8 @@ + fx:controller="io.github.agcom.quadtree.controllers.QuadTreeController" + stylesheets="@/io/github/agcom/quadtree/styles/quadtree.css">
diff --git a/src/main/resources/com/github/agcom/quadtree/styles/global.css b/src/main/resources/io/github/agcom/quadtree/styles/global.css similarity index 100% rename from src/main/resources/com/github/agcom/quadtree/styles/global.css rename to src/main/resources/io/github/agcom/quadtree/styles/global.css diff --git a/src/main/resources/com/github/agcom/quadtree/styles/home.css b/src/main/resources/io/github/agcom/quadtree/styles/home.css similarity index 100% rename from src/main/resources/com/github/agcom/quadtree/styles/home.css rename to src/main/resources/io/github/agcom/quadtree/styles/home.css diff --git a/src/main/resources/com/github/agcom/quadtree/styles/quadtree.css b/src/main/resources/io/github/agcom/quadtree/styles/quadtree.css similarity index 100% rename from src/main/resources/com/github/agcom/quadtree/styles/quadtree.css rename to src/main/resources/io/github/agcom/quadtree/styles/quadtree.css