Optimization: Grouping the controller in only one package

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

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.controller.OCLController;
-import fr.insa.ocm.viewmodel.OCLController;
+import fr.insa.ocm.controller.mainuis.MainView;
 import javafx.application.Application;
 import javafx.stage.Stage;
 

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.controller.mainuis.MainView;
-import fr.insa.ocm.view.mainuis.MainView;
 import javafx.application.Platform;
-import javafx.beans.property.SimpleStringProperty;
-
-import java.util.List;
-import java.util.Map;
 
 public class InfoAlgorithm extends Thread {
 

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;

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;

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;

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.controller.misc.FastForwardWaitingView;
-import fr.insa.ocm.view.misc.FastForwardWaitingView;
+import fr.insa.ocm.controller.misc.parts.fastforward.AddConditionView;
-import fr.insa.ocm.view.misc.parts.fastforward.AddConditionView;
+import fr.insa.ocm.controller.misc.parts.fastforward.ConditionView;
-import fr.insa.ocm.view.misc.parts.fastforward.ConditionView;
+import fr.insa.ocm.controller.OCLController;
-import fr.insa.ocm.viewmodel.OCLController;
 import fr.insa.ocm.model.utils.fastforward.condition.Condition;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;

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.OCLApplication;
-import fr.insa.ocm.view.misc.*;
+import fr.insa.ocm.controller.misc.menus.AboutView;
-import fr.insa.ocm.view.misc.menus.AboutView;
+import fr.insa.ocm.controller.misc.menus.MonitorView;
-import fr.insa.ocm.view.misc.menus.MonitorView;
+import fr.insa.ocm.controller.misc.menus.LoadStateView;
-import fr.insa.ocm.view.misc.menus.LoadStateView;
+import fr.insa.ocm.controller.misc.menus.SettingsView;
-import fr.insa.ocm.view.misc.menus.SettingsView;
+import fr.insa.ocm.controller.InfoAlgorithm;
-import fr.insa.ocm.viewmodel.InfoAlgorithm;
+import fr.insa.ocm.controller.OCLController;
-import fr.insa.ocm.viewmodel.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 {

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.controller.misc.parts.mining.PatternView;
-import fr.insa.ocm.viewmodel.OCLController;
+import fr.insa.ocm.controller.OCLController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;

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;

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;

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;

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;

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.controller.misc.ErrorView;
-import fr.insa.ocm.view.misc.InfoView;
+import fr.insa.ocm.controller.misc.InfoView;
-import fr.insa.ocm.view.mainuis.MainView;
+import fr.insa.ocm.controller.mainuis.MainView;
-import fr.insa.ocm.viewmodel.OCLController;
+import fr.insa.ocm.controller.OCLController;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.concurrent.Task;

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;

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.controller.misc.parts.settings.library.SettingsRealKDView;
-import fr.insa.ocm.view.misc.parts.settings.library.SettingsSPMFView;
+import fr.insa.ocm.controller.misc.parts.settings.library.SettingsSPMFView;
-import fr.insa.ocm.view.misc.parts.settings.pattern.SettingsPatternView;
+import fr.insa.ocm.controller.misc.parts.settings.pattern.SettingsPatternView;
-import fr.insa.ocm.viewmodel.OCLController;
+import fr.insa.ocm.controller.OCLController;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;