Merge pull request #83 from Team-40-IDATT2003/82-sort-classes-into-pa…

…ckages

82 sort classes into packages

pom.xml

@@ -47,6 +47,9 @@
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.8</version>
+                <configuration>
+                    <mainClass>edu.ntnu.idi.idatt2003.g40.mappe.Main</mainClass>
+                </configuration>
             </plugin>
 
             <plugin>

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Main.java

@@ -1,9 +1,15 @@
 package edu.ntnu.idi.idatt2003.g40.mappe;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.FileConverter;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.FileParser;
+import javafx.application.Application;
+import javafx.stage.Stage;
+
 import java.io.IOException;
 import java.util.List;
 
-public class Main {
+public class Main extends Application {
   static void main() {
     FileParser parser1 = new FileParser("src/main/resources/dummydata.txt");
     FileConverter converter1 = new FileConverter();
@@ -15,4 +21,9 @@ static void main() {
       System.err.println(e.getMessage());
     }
   }
+
+  @Override
+  public void start(final Stage stage) throws Exception {
+
+  }
 }

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatusController.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/controller/PlayerStatusController.java

@@ -1,4 +1,7 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.controller;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.PlayerStatus;
 
 import java.math.BigDecimal;
 

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Exchange.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/Exchange.java

@@ -1,4 +1,14 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.engine;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Purchase;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Sale;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Transaction;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.PurchaseCalculator;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.SaleCalculator;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionArchive.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/TransactionArchive.java

@@ -1,4 +1,8 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.engine;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Purchase;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Sale;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Transaction;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Player.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Player.java

@@ -1,4 +1,7 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.engine.TransactionArchive;
 
 import java.math.BigDecimal;
 

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatus.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerStatus.java

@@ -1,6 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
-
-import java.math.BigDecimal;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 /**
  * Enum representing a players' current status.

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Portfolio.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Portfolio.java

@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.SaleCalculator;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Purchase.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Purchase.java

@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
 
 /**
  * Purchase represents purchases the player commits.

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Sale.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Sale.java

@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
 
 /**
  * Sale represents sales the player commits.

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Share.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Share.java

@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import java.math.BigDecimal;
 

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Stock.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Stock.java

@@ -1,6 +1,5 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Comparator;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/Transaction.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/model/Transaction.java

@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
 
 /**
  * Transaction abstract class.

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/FileConverter.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileConverter.java

@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/FileParser.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileParser.java

@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseCalculator.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/PurchaseCalculator.java

@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
 
 import java.math.BigDecimal;
 

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleCalculator.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/SaleCalculator.java

@@ -1,4 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
 
 import java.math.BigDecimal;
 

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionCalculator.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/service/TransactionCalculator.java

@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
 import java.math.BigDecimal;
 

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/ExchangeTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/ExchangeTest.java

@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.engine;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -9,6 +9,7 @@
 import java.math.BigDecimal;
 import java.util.List;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.model.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/TransactionArchiveTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/engine/TransactionArchiveTest.java

@@ -1,11 +1,14 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.engine;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
 import java.util.List;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.*;
+import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionCalculator;
 import org.junit.jupiter.api.Test;
 
 final class TransactionArchiveTest {

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerStatusTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerStatusTest.java

@@ -1,5 +1,6 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.controller.PlayerStatusController;
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PlayerTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PlayerTest.java

@@ -1,9 +1,11 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.math.BigDecimal;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.SaleCalculator;
 import org.junit.jupiter.api.Test;
 
 final class PlayerTest {

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PortfolioTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PortfolioTest.java

@@ -1,11 +1,13 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
 import java.util.List;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.SaleCalculator;
 import org.junit.jupiter.api.Test;
 
 final class PortfolioTest {

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/PurchaseTest.java

@@ -1,9 +1,11 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.PurchaseCalculator;
 import org.junit.jupiter.api.Test;
 
 /**

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/SaleTest.java

@@ -1,9 +1,11 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.service.PurchaseCalculator;
 import org.junit.jupiter.api.Test;
 
 /**

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/ShareTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/ShareTest.java

@@ -1,9 +1,10 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.math.BigDecimal;
+
 import org.junit.jupiter.api.Test;
 
 final class ShareTest {

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/StockTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/model/StockTest.java

@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -7,6 +7,7 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/FileConverterTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileConverterTest.java

@@ -1,15 +1,13 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 class FileConverterTest {
 
   private FileConverter converter;

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/FileParserTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/FileParserTest.java

@@ -1,10 +1,8 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.File;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/PurchaseCalculatorTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/PurchaseCalculatorTest.java

@@ -1,8 +1,11 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigDecimal;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import org.junit.jupiter.api.Test;
 
 final class PurchaseCalculatorTest {

src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/SaleCalculatorTest.java → src/test/java/edu/ntnu/idi/idatt2003/g40/mappe/service/SaleCalculatorTest.java

@@ -1,8 +1,11 @@
-package edu.ntnu.idi.idatt2003.g40.mappe;
+package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigDecimal;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import org.junit.jupiter.api.Test;
 
 final class SaleCalculatorTest {