From 9dbb4ef495d80c3ef2bb37e0a28227ecd4488a10 Mon Sep 17 00:00:00 2001 From: "Christian F." Date: Tue, 22 Oct 2024 14:54:31 +0200 Subject: [PATCH] - always perform duplicate check when reading filmlist --- .../mediathek/gui/actions/ShowDuplicateStatisticsAction.java | 2 +- .../duplicates/{ => details}/DuplicateFilmDetailsDialog.java | 2 +- .../duplicates/{ => details}/DuplicateFilmDetailsDialog.jfd | 0 .../{ => details}/DuplicateFilmDetailsTableFormat.java | 2 +- .../duplicates/{ => statistics}/DuplicateStatisticsDialog.java | 3 ++- .../duplicates/{ => statistics}/DuplicateStatisticsDialog.jfd | 0 .../{ => statistics}/DuplicateStatisticsTableFormat.java | 3 ++- src/main/java/mediathek/gui/tabs/tab_film/GuiFilme.java | 2 +- 8 files changed, 8 insertions(+), 6 deletions(-) rename src/main/java/mediathek/gui/duplicates/{ => details}/DuplicateFilmDetailsDialog.java (99%) rename src/main/java/mediathek/gui/duplicates/{ => details}/DuplicateFilmDetailsDialog.jfd (100%) rename src/main/java/mediathek/gui/duplicates/{ => details}/DuplicateFilmDetailsTableFormat.java (96%) rename src/main/java/mediathek/gui/duplicates/{ => statistics}/DuplicateStatisticsDialog.java (99%) rename src/main/java/mediathek/gui/duplicates/{ => statistics}/DuplicateStatisticsDialog.jfd (100%) rename src/main/java/mediathek/gui/duplicates/{ => statistics}/DuplicateStatisticsTableFormat.java (93%) diff --git a/src/main/java/mediathek/gui/actions/ShowDuplicateStatisticsAction.java b/src/main/java/mediathek/gui/actions/ShowDuplicateStatisticsAction.java index 1e37783d8a..1bda8cf1b9 100644 --- a/src/main/java/mediathek/gui/actions/ShowDuplicateStatisticsAction.java +++ b/src/main/java/mediathek/gui/actions/ShowDuplicateStatisticsAction.java @@ -1,6 +1,6 @@ package mediathek.gui.actions; -import mediathek.gui.duplicates.DuplicateStatisticsDialog; +import mediathek.gui.duplicates.statistics.DuplicateStatisticsDialog; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/src/main/java/mediathek/gui/duplicates/DuplicateFilmDetailsDialog.java b/src/main/java/mediathek/gui/duplicates/details/DuplicateFilmDetailsDialog.java similarity index 99% rename from src/main/java/mediathek/gui/duplicates/DuplicateFilmDetailsDialog.java rename to src/main/java/mediathek/gui/duplicates/details/DuplicateFilmDetailsDialog.java index 1d17ab8d95..c990ce9d02 100644 --- a/src/main/java/mediathek/gui/duplicates/DuplicateFilmDetailsDialog.java +++ b/src/main/java/mediathek/gui/duplicates/details/DuplicateFilmDetailsDialog.java @@ -2,7 +2,7 @@ * Created by JFormDesigner on Tue Oct 22 13:37:47 CEST 2024 */ -package mediathek.gui.duplicates; +package mediathek.gui.duplicates.details; import ca.odell.glazedlists.BasicEventList; import ca.odell.glazedlists.SortedList; diff --git a/src/main/java/mediathek/gui/duplicates/DuplicateFilmDetailsDialog.jfd b/src/main/java/mediathek/gui/duplicates/details/DuplicateFilmDetailsDialog.jfd similarity index 100% rename from src/main/java/mediathek/gui/duplicates/DuplicateFilmDetailsDialog.jfd rename to src/main/java/mediathek/gui/duplicates/details/DuplicateFilmDetailsDialog.jfd diff --git a/src/main/java/mediathek/gui/duplicates/DuplicateFilmDetailsTableFormat.java b/src/main/java/mediathek/gui/duplicates/details/DuplicateFilmDetailsTableFormat.java similarity index 96% rename from src/main/java/mediathek/gui/duplicates/DuplicateFilmDetailsTableFormat.java rename to src/main/java/mediathek/gui/duplicates/details/DuplicateFilmDetailsTableFormat.java index 45808585ce..b6da974a0b 100644 --- a/src/main/java/mediathek/gui/duplicates/DuplicateFilmDetailsTableFormat.java +++ b/src/main/java/mediathek/gui/duplicates/details/DuplicateFilmDetailsTableFormat.java @@ -1,4 +1,4 @@ -package mediathek.gui.duplicates; +package mediathek.gui.duplicates.details; import ca.odell.glazedlists.gui.AdvancedTableFormat; import mediathek.daten.DatenFilm; diff --git a/src/main/java/mediathek/gui/duplicates/DuplicateStatisticsDialog.java b/src/main/java/mediathek/gui/duplicates/statistics/DuplicateStatisticsDialog.java similarity index 99% rename from src/main/java/mediathek/gui/duplicates/DuplicateStatisticsDialog.java rename to src/main/java/mediathek/gui/duplicates/statistics/DuplicateStatisticsDialog.java index 10b9475de2..e991570f4b 100644 --- a/src/main/java/mediathek/gui/duplicates/DuplicateStatisticsDialog.java +++ b/src/main/java/mediathek/gui/duplicates/statistics/DuplicateStatisticsDialog.java @@ -2,11 +2,12 @@ * Created by JFormDesigner on Mon Oct 21 17:52:41 CEST 2024 */ -package mediathek.gui.duplicates; +package mediathek.gui.duplicates.statistics; import ca.odell.glazedlists.SortedList; import ca.odell.glazedlists.swing.GlazedListsSwing; import mediathek.config.Daten; +import mediathek.gui.duplicates.FilmStatistics; import mediathek.tool.ApplicationConfiguration; import org.apache.commons.configuration2.sync.LockMode; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/mediathek/gui/duplicates/DuplicateStatisticsDialog.jfd b/src/main/java/mediathek/gui/duplicates/statistics/DuplicateStatisticsDialog.jfd similarity index 100% rename from src/main/java/mediathek/gui/duplicates/DuplicateStatisticsDialog.jfd rename to src/main/java/mediathek/gui/duplicates/statistics/DuplicateStatisticsDialog.jfd diff --git a/src/main/java/mediathek/gui/duplicates/DuplicateStatisticsTableFormat.java b/src/main/java/mediathek/gui/duplicates/statistics/DuplicateStatisticsTableFormat.java similarity index 93% rename from src/main/java/mediathek/gui/duplicates/DuplicateStatisticsTableFormat.java rename to src/main/java/mediathek/gui/duplicates/statistics/DuplicateStatisticsTableFormat.java index 11cf94eacf..5e58208652 100644 --- a/src/main/java/mediathek/gui/duplicates/DuplicateStatisticsTableFormat.java +++ b/src/main/java/mediathek/gui/duplicates/statistics/DuplicateStatisticsTableFormat.java @@ -1,6 +1,7 @@ -package mediathek.gui.duplicates; +package mediathek.gui.duplicates.statistics; import ca.odell.glazedlists.gui.AdvancedTableFormat; +import mediathek.gui.duplicates.FilmStatistics; import java.util.Comparator; diff --git a/src/main/java/mediathek/gui/tabs/tab_film/GuiFilme.java b/src/main/java/mediathek/gui/tabs/tab_film/GuiFilme.java index 22f32b4a1f..b113f72e9d 100644 --- a/src/main/java/mediathek/gui/tabs/tab_film/GuiFilme.java +++ b/src/main/java/mediathek/gui/tabs/tab_film/GuiFilme.java @@ -32,7 +32,7 @@ import mediathek.gui.dialog.DialogAboNoSet; import mediathek.gui.dialog.DialogAddDownload; import mediathek.gui.dialog.DialogAddMoreDownload; -import mediathek.gui.duplicates.DuplicateFilmDetailsDialog; +import mediathek.gui.duplicates.details.DuplicateFilmDetailsDialog; import mediathek.gui.messages.*; import mediathek.gui.messages.history.DownloadHistoryChangedEvent; import mediathek.gui.tabs.AGuiTabPanel;