diff --git a/src/main/java/StockFileHandler.java b/src/main/java/Controller/StockFileHandler.java similarity index 97% rename from src/main/java/StockFileHandler.java rename to src/main/java/Controller/StockFileHandler.java index 0b1f720..8874232 100644 --- a/src/main/java/StockFileHandler.java +++ b/src/main/java/Controller/StockFileHandler.java @@ -1,9 +1,12 @@ +package Controller; import java.nio.file.*; import java.io.IOException; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import Model.Stock; + public class StockFileHandler { // lesing diff --git a/src/main/java/Exchange.java b/src/main/java/Model/Exchange.java similarity index 99% rename from src/main/java/Exchange.java rename to src/main/java/Model/Exchange.java index 14e1b2e..320fae8 100644 --- a/src/main/java/Exchange.java +++ b/src/main/java/Model/Exchange.java @@ -1,3 +1,4 @@ +package Model; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/Player.java b/src/main/java/Model/Player.java similarity index 98% rename from src/main/java/Player.java rename to src/main/java/Model/Player.java index 59b4f72..e7a1e31 100644 --- a/src/main/java/Player.java +++ b/src/main/java/Model/Player.java @@ -1,3 +1,4 @@ +package Model; import java.math.BigDecimal; public class Player { diff --git a/src/main/java/Portfolio.java b/src/main/java/Model/Portfolio.java similarity index 98% rename from src/main/java/Portfolio.java rename to src/main/java/Model/Portfolio.java index 8b8e58c..05dd1de 100644 --- a/src/main/java/Portfolio.java +++ b/src/main/java/Model/Portfolio.java @@ -1,3 +1,4 @@ +package Model; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/Purchase.java b/src/main/java/Model/Purchase.java similarity index 97% rename from src/main/java/Purchase.java rename to src/main/java/Model/Purchase.java index 67b1049..d0b14fe 100644 --- a/src/main/java/Purchase.java +++ b/src/main/java/Model/Purchase.java @@ -1,3 +1,4 @@ +package Model; import java.math.BigDecimal; public class Purchase extends Transaction { diff --git a/src/main/java/PurchaseCalculator.java b/src/main/java/Model/PurchaseCalculator.java similarity index 98% rename from src/main/java/PurchaseCalculator.java rename to src/main/java/Model/PurchaseCalculator.java index 78f8e90..6a29413 100644 --- a/src/main/java/PurchaseCalculator.java +++ b/src/main/java/Model/PurchaseCalculator.java @@ -1,3 +1,4 @@ +package Model; import java.math.BigDecimal; public class PurchaseCalculator implements TransactionCalculator { diff --git a/src/main/java/Sale.java b/src/main/java/Model/Sale.java similarity index 97% rename from src/main/java/Sale.java rename to src/main/java/Model/Sale.java index 7a3efc2..42fee68 100644 --- a/src/main/java/Sale.java +++ b/src/main/java/Model/Sale.java @@ -1,3 +1,4 @@ +package Model; import java.math.BigDecimal; public class Sale extends Transaction { diff --git a/src/main/java/SaleCalculator.java b/src/main/java/Model/SaleCalculator.java similarity index 98% rename from src/main/java/SaleCalculator.java rename to src/main/java/Model/SaleCalculator.java index f868729..27fd394 100644 --- a/src/main/java/SaleCalculator.java +++ b/src/main/java/Model/SaleCalculator.java @@ -1,3 +1,4 @@ +package Model; import java.math.BigDecimal; public class SaleCalculator implements TransactionCalculator{ diff --git a/src/main/java/Share.java b/src/main/java/Model/Share.java similarity index 97% rename from src/main/java/Share.java rename to src/main/java/Model/Share.java index 0ab76b5..dee79dd 100644 --- a/src/main/java/Share.java +++ b/src/main/java/Model/Share.java @@ -1,3 +1,4 @@ +package Model; import java.math.BigDecimal; public class Share { diff --git a/src/main/java/Stock.java b/src/main/java/Model/Stock.java similarity index 98% rename from src/main/java/Stock.java rename to src/main/java/Model/Stock.java index 353a7c8..6916dc3 100644 --- a/src/main/java/Stock.java +++ b/src/main/java/Model/Stock.java @@ -1,3 +1,4 @@ +package Model; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/Transaction.java b/src/main/java/Model/Transaction.java similarity index 97% rename from src/main/java/Transaction.java rename to src/main/java/Model/Transaction.java index 18d07ed..1ef6aa8 100644 --- a/src/main/java/Transaction.java +++ b/src/main/java/Model/Transaction.java @@ -1,3 +1,4 @@ +package Model; public abstract class Transaction { private Share share; private int week; diff --git a/src/main/java/TransactionArchive.java b/src/main/java/Model/TransactionArchive.java similarity index 98% rename from src/main/java/TransactionArchive.java rename to src/main/java/Model/TransactionArchive.java index 6d86d71..92ca3c2 100644 --- a/src/main/java/TransactionArchive.java +++ b/src/main/java/Model/TransactionArchive.java @@ -1,3 +1,4 @@ +package Model; import java.util.ArrayList; import java.util.stream.Collectors; import java.util.List; diff --git a/src/main/java/TransactionCalculator.java b/src/main/java/Model/TransactionCalculator.java similarity index 94% rename from src/main/java/TransactionCalculator.java rename to src/main/java/Model/TransactionCalculator.java index 0bafc6e..560992d 100644 --- a/src/main/java/TransactionCalculator.java +++ b/src/main/java/Model/TransactionCalculator.java @@ -1,3 +1,4 @@ +package Model; import java.math.BigDecimal; public interface TransactionCalculator { diff --git a/src/test/java/ExchangeTest.java b/src/test/java/ExchangeTest.java index eb3ad47..f80b1d9 100644 --- a/src/test/java/ExchangeTest.java +++ b/src/test/java/ExchangeTest.java @@ -1,5 +1,9 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; + +import Model.Exchange; +import Model.Stock; + import static org.junit.jupiter.api.Assertions.*; import java.math.BigDecimal; diff --git a/src/test/java/PortfolioTest.java b/src/test/java/PortfolioTest.java index 36f7419..d921601 100644 --- a/src/test/java/PortfolioTest.java +++ b/src/test/java/PortfolioTest.java @@ -1,6 +1,11 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; + +import Model.Portfolio; +import Model.Share; +import Model.Stock; + import java.math.BigDecimal; public class PortfolioTest { diff --git a/src/test/java/PurchaseTest.java b/src/test/java/PurchaseTest.java index e272e70..2f87b39 100644 --- a/src/test/java/PurchaseTest.java +++ b/src/test/java/PurchaseTest.java @@ -5,6 +5,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import Model.Player; +import Model.Purchase; +import Model.Share; +import Model.Stock; + public class PurchaseTest { Stock stock; Share share; diff --git a/src/test/java/SaleTest.java b/src/test/java/SaleTest.java index 9d15ec7..a17d1e2 100644 --- a/src/test/java/SaleTest.java +++ b/src/test/java/SaleTest.java @@ -1,6 +1,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import Model.Player; +import Model.Sale; +import Model.Share; +import Model.Stock; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/ShareTest.java b/src/test/java/ShareTest.java index ba6dc76..3d840bb 100644 --- a/src/test/java/ShareTest.java +++ b/src/test/java/ShareTest.java @@ -1,6 +1,10 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; + +import Model.Share; +import Model.Stock; + import java.math.BigDecimal; diff --git a/src/test/java/StockTest.java b/src/test/java/StockTest.java index 1bfcc2a..fcc0d09 100644 --- a/src/test/java/StockTest.java +++ b/src/test/java/StockTest.java @@ -1,4 +1,7 @@ import org.junit.jupiter.api.Test; + +import Model.Stock; + import static org.junit.jupiter.api.Assertions.*; import java.math.BigDecimal; diff --git a/target/classes/Exchange.class b/target/classes/Exchange.class deleted file mode 100644 index d086d6e..0000000 Binary files a/target/classes/Exchange.class and /dev/null differ diff --git a/target/classes/Portfolio.class b/target/classes/Portfolio.class deleted file mode 100644 index 05b636c..0000000 Binary files a/target/classes/Portfolio.class and /dev/null differ diff --git a/target/classes/PurchaseCalculator.class b/target/classes/PurchaseCalculator.class deleted file mode 100644 index bab65f2..0000000 Binary files a/target/classes/PurchaseCalculator.class and /dev/null differ diff --git a/target/classes/Share.class b/target/classes/Share.class deleted file mode 100644 index 9e7f4f9..0000000 Binary files a/target/classes/Share.class and /dev/null differ diff --git a/target/classes/Stock.class b/target/classes/Stock.class deleted file mode 100644 index 4b99ae0..0000000 Binary files a/target/classes/Stock.class and /dev/null differ diff --git a/target/classes/TransactionCalculator.class b/target/classes/TransactionCalculator.class deleted file mode 100644 index 47f318a..0000000 Binary files a/target/classes/TransactionCalculator.class and /dev/null differ diff --git a/target/test-classes/ExchangeTest.class b/target/test-classes/ExchangeTest.class index 1b23237..69ecbef 100644 Binary files a/target/test-classes/ExchangeTest.class and b/target/test-classes/ExchangeTest.class differ diff --git a/target/test-classes/PortfolioTest.class b/target/test-classes/PortfolioTest.class index 29fe8be..9be31bc 100644 Binary files a/target/test-classes/PortfolioTest.class and b/target/test-classes/PortfolioTest.class differ diff --git a/target/test-classes/ShareTest.class b/target/test-classes/ShareTest.class index 02e06be..0c78c04 100644 Binary files a/target/test-classes/ShareTest.class and b/target/test-classes/ShareTest.class differ diff --git a/target/test-classes/StockTest.class b/target/test-classes/StockTest.class index 6cfc71c..1a94286 100644 Binary files a/target/test-classes/StockTest.class and b/target/test-classes/StockTest.class differ