Merge pull request #178 from Team-40-IDATT2003/129-final-refactor

129 final refactor

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

@@ -1,6 +1,6 @@
 package edu.ntnu.idi.idatt2003.g40.mappe;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Exchange;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.SaveGame;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
@@ -36,8 +36,8 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.financialsummary.SummaryView;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.market.MarketController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.market.MarketView;
-import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameEngineController;
-import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameEngineView;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameEngineController;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameEngineView;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesView;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.games.ClickerGame;

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

@@ -1,9 +1,5 @@
-package edu.ntnu.idi.idatt2003.g40.mappe.engine;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
-import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
-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.TransactionFactory;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.TransactionType;
 import edu.ntnu.idi.idatt2003.g40.mappe.utils.Validator;
@@ -13,6 +9,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameEngineView;
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.ReadOnlyIntegerWrapper;
 
@@ -331,7 +329,7 @@ public Transaction sell(BigDecimal amount,
    * -10% to +10%.
    * </p>
    *
-   * @see edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameEngineView
+   * @see GameEngineView
    */
   public void advance() {
     for (Stock stock : stockMap.values()) {

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

@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe.exceptions;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 /**
  * Exception primarily thrown when the active

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

@@ -9,7 +9,7 @@
  * Holds just enough information to recreate a {@link Share} when the save is
  * loaded: the stock symbol, the quantity owned and the original purchase
  * price. The actual {@link Stock} object is looked up on the live
- * {@link edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange} when the save is
+ * {@link Exchange} when the save is
  * applied.
  * </p>
  *

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

@@ -1,8 +1,6 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.controller.PlayerStatusController;
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.TransactionArchive;
-import edu.ntnu.idi.idatt2003.g40.mappe.exceptions.NotEnoughMoneyException;
 import edu.ntnu.idi.idatt2003.g40.mappe.utils.Validator;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -17,7 +15,7 @@
  * <ul>
  *   <li>Has a portfolio</li>
  *   <li>Can buy and sell shares on an
- *   {@link edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange}.</li>
+ *   {@link Exchange}.</li>
  *   <li>Has a set amount of money to use on said exchange.</li>
  *   <li>Has a {@link TransactionArchive}</li>
  * </ul>

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

@@ -3,9 +3,7 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.utils.Validator;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Represents a player's portfolio of shares.

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

@@ -23,14 +23,4 @@ public Purchase(final Share share,
                   final TransactionCalculator calculator) {
     super(share, week, calculator);
   }
-
-  /**
-   * Commits the purchase.
-   *
-   * @param player the {@link Player} object performing the purchase.
-   * */
-  @Override
-  public void commit(final Player player) {
-    setCommitted(true);
-  }
 }

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

@@ -23,14 +23,4 @@ public Sale(final Share share,
               final TransactionCalculator calculator) {
     super(share, week, calculator);
   }
-
-  /**
-   * Commits the purchase.
-   *
-   * @param player the {@link Player} object performing the purchase.
-   * */
-  @Override
-  public void commit(final Player player) {
-    setCommitted(true);
-  }
 }

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

@@ -97,14 +97,7 @@ public boolean isCommited() {
    *
    * @param player The player that performed the transaction.
    * */
-  public abstract void commit(Player player);
-
-  /**
-   * Sets the committed flag.
-   *
-   * @param value the value to set the committed flag to.
-   * */
-  protected void setCommitted(final boolean value) {
-    committed = value;
+  public void commit(final Player player) {
+    committed = true;
   }
 }

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

@@ -1,8 +1,5 @@
-package edu.ntnu.idi.idatt2003.g40.mappe.engine;
+package edu.ntnu.idi.idatt2003.g40.mappe.model;
 
-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 edu.ntnu.idi.idatt2003.g40.mappe.utils.Validator;
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -12,7 +12,7 @@
  * quantity traded, the price per unit at the time of the transaction, and
  * the in-game week it took place. Used by the
  * {@link edu.ntnu.idi.idatt2003.g40.mappe.service.SaveGameService} to
- * persist the {@link edu.ntnu.idi.idatt2003.g40.mappe.engine.TransactionArchive}
+ * persist the {@link TransactionArchive}
  * across sessions.
  * </p>
  *

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

@@ -1,7 +1,7 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.service;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.TransactionArchive;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.TransactionArchive;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.OwnedShareData;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Portfolio;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/creategame/CreateGameController.java

@@ -1,6 +1,6 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.creategame;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Exchange;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.SaveGame;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/ingame/quit/QuitDialogController.java

@@ -1,6 +1,6 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.ingame.quit;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Exchange;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.SaveGame;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/WidgetEnum.java

@@ -1,5 +1,7 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets;
 
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameEngineView;
+
 /**
  * Enum used to define the various widgets for the application.
  *
@@ -23,7 +25,7 @@ public enum WidgetEnum {
   MINIGAMES_OVERVIEW,
 
   /**
-   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameEngineView}.
+   * {@link GameEngineView}.
    * */
   MINIGAMES_ENGINE,
 

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/dashboard/DashBoardController.java

@@ -1,7 +1,7 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.dashboard;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
-import edu.ntnu.idi.idatt2003.g40.mappe.exceptions.NotEnoughMoneyException;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.NotEnoughMoneyException;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.*;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.PurchaseCalculator;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.SaleCalculator;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/financialsummary/SummaryController.java

@@ -1,12 +1,14 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.financialsummary;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Exchange;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventData;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventSubscriber;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventType;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
+
+import javax.swing.event.ChangeListener;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,6 +36,8 @@ public class SummaryController extends ViewController<SummaryView>
    * */
   private List<BigDecimal> playerNetWorthHistory;
 
+  private ChangeListener changeListener1;
+
   /**
    * {@inheritDoc}.
    */
@@ -103,7 +107,6 @@ public void handleContextUpdate(final Exchange criticalExchange, final Player ac
     } else {
       this.playerNetWorthHistory.add(this.player.getStartingMoney());
     }
-
     getViewElement().setWeek(this.exchange.getWeek());
     getViewElement().updateChart(this.playerNetWorthHistory.stream().map(BigDecimal::floatValue).toList());
     getViewElement().setBalance(this.player.getMoney().floatValue(), this.player.getNetWorth().floatValue());

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/market/MarketController.java

@@ -1,6 +1,6 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.market;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Exchange;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/MiniGamesController.java

@@ -7,6 +7,7 @@
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventType;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.WidgetEnum;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameEngineController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.games.ClickerGame;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.games.FindStockGame;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.games.TimeInputsGame;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/MiniGamesView.java

@@ -1,6 +1,7 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameEngineView;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineController.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/engine/GameEngineController.java

@@ -1,11 +1,13 @@
-package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames;
+package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventData;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventManager;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventType;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewController;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.WidgetEnum;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesActions;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesView;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.util.Duration;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameEngineView.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/engine/GameEngineView.java

@@ -1,7 +1,8 @@
-package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames;
+package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
-import java.util.function.IntConsumer;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesActions;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/GameGimmick.java → src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/engine/GameGimmick.java

@@ -1,4 +1,4 @@
-package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames;
+package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine;
 
 import java.util.function.IntConsumer;
 import javafx.scene.Node;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/ClickerGame.java

@@ -1,7 +1,7 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.games;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
-import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameGimmick;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameGimmick;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesActions;
 import java.util.function.IntConsumer;
 import javafx.scene.Node;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/FindStockGame.java

@@ -1,12 +1,15 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.games;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
-import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameGimmick;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameEngineController;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameGimmick;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesActions;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.IntConsumer;
+
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameEngineView;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -21,7 +24,7 @@
  *
  * <p>Implements {@link GameGimmick}</p>
  *
- * @see edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameEngineView
+ * @see GameEngineView
  * @see edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesView
  * */
 public final class FindStockGame
@@ -52,7 +55,7 @@ public final class FindStockGame
    * The logic for changing score.
    *
    * <p>Gotten from
-   * {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameEngineController}</p>
+   * {@link GameEngineController}</p>
    * */
   private IntConsumer scoreModifier;
 

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/minigames/games/TimeInputsGame.java

@@ -1,7 +1,8 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.games;
 
 import edu.ntnu.idi.idatt2003.g40.mappe.view.ViewElement;
-import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameGimmick;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameEngineController;
+import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.engine.GameGimmick;
 import edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.MiniGamesActions;
 import java.util.Random;
 import java.util.function.IntConsumer;
@@ -50,7 +51,7 @@ public final class TimeInputsGame
   private final double successZoneExtent = 30;
 
   /**
-   * Consumer given by {@link edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.minigames.GameEngineController}
+   * Consumer given by {@link GameEngineController}
    * That determines how to calculate point gains/losses.
    * */
   private IntConsumer scoreModifier;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/stats/StatsController.java

@@ -1,6 +1,6 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.stats;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.Exchange;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.Exchange;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Player;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Share;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Stock;

src/main/java/edu/ntnu/idi/idatt2003/g40/mappe/view/widgets/transactions/TransactionsController.java

@@ -1,6 +1,6 @@
 package edu.ntnu.idi.idatt2003.g40.mappe.view.widgets.transactions;
 
-import edu.ntnu.idi.idatt2003.g40.mappe.engine.TransactionArchive;
+import edu.ntnu.idi.idatt2003.g40.mappe.model.TransactionArchive;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Sale;
 import edu.ntnu.idi.idatt2003.g40.mappe.model.Transaction;
 import edu.ntnu.idi.idatt2003.g40.mappe.service.event.EventData;