Merge pull request #39 from solvena/37-add-more-folders

Created new folders for better structure

src/main/java/Model/Exchange.java → src/main/java/Model/Exchange/Exchange.java

@@ -1,12 +1,20 @@
-package Model;
-
+package Model.Exchange;
+
+import Model.Player.Player;
+import Model.Purchase.Purchase;
+import Model.Share;
+import Model.Stock;
+import Model.Transaction.Transaction;
+import Model.Transaction.TransactionFactory;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+
+
 /**
  * Represents a stock exchange where players can buy and sell stocks.
  * The Exchange maintains a collection of stocks, advances through weeks,

src/main/java/Model/ExchangeObserver.java → src/main/java/Model/Exchange/ExchangeObserver.java

@@ -1,4 +1,4 @@
-package Model;
+package Model.Exchange;
 
 /**
  * Observer interface for receiving notifications from the Exchange.

src/main/java/Model/Player.java → src/main/java/Model/Player/Player.java

@@ -1,7 +1,10 @@
-package Model;
+package Model.Player;
 
+import Model.Portfolio;
+import Model.Transaction.TransactionArchive;
 import java.math.BigDecimal;
 
+
 /**
  * Represents a player in the stock trading game.
  * A Player manages their personal portfolio of shares, cash balance, and transaction

src/main/java/Model/PlayerStatus.java → src/main/java/Model/Player/PlayerStatus.java

@@ -1,4 +1,4 @@
-package Model;
+package Model.Player;
 
 /**
  * Enum representing the player's trading status level.

src/main/java/Model/Portfolio.java

@@ -1,9 +1,11 @@
 package Model;
-
+
+import Model.Sale.SaleCalculator;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+
 /**
  * Represents a portfolio of shares held by a player.
  * A Portfolio manages a collection of Share objects and provides methods to add,

src/main/java/Model/Purchase.java → src/main/java/Model/Purchase/Purchase.java

@@ -1,7 +1,11 @@
-package Model;
+package Model.Purchase;
 
+import Model.Player.Player;
+import Model.Share;
+import Model.Transaction.Transaction;
 import java.math.BigDecimal;
 
+
 /**
  * Represents a stock purchase transaction.
  * A Purchase transaction represents a player buying shares. When committed,

src/main/java/Model/PurchaseCalculator.java → src/main/java/Model/Purchase/PurchaseCalculator.java

@@ -1,5 +1,7 @@
-package Model;
+package Model.Purchase;
 
+import Model.Share;
+import Model.Transaction.TransactionCalculator;
 import java.math.BigDecimal;
 
 /**

src/main/java/Model/Sale.java → src/main/java/Model/Sale/Sale.java

@@ -1,5 +1,8 @@
-package Model;
+package Model.Sale;
 
+import Model.Player.Player;
+import Model.Share;
+import Model.Transaction.Transaction;
 import java.math.BigDecimal;
 
 /**

src/main/java/Model/SaleCalculator.java → src/main/java/Model/Sale/SaleCalculator.java

@@ -1,5 +1,7 @@
-package Model;
+package Model.Sale;
 
+import Model.Share;
+import Model.Transaction.TransactionCalculator;
 import java.math.BigDecimal;
 
 /**

src/main/java/Model/Transaction.java → src/main/java/Model/Transaction/Transaction.java

@@ -1,4 +1,8 @@
-package Model;
+package Model.Transaction;
+
+import Model.Player.Player;
+import Model.Share;
+
 
 /**
  * Abstract base class for all transactions (purchases and sales).

src/main/java/Model/TransactionArchive.java → src/main/java/Model/Transaction/TransactionArchive.java

@@ -1,9 +1,13 @@
-package Model;
+package Model.Transaction;
 
+import Model.Purchase.Purchase;
+import Model.Sale.Sale;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+
+
 /**
  * Maintains a chronological archive of all transactions executed by a player.
  * The TransactionArchive allows retrieval of transactions by week and type

src/main/java/Model/TransactionCalculator.java → src/main/java/Model/Transaction/TransactionCalculator.java

@@ -1,4 +1,4 @@
-package Model;
+package Model.Transaction;
 
 import java.math.BigDecimal;
 

src/main/java/Model/TransactionFactory.java → src/main/java/Model/Transaction/TransactionFactory.java

@@ -1,4 +1,9 @@
-package Model;
+package Model.Transaction;
+
+import Model.Purchase.Purchase;
+import Model.Sale.Sale;
+import Model.Share;
+
 
 /**
  * Factory for creating transaction objects.

src/main/java/View/GameSetupScene.java

@@ -1,8 +1,9 @@
 package View;
 
 import Controller.StockFileHandler;
-import Model.Exchange;
 import Model.Stock;
+import Model.Exchange.Exchange;
+
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/View/MainGameScene.java

@@ -1,6 +1,15 @@
 package View;
 
 import Model.*;
+import Model.Exchange.Exchange;
+import Model.Exchange.ExchangeObserver;
+import Model.Player.Player;
+import Model.Player.PlayerStatus;
+import Model.Purchase.Purchase;
+import Model.Sale.Sale;
+import Model.Sale.SaleCalculator;
+import Model.Transaction.Transaction;
+
 import java.math.BigDecimal;
 import java.util.List;
 import javafx.collections.FXCollections;

src/main/java/View/StockTradingGameApp.java

@@ -2,6 +2,8 @@
 
 import Controller.StockFileHandler;
 import Model.*;
+import Model.Exchange.Exchange;
+import Model.Player.Player;
 import javafx.application.Application;
 import javafx.stage.Stage;
 

src/test/java/ExchangeTest.java

@@ -1,12 +1,12 @@
 import static org.junit.jupiter.api.Assertions.*;
 
-import Model.Exchange;
-import Model.Player;
-import Model.Purchase;
-import Model.Sale;
+import Model.Exchange.Exchange;
+import Model.Player.Player;
+import Model.Purchase.Purchase;
+import Model.Sale.Sale;
 import Model.Share;
 import Model.Stock;
-import Model.Transaction;
+import Model.Transaction.Transaction;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;

src/test/java/PlayerTest.java

@@ -1,6 +1,6 @@
-import static org.junit.jupiter.api.Assertions.*;
+import Model.Player.Player;
 
-import Model.Player;
+import static org.junit.jupiter.api.Assertions.*;
 import java.math.BigDecimal;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

src/test/java/PurchaseTest.java

@@ -1,7 +1,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
-import Model.Player;
-import Model.Purchase;
+import Model.Player.Player;
+import Model.Purchase.Purchase;
 import Model.Share;
 import Model.Stock;
 import java.math.BigDecimal;

src/test/java/SaleTest.java

@@ -1,7 +1,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
-import Model.Player;
-import Model.Sale;
+import Model.Player.Player;
+import Model.Sale.Sale;
 import Model.Share;
 import Model.Stock;
 import java.math.BigDecimal;

src/test/java/StockTest.java

@@ -1,11 +1,10 @@
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 import Model.Stock;
-
-import static org.junit.jupiter.api.Assertions.*;
 import java.math.BigDecimal;
 import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for the Stock class.

src/test/java/TransactionArchiveTest.java

@@ -1,11 +1,11 @@
 import static org.junit.jupiter.api.Assertions.*;
 
-import Model.Player;
-import Model.Purchase;
-import Model.Sale;
+import Model.Player.Player;
+import Model.Purchase.Purchase;
+import Model.Sale.Sale;
 import Model.Share;
 import Model.Stock;
-import Model.TransactionArchive;
+import Model.Transaction.TransactionArchive;
 import java.math.BigDecimal;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,19 +1,19 @@
 C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Controller\StockFileHandler.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Exchange.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\ExchangeObserver.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Player.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\PlayerStatus.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Exchange\Exchange.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Exchange\ExchangeObserver.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Player\Player.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Player\PlayerStatus.java
 C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Portfolio.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Purchase.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\PurchaseCalculator.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Sale.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\SaleCalculator.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Purchase\Purchase.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Purchase\PurchaseCalculator.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Sale\Sale.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Sale\SaleCalculator.java
 C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Share.java
 C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Stock.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Transaction.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\TransactionArchive.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\TransactionCalculator.java
-C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\TransactionFactory.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Transaction\Transaction.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Transaction\TransactionArchive.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Transaction\TransactionCalculator.java
+C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\Model\Transaction\TransactionFactory.java
 C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\View\GameSetupScene.java
 C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\View\Launcher.java
 C:\Users\elisa\Downloads\progdel1\Programmering2_mappe_v26\src\main\java\View\MainGameScene.java