From d5bee39c2045385229f2fff0368dbaeed2edef0f Mon Sep 17 00:00:00 2001 From: andrewlalis Date: Sat, 30 Dec 2023 23:11:59 -0500 Subject: [PATCH] Refactored project. --- src/main/java/com/andrewlalis/perfin/PerfinApp.java | 1 + .../com/andrewlalis/perfin/control/AccountViewController.java | 2 +- .../andrewlalis/perfin/control/AccountsViewController.java | 2 +- .../perfin/control/CreateTransactionController.java | 2 +- .../andrewlalis/perfin/control/ProfilesViewController.java | 2 +- .../andrewlalis/perfin/control/TransactionViewController.java | 4 ++-- .../perfin/control/TransactionsViewController.java | 4 ++-- src/main/java/com/andrewlalis/perfin/data/DataSource.java | 3 +++ .../perfin/data/impl/JdbcAccountEntryRepository.java | 2 +- .../perfin/data/impl/JdbcAccountHistoryItemRepository.java | 2 +- .../andrewlalis/perfin/data/impl/JdbcAccountRepository.java | 4 ++-- .../perfin/data/impl/JdbcAttachmentRepository.java | 4 ++-- .../perfin/data/impl/JdbcBalanceRecordRepository.java | 2 +- .../java/com/andrewlalis/perfin/data/impl/JdbcDataSource.java | 1 + .../perfin/data/impl/JdbcTransactionRepository.java | 2 +- .../com/andrewlalis/perfin/data/{ => util}/CurrencyUtil.java | 2 +- .../java/com/andrewlalis/perfin/data/{ => util}/DateUtil.java | 2 +- .../java/com/andrewlalis/perfin/data/{ => util}/DbUtil.java | 2 +- .../java/com/andrewlalis/perfin/data/{ => util}/FileUtil.java | 2 +- .../java/com/andrewlalis/perfin/{ => data/util}/Pair.java | 2 +- .../andrewlalis/perfin/data/{ => util}/ResultSetMapper.java | 2 +- .../com/andrewlalis/perfin/data/{ => util}/SQLRunnable.java | 2 +- .../com/andrewlalis/perfin/data/{ => util}/SQLSupplier.java | 2 +- .../andrewlalis/perfin/data/{ => util}/ThrowableConsumer.java | 2 +- .../perfin/data/{ => util}/UncheckedSqlException.java | 2 +- src/main/java/com/andrewlalis/perfin/model/Attachment.java | 2 +- .../com/andrewlalis/perfin/model/TransactionAttachment.java | 2 +- src/main/java/com/andrewlalis/perfin/view/ProfilesStage.java | 1 - .../java/com/andrewlalis/perfin/{ => view}/SceneUtil.java | 3 ++- .../java/com/andrewlalis/perfin/view/StartupSplashScreen.java | 2 +- .../andrewlalis/perfin/view/component/TransactionTile.java | 4 ++-- 31 files changed, 38 insertions(+), 33 deletions(-) rename src/main/java/com/andrewlalis/perfin/data/{ => util}/CurrencyUtil.java (93%) rename src/main/java/com/andrewlalis/perfin/data/{ => util}/DateUtil.java (96%) rename src/main/java/com/andrewlalis/perfin/data/{ => util}/DbUtil.java (99%) rename src/main/java/com/andrewlalis/perfin/data/{ => util}/FileUtil.java (98%) rename src/main/java/com/andrewlalis/perfin/{ => data/util}/Pair.java (78%) rename src/main/java/com/andrewlalis/perfin/data/{ => util}/ResultSetMapper.java (79%) rename src/main/java/com/andrewlalis/perfin/data/{ => util}/SQLRunnable.java (70%) rename src/main/java/com/andrewlalis/perfin/data/{ => util}/SQLSupplier.java (71%) rename src/main/java/com/andrewlalis/perfin/data/{ => util}/ThrowableConsumer.java (71%) rename src/main/java/com/andrewlalis/perfin/data/{ => util}/UncheckedSqlException.java (89%) rename src/main/java/com/andrewlalis/perfin/{ => view}/SceneUtil.java (95%) diff --git a/src/main/java/com/andrewlalis/perfin/PerfinApp.java b/src/main/java/com/andrewlalis/perfin/PerfinApp.java index d989291..7d72d04 100644 --- a/src/main/java/com/andrewlalis/perfin/PerfinApp.java +++ b/src/main/java/com/andrewlalis/perfin/PerfinApp.java @@ -3,6 +3,7 @@ package com.andrewlalis.perfin; import com.andrewlalis.javafx_scene_router.AnchorPaneRouterView; import com.andrewlalis.javafx_scene_router.SceneRouter; import com.andrewlalis.perfin.model.Profile; +import com.andrewlalis.perfin.view.SceneUtil; import com.andrewlalis.perfin.view.StartupSplashScreen; import javafx.application.Application; import javafx.application.Platform; diff --git a/src/main/java/com/andrewlalis/perfin/control/AccountViewController.java b/src/main/java/com/andrewlalis/perfin/control/AccountViewController.java index 7b636e0..34424b0 100644 --- a/src/main/java/com/andrewlalis/perfin/control/AccountViewController.java +++ b/src/main/java/com/andrewlalis/perfin/control/AccountViewController.java @@ -1,7 +1,7 @@ package com.andrewlalis.perfin.control; import com.andrewlalis.javafx_scene_router.RouteSelectionListener; -import com.andrewlalis.perfin.data.DateUtil; +import com.andrewlalis.perfin.data.util.DateUtil; import com.andrewlalis.perfin.model.Account; import com.andrewlalis.perfin.model.Profile; import javafx.fxml.FXML; diff --git a/src/main/java/com/andrewlalis/perfin/control/AccountsViewController.java b/src/main/java/com/andrewlalis/perfin/control/AccountsViewController.java index 35923da..17fdfe4 100644 --- a/src/main/java/com/andrewlalis/perfin/control/AccountsViewController.java +++ b/src/main/java/com/andrewlalis/perfin/control/AccountsViewController.java @@ -2,7 +2,7 @@ package com.andrewlalis.perfin.control; import com.andrewlalis.javafx_scene_router.RouteSelectionListener; import com.andrewlalis.perfin.view.component.AccountTile; -import com.andrewlalis.perfin.data.CurrencyUtil; +import com.andrewlalis.perfin.data.util.CurrencyUtil; import com.andrewlalis.perfin.data.pagination.PageRequest; import com.andrewlalis.perfin.data.pagination.Sort; import com.andrewlalis.perfin.model.Profile; diff --git a/src/main/java/com/andrewlalis/perfin/control/CreateTransactionController.java b/src/main/java/com/andrewlalis/perfin/control/CreateTransactionController.java index 8056ee5..0bd3429 100644 --- a/src/main/java/com/andrewlalis/perfin/control/CreateTransactionController.java +++ b/src/main/java/com/andrewlalis/perfin/control/CreateTransactionController.java @@ -1,7 +1,7 @@ package com.andrewlalis.perfin.control; import com.andrewlalis.javafx_scene_router.RouteSelectionListener; -import com.andrewlalis.perfin.data.DateUtil; +import com.andrewlalis.perfin.data.util.DateUtil; import com.andrewlalis.perfin.model.Account; import com.andrewlalis.perfin.model.CreditAndDebitAccounts; import com.andrewlalis.perfin.model.Profile; diff --git a/src/main/java/com/andrewlalis/perfin/control/ProfilesViewController.java b/src/main/java/com/andrewlalis/perfin/control/ProfilesViewController.java index be038e7..b79dd12 100644 --- a/src/main/java/com/andrewlalis/perfin/control/ProfilesViewController.java +++ b/src/main/java/com/andrewlalis/perfin/control/ProfilesViewController.java @@ -1,6 +1,6 @@ package com.andrewlalis.perfin.control; -import com.andrewlalis.perfin.data.FileUtil; +import com.andrewlalis.perfin.data.util.FileUtil; import com.andrewlalis.perfin.model.Profile; import com.andrewlalis.perfin.view.ProfilesStage; import javafx.beans.binding.BooleanExpression; diff --git a/src/main/java/com/andrewlalis/perfin/control/TransactionViewController.java b/src/main/java/com/andrewlalis/perfin/control/TransactionViewController.java index fdc3f17..8cfe6b0 100644 --- a/src/main/java/com/andrewlalis/perfin/control/TransactionViewController.java +++ b/src/main/java/com/andrewlalis/perfin/control/TransactionViewController.java @@ -1,7 +1,7 @@ package com.andrewlalis.perfin.control; -import com.andrewlalis.perfin.data.CurrencyUtil; -import com.andrewlalis.perfin.data.DateUtil; +import com.andrewlalis.perfin.data.util.CurrencyUtil; +import com.andrewlalis.perfin.data.util.DateUtil; import com.andrewlalis.perfin.model.Attachment; import com.andrewlalis.perfin.model.CreditAndDebitAccounts; import com.andrewlalis.perfin.model.Profile; diff --git a/src/main/java/com/andrewlalis/perfin/control/TransactionsViewController.java b/src/main/java/com/andrewlalis/perfin/control/TransactionsViewController.java index d230778..e197d2f 100644 --- a/src/main/java/com/andrewlalis/perfin/control/TransactionsViewController.java +++ b/src/main/java/com/andrewlalis/perfin/control/TransactionsViewController.java @@ -1,8 +1,8 @@ package com.andrewlalis.perfin.control; import com.andrewlalis.javafx_scene_router.RouteSelectionListener; -import com.andrewlalis.perfin.Pair; -import com.andrewlalis.perfin.SceneUtil; +import com.andrewlalis.perfin.data.util.Pair; +import com.andrewlalis.perfin.view.SceneUtil; import com.andrewlalis.perfin.data.pagination.Page; import com.andrewlalis.perfin.data.pagination.PageRequest; import com.andrewlalis.perfin.data.pagination.Sort; diff --git a/src/main/java/com/andrewlalis/perfin/data/DataSource.java b/src/main/java/com/andrewlalis/perfin/data/DataSource.java index aa67bcd..18099a8 100644 --- a/src/main/java/com/andrewlalis/perfin/data/DataSource.java +++ b/src/main/java/com/andrewlalis/perfin/data/DataSource.java @@ -1,6 +1,9 @@ package com.andrewlalis.perfin.data; import com.andrewlalis.perfin.data.pagination.PageRequest; +import com.andrewlalis.perfin.data.util.CurrencyUtil; +import com.andrewlalis.perfin.data.util.DbUtil; +import com.andrewlalis.perfin.data.util.ThrowableConsumer; import com.andrewlalis.perfin.model.Account; import javafx.application.Platform; diff --git a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountEntryRepository.java b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountEntryRepository.java index 3aecf97..3e1e837 100644 --- a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountEntryRepository.java +++ b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountEntryRepository.java @@ -2,7 +2,7 @@ package com.andrewlalis.perfin.data.impl; import com.andrewlalis.perfin.data.AccountEntryRepository; import com.andrewlalis.perfin.data.AccountHistoryItemRepository; -import com.andrewlalis.perfin.data.DbUtil; +import com.andrewlalis.perfin.data.util.DbUtil; import com.andrewlalis.perfin.model.AccountEntry; import java.math.BigDecimal; diff --git a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountHistoryItemRepository.java b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountHistoryItemRepository.java index de4815b..5c501c1 100644 --- a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountHistoryItemRepository.java +++ b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountHistoryItemRepository.java @@ -1,7 +1,7 @@ package com.andrewlalis.perfin.data.impl; import com.andrewlalis.perfin.data.AccountHistoryItemRepository; -import com.andrewlalis.perfin.data.DbUtil; +import com.andrewlalis.perfin.data.util.DbUtil; import com.andrewlalis.perfin.model.history.AccountHistoryItemType; import java.sql.Connection; diff --git a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountRepository.java b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountRepository.java index aeff40f..50ab7ef 100644 --- a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountRepository.java +++ b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountRepository.java @@ -1,8 +1,8 @@ package com.andrewlalis.perfin.data.impl; import com.andrewlalis.perfin.data.AccountRepository; -import com.andrewlalis.perfin.data.DateUtil; -import com.andrewlalis.perfin.data.DbUtil; +import com.andrewlalis.perfin.data.util.DateUtil; +import com.andrewlalis.perfin.data.util.DbUtil; import com.andrewlalis.perfin.data.pagination.Page; import com.andrewlalis.perfin.data.pagination.PageRequest; import com.andrewlalis.perfin.model.Account; diff --git a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAttachmentRepository.java b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAttachmentRepository.java index cd21288..65e3e80 100644 --- a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAttachmentRepository.java +++ b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcAttachmentRepository.java @@ -1,8 +1,8 @@ package com.andrewlalis.perfin.data.impl; import com.andrewlalis.perfin.data.AttachmentRepository; -import com.andrewlalis.perfin.data.DbUtil; -import com.andrewlalis.perfin.data.FileUtil; +import com.andrewlalis.perfin.data.util.DbUtil; +import com.andrewlalis.perfin.data.util.FileUtil; import com.andrewlalis.perfin.model.Attachment; import com.github.f4b6a3.ulid.UlidCreator; diff --git a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcBalanceRecordRepository.java b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcBalanceRecordRepository.java index 85693bb..5695d24 100644 --- a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcBalanceRecordRepository.java +++ b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcBalanceRecordRepository.java @@ -3,7 +3,7 @@ package com.andrewlalis.perfin.data.impl; import com.andrewlalis.perfin.data.AccountHistoryItemRepository; import com.andrewlalis.perfin.data.AttachmentRepository; import com.andrewlalis.perfin.data.BalanceRecordRepository; -import com.andrewlalis.perfin.data.DbUtil; +import com.andrewlalis.perfin.data.util.DbUtil; import com.andrewlalis.perfin.model.Attachment; import com.andrewlalis.perfin.model.BalanceRecord; diff --git a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcDataSource.java b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcDataSource.java index afedbef..08f46c3 100644 --- a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcDataSource.java +++ b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcDataSource.java @@ -1,6 +1,7 @@ package com.andrewlalis.perfin.data.impl; import com.andrewlalis.perfin.data.*; +import com.andrewlalis.perfin.data.util.UncheckedSqlException; import java.nio.file.Path; import java.sql.Connection; diff --git a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcTransactionRepository.java b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcTransactionRepository.java index bcd3e84..7681fcc 100644 --- a/src/main/java/com/andrewlalis/perfin/data/impl/JdbcTransactionRepository.java +++ b/src/main/java/com/andrewlalis/perfin/data/impl/JdbcTransactionRepository.java @@ -2,7 +2,7 @@ package com.andrewlalis.perfin.data.impl; import com.andrewlalis.perfin.data.AccountEntryRepository; import com.andrewlalis.perfin.data.AttachmentRepository; -import com.andrewlalis.perfin.data.DbUtil; +import com.andrewlalis.perfin.data.util.DbUtil; import com.andrewlalis.perfin.data.TransactionRepository; import com.andrewlalis.perfin.data.pagination.Page; import com.andrewlalis.perfin.data.pagination.PageRequest; diff --git a/src/main/java/com/andrewlalis/perfin/data/CurrencyUtil.java b/src/main/java/com/andrewlalis/perfin/data/util/CurrencyUtil.java similarity index 93% rename from src/main/java/com/andrewlalis/perfin/data/CurrencyUtil.java rename to src/main/java/com/andrewlalis/perfin/data/util/CurrencyUtil.java index f6d187d..9649461 100644 --- a/src/main/java/com/andrewlalis/perfin/data/CurrencyUtil.java +++ b/src/main/java/com/andrewlalis/perfin/data/util/CurrencyUtil.java @@ -1,4 +1,4 @@ -package com.andrewlalis.perfin.data; +package com.andrewlalis.perfin.data.util; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/src/main/java/com/andrewlalis/perfin/data/DateUtil.java b/src/main/java/com/andrewlalis/perfin/data/util/DateUtil.java similarity index 96% rename from src/main/java/com/andrewlalis/perfin/data/DateUtil.java rename to src/main/java/com/andrewlalis/perfin/data/util/DateUtil.java index 245764a..5a571fd 100644 --- a/src/main/java/com/andrewlalis/perfin/data/DateUtil.java +++ b/src/main/java/com/andrewlalis/perfin/data/util/DateUtil.java @@ -1,4 +1,4 @@ -package com.andrewlalis.perfin.data; +package com.andrewlalis.perfin.data.util; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/src/main/java/com/andrewlalis/perfin/data/DbUtil.java b/src/main/java/com/andrewlalis/perfin/data/util/DbUtil.java similarity index 99% rename from src/main/java/com/andrewlalis/perfin/data/DbUtil.java rename to src/main/java/com/andrewlalis/perfin/data/util/DbUtil.java index e58a634..11d2cdb 100644 --- a/src/main/java/com/andrewlalis/perfin/data/DbUtil.java +++ b/src/main/java/com/andrewlalis/perfin/data/util/DbUtil.java @@ -1,4 +1,4 @@ -package com.andrewlalis.perfin.data; +package com.andrewlalis.perfin.data.util; import com.andrewlalis.perfin.data.pagination.Page; import com.andrewlalis.perfin.data.pagination.PageRequest; diff --git a/src/main/java/com/andrewlalis/perfin/data/FileUtil.java b/src/main/java/com/andrewlalis/perfin/data/util/FileUtil.java similarity index 98% rename from src/main/java/com/andrewlalis/perfin/data/FileUtil.java rename to src/main/java/com/andrewlalis/perfin/data/util/FileUtil.java index c6760e4..7e98fd5 100644 --- a/src/main/java/com/andrewlalis/perfin/data/FileUtil.java +++ b/src/main/java/com/andrewlalis/perfin/data/util/FileUtil.java @@ -1,4 +1,4 @@ -package com.andrewlalis.perfin.data; +package com.andrewlalis.perfin.data.util; import java.io.IOException; import java.nio.file.FileVisitResult; diff --git a/src/main/java/com/andrewlalis/perfin/Pair.java b/src/main/java/com/andrewlalis/perfin/data/util/Pair.java similarity index 78% rename from src/main/java/com/andrewlalis/perfin/Pair.java rename to src/main/java/com/andrewlalis/perfin/data/util/Pair.java index 85cd786..2d0d797 100644 --- a/src/main/java/com/andrewlalis/perfin/Pair.java +++ b/src/main/java/com/andrewlalis/perfin/data/util/Pair.java @@ -1,4 +1,4 @@ -package com.andrewlalis.perfin; +package com.andrewlalis.perfin.data.util; public record Pair(A first, B second) { public static Pair of(A first, B second) { diff --git a/src/main/java/com/andrewlalis/perfin/data/ResultSetMapper.java b/src/main/java/com/andrewlalis/perfin/data/util/ResultSetMapper.java similarity index 79% rename from src/main/java/com/andrewlalis/perfin/data/ResultSetMapper.java rename to src/main/java/com/andrewlalis/perfin/data/util/ResultSetMapper.java index 390f5cf..c2c5eea 100644 --- a/src/main/java/com/andrewlalis/perfin/data/ResultSetMapper.java +++ b/src/main/java/com/andrewlalis/perfin/data/util/ResultSetMapper.java @@ -1,4 +1,4 @@ -package com.andrewlalis.perfin.data; +package com.andrewlalis.perfin.data.util; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/main/java/com/andrewlalis/perfin/data/SQLRunnable.java b/src/main/java/com/andrewlalis/perfin/data/util/SQLRunnable.java similarity index 70% rename from src/main/java/com/andrewlalis/perfin/data/SQLRunnable.java rename to src/main/java/com/andrewlalis/perfin/data/util/SQLRunnable.java index 0bf842a..8498102 100644 --- a/src/main/java/com/andrewlalis/perfin/data/SQLRunnable.java +++ b/src/main/java/com/andrewlalis/perfin/data/util/SQLRunnable.java @@ -1,4 +1,4 @@ -package com.andrewlalis.perfin.data; +package com.andrewlalis.perfin.data.util; import java.sql.SQLException; diff --git a/src/main/java/com/andrewlalis/perfin/data/SQLSupplier.java b/src/main/java/com/andrewlalis/perfin/data/util/SQLSupplier.java similarity index 71% rename from src/main/java/com/andrewlalis/perfin/data/SQLSupplier.java rename to src/main/java/com/andrewlalis/perfin/data/util/SQLSupplier.java index 45b9e1b..6c2a3e1 100644 --- a/src/main/java/com/andrewlalis/perfin/data/SQLSupplier.java +++ b/src/main/java/com/andrewlalis/perfin/data/util/SQLSupplier.java @@ -1,4 +1,4 @@ -package com.andrewlalis.perfin.data; +package com.andrewlalis.perfin.data.util; import java.sql.SQLException; diff --git a/src/main/java/com/andrewlalis/perfin/data/ThrowableConsumer.java b/src/main/java/com/andrewlalis/perfin/data/util/ThrowableConsumer.java similarity index 71% rename from src/main/java/com/andrewlalis/perfin/data/ThrowableConsumer.java rename to src/main/java/com/andrewlalis/perfin/data/util/ThrowableConsumer.java index ffc7fcf..93355ff 100644 --- a/src/main/java/com/andrewlalis/perfin/data/ThrowableConsumer.java +++ b/src/main/java/com/andrewlalis/perfin/data/util/ThrowableConsumer.java @@ -1,4 +1,4 @@ -package com.andrewlalis.perfin.data; +package com.andrewlalis.perfin.data.util; @FunctionalInterface public interface ThrowableConsumer { diff --git a/src/main/java/com/andrewlalis/perfin/data/UncheckedSqlException.java b/src/main/java/com/andrewlalis/perfin/data/util/UncheckedSqlException.java similarity index 89% rename from src/main/java/com/andrewlalis/perfin/data/UncheckedSqlException.java rename to src/main/java/com/andrewlalis/perfin/data/util/UncheckedSqlException.java index 3933c68..17fc705 100644 --- a/src/main/java/com/andrewlalis/perfin/data/UncheckedSqlException.java +++ b/src/main/java/com/andrewlalis/perfin/data/util/UncheckedSqlException.java @@ -1,4 +1,4 @@ -package com.andrewlalis.perfin.data; +package com.andrewlalis.perfin.data.util; import java.sql.SQLException; diff --git a/src/main/java/com/andrewlalis/perfin/model/Attachment.java b/src/main/java/com/andrewlalis/perfin/model/Attachment.java index 01082b6..927cb41 100644 --- a/src/main/java/com/andrewlalis/perfin/model/Attachment.java +++ b/src/main/java/com/andrewlalis/perfin/model/Attachment.java @@ -1,6 +1,6 @@ package com.andrewlalis.perfin.model; -import com.andrewlalis.perfin.data.FileUtil; +import com.andrewlalis.perfin.data.util.FileUtil; import java.nio.file.Path; import java.time.LocalDateTime; diff --git a/src/main/java/com/andrewlalis/perfin/model/TransactionAttachment.java b/src/main/java/com/andrewlalis/perfin/model/TransactionAttachment.java index e5206b0..cdfb218 100644 --- a/src/main/java/com/andrewlalis/perfin/model/TransactionAttachment.java +++ b/src/main/java/com/andrewlalis/perfin/model/TransactionAttachment.java @@ -1,6 +1,6 @@ package com.andrewlalis.perfin.model; -import com.andrewlalis.perfin.data.DateUtil; +import com.andrewlalis.perfin.data.util.DateUtil; import java.nio.file.Path; import java.time.LocalDateTime; diff --git a/src/main/java/com/andrewlalis/perfin/view/ProfilesStage.java b/src/main/java/com/andrewlalis/perfin/view/ProfilesStage.java index 2a0d1e6..db102f0 100644 --- a/src/main/java/com/andrewlalis/perfin/view/ProfilesStage.java +++ b/src/main/java/com/andrewlalis/perfin/view/ProfilesStage.java @@ -1,6 +1,5 @@ package com.andrewlalis.perfin.view; -import com.andrewlalis.perfin.SceneUtil; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.Window; diff --git a/src/main/java/com/andrewlalis/perfin/SceneUtil.java b/src/main/java/com/andrewlalis/perfin/view/SceneUtil.java similarity index 95% rename from src/main/java/com/andrewlalis/perfin/SceneUtil.java rename to src/main/java/com/andrewlalis/perfin/view/SceneUtil.java index e7c2e8f..279760b 100644 --- a/src/main/java/com/andrewlalis/perfin/SceneUtil.java +++ b/src/main/java/com/andrewlalis/perfin/view/SceneUtil.java @@ -1,5 +1,6 @@ -package com.andrewlalis.perfin; +package com.andrewlalis.perfin.view; +import com.andrewlalis.perfin.data.util.Pair; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; diff --git a/src/main/java/com/andrewlalis/perfin/view/StartupSplashScreen.java b/src/main/java/com/andrewlalis/perfin/view/StartupSplashScreen.java index ee9a56c..1e55ec9 100644 --- a/src/main/java/com/andrewlalis/perfin/view/StartupSplashScreen.java +++ b/src/main/java/com/andrewlalis/perfin/view/StartupSplashScreen.java @@ -1,6 +1,6 @@ package com.andrewlalis.perfin.view; -import com.andrewlalis.perfin.data.ThrowableConsumer; +import com.andrewlalis.perfin.data.util.ThrowableConsumer; import javafx.application.Platform; import javafx.scene.Scene; import javafx.scene.control.TextArea; diff --git a/src/main/java/com/andrewlalis/perfin/view/component/TransactionTile.java b/src/main/java/com/andrewlalis/perfin/view/component/TransactionTile.java index 24a3cea..833881a 100644 --- a/src/main/java/com/andrewlalis/perfin/view/component/TransactionTile.java +++ b/src/main/java/com/andrewlalis/perfin/view/component/TransactionTile.java @@ -1,7 +1,7 @@ package com.andrewlalis.perfin.view.component; -import com.andrewlalis.perfin.data.CurrencyUtil; -import com.andrewlalis.perfin.data.DateUtil; +import com.andrewlalis.perfin.data.util.CurrencyUtil; +import com.andrewlalis.perfin.data.util.DateUtil; import com.andrewlalis.perfin.model.CreditAndDebitAccounts; import com.andrewlalis.perfin.model.Profile; import com.andrewlalis.perfin.model.Transaction;