diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF index b0cdb58..02c8957 100644 --- a/src/main/java/META-INF/MANIFEST.MF +++ b/src/main/java/META-INF/MANIFEST.MF @@ -1,2 +1,2 @@ Manifest-Version: 1.0 -Main-Class: fr.insa.ocm.view.OCLApplication +Main-Class: fr.insa.ocm.OCLApplication diff --git a/src/main/java/fr/insa/ocm/view/OCLApplication.java b/src/main/java/fr/insa/ocm/OCLApplication.java similarity index 85% rename from src/main/java/fr/insa/ocm/view/OCLApplication.java rename to src/main/java/fr/insa/ocm/OCLApplication.java index 3839b2e..5021ca5 100644 --- a/src/main/java/fr/insa/ocm/view/OCLApplication.java +++ b/src/main/java/fr/insa/ocm/OCLApplication.java @@ -1,7 +1,7 @@ -package fr.insa.ocm.view; +package fr.insa.ocm; -import fr.insa.ocm.view.mainuis.MainView; -import fr.insa.ocm.viewmodel.OCLController; +import fr.insa.ocm.controller.OCLController; +import fr.insa.ocm.controller.mainuis.MainView; import javafx.application.Application; import javafx.stage.Stage; diff --git a/src/main/java/fr/insa/ocm/viewmodel/InfoAlgorithm.java b/src/main/java/fr/insa/ocm/controller/InfoAlgorithm.java similarity index 89% rename from src/main/java/fr/insa/ocm/viewmodel/InfoAlgorithm.java rename to src/main/java/fr/insa/ocm/controller/InfoAlgorithm.java index e724955..69778f5 100644 --- a/src/main/java/fr/insa/ocm/viewmodel/InfoAlgorithm.java +++ b/src/main/java/fr/insa/ocm/controller/InfoAlgorithm.java @@ -1,14 +1,9 @@ -package fr.insa.ocm.viewmodel; +package fr.insa.ocm.controller; import fr.insa.ocm.model.DebugLogger; import fr.insa.ocm.model.OCMManager; -import fr.insa.ocm.model.wrapper.api.AbstractAlgorithmLauncher; -import fr.insa.ocm.view.mainuis.MainView; +import fr.insa.ocm.controller.mainuis.MainView; import javafx.application.Platform; -import javafx.beans.property.SimpleStringProperty; - -import java.util.List; -import java.util.Map; public class InfoAlgorithm extends Thread { diff --git a/src/main/java/fr/insa/ocm/viewmodel/Monitor.java b/src/main/java/fr/insa/ocm/controller/Monitor.java similarity index 99% rename from src/main/java/fr/insa/ocm/viewmodel/Monitor.java rename to src/main/java/fr/insa/ocm/controller/Monitor.java index 87e99a9..b73c422 100644 --- a/src/main/java/fr/insa/ocm/viewmodel/Monitor.java +++ b/src/main/java/fr/insa/ocm/controller/Monitor.java @@ -1,4 +1,4 @@ -package fr.insa.ocm.viewmodel; +package fr.insa.ocm.controller; import fr.insa.ocm.model.DebugLogger; import fr.insa.ocm.model.OCMManager; diff --git a/src/main/java/fr/insa/ocm/viewmodel/OCLController.java b/src/main/java/fr/insa/ocm/controller/OCLController.java similarity index 98% rename from src/main/java/fr/insa/ocm/viewmodel/OCLController.java rename to src/main/java/fr/insa/ocm/controller/OCLController.java index 0e1b225..016f556 100644 --- a/src/main/java/fr/insa/ocm/viewmodel/OCLController.java +++ b/src/main/java/fr/insa/ocm/controller/OCLController.java @@ -1,4 +1,4 @@ -package fr.insa.ocm.viewmodel; +package fr.insa.ocm.controller; import fr.insa.ocm.model.DebugLogger; import fr.insa.ocm.model.OCMManager; @@ -6,7 +6,7 @@ import fr.insa.ocm.model.oneclicklearning.cache.api.Cache; import fr.insa.ocm.model.oneclicklearning.coactivelearning.api.CoactiveLearning; import fr.insa.ocm.model.utils.fastforward.FastForward; import fr.insa.ocm.model.wrapper.api.Pattern; -import fr.insa.ocm.view.misc.FastForwardWaitingView; +import fr.insa.ocm.controller.misc.FastForwardWaitingView; import fr.insa.ocm.model.utils.fastforward.condition.Condition; import javafx.application.Platform; import javafx.beans.property.DoubleProperty; diff --git a/src/main/java/fr/insa/ocm/view/mainuis/DataView.java b/src/main/java/fr/insa/ocm/controller/mainuis/DataView.java similarity index 98% rename from src/main/java/fr/insa/ocm/view/mainuis/DataView.java rename to src/main/java/fr/insa/ocm/controller/mainuis/DataView.java index 09e5727..41dc3ca 100644 --- a/src/main/java/fr/insa/ocm/view/mainuis/DataView.java +++ b/src/main/java/fr/insa/ocm/controller/mainuis/DataView.java @@ -1,4 +1,4 @@ -package fr.insa.ocm.view.mainuis; +package fr.insa.ocm.controller.mainuis; import javafx.fxml.FXML; diff --git a/src/main/java/fr/insa/ocm/view/mainuis/FastForwardView.java b/src/main/java/fr/insa/ocm/controller/mainuis/FastForwardView.java similarity index 95% rename from src/main/java/fr/insa/ocm/view/mainuis/FastForwardView.java rename to src/main/java/fr/insa/ocm/controller/mainuis/FastForwardView.java index 5ca6d42..a9b6c42 100644 --- a/src/main/java/fr/insa/ocm/view/mainuis/FastForwardView.java +++ b/src/main/java/fr/insa/ocm/controller/mainuis/FastForwardView.java @@ -1,14 +1,13 @@ -package fr.insa.ocm.view.mainuis; +package fr.insa.ocm.controller.mainuis; import org.jetbrains.annotations.NotNull; import fr.insa.ocm.model.DebugLogger; import fr.insa.ocm.model.utils.serialize.condition.ConditionsDeserializer; import fr.insa.ocm.model.utils.serialize.condition.ConditionsSerializer; -import fr.insa.ocm.view.OCLApplication; -import fr.insa.ocm.view.misc.FastForwardWaitingView; -import fr.insa.ocm.view.misc.parts.fastforward.AddConditionView; -import fr.insa.ocm.view.misc.parts.fastforward.ConditionView; -import fr.insa.ocm.viewmodel.OCLController; +import fr.insa.ocm.controller.misc.FastForwardWaitingView; +import fr.insa.ocm.controller.misc.parts.fastforward.AddConditionView; +import fr.insa.ocm.controller.misc.parts.fastforward.ConditionView; +import fr.insa.ocm.controller.OCLController; import fr.insa.ocm.model.utils.fastforward.condition.Condition; import javafx.application.Platform; import javafx.collections.FXCollections; diff --git a/src/main/java/fr/insa/ocm/view/mainuis/MainView.java b/src/main/java/fr/insa/ocm/controller/mainuis/MainView.java similarity index 94% rename from src/main/java/fr/insa/ocm/view/mainuis/MainView.java rename to src/main/java/fr/insa/ocm/controller/mainuis/MainView.java index 7189ba1..e02719f 100644 --- a/src/main/java/fr/insa/ocm/view/mainuis/MainView.java +++ b/src/main/java/fr/insa/ocm/controller/mainuis/MainView.java @@ -1,16 +1,17 @@ -package fr.insa.ocm.view.mainuis; +package fr.insa.ocm.controller.mainuis; +import fr.insa.ocm.controller.misc.ErrorView; +import fr.insa.ocm.controller.misc.InfoView; import fr.insa.ocm.model.OCMManager; import fr.insa.ocm.model.utils.serialize.OCMSerializer; import fr.insa.ocm.model.wrapper.api.Pattern; -import fr.insa.ocm.view.OCLApplication; -import fr.insa.ocm.view.misc.*; -import fr.insa.ocm.view.misc.menus.AboutView; -import fr.insa.ocm.view.misc.menus.MonitorView; -import fr.insa.ocm.view.misc.menus.LoadStateView; -import fr.insa.ocm.view.misc.menus.SettingsView; -import fr.insa.ocm.viewmodel.InfoAlgorithm; -import fr.insa.ocm.viewmodel.OCLController; +import fr.insa.ocm.OCLApplication; +import fr.insa.ocm.controller.misc.menus.AboutView; +import fr.insa.ocm.controller.misc.menus.MonitorView; +import fr.insa.ocm.controller.misc.menus.LoadStateView; +import fr.insa.ocm.controller.misc.menus.SettingsView; +import fr.insa.ocm.controller.InfoAlgorithm; +import fr.insa.ocm.controller.OCLController; import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -25,7 +26,6 @@ import javafx.stage.Stage; import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.List; public class MainView { diff --git a/src/main/java/fr/insa/ocm/view/mainuis/MiningView.java b/src/main/java/fr/insa/ocm/controller/mainuis/MiningView.java similarity index 95% rename from src/main/java/fr/insa/ocm/view/mainuis/MiningView.java rename to src/main/java/fr/insa/ocm/controller/mainuis/MiningView.java index 9b2fb47..123df03 100644 --- a/src/main/java/fr/insa/ocm/view/mainuis/MiningView.java +++ b/src/main/java/fr/insa/ocm/controller/mainuis/MiningView.java @@ -1,10 +1,10 @@ -package fr.insa.ocm.view.mainuis; +package fr.insa.ocm.controller.mainuis; import org.jetbrains.annotations.NotNull; import fr.insa.ocm.model.OCMManager; import fr.insa.ocm.model.wrapper.api.Pattern; -import fr.insa.ocm.view.misc.parts.mining.PatternView; -import fr.insa.ocm.viewmodel.OCLController; +import fr.insa.ocm.controller.misc.parts.mining.PatternView; +import fr.insa.ocm.controller.OCLController; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; diff --git a/src/main/java/fr/insa/ocm/view/misc/ErrorView.java b/src/main/java/fr/insa/ocm/controller/misc/ErrorView.java similarity index 97% rename from src/main/java/fr/insa/ocm/view/misc/ErrorView.java rename to src/main/java/fr/insa/ocm/controller/misc/ErrorView.java index 10ef1bb..22ce0d4 100644 --- a/src/main/java/fr/insa/ocm/view/misc/ErrorView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/ErrorView.java @@ -1,4 +1,4 @@ -package fr.insa.ocm.view.misc; +package fr.insa.ocm.controller.misc; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/src/main/java/fr/insa/ocm/view/misc/FastForwardWaitingView.java b/src/main/java/fr/insa/ocm/controller/misc/FastForwardWaitingView.java similarity index 96% rename from src/main/java/fr/insa/ocm/view/misc/FastForwardWaitingView.java rename to src/main/java/fr/insa/ocm/controller/misc/FastForwardWaitingView.java index ac57249..2828cb5 100644 --- a/src/main/java/fr/insa/ocm/view/misc/FastForwardWaitingView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/FastForwardWaitingView.java @@ -1,6 +1,6 @@ -package fr.insa.ocm.view.misc; +package fr.insa.ocm.controller.misc; -import fr.insa.ocm.viewmodel.OCLController; +import fr.insa.ocm.controller.OCLController; import javafx.application.Platform; import javafx.beans.property.DoubleProperty; import javafx.beans.property.StringProperty; diff --git a/src/main/java/fr/insa/ocm/view/misc/InfoView.java b/src/main/java/fr/insa/ocm/controller/misc/InfoView.java similarity index 97% rename from src/main/java/fr/insa/ocm/view/misc/InfoView.java rename to src/main/java/fr/insa/ocm/controller/misc/InfoView.java index ce551f2..2ab1a22 100644 --- a/src/main/java/fr/insa/ocm/view/misc/InfoView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/InfoView.java @@ -1,4 +1,4 @@ -package fr.insa.ocm.view.misc; +package fr.insa.ocm.controller.misc; import org.jetbrains.annotations.NotNull; import javafx.fxml.FXML; diff --git a/src/main/java/fr/insa/ocm/view/misc/menus/AboutView.java b/src/main/java/fr/insa/ocm/controller/misc/menus/AboutView.java similarity index 92% rename from src/main/java/fr/insa/ocm/view/misc/menus/AboutView.java rename to src/main/java/fr/insa/ocm/controller/misc/menus/AboutView.java index 490f44c..3939bc3 100644 --- a/src/main/java/fr/insa/ocm/view/misc/menus/AboutView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/menus/AboutView.java @@ -1,6 +1,6 @@ -package fr.insa.ocm.view.misc.menus; +package fr.insa.ocm.controller.misc.menus; -import fr.insa.ocm.viewmodel.OCLController; +import fr.insa.ocm.controller.OCLController; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; diff --git a/src/main/java/fr/insa/ocm/view/misc/menus/LoadStateView.java b/src/main/java/fr/insa/ocm/controller/misc/menus/LoadStateView.java similarity index 95% rename from src/main/java/fr/insa/ocm/view/misc/menus/LoadStateView.java rename to src/main/java/fr/insa/ocm/controller/misc/menus/LoadStateView.java index 60f9d2c..ce13725 100644 --- a/src/main/java/fr/insa/ocm/view/misc/menus/LoadStateView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/menus/LoadStateView.java @@ -1,11 +1,11 @@ -package fr.insa.ocm.view.misc.menus; +package fr.insa.ocm.controller.misc.menus; import fr.insa.ocm.model.OCMManager; import fr.insa.ocm.model.utils.serialize.OCMDeserializer; -import fr.insa.ocm.view.misc.ErrorView; -import fr.insa.ocm.view.misc.InfoView; -import fr.insa.ocm.view.mainuis.MainView; -import fr.insa.ocm.viewmodel.OCLController; +import fr.insa.ocm.controller.misc.ErrorView; +import fr.insa.ocm.controller.misc.InfoView; +import fr.insa.ocm.controller.mainuis.MainView; +import fr.insa.ocm.controller.OCLController; import javafx.application.Platform; import javafx.beans.property.SimpleStringProperty; import javafx.concurrent.Task; diff --git a/src/main/java/fr/insa/ocm/view/misc/menus/MonitorView.java b/src/main/java/fr/insa/ocm/controller/misc/menus/MonitorView.java similarity index 96% rename from src/main/java/fr/insa/ocm/view/misc/menus/MonitorView.java rename to src/main/java/fr/insa/ocm/controller/misc/menus/MonitorView.java index 6d4adeb..0686db3 100644 --- a/src/main/java/fr/insa/ocm/view/misc/menus/MonitorView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/menus/MonitorView.java @@ -1,8 +1,8 @@ -package fr.insa.ocm.view.misc.menus; +package fr.insa.ocm.controller.misc.menus; import fr.insa.ocm.model.DebugLogger; -import fr.insa.ocm.viewmodel.Monitor; +import fr.insa.ocm.controller.Monitor; import javafx.beans.property.SimpleStringProperty; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/src/main/java/fr/insa/ocm/view/misc/menus/SettingsView.java b/src/main/java/fr/insa/ocm/controller/misc/menus/SettingsView.java similarity index 91% rename from src/main/java/fr/insa/ocm/view/misc/menus/SettingsView.java rename to src/main/java/fr/insa/ocm/controller/misc/menus/SettingsView.java index b76f772..8a2ebaf 100644 --- a/src/main/java/fr/insa/ocm/view/misc/menus/SettingsView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/menus/SettingsView.java @@ -1,13 +1,12 @@ -package fr.insa.ocm.view.misc.menus; +package fr.insa.ocm.controller.misc.menus; import fr.insa.ocm.model.DebugLogger; import fr.insa.ocm.model.OCMManager; -import fr.insa.ocm.model.oneclicklearning.cache.set.CacheSet; import fr.insa.ocm.model.wrapper.api.Pattern; -import fr.insa.ocm.view.misc.parts.settings.library.SettingsRealKDView; -import fr.insa.ocm.view.misc.parts.settings.library.SettingsSPMFView; -import fr.insa.ocm.view.misc.parts.settings.pattern.SettingsPatternView; -import fr.insa.ocm.viewmodel.OCLController; +import fr.insa.ocm.controller.misc.parts.settings.library.SettingsRealKDView; +import fr.insa.ocm.controller.misc.parts.settings.library.SettingsSPMFView; +import fr.insa.ocm.controller.misc.parts.settings.pattern.SettingsPatternView; +import fr.insa.ocm.controller.OCLController; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/AddConditionView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/AddConditionView.java similarity index 96% rename from src/main/java/fr/insa/ocm/view/misc/parts/fastforward/AddConditionView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/AddConditionView.java index 8b861a3..4a63b11 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/AddConditionView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/AddConditionView.java @@ -1,7 +1,7 @@ -package fr.insa.ocm.view.misc.parts.fastforward; +package fr.insa.ocm.controller.misc.parts.fastforward; import fr.insa.ocm.model.DebugLogger; -import fr.insa.ocm.view.mainuis.FastForwardView; +import fr.insa.ocm.controller.mainuis.FastForwardView; import fr.insa.ocm.model.utils.fastforward.condition.Condition; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionAlgorithmView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionAlgorithmView.java similarity index 94% rename from src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionAlgorithmView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionAlgorithmView.java index 336a9c9..d853f17 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionAlgorithmView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionAlgorithmView.java @@ -1,7 +1,7 @@ -package fr.insa.ocm.view.misc.parts.fastforward; +package fr.insa.ocm.controller.misc.parts.fastforward; import fr.insa.ocm.model.OCMManager; -import fr.insa.ocm.view.mainuis.FastForwardView; +import fr.insa.ocm.controller.mainuis.FastForwardView; import fr.insa.ocm.model.utils.fastforward.condition.Condition; import fr.insa.ocm.model.utils.fastforward.condition.ConditionAlgorithm; import javafx.fxml.FXML; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionAttributeView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionAttributeView.java similarity index 94% rename from src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionAttributeView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionAttributeView.java index 871a625..27c080a 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionAttributeView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionAttributeView.java @@ -1,8 +1,8 @@ -package fr.insa.ocm.view.misc.parts.fastforward; +package fr.insa.ocm.controller.misc.parts.fastforward; import fr.insa.ocm.model.OCMManager; -import fr.insa.ocm.view.mainuis.FastForwardView; +import fr.insa.ocm.controller.mainuis.FastForwardView; import fr.insa.ocm.model.utils.fastforward.condition.Condition; import fr.insa.ocm.model.utils.fastforward.condition.ConditionAttribute; import javafx.fxml.FXML; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionMeasureBetweenView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionMeasureBetweenView.java similarity index 95% rename from src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionMeasureBetweenView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionMeasureBetweenView.java index 12de6b1..93fb21e 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionMeasureBetweenView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionMeasureBetweenView.java @@ -1,7 +1,7 @@ -package fr.insa.ocm.view.misc.parts.fastforward; +package fr.insa.ocm.controller.misc.parts.fastforward; import fr.insa.ocm.model.wrapper.api.Pattern; -import fr.insa.ocm.view.mainuis.FastForwardView; +import fr.insa.ocm.controller.mainuis.FastForwardView; import fr.insa.ocm.model.utils.fastforward.condition.Condition; import fr.insa.ocm.model.utils.fastforward.condition.ConditionMeasureBetween; import javafx.fxml.FXML; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionMeasureDynamicView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionMeasureDynamicView.java similarity index 94% rename from src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionMeasureDynamicView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionMeasureDynamicView.java index 9243b2f..598c94a 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionMeasureDynamicView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionMeasureDynamicView.java @@ -1,7 +1,7 @@ -package fr.insa.ocm.view.misc.parts.fastforward; +package fr.insa.ocm.controller.misc.parts.fastforward; import fr.insa.ocm.model.wrapper.api.Pattern; -import fr.insa.ocm.view.mainuis.FastForwardView; +import fr.insa.ocm.controller.mainuis.FastForwardView; import fr.insa.ocm.model.utils.fastforward.condition.Condition; import fr.insa.ocm.model.utils.fastforward.condition.ConditionMeasureDynamic; import javafx.fxml.FXML; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionMeasureStaticView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionMeasureStaticView.java similarity index 94% rename from src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionMeasureStaticView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionMeasureStaticView.java index 8fc409e..8699e18 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionMeasureStaticView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionMeasureStaticView.java @@ -1,7 +1,7 @@ -package fr.insa.ocm.view.misc.parts.fastforward; +package fr.insa.ocm.controller.misc.parts.fastforward; import fr.insa.ocm.model.wrapper.api.Pattern; -import fr.insa.ocm.view.mainuis.FastForwardView; +import fr.insa.ocm.controller.mainuis.FastForwardView; import fr.insa.ocm.model.utils.fastforward.condition.Condition; import fr.insa.ocm.model.utils.fastforward.condition.ConditionMeasureStatic; import javafx.fxml.FXML; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionView.java similarity index 94% rename from src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionView.java index 97a67c3..f6ba580 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/fastforward/ConditionView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/fastforward/ConditionView.java @@ -1,6 +1,6 @@ -package fr.insa.ocm.view.misc.parts.fastforward; +package fr.insa.ocm.controller.misc.parts.fastforward; -import fr.insa.ocm.view.mainuis.FastForwardView; +import fr.insa.ocm.controller.mainuis.FastForwardView; import fr.insa.ocm.model.utils.fastforward.condition.Condition; import javafx.fxml.FXML; import javafx.scene.control.Button; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/mining/PatternView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/mining/PatternView.java similarity index 98% rename from src/main/java/fr/insa/ocm/view/misc/parts/mining/PatternView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/mining/PatternView.java index 24e4d4e..932b50d 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/mining/PatternView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/mining/PatternView.java @@ -1,4 +1,4 @@ -package fr.insa.ocm.view.misc.parts.mining; +package fr.insa.ocm.controller.misc.parts.mining; import org.jetbrains.annotations.NotNull; import fr.insa.ocm.model.DebugLogger; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/settings/library/SettingsRealKDView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/settings/library/SettingsRealKDView.java similarity index 90% rename from src/main/java/fr/insa/ocm/view/misc/parts/settings/library/SettingsRealKDView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/settings/library/SettingsRealKDView.java index edc8ac8..7935f06 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/settings/library/SettingsRealKDView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/settings/library/SettingsRealKDView.java @@ -1,4 +1,4 @@ -package fr.insa.ocm.view.misc.parts.settings.library; +package fr.insa.ocm.controller.misc.parts.settings.library; import javafx.fxml.FXML; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/settings/library/SettingsSPMFView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/settings/library/SettingsSPMFView.java similarity index 98% rename from src/main/java/fr/insa/ocm/view/misc/parts/settings/library/SettingsSPMFView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/settings/library/SettingsSPMFView.java index d91e8e5..733bf8e 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/settings/library/SettingsSPMFView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/settings/library/SettingsSPMFView.java @@ -1,4 +1,4 @@ -package fr.insa.ocm.view.misc.parts.settings.library; +package fr.insa.ocm.controller.misc.parts.settings.library; import fr.insa.ocm.model.DebugLogger; diff --git a/src/main/java/fr/insa/ocm/view/misc/parts/settings/pattern/SettingsPatternView.java b/src/main/java/fr/insa/ocm/controller/misc/parts/settings/pattern/SettingsPatternView.java similarity index 95% rename from src/main/java/fr/insa/ocm/view/misc/parts/settings/pattern/SettingsPatternView.java rename to src/main/java/fr/insa/ocm/controller/misc/parts/settings/pattern/SettingsPatternView.java index 3814102..755ea31 100644 --- a/src/main/java/fr/insa/ocm/view/misc/parts/settings/pattern/SettingsPatternView.java +++ b/src/main/java/fr/insa/ocm/controller/misc/parts/settings/pattern/SettingsPatternView.java @@ -1,4 +1,4 @@ -package fr.insa.ocm.view.misc.parts.settings.pattern; +package fr.insa.ocm.controller.misc.parts.settings.pattern; import fr.insa.ocm.model.wrapper.api.Pattern; import fr.insa.ocm.model.wrapper.spmf.AlgorithmLauncherSPMF;