diff --git a/Workspace/client/src/main/java/com/pqt/client/Main.java b/Workspace/client/src/main/java/com/pqt/client/Main.java index dfe7bf16..9bc6ca24 100644 --- a/Workspace/client/src/main/java/com/pqt/client/Main.java +++ b/Workspace/client/src/main/java/com/pqt/client/Main.java @@ -1,22 +1,7 @@ package com.pqt.client; import com.pqt.client.gui.FrameManager; -import com.pqt.client.gui.main_frame.MainFrame; -import com.pqt.client.gui.main_frame.listeners.IMainFrameModelListener; -import com.pqt.client.gui.modules.account_screen.AccountScreen; -import com.pqt.client.gui.modules.sale_screen.SaleScreen; -import com.pqt.client.gui.modules.stat_screen.StatScreen; -import com.pqt.client.gui.modules.stock_screen.StockScreen; -import com.pqt.client.gui.ressources.components.generics.toast.ToastFactory; -import com.pqt.client.gui.ressources.css.GUICssTool; -import com.pqt.client.gui.ressources.strings.GUIStringTool; -import com.pqt.client.gui.startup_frame.StartupFrame; -import com.pqt.client.gui.startup_frame.listeners.frame.IStartupFrameModelListener; -import com.pqt.client.module.ClientBackEndModuleManager; import javafx.application.Application; -import javafx.application.Platform; -import javafx.scene.Scene; -import javafx.scene.layout.Pane; import javafx.stage.Stage; public class Main extends Application{ diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/FrameManager.java b/Workspace/client/src/main/java/com/pqt/client/gui/FrameManager.java index 03bacd96..5685cb9a 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/FrameManager.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/FrameManager.java @@ -1,15 +1,15 @@ package com.pqt.client.gui; -import com.pqt.client.gui.main_frame.MainFrame; -import com.pqt.client.gui.main_frame.listeners.IMainFrameModelListener; +import com.pqt.client.gui.frames.main_frame.MainFrame; +import com.pqt.client.gui.frames.main_frame.listeners.IMainFrameModelListener; import com.pqt.client.gui.modules.account_screen.AccountScreen; import com.pqt.client.gui.modules.sale_screen.SaleScreen; import com.pqt.client.gui.modules.stat_screen.StatScreen; import com.pqt.client.gui.modules.stock_screen.StockScreen; import com.pqt.client.gui.ressources.components.generics.toast.ToastFactory; import com.pqt.client.gui.ressources.strings.GUIStringTool; -import com.pqt.client.gui.startup_frame.StartupFrame; -import com.pqt.client.gui.startup_frame.listeners.frame.IStartupFrameModelListener; +import com.pqt.client.gui.frames.startup_frame.StartupFrame; +import com.pqt.client.gui.frames.startup_frame.listeners.frame.IStartupFrameModelListener; import com.pqt.client.module.ClientBackEndModuleManager; import javafx.application.Platform; import javafx.stage.Stage; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrame.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrame.java similarity index 80% rename from Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrame.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrame.java index 8c75b428..e5d502d6 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrame.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrame.java @@ -1,10 +1,8 @@ -package com.pqt.client.gui.main_frame; +package com.pqt.client.gui.frames.main_frame; -import com.pqt.client.gui.main_frame.listeners.IMainFrameModelListener; +import com.pqt.client.gui.frames.main_frame.listeners.IMainFrameModelListener; import com.pqt.client.gui.modules.IGuiModule; -import com.pqt.client.gui.ressources.components.generics.IFXComponent; import com.pqt.client.gui.ressources.components.generics.frames.IFXFrame; -import com.pqt.client.gui.startup_frame.listeners.frame.IStartupFrameModelListener; import com.pqt.client.module.account.AccountService; import javafx.scene.layout.Pane; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameController.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrameController.java similarity index 91% rename from Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameController.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrameController.java index 15f43711..c5912dd8 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameController.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrameController.java @@ -1,6 +1,6 @@ -package com.pqt.client.gui.main_frame; +package com.pqt.client.gui.frames.main_frame; -import com.pqt.client.gui.main_frame.listeners.IMainFrameModelListener; +import com.pqt.client.gui.frames.main_frame.listeners.IMainFrameModelListener; import com.pqt.client.gui.modules.IGuiModule; import com.pqt.core.entities.user_account.AccountLevel; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrameModel.java similarity index 92% rename from Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrameModel.java index 12a95bd7..7fc199bf 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrameModel.java @@ -1,13 +1,12 @@ -package com.pqt.client.gui.main_frame; +package com.pqt.client.gui.frames.main_frame; -import com.pqt.client.gui.main_frame.listeners.IMainFrameModelListener; +import com.pqt.client.gui.frames.main_frame.listeners.IMainFrameModelListener; import com.pqt.client.module.account.AccountService; import com.pqt.client.module.account.listeners.IAccountListener; import com.pqt.core.entities.user_account.Account; import javax.swing.event.EventListenerList; import java.util.Arrays; -import java.util.Collection; class MainFrameModel { diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameView.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrameView.java similarity index 99% rename from Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameView.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrameView.java index fbe883b1..ce3fb389 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameView.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/MainFrameView.java @@ -1,4 +1,4 @@ -package com.pqt.client.gui.main_frame; +package com.pqt.client.gui.frames.main_frame; import com.pqt.client.gui.ressources.components.generics.IFXComponent; import com.pqt.client.gui.ressources.components.generics.others.SideBar; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/listeners/IMainFrameModelListener.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/listeners/IMainFrameModelListener.java similarity index 71% rename from Workspace/client/src/main/java/com/pqt/client/gui/main_frame/listeners/IMainFrameModelListener.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/listeners/IMainFrameModelListener.java index d9c1229f..6b3f04d2 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/listeners/IMainFrameModelListener.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/main_frame/listeners/IMainFrameModelListener.java @@ -1,4 +1,4 @@ -package com.pqt.client.gui.main_frame.listeners; +package com.pqt.client.gui.frames.main_frame.listeners; import java.util.EventListener; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrame.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrame.java similarity index 83% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrame.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrame.java index 4b06345a..09371ee6 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrame.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrame.java @@ -1,8 +1,7 @@ -package com.pqt.client.gui.startup_frame; +package com.pqt.client.gui.frames.startup_frame; -import com.pqt.client.gui.ressources.components.generics.IFXComponent; import com.pqt.client.gui.ressources.components.generics.frames.IFXFrame; -import com.pqt.client.gui.startup_frame.listeners.frame.IStartupFrameModelListener; +import com.pqt.client.gui.frames.startup_frame.listeners.frame.IStartupFrameModelListener; import com.pqt.client.module.account.AccountService; import com.pqt.client.module.network.NetworkService; import javafx.scene.layout.Pane; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameController.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrameController.java similarity index 91% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameController.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrameController.java index 9789a551..2d4b2a82 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameController.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrameController.java @@ -1,7 +1,7 @@ -package com.pqt.client.gui.startup_frame; +package com.pqt.client.gui.frames.startup_frame; import com.pqt.client.gui.ressources.strings.GUIStringTool; -import com.pqt.client.gui.startup_frame.listeners.frame.IStartupFrameModelListener; +import com.pqt.client.gui.frames.startup_frame.listeners.frame.IStartupFrameModelListener; public class StartupFrameController implements IStartupFrameModelListener { diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameModel.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrameModel.java similarity index 86% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameModel.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrameModel.java index b02374db..9039216c 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameModel.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrameModel.java @@ -1,9 +1,9 @@ -package com.pqt.client.gui.startup_frame; +package com.pqt.client.gui.frames.startup_frame; -import com.pqt.client.gui.startup_frame.listeners.frame.IStartupFrameModelEventFirerer; -import com.pqt.client.gui.startup_frame.listeners.frame.IStartupFrameModelListener; -import com.pqt.client.gui.startup_frame.listeners.frame.SimpleStartupFrameModelEventFirerer; -import com.pqt.client.gui.startup_frame.listeners.procedure.IStartupProcedureListener; +import com.pqt.client.gui.frames.startup_frame.listeners.frame.IStartupFrameModelEventFirerer; +import com.pqt.client.gui.frames.startup_frame.listeners.frame.IStartupFrameModelListener; +import com.pqt.client.gui.frames.startup_frame.listeners.frame.SimpleStartupFrameModelEventFirerer; +import com.pqt.client.gui.frames.startup_frame.listeners.procedure.IStartupProcedureListener; import com.pqt.client.module.account.AccountService; import com.pqt.client.module.network.NetworkService; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameView.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrameView.java similarity index 98% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameView.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrameView.java index f617423c..7dde6fac 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameView.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupFrameView.java @@ -1,4 +1,4 @@ -package com.pqt.client.gui.startup_frame; +package com.pqt.client.gui.frames.startup_frame; import com.pqt.client.gui.ressources.components.generics.IFXComponent; import com.pqt.client.gui.ressources.strings.GUIStringTool; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupProcedureHandler.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupProcedureHandler.java similarity index 95% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupProcedureHandler.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupProcedureHandler.java index 2e5b04c0..453481bb 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupProcedureHandler.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/StartupProcedureHandler.java @@ -1,8 +1,8 @@ -package com.pqt.client.gui.startup_frame; +package com.pqt.client.gui.frames.startup_frame; -import com.pqt.client.gui.startup_frame.listeners.procedure.IStartupProcedureEventFirerer; -import com.pqt.client.gui.startup_frame.listeners.procedure.IStartupProcedureListener; -import com.pqt.client.gui.startup_frame.listeners.procedure.SimpleStartupProcedureEventFirerer; +import com.pqt.client.gui.frames.startup_frame.listeners.procedure.IStartupProcedureEventFirerer; +import com.pqt.client.gui.frames.startup_frame.listeners.procedure.IStartupProcedureListener; +import com.pqt.client.gui.frames.startup_frame.listeners.procedure.SimpleStartupProcedureEventFirerer; import com.pqt.client.module.account.AccountService; import com.pqt.client.module.account.listeners.AccountListenerAdapter; import com.pqt.client.module.account.listeners.IAccountListener; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/frame/IStartupFrameModelEventFirerer.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/frame/IStartupFrameModelEventFirerer.java similarity index 74% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/frame/IStartupFrameModelEventFirerer.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/frame/IStartupFrameModelEventFirerer.java index 877df58f..7637abea 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/frame/IStartupFrameModelEventFirerer.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/frame/IStartupFrameModelEventFirerer.java @@ -1,4 +1,4 @@ -package com.pqt.client.gui.startup_frame.listeners.frame; +package com.pqt.client.gui.frames.startup_frame.listeners.frame; public interface IStartupFrameModelEventFirerer { void fireStartupValidated(); diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/frame/IStartupFrameModelListener.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/frame/IStartupFrameModelListener.java similarity index 67% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/frame/IStartupFrameModelListener.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/frame/IStartupFrameModelListener.java index 5249ede1..28e67398 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/frame/IStartupFrameModelListener.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/frame/IStartupFrameModelListener.java @@ -1,4 +1,4 @@ -package com.pqt.client.gui.startup_frame.listeners.frame; +package com.pqt.client.gui.frames.startup_frame.listeners.frame; import java.util.EventListener; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/frame/SimpleStartupFrameModelEventFirerer.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/frame/SimpleStartupFrameModelEventFirerer.java similarity index 92% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/frame/SimpleStartupFrameModelEventFirerer.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/frame/SimpleStartupFrameModelEventFirerer.java index 1ada34ae..4dad0b34 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/frame/SimpleStartupFrameModelEventFirerer.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/frame/SimpleStartupFrameModelEventFirerer.java @@ -1,4 +1,4 @@ -package com.pqt.client.gui.startup_frame.listeners.frame; +package com.pqt.client.gui.frames.startup_frame.listeners.frame; import javax.swing.event.EventListenerList; import java.util.Arrays; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/procedure/IStartupProcedureEventFirerer.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/procedure/IStartupProcedureEventFirerer.java similarity index 84% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/procedure/IStartupProcedureEventFirerer.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/procedure/IStartupProcedureEventFirerer.java index e06829c7..93c9b061 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/procedure/IStartupProcedureEventFirerer.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/procedure/IStartupProcedureEventFirerer.java @@ -1,4 +1,4 @@ -package com.pqt.client.gui.startup_frame.listeners.procedure; +package com.pqt.client.gui.frames.startup_frame.listeners.procedure; public interface IStartupProcedureEventFirerer { diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/procedure/IStartupProcedureListener.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/procedure/IStartupProcedureListener.java similarity index 82% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/procedure/IStartupProcedureListener.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/procedure/IStartupProcedureListener.java index cdf6f189..6f0968e4 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/procedure/IStartupProcedureListener.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/procedure/IStartupProcedureListener.java @@ -1,4 +1,4 @@ -package com.pqt.client.gui.startup_frame.listeners.procedure; +package com.pqt.client.gui.frames.startup_frame.listeners.procedure; import java.util.EventListener; diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/procedure/SimpleStartupProcedureEventFirerer.java b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/procedure/SimpleStartupProcedureEventFirerer.java similarity index 95% rename from Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/procedure/SimpleStartupProcedureEventFirerer.java rename to Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/procedure/SimpleStartupProcedureEventFirerer.java index f0cef5cb..97a0693e 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/listeners/procedure/SimpleStartupProcedureEventFirerer.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/frames/startup_frame/listeners/procedure/SimpleStartupProcedureEventFirerer.java @@ -1,4 +1,4 @@ -package com.pqt.client.gui.startup_frame.listeners.procedure; +package com.pqt.client.gui.frames.startup_frame.listeners.procedure; import javax.swing.event.EventListenerList; import java.util.Arrays;