From e6d03430994593403a325edf241a29610522412d Mon Sep 17 00:00:00 2001 From: inbalmishal Date: Thu, 11 Jun 2020 15:37:51 +0300 Subject: [PATCH] inballl --- src/{Controller => controller}/AutoFuncController.java | 2 +- src/{Controller => controller}/ItemController.java | 2 +- src/{Controller => controller}/ManagerController.java | 2 +- src/{Controller => controller}/MemberController.java | 2 +- src/{Controller => controller}/PurchaseController.java | 2 +- src/{Controller => controller}/StoreController.java | 2 +- src/{Controller => controller}/WorkerController.java | 2 +- src/driver/MVCDriver.java | 4 ++-- src/{Model => model}/AutoFuncModel.java | 0 src/{Model => model}/ItemModel.java | 0 src/{Model => model}/ManagerModel.java | 0 src/{Model => model}/MemberModel.java | 0 src/{Model => model}/PurchaseModel.java | 0 src/{Model => model}/StoreModel.java | 0 src/{Model => model}/WorkerModel.java | 0 src/{Model => model}/entities/Item.java | 0 src/{Model => model}/entities/Manager.java | 0 src/{Model => model}/entities/Member.java | 0 src/{Model => model}/entities/Pants.java | 0 src/{Model => model}/entities/Person.java | 0 src/{Model => model}/entities/Purchase.java | 0 src/{Model => model}/entities/Shirt.java | 0 src/{Model => model}/entities/Shoe.java | 0 src/{Model => model}/entities/Worker.java | 0 src/{View => view}/UserInterface.java | 5 +---- src/{View => view}/ViewInterface.java | 4 ++-- 26 files changed, 12 insertions(+), 15 deletions(-) rename src/{Controller => controller}/AutoFuncController.java (96%) rename src/{Controller => controller}/ItemController.java (98%) rename src/{Controller => controller}/ManagerController.java (98%) rename src/{Controller => controller}/MemberController.java (98%) rename src/{Controller => controller}/PurchaseController.java (98%) rename src/{Controller => controller}/StoreController.java (99%) rename src/{Controller => controller}/WorkerController.java (97%) rename src/{Model => model}/AutoFuncModel.java (100%) rename src/{Model => model}/ItemModel.java (100%) rename src/{Model => model}/ManagerModel.java (100%) rename src/{Model => model}/MemberModel.java (100%) rename src/{Model => model}/PurchaseModel.java (100%) rename src/{Model => model}/StoreModel.java (100%) rename src/{Model => model}/WorkerModel.java (100%) rename src/{Model => model}/entities/Item.java (100%) rename src/{Model => model}/entities/Manager.java (100%) rename src/{Model => model}/entities/Member.java (100%) rename src/{Model => model}/entities/Pants.java (100%) rename src/{Model => model}/entities/Person.java (100%) rename src/{Model => model}/entities/Purchase.java (100%) rename src/{Model => model}/entities/Shirt.java (100%) rename src/{Model => model}/entities/Shoe.java (100%) rename src/{Model => model}/entities/Worker.java (100%) rename src/{View => view}/UserInterface.java (94%) rename src/{View => view}/ViewInterface.java (60%) diff --git a/src/Controller/AutoFuncController.java b/src/controller/AutoFuncController.java similarity index 96% rename from src/Controller/AutoFuncController.java rename to src/controller/AutoFuncController.java index 98cca1c..885446b 100644 --- a/src/Controller/AutoFuncController.java +++ b/src/controller/AutoFuncController.java @@ -1,5 +1,5 @@ package controller; -import View.*; +import view.*; import model.*; diff --git a/src/Controller/ItemController.java b/src/controller/ItemController.java similarity index 98% rename from src/Controller/ItemController.java rename to src/controller/ItemController.java index 1edd450..75c9f29 100644 --- a/src/Controller/ItemController.java +++ b/src/controller/ItemController.java @@ -1,5 +1,5 @@ package controller; -import View.*; +import view.*; import model.*; import model.entities.*; diff --git a/src/Controller/ManagerController.java b/src/controller/ManagerController.java similarity index 98% rename from src/Controller/ManagerController.java rename to src/controller/ManagerController.java index 8428892..905697b 100644 --- a/src/Controller/ManagerController.java +++ b/src/controller/ManagerController.java @@ -1,5 +1,5 @@ package controller; -import View.*; +import view.*; import model.*; import model.entities.Worker; diff --git a/src/Controller/MemberController.java b/src/controller/MemberController.java similarity index 98% rename from src/Controller/MemberController.java rename to src/controller/MemberController.java index 536f7f5..f3eeca1 100644 --- a/src/Controller/MemberController.java +++ b/src/controller/MemberController.java @@ -1,5 +1,5 @@ package controller; -import View.*; +import view.*; import model.*; import model.entities.Member; diff --git a/src/Controller/PurchaseController.java b/src/controller/PurchaseController.java similarity index 98% rename from src/Controller/PurchaseController.java rename to src/controller/PurchaseController.java index a24332d..68e255c 100644 --- a/src/Controller/PurchaseController.java +++ b/src/controller/PurchaseController.java @@ -1,5 +1,5 @@ package controller; -import View.*; +import view.*; import model.*; import model.entities.Member; import model.entities.Purchase; diff --git a/src/Controller/StoreController.java b/src/controller/StoreController.java similarity index 99% rename from src/Controller/StoreController.java rename to src/controller/StoreController.java index ae6affd..6672226 100644 --- a/src/Controller/StoreController.java +++ b/src/controller/StoreController.java @@ -1,5 +1,5 @@ package controller; -import View.*; +import view.*; import model.*; import model.entities.*; diff --git a/src/Controller/WorkerController.java b/src/controller/WorkerController.java similarity index 97% rename from src/Controller/WorkerController.java rename to src/controller/WorkerController.java index 2e58fb1..8a6f11b 100644 --- a/src/Controller/WorkerController.java +++ b/src/controller/WorkerController.java @@ -1,5 +1,5 @@ package controller; -import View.*; +import view.*; import model.*; import model.entities.Worker; diff --git a/src/driver/MVCDriver.java b/src/driver/MVCDriver.java index 25f216d..268362d 100644 --- a/src/driver/MVCDriver.java +++ b/src/driver/MVCDriver.java @@ -1,6 +1,6 @@ package driver; -import View.UserInterface; -import View.ViewInterface; +import view.UserInterface; +import view.ViewInterface; import controller.OpenController; import model.OpenModel; diff --git a/src/Model/AutoFuncModel.java b/src/model/AutoFuncModel.java similarity index 100% rename from src/Model/AutoFuncModel.java rename to src/model/AutoFuncModel.java diff --git a/src/Model/ItemModel.java b/src/model/ItemModel.java similarity index 100% rename from src/Model/ItemModel.java rename to src/model/ItemModel.java diff --git a/src/Model/ManagerModel.java b/src/model/ManagerModel.java similarity index 100% rename from src/Model/ManagerModel.java rename to src/model/ManagerModel.java diff --git a/src/Model/MemberModel.java b/src/model/MemberModel.java similarity index 100% rename from src/Model/MemberModel.java rename to src/model/MemberModel.java diff --git a/src/Model/PurchaseModel.java b/src/model/PurchaseModel.java similarity index 100% rename from src/Model/PurchaseModel.java rename to src/model/PurchaseModel.java diff --git a/src/Model/StoreModel.java b/src/model/StoreModel.java similarity index 100% rename from src/Model/StoreModel.java rename to src/model/StoreModel.java diff --git a/src/Model/WorkerModel.java b/src/model/WorkerModel.java similarity index 100% rename from src/Model/WorkerModel.java rename to src/model/WorkerModel.java diff --git a/src/Model/entities/Item.java b/src/model/entities/Item.java similarity index 100% rename from src/Model/entities/Item.java rename to src/model/entities/Item.java diff --git a/src/Model/entities/Manager.java b/src/model/entities/Manager.java similarity index 100% rename from src/Model/entities/Manager.java rename to src/model/entities/Manager.java diff --git a/src/Model/entities/Member.java b/src/model/entities/Member.java similarity index 100% rename from src/Model/entities/Member.java rename to src/model/entities/Member.java diff --git a/src/Model/entities/Pants.java b/src/model/entities/Pants.java similarity index 100% rename from src/Model/entities/Pants.java rename to src/model/entities/Pants.java diff --git a/src/Model/entities/Person.java b/src/model/entities/Person.java similarity index 100% rename from src/Model/entities/Person.java rename to src/model/entities/Person.java diff --git a/src/Model/entities/Purchase.java b/src/model/entities/Purchase.java similarity index 100% rename from src/Model/entities/Purchase.java rename to src/model/entities/Purchase.java diff --git a/src/Model/entities/Shirt.java b/src/model/entities/Shirt.java similarity index 100% rename from src/Model/entities/Shirt.java rename to src/model/entities/Shirt.java diff --git a/src/Model/entities/Shoe.java b/src/model/entities/Shoe.java similarity index 100% rename from src/Model/entities/Shoe.java rename to src/model/entities/Shoe.java diff --git a/src/Model/entities/Worker.java b/src/model/entities/Worker.java similarity index 100% rename from src/Model/entities/Worker.java rename to src/model/entities/Worker.java diff --git a/src/View/UserInterface.java b/src/view/UserInterface.java similarity index 94% rename from src/View/UserInterface.java rename to src/view/UserInterface.java index aee1810..2f97433 100644 --- a/src/View/UserInterface.java +++ b/src/view/UserInterface.java @@ -1,9 +1,6 @@ -package View; +package view; import controller.*; -import model.MemberModel; - -import java.util.Scanner; public class UserInterface implements ViewInterface, Runnable { private AutoFuncController autoFuncController; diff --git a/src/View/ViewInterface.java b/src/view/ViewInterface.java similarity index 60% rename from src/View/ViewInterface.java rename to src/view/ViewInterface.java index cd1033a..7ed40fe 100644 --- a/src/View/ViewInterface.java +++ b/src/view/ViewInterface.java @@ -1,5 +1,5 @@ -package View; -import controller.*; +package view; + public interface ViewInterface { void start();