From 9acc32b2d6a3140ba2b31d56606d8adb56780366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Einar=20Sk=C3=B8ien?= Date: Mon, 18 May 2026 13:04:29 +0200 Subject: [PATCH] clean imports according to checkstyle and remove unnecesary imports --- .../AppControllers/StockAppController.java | 4 +--- .../gruppe42/Controller/MarketController.java | 3 --- .../gruppe42/Controller/PopupsController.java | 2 +- .../Controller/TimeAndWeatherController.java | 3 +-- .../DesktopDialogController.java | 18 +++++++++--------- .../ViewControllers/DesktopViewController.java | 15 +++++++-------- .../ViewControllers/StartViewController.java | 1 - .../ntnu/idi/idatt2003/gruppe42/Millions.java | 3 +-- .../idatt2003/gruppe42/Model/Portfolio.java | 2 -- .../gruppe42/Model/Transaction/Purchase.java | 3 --- .../gruppe42/View/Apps/AppStoreApp.java | 11 ----------- .../gruppe42/View/Apps/HustlersApp.java | 4 ++-- ...ndRapportApp.java => WeekendReportApp.java} | 4 ++-- .../gruppe42/View/Views/DesktopView.java | 4 ---- .../gruppe42/View/Views/StartView.java | 9 ++++++--- 15 files changed, 30 insertions(+), 56 deletions(-) rename src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/{WeekendRapportApp.java => WeekendReportApp.java} (99%) diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/AppControllers/StockAppController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/AppControllers/StockAppController.java index a108961..293061b 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/AppControllers/StockAppController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/AppControllers/StockAppController.java @@ -1,7 +1,5 @@ package edu.ntnu.idi.idatt2003.gruppe42.Controller.AppControllers; -import edu.ntnu.idi.idatt2003.gruppe42.Audio.AudioManager; -import edu.ntnu.idi.idatt2003.gruppe42.Audio.Audio; import edu.ntnu.idi.idatt2003.gruppe42.Controller.MarketController; import edu.ntnu.idi.idatt2003.gruppe42.Model.Player; import edu.ntnu.idi.idatt2003.gruppe42.Model.Stock; @@ -12,8 +10,8 @@ import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Button; -import javafx.scene.control.ListCell; import javafx.scene.control.Label; +import javafx.scene.control.ListCell; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/MarketController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/MarketController.java index 09bbbd1..1c1b12b 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/MarketController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/MarketController.java @@ -4,12 +4,9 @@ import edu.ntnu.idi.idatt2003.gruppe42.Model.Exchange; import edu.ntnu.idi.idatt2003.gruppe42.Model.Stock; import edu.ntnu.idi.idatt2003.gruppe42.Model.StockFileHandler; -import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.StockApp; import java.io.IOException; -import java.net.URISyntaxException; import java.nio.file.Path; import java.util.List; -import java.util.Objects; /** Controller for the stock market. */ public final class MarketController { diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupsController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupsController.java index 57231d7..166046f 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupsController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupsController.java @@ -1,7 +1,7 @@ package edu.ntnu.idi.idatt2003.gruppe42.Controller; -import edu.ntnu.idi.idatt2003.gruppe42.Audio.AudioManager; import edu.ntnu.idi.idatt2003.gruppe42.Audio.Audio; +import edu.ntnu.idi.idatt2003.gruppe42.Audio.AudioManager; import edu.ntnu.idi.idatt2003.gruppe42.Model.App; import edu.ntnu.idi.idatt2003.gruppe42.View.Popup; import java.util.List; diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java index 2499382..62bd2b6 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/TimeAndWeatherController.java @@ -1,12 +1,11 @@ package edu.ntnu.idi.idatt2003.gruppe42.Controller; -import edu.ntnu.idi.idatt2003.gruppe42.Audio.AudioManager; import edu.ntnu.idi.idatt2003.gruppe42.Audio.Audio; +import edu.ntnu.idi.idatt2003.gruppe42.Audio.AudioManager; import edu.ntnu.idi.idatt2003.gruppe42.Controller.AppControllers.AppController; import edu.ntnu.idi.idatt2003.gruppe42.Model.Day; import edu.ntnu.idi.idatt2003.gruppe42.Model.GameState; import java.util.Random; - import javafx.application.Platform; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty; diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopDialogController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopDialogController.java index 6c5d9db..e8a3dc6 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopDialogController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopDialogController.java @@ -5,7 +5,7 @@ import edu.ntnu.idi.idatt2003.gruppe42.Model.Transaction.Transaction; import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.GameOverApp; import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.WarningApp; -import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.WeekendRapportApp; +import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.WeekendReportApp; import edu.ntnu.idi.idatt2003.gruppe42.View.Views.DesktopView; import edu.ntnu.idi.idatt2003.gruppe42.View.Views.DesktopView.ModalLayer; import java.math.BigDecimal; @@ -18,7 +18,7 @@ public final class DesktopDialogController { private final Player player; private final TimeAndWeatherController timeAndWeatherController; - private final WeekendRapportApp weekendRapportApp; + private final WeekendReportApp weekendReportApp; private final WarningApp warningApp; private final GameOverApp gameOverApp; private DesktopView desktopView; @@ -30,19 +30,19 @@ public final class DesktopDialogController { * * @param player the player model * @param timeAndWeatherController the time and weather controller - * @param weekendRapportApp the weekend rapport app + * @param weekendReportApp the weekend rapport app * @param warningApp the warning app * @param gameOverApp the game over app */ public DesktopDialogController( Player player, TimeAndWeatherController timeAndWeatherController, - WeekendRapportApp weekendRapportApp, + WeekendReportApp weekendReportApp, WarningApp warningApp, GameOverApp gameOverApp) { this.player = player; this.timeAndWeatherController = timeAndWeatherController; - this.weekendRapportApp = weekendRapportApp; + this.weekendReportApp = weekendReportApp; this.warningApp = warningApp; this.gameOverApp = gameOverApp; @@ -72,14 +72,14 @@ public void showWeekendRapport() { player.deductRent(WEEKLY_RENT); BigDecimal cashAfter = player.getMoney(); - weekendRapportApp.populate(transactions, netIncome, cashBefore, WEEKLY_RENT, cashAfter); - weekendRapportApp.show(); + weekendReportApp.populate(transactions, netIncome, cashBefore, WEEKLY_RENT, cashAfter); + weekendReportApp.show(); desktopView.enterLayer(ModalLayer.RAPPORT); } private void wireWeekendRapport() { - weekendRapportApp.getContinueButton().setOnAction(event -> { - weekendRapportApp.getRoot().setVisible(false); + weekendReportApp.getContinueButton().setOnAction(event -> { + weekendReportApp.getRoot().setVisible(false); desktopView.exitLayer(ModalLayer.RAPPORT); timeAndWeatherController.setDay(0); }); diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java index cafa48a..bfebd27 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/DesktopViewController.java @@ -21,11 +21,10 @@ import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.SettingsApp; import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.StockApp; import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.WarningApp; -import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.WeekendRapportApp; +import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.WeekendReportApp; import edu.ntnu.idi.idatt2003.gruppe42.View.Popup; import edu.ntnu.idi.idatt2003.gruppe42.View.Views.DesktopView; import edu.ntnu.idi.idatt2003.gruppe42.View.Views.DesktopView.ModalLayer; -import java.math.BigDecimal; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -49,7 +48,7 @@ public final class DesktopViewController { private final MailController mailController; private final DesktopDialogController dialogController; private final DesktopComponentFactory componentFactory; - private final WeekendRapportApp weekendRapportApp = new WeekendRapportApp(); + private final WeekendReportApp weekendReportApp = new WeekendReportApp(); private final WarningApp warningApp = new WarningApp(); private final GameOverApp gameOverApp = new GameOverApp(); @@ -73,7 +72,7 @@ public DesktopViewController( this.popupsController = popupsController; this.componentFactory = new DesktopComponentFactory(popupsController, mailController); this.dialogController = new DesktopDialogController( - player, timeAndWeatherController, weekendRapportApp, warningApp, gameOverApp); + player, timeAndWeatherController, weekendReportApp, warningApp, gameOverApp); this.desktopView = new DesktopView(this); this.dialogController.setDesktopView(desktopView); @@ -147,22 +146,22 @@ private void setupPopupOverlay(List popups) { overlay.getChildren().add(p.getRoot()); } - weekendRapportApp.centerInParent(); + weekendReportApp.centerInParent(); warningApp.centerInParent(); gameOverApp.centerInParent(); - desktopView.registerModal(ModalLayer.RAPPORT, weekendRapportApp.getRoot()); + desktopView.registerModal(ModalLayer.RAPPORT, weekendReportApp.getRoot()); desktopView.registerModal(ModalLayer.WARNING, warningApp.getRoot()); desktopView.registerModal(ModalLayer.GAME_OVER, gameOverApp.getRoot()); overlay.getChildren().addAll( - desktopView.getOverlay(ModalLayer.RAPPORT), weekendRapportApp.getRoot(), + desktopView.getOverlay(ModalLayer.RAPPORT), weekendReportApp.getRoot(), desktopView.getOverlay(ModalLayer.WARNING), warningApp.getRoot(), desktopView.getOverlay(ModalLayer.GAME_OVER), gameOverApp.getRoot() ); desktopView.getOverlay(ModalLayer.RAPPORT).setOnMouseClicked( - event -> weekendRapportApp.getContinueButton().fire()); + event -> weekendReportApp.getContinueButton().fire()); } private void setupDesktopUI() { diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/StartViewController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/StartViewController.java index c01562a..fac0b0d 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/StartViewController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/ViewControllers/StartViewController.java @@ -10,7 +10,6 @@ import edu.ntnu.idi.idatt2003.gruppe42.View.Apps.WarningApp; import edu.ntnu.idi.idatt2003.gruppe42.View.Popup; import edu.ntnu.idi.idatt2003.gruppe42.View.Views.StartView; - import java.nio.file.Path; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Millions.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Millions.java index 1a082e8..cc72c0c 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Millions.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Millions.java @@ -9,12 +9,11 @@ import edu.ntnu.idi.idatt2003.gruppe42.Model.Player; import edu.ntnu.idi.idatt2003.gruppe42.View.Views.DesktopView; import edu.ntnu.idi.idatt2003.gruppe42.View.Views.StartView; +import java.nio.file.Path; import javafx.application.Application; import javafx.scene.Scene; import javafx.stage.Stage; -import java.nio.file.Path; - /** JavaFX application entry point. */ public class Millions extends Application { diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Portfolio.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Portfolio.java index ec2cb39..c7004b6 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Portfolio.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Portfolio.java @@ -1,8 +1,6 @@ package edu.ntnu.idi.idatt2003.gruppe42.Model; import edu.ntnu.idi.idatt2003.gruppe42.Model.Calculator.SaleCalculator; -import edu.ntnu.idi.idatt2003.gruppe42.Model.Share; - import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Transaction/Purchase.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Transaction/Purchase.java index 84c6151..4c3f1a3 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Transaction/Purchase.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Transaction/Purchase.java @@ -1,12 +1,9 @@ package edu.ntnu.idi.idatt2003.gruppe42.Model.Transaction; import edu.ntnu.idi.idatt2003.gruppe42.Model.Calculator.PurchaseCalculator; -import edu.ntnu.idi.idatt2003.gruppe42.Model.Calculator.TransactionCalculator; import edu.ntnu.idi.idatt2003.gruppe42.Model.Player; import edu.ntnu.idi.idatt2003.gruppe42.Model.Share; -import java.math.BigDecimal; - /** Represents a stock purchase. */ public final class Purchase extends Transaction { /** Constructs a purchase. */ diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/AppStoreApp.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/AppStoreApp.java index a0629c4..4763bc4 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/AppStoreApp.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/AppStoreApp.java @@ -2,17 +2,6 @@ import edu.ntnu.idi.idatt2003.gruppe42.Model.App; import edu.ntnu.idi.idatt2003.gruppe42.View.Popup; -import javafx.geometry.Insets; -import javafx.scene.control.Label; -import javafx.scene.layout.VBox; -import javafx.scene.layout.HBox; -import javafx.scene.control.Button; -import javafx.scene.layout.Priority; -import javafx.scene.text.Font; -import javafx.scene.text.FontWeight; -import javafx.scene.paint.Color; -import javafx.geometry.Pos; -import javafx.scene.shape.Rectangle; /** * A popup for the app store app. diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/HustlersApp.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/HustlersApp.java index 10c61fc..d4bba00 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/HustlersApp.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/HustlersApp.java @@ -2,6 +2,8 @@ import edu.ntnu.idi.idatt2003.gruppe42.Model.App; import edu.ntnu.idi.idatt2003.gruppe42.View.Popup; +import java.util.LinkedHashMap; +import java.util.Map; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Label; @@ -13,8 +15,6 @@ import javafx.scene.text.Font; import javafx.scene.text.Text; import javafx.scene.text.TextFlow; -import java.util.LinkedHashMap; -import java.util.Map; /** Tutorial app popup. */ public class HustlersApp extends Popup { diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/WeekendRapportApp.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/WeekendReportApp.java similarity index 99% rename from src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/WeekendRapportApp.java rename to src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/WeekendReportApp.java index a9cb75c..6014ee1 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/WeekendRapportApp.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Apps/WeekendReportApp.java @@ -17,7 +17,7 @@ import javafx.scene.layout.VBox; /** End-of-week financial report. */ -public class WeekendRapportApp extends Popup { +public class WeekendReportApp extends Popup { private static final BigDecimal STRONG_WEEK_THRESHOLD = new BigDecimal("50.00"); @@ -33,7 +33,7 @@ public class WeekendRapportApp extends Popup { private final Button continueButton = new Button("Continue to Sunday →"); - public WeekendRapportApp() { + public WeekendReportApp() { super(740, 620, 0, 0, App.WEEKENDRAPPORT); getCloseButton().setOnAction(event -> continueButton.fire()); diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java index a669b65..e475aef 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/DesktopView.java @@ -2,7 +2,6 @@ import edu.ntnu.idi.idatt2003.gruppe42.Controller.ViewControllers.DesktopViewController; import edu.ntnu.idi.idatt2003.gruppe42.Model.App; -import edu.ntnu.idi.idatt2003.gruppe42.Model.Player; import edu.ntnu.idi.idatt2003.gruppe42.View.Views.Components.DesktopBottomBar; import java.nio.file.Files; import java.nio.file.Path; @@ -12,17 +11,14 @@ import java.util.EnumSet; import java.util.List; import javafx.application.Platform; -import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.Node; import javafx.scene.control.Button; -import javafx.scene.control.Label; import javafx.scene.effect.GaussianBlur; import javafx.scene.input.KeyCode; import javafx.scene.layout.BorderPane; import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; -import javafx.scene.layout.HBox; import javafx.scene.layout.Pane; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java index fb84c9e..fac1ce6 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/View/Views/StartView.java @@ -1,5 +1,6 @@ package edu.ntnu.idi.idatt2003.gruppe42.View.Views; +import java.util.Objects; import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.control.Label; @@ -8,9 +9,11 @@ import javafx.scene.control.ToggleGroup; import javafx.scene.image.Image; import javafx.scene.image.ImageView; -import javafx.scene.layout.*; - -import java.util.Objects; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.StackPane; +import javafx.scene.layout.VBox; /** Start screen view. */ public class StartView {