From 5083d77ffe64750c5f37f83ce25bb7a3b266aa85 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Sun, 26 Jan 2020 15:07:30 +0100 Subject: [PATCH] Move tab related stuff to own package --- client/src/main/java/ctbrec/ui/CamrecApplication.java | 9 ++++++++- client/src/main/java/ctbrec/ui/SiteUI.java | 1 + client/src/main/java/ctbrec/ui/news/NewsTab.java | 2 +- client/src/main/java/ctbrec/ui/settings/SettingsTab.java | 2 +- .../java/ctbrec/ui/sites/bonga/BongaCamsFriendsTab.java | 6 +++--- .../main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java | 2 +- .../java/ctbrec/ui/sites/bonga/BongaCamsTabProvider.java | 6 +++--- .../ctbrec/ui/sites/bonga/BongaCamsUpdateService.java | 2 +- .../main/java/ctbrec/ui/sites/cam4/Cam4FollowedTab.java | 4 ++-- .../ctbrec/ui/sites/cam4/Cam4FollowedUpdateService.java | 2 +- .../src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java | 2 +- .../main/java/ctbrec/ui/sites/cam4/Cam4TabProvider.java | 4 ++-- .../java/ctbrec/ui/sites/cam4/Cam4UpdateService.java | 2 +- .../java/ctbrec/ui/sites/camsoda/CamsodaFollowedTab.java | 4 ++-- .../ui/sites/camsoda/CamsodaFollowedUpdateService.java | 2 +- .../java/ctbrec/ui/sites/camsoda/CamsodaShowsTab.java | 2 +- .../main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java | 2 +- .../java/ctbrec/ui/sites/camsoda/CamsodaTabProvider.java | 4 ++-- .../ctbrec/ui/sites/camsoda/CamsodaUpdateService.java | 2 +- .../ui/sites/chaturbate/ChaturbateFollowedTab.java | 4 ++-- .../ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java | 2 +- .../ui/sites/chaturbate/ChaturbateTabProvider.java | 4 ++-- .../ui/sites/chaturbate/ChaturbateUpdateService.java | 2 +- .../java/ctbrec/ui/sites/fc2live/Fc2FollowedTab.java | 4 ++-- .../ui/sites/fc2live/Fc2FollowedUpdateService.java | 2 +- .../main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java | 2 +- .../java/ctbrec/ui/sites/fc2live/Fc2TabProvider.java | 4 ++-- .../java/ctbrec/ui/sites/fc2live/Fc2UpdateService.java | 2 +- .../ui/sites/flirt4free/Flirt4FreeFavoritesTab.java | 4 ++-- .../flirt4free/Flirt4FreeFavoritesUpdateService.java | 2 +- .../ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java | 2 +- .../ui/sites/flirt4free/Flirt4FreeTabProvider.java | 4 ++-- .../ui/sites/flirt4free/Flirt4FreeUpdateService.java | 2 +- .../ctbrec/ui/sites/jasmin/LiveJasminFollowedTab.java | 2 +- .../ui/sites/jasmin/LiveJasminFollowedUpdateService.java | 2 +- .../java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java | 2 +- .../main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java | 4 ++-- .../ctbrec/ui/sites/jasmin/LiveJasminTabProvider.java | 4 ++-- .../ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java | 2 +- .../ctbrec/ui/sites/myfreecams/FriendsUpdateService.java | 2 +- .../ctbrec/ui/sites/myfreecams/HDCamsUpdateService.java | 2 +- .../ctbrec/ui/sites/myfreecams/MyFreeCamsFriendsTab.java | 4 ++-- .../ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java | 2 +- .../ui/sites/myfreecams/MyFreeCamsTabProvider.java | 6 +++--- .../ctbrec/ui/sites/myfreecams/MyFreeCamsTableTab.java | 2 +- .../ui/sites/myfreecams/OnlineCamsUpdateService.java | 2 +- .../ctbrec/ui/sites/myfreecams/PopularModelService.java | 2 +- .../ui/sites/streamate/StreamateFollowedService.java | 2 +- .../ctbrec/ui/sites/streamate/StreamateFollowedTab.java | 4 ++-- .../java/ctbrec/ui/sites/streamate/StreamateSiteUi.java | 2 +- .../ctbrec/ui/sites/streamate/StreamateTabProvider.java | 4 ++-- .../ui/sites/streamate/StreamateUpdateService.java | 2 +- .../src/main/java/ctbrec/ui/{ => tabs}/DonateTabFx.java | 3 ++- .../src/main/java/ctbrec/ui/{ => tabs}/FollowedTab.java | 2 +- client/src/main/java/ctbrec/ui/{ => tabs}/HelpTab.java | 3 ++- .../ctbrec/ui/{ => tabs}/PaginatedScheduledService.java | 2 +- .../java/ctbrec/ui/{ => tabs}/RecordedModelsTab.java | 7 ++++++- .../main/java/ctbrec/ui/{ => tabs}/RecordingsTab.java | 8 +++++++- client/src/main/java/ctbrec/ui/{ => tabs}/SiteTab.java | 2 +- .../src/main/java/ctbrec/ui/{ => tabs}/SiteTabPane.java | 3 ++- .../src/main/java/ctbrec/ui/{ => tabs}/TabProvider.java | 2 +- .../java/ctbrec/ui/{ => tabs}/TabSelectionListener.java | 2 +- client/src/main/java/ctbrec/ui/{ => tabs}/ThumbCell.java | 7 ++++++- .../main/java/ctbrec/ui/{ => tabs}/ThumbOverviewTab.java | 7 ++++++- .../ctbrec/ui/{ => tabs}/ThumbOverviewTabSearchTask.java | 3 ++- client/src/main/java/ctbrec/ui/{ => tabs}/UpdateTab.java | 6 ++++-- 66 files changed, 122 insertions(+), 87 deletions(-) rename client/src/main/java/ctbrec/ui/{ => tabs}/DonateTabFx.java (98%) rename client/src/main/java/ctbrec/ui/{ => tabs}/FollowedTab.java (81%) rename client/src/main/java/ctbrec/ui/{ => tabs}/HelpTab.java (90%) rename client/src/main/java/ctbrec/ui/{ => tabs}/PaginatedScheduledService.java (93%) rename client/src/main/java/ctbrec/ui/{ => tabs}/RecordedModelsTab.java (99%) rename client/src/main/java/ctbrec/ui/{ => tabs}/RecordingsTab.java (99%) rename client/src/main/java/ctbrec/ui/{ => tabs}/SiteTab.java (95%) rename client/src/main/java/ctbrec/ui/{ => tabs}/SiteTabPane.java (96%) rename client/src/main/java/ctbrec/ui/{ => tabs}/TabProvider.java (90%) rename client/src/main/java/ctbrec/ui/{ => tabs}/TabSelectionListener.java (80%) rename client/src/main/java/ctbrec/ui/{ => tabs}/ThumbCell.java (99%) rename client/src/main/java/ctbrec/ui/{ => tabs}/ThumbOverviewTab.java (99%) rename client/src/main/java/ctbrec/ui/{ => tabs}/ThumbOverviewTabSearchTask.java (97%) rename client/src/main/java/ctbrec/ui/{ => tabs}/UpdateTab.java (91%) diff --git a/client/src/main/java/ctbrec/ui/CamrecApplication.java b/client/src/main/java/ctbrec/ui/CamrecApplication.java index 2bc70ae9..562d88a7 100644 --- a/client/src/main/java/ctbrec/ui/CamrecApplication.java +++ b/client/src/main/java/ctbrec/ui/CamrecApplication.java @@ -49,6 +49,13 @@ import ctbrec.sites.mfc.MyFreeCams; import ctbrec.sites.streamate.Streamate; import ctbrec.ui.news.NewsTab; import ctbrec.ui.settings.SettingsTab; +import ctbrec.ui.tabs.DonateTabFx; +import ctbrec.ui.tabs.HelpTab; +import ctbrec.ui.tabs.RecordedModelsTab; +import ctbrec.ui.tabs.RecordingsTab; +import ctbrec.ui.tabs.SiteTab; +import ctbrec.ui.tabs.TabSelectionListener; +import ctbrec.ui.tabs.UpdateTab; import javafx.application.Application; import javafx.application.HostServices; import javafx.application.Platform; @@ -405,7 +412,7 @@ public class CamrecApplication extends Application { } } - static class Release { + public static class Release { private String name; private String tag_name; // NOSONAR - name pattern is needed by moshi private String html_url; // NOSONAR - name pattern is needed by moshi diff --git a/client/src/main/java/ctbrec/ui/SiteUI.java b/client/src/main/java/ctbrec/ui/SiteUI.java index 076ba0ae..4168ce5c 100644 --- a/client/src/main/java/ctbrec/ui/SiteUI.java +++ b/client/src/main/java/ctbrec/ui/SiteUI.java @@ -4,6 +4,7 @@ import java.io.IOException; import ctbrec.Model; import ctbrec.sites.ConfigUI; +import ctbrec.ui.tabs.TabProvider; public interface SiteUI { diff --git a/client/src/main/java/ctbrec/ui/news/NewsTab.java b/client/src/main/java/ctbrec/ui/news/NewsTab.java index bf4e075f..fc0a2395 100644 --- a/client/src/main/java/ctbrec/ui/news/NewsTab.java +++ b/client/src/main/java/ctbrec/ui/news/NewsTab.java @@ -12,8 +12,8 @@ import com.squareup.moshi.Moshi; import ctbrec.io.HttpException; import ctbrec.ui.CamrecApplication; -import ctbrec.ui.TabSelectionListener; import ctbrec.ui.controls.Dialogs; +import ctbrec.ui.tabs.TabSelectionListener; import javafx.application.Platform; import javafx.geometry.Insets; import javafx.geometry.Pos; diff --git a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java index a20c7023..2f0d1c6f 100644 --- a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java +++ b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java @@ -32,10 +32,10 @@ import ctbrec.sites.ConfigUI; import ctbrec.sites.Site; import ctbrec.ui.AutosizeAlert; import ctbrec.ui.SiteUiFactory; -import ctbrec.ui.TabSelectionListener; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.controls.DirectorySelectionBox; import ctbrec.ui.controls.ProgramSelectionBox; +import ctbrec.ui.tabs.TabSelectionListener; import javafx.collections.FXCollections; import javafx.geometry.HPos; import javafx.geometry.Insets; diff --git a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsFriendsTab.java b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsFriendsTab.java index b0ad320d..0d7d8cb2 100644 --- a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsFriendsTab.java +++ b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsFriendsTab.java @@ -1,9 +1,9 @@ package ctbrec.ui.sites.bonga; import ctbrec.sites.Site; -import ctbrec.ui.FollowedTab; -import ctbrec.ui.PaginatedScheduledService; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.FollowedTab; +import ctbrec.ui.tabs.PaginatedScheduledService; +import ctbrec.ui.tabs.ThumbOverviewTab; public class BongaCamsFriendsTab extends ThumbOverviewTab implements FollowedTab { diff --git a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java index 928c2df7..0c1ace01 100644 --- a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java @@ -10,9 +10,9 @@ import org.slf4j.LoggerFactory; import ctbrec.sites.ConfigUI; import ctbrec.sites.bonga.BongaCams; import ctbrec.sites.bonga.BongaCamsHttpClient; -import ctbrec.ui.TabProvider; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.tabs.TabProvider; public class BongaCamsSiteUi extends AbstractSiteUi { diff --git a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsTabProvider.java b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsTabProvider.java index 33068f5c..399a1efe 100644 --- a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsTabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsTabProvider.java @@ -5,9 +5,9 @@ import java.util.List; import ctbrec.recorder.Recorder; import ctbrec.sites.bonga.BongaCams; -import ctbrec.ui.PaginatedScheduledService; -import ctbrec.ui.TabProvider; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.PaginatedScheduledService; +import ctbrec.ui.tabs.TabProvider; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.scene.Scene; import javafx.scene.control.Tab; diff --git a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsUpdateService.java b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsUpdateService.java index c2e8700b..72abc4ef 100644 --- a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsUpdateService.java @@ -17,7 +17,7 @@ import ctbrec.Config; import ctbrec.Model; import ctbrec.sites.bonga.BongaCams; import ctbrec.sites.bonga.BongaCamsModel; -import ctbrec.ui.PaginatedScheduledService; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedTab.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedTab.java index f56a4743..2db35a38 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedTab.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedTab.java @@ -1,8 +1,8 @@ package ctbrec.ui.sites.cam4; import ctbrec.sites.cam4.Cam4; -import ctbrec.ui.FollowedTab; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.FollowedTab; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.concurrent.WorkerStateEvent; import javafx.geometry.Insets; import javafx.scene.Scene; diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedUpdateService.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedUpdateService.java index 97df0221..05144d23 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedUpdateService.java @@ -19,8 +19,8 @@ import ctbrec.io.HtmlParser; import ctbrec.io.HttpException; import ctbrec.sites.cam4.Cam4; import ctbrec.sites.cam4.Cam4Model; -import ctbrec.ui.PaginatedScheduledService; import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java index 202937f3..f7544018 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java @@ -10,9 +10,9 @@ import org.slf4j.LoggerFactory; import ctbrec.sites.ConfigUI; import ctbrec.sites.cam4.Cam4; import ctbrec.sites.cam4.Cam4HttpClient; -import ctbrec.ui.TabProvider; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.tabs.TabProvider; import javafx.application.Platform; public class Cam4SiteUi extends AbstractSiteUi { diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4TabProvider.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4TabProvider.java index 38fd1745..4cfb118d 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4TabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4TabProvider.java @@ -5,8 +5,8 @@ import java.util.List; import ctbrec.recorder.Recorder; import ctbrec.sites.cam4.Cam4; -import ctbrec.ui.TabProvider; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.TabProvider; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.scene.Scene; import javafx.scene.control.Tab; diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4UpdateService.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4UpdateService.java index 40905828..2317ff7c 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4UpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4UpdateService.java @@ -21,8 +21,8 @@ import ctbrec.io.HtmlParser; import ctbrec.io.HttpException; import ctbrec.sites.cam4.Cam4; import ctbrec.sites.cam4.Cam4Model; -import ctbrec.ui.PaginatedScheduledService; import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaFollowedTab.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaFollowedTab.java index d1d5a8c6..d9904195 100644 --- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaFollowedTab.java +++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaFollowedTab.java @@ -1,8 +1,8 @@ package ctbrec.ui.sites.camsoda; import ctbrec.sites.camsoda.Camsoda; -import ctbrec.ui.FollowedTab; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.FollowedTab; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.concurrent.WorkerStateEvent; import javafx.geometry.Insets; import javafx.scene.Scene; diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaFollowedUpdateService.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaFollowedUpdateService.java index 2d225780..ca3ff432 100644 --- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaFollowedUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaFollowedUpdateService.java @@ -16,8 +16,8 @@ import ctbrec.Model; import ctbrec.io.HttpException; import ctbrec.sites.camsoda.Camsoda; import ctbrec.sites.camsoda.CamsodaModel; -import ctbrec.ui.PaginatedScheduledService; import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaShowsTab.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaShowsTab.java index e9bde4f1..867b8414 100644 --- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaShowsTab.java +++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaShowsTab.java @@ -25,7 +25,7 @@ import ctbrec.sites.camsoda.Camsoda; import ctbrec.ui.AutosizeAlert; import ctbrec.ui.DesktopIntegration; import ctbrec.ui.SiteUiFactory; -import ctbrec.ui.TabSelectionListener; +import ctbrec.ui.tabs.TabSelectionListener; import javafx.application.Platform; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java index e987b0b8..b5a76dd1 100644 --- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java @@ -4,8 +4,8 @@ import java.io.IOException; import ctbrec.sites.ConfigUI; import ctbrec.sites.camsoda.Camsoda; -import ctbrec.ui.TabProvider; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.tabs.TabProvider; public class CamsodaSiteUi extends AbstractSiteUi { diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaTabProvider.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaTabProvider.java index 5873b9cf..d44c3ba9 100644 --- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaTabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaTabProvider.java @@ -7,8 +7,8 @@ import java.util.List; import ctbrec.recorder.Recorder; import ctbrec.sites.camsoda.Camsoda; -import ctbrec.ui.TabProvider; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.TabProvider; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.scene.Scene; import javafx.scene.control.Tab; diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java index 761b2d1d..d801af7f 100644 --- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java @@ -18,8 +18,8 @@ import ctbrec.StringUtil; import ctbrec.io.HttpException; import ctbrec.sites.camsoda.Camsoda; import ctbrec.sites.camsoda.CamsodaModel; -import ctbrec.ui.PaginatedScheduledService; import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateFollowedTab.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateFollowedTab.java index a94b986f..952eeacf 100644 --- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateFollowedTab.java +++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateFollowedTab.java @@ -1,8 +1,8 @@ package ctbrec.ui.sites.chaturbate; import ctbrec.sites.chaturbate.Chaturbate; -import ctbrec.ui.FollowedTab; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.FollowedTab; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.concurrent.WorkerStateEvent; import javafx.geometry.Insets; import javafx.scene.Scene; diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java index 3d01af09..a72633a1 100644 --- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java @@ -4,8 +4,8 @@ import java.io.IOException; import ctbrec.sites.ConfigUI; import ctbrec.sites.chaturbate.Chaturbate; -import ctbrec.ui.TabProvider; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.tabs.TabProvider; public class ChaturbateSiteUi extends AbstractSiteUi { diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java index f425a23b..641c65fe 100644 --- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateTabProvider.java @@ -5,8 +5,8 @@ import java.util.List; import ctbrec.recorder.Recorder; import ctbrec.sites.chaturbate.Chaturbate; -import ctbrec.ui.TabProvider; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.TabProvider; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.scene.Scene; import javafx.scene.control.Tab; diff --git a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateUpdateService.java b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateUpdateService.java index 84d5cdc2..cddd8d17 100644 --- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateUpdateService.java @@ -14,8 +14,8 @@ import ctbrec.Model; import ctbrec.StringUtil; import ctbrec.sites.chaturbate.Chaturbate; import ctbrec.sites.chaturbate.ChaturbateModelParser; -import ctbrec.ui.PaginatedScheduledService; import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2FollowedTab.java b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2FollowedTab.java index 86d53bc7..d7756872 100644 --- a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2FollowedTab.java +++ b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2FollowedTab.java @@ -1,8 +1,8 @@ package ctbrec.ui.sites.fc2live; import ctbrec.sites.fc2live.Fc2Live; -import ctbrec.ui.FollowedTab; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.FollowedTab; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.geometry.Insets; import javafx.scene.control.RadioButton; import javafx.scene.control.ToggleGroup; diff --git a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2FollowedUpdateService.java b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2FollowedUpdateService.java index 478b6a3b..e0b752a8 100644 --- a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2FollowedUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2FollowedUpdateService.java @@ -14,7 +14,7 @@ import ctbrec.Model; import ctbrec.io.HttpException; import ctbrec.sites.fc2live.Fc2Live; import ctbrec.sites.fc2live.Fc2Model; -import ctbrec.ui.PaginatedScheduledService; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.FormBody; import okhttp3.Request; diff --git a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java index 5f9a174f..de179f0c 100644 --- a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java @@ -11,9 +11,9 @@ import ctbrec.sites.fc2live.Fc2Live; import ctbrec.sites.fc2live.Fc2Model; import ctbrec.ui.JavaFxModel; import ctbrec.ui.Player; -import ctbrec.ui.TabProvider; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.tabs.TabProvider; public class Fc2LiveSiteUi extends AbstractSiteUi { private static final transient Logger LOG = LoggerFactory.getLogger(Fc2LiveSiteUi.class); diff --git a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2TabProvider.java b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2TabProvider.java index a5a0b32f..51e4c5fe 100644 --- a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2TabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2TabProvider.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import ctbrec.sites.fc2live.Fc2Live; -import ctbrec.ui.TabProvider; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.TabProvider; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.scene.Scene; import javafx.scene.control.Tab; diff --git a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2UpdateService.java b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2UpdateService.java index a630ebc3..4c3631b2 100644 --- a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2UpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2UpdateService.java @@ -18,7 +18,7 @@ import ctbrec.Model; import ctbrec.io.HttpException; import ctbrec.sites.fc2live.Fc2Live; import ctbrec.sites.fc2live.Fc2Model; -import ctbrec.ui.PaginatedScheduledService; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.RequestBody; diff --git a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesTab.java b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesTab.java index 28cf9eeb..58f0c68a 100644 --- a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesTab.java +++ b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesTab.java @@ -1,8 +1,8 @@ package ctbrec.ui.sites.flirt4free; import ctbrec.sites.flirt4free.Flirt4Free; -import ctbrec.ui.FollowedTab; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.FollowedTab; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.scene.Scene; import javafx.scene.input.KeyCode; import javafx.scene.input.KeyEvent; diff --git a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesUpdateService.java b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesUpdateService.java index da8f3aa9..9311d895 100644 --- a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeFavoritesUpdateService.java @@ -17,8 +17,8 @@ import ctbrec.io.HtmlParser; import ctbrec.io.HttpException; import ctbrec.sites.flirt4free.Flirt4Free; import ctbrec.sites.flirt4free.Flirt4FreeModel; -import ctbrec.ui.PaginatedScheduledService; import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java index 737cb2bf..aa76756a 100644 --- a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java @@ -4,8 +4,8 @@ import java.io.IOException; import ctbrec.sites.ConfigUI; import ctbrec.sites.flirt4free.Flirt4Free; -import ctbrec.ui.TabProvider; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.tabs.TabProvider; public class Flirt4FreeSiteUi extends AbstractSiteUi { diff --git a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeTabProvider.java b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeTabProvider.java index 23555159..f10878f4 100644 --- a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeTabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeTabProvider.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import ctbrec.sites.flirt4free.Flirt4Free; -import ctbrec.ui.TabProvider; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.TabProvider; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.scene.Scene; import javafx.scene.control.Tab; import javafx.util.Duration; diff --git a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeUpdateService.java b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeUpdateService.java index d1a360e1..efa4d9a2 100644 --- a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeUpdateService.java @@ -21,7 +21,7 @@ import ctbrec.io.HtmlParser; import ctbrec.io.HttpException; import ctbrec.sites.flirt4free.Flirt4Free; import ctbrec.sites.flirt4free.Flirt4FreeModel; -import ctbrec.ui.PaginatedScheduledService; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedTab.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedTab.java index d5c9cdc0..8d59dc30 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedTab.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedTab.java @@ -1,7 +1,7 @@ package ctbrec.ui.sites.jasmin; import ctbrec.sites.jasmin.LiveJasmin; -import ctbrec.ui.FollowedTab; +import ctbrec.ui.tabs.FollowedTab; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.RadioButton; diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedUpdateService.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedUpdateService.java index b8d1019b..ab2e1c3d 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminFollowedUpdateService.java @@ -17,8 +17,8 @@ import ctbrec.Model; import ctbrec.io.HttpException; import ctbrec.sites.jasmin.LiveJasmin; import ctbrec.sites.jasmin.LiveJasminModel; -import ctbrec.ui.PaginatedScheduledService; import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java index 1c6a96b1..4f98b469 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java @@ -11,9 +11,9 @@ import org.slf4j.LoggerFactory; import ctbrec.sites.ConfigUI; import ctbrec.sites.jasmin.LiveJasmin; import ctbrec.sites.jasmin.LiveJasminHttpClient; -import ctbrec.ui.TabProvider; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.tabs.TabProvider; public class LiveJasminSiteUi extends AbstractSiteUi { diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java index e42d321b..f1d7df09 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTab.java @@ -4,8 +4,8 @@ import java.io.IOException; import ctbrec.Config; import ctbrec.sites.Site; -import ctbrec.ui.PaginatedScheduledService; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.PaginatedScheduledService; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.concurrent.WorkerStateEvent; import javafx.scene.Scene; import javafx.scene.control.Button; diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTabProvider.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTabProvider.java index 94a004d0..da0c7c03 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminTabProvider.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import ctbrec.sites.jasmin.LiveJasmin; -import ctbrec.ui.TabProvider; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.TabProvider; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.scene.Scene; import javafx.scene.control.Tab; import javafx.util.Duration; diff --git a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java index 61f8cd11..77a8b9a6 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminUpdateService.java @@ -19,9 +19,9 @@ import ctbrec.io.CookieJarImpl; import ctbrec.io.HttpException; import ctbrec.sites.jasmin.LiveJasmin; import ctbrec.sites.jasmin.LiveJasminModel; -import ctbrec.ui.PaginatedScheduledService; import ctbrec.ui.SiteUI; import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Cookie; import okhttp3.HttpUrl; diff --git a/client/src/main/java/ctbrec/ui/sites/myfreecams/FriendsUpdateService.java b/client/src/main/java/ctbrec/ui/sites/myfreecams/FriendsUpdateService.java index f463c2b0..6ef55d2d 100644 --- a/client/src/main/java/ctbrec/ui/sites/myfreecams/FriendsUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/FriendsUpdateService.java @@ -20,8 +20,8 @@ import ctbrec.sites.mfc.MyFreeCamsClient; import ctbrec.sites.mfc.MyFreeCamsModel; import ctbrec.sites.mfc.SessionState; import ctbrec.sites.mfc.User; -import ctbrec.ui.PaginatedScheduledService; import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/myfreecams/HDCamsUpdateService.java b/client/src/main/java/ctbrec/ui/sites/myfreecams/HDCamsUpdateService.java index 2cdeccc1..c087c268 100644 --- a/client/src/main/java/ctbrec/ui/sites/myfreecams/HDCamsUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/HDCamsUpdateService.java @@ -10,7 +10,7 @@ import ctbrec.Model; import ctbrec.sites.mfc.MyFreeCamsClient; import ctbrec.sites.mfc.SessionState; import ctbrec.sites.mfc.User; -import ctbrec.ui.PaginatedScheduledService; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; public class HDCamsUpdateService extends PaginatedScheduledService { diff --git a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsFriendsTab.java b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsFriendsTab.java index 004dfec5..78031a72 100644 --- a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsFriendsTab.java +++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsFriendsTab.java @@ -2,8 +2,8 @@ package ctbrec.ui.sites.myfreecams; import static ctbrec.ui.sites.myfreecams.FriendsUpdateService.Mode.*; import ctbrec.sites.mfc.MyFreeCams; -import ctbrec.ui.FollowedTab; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.FollowedTab; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.geometry.Insets; import javafx.scene.Scene; import javafx.scene.control.RadioButton; diff --git a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java index fcf95111..d1766650 100644 --- a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java @@ -4,8 +4,8 @@ import java.io.IOException; import ctbrec.sites.ConfigUI; import ctbrec.sites.mfc.MyFreeCams; -import ctbrec.ui.TabProvider; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.tabs.TabProvider; public class MyFreeCamsSiteUi extends AbstractSiteUi { diff --git a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsTabProvider.java b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsTabProvider.java index 998006e2..978cb86f 100644 --- a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsTabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsTabProvider.java @@ -5,9 +5,9 @@ import java.util.List; import ctbrec.recorder.Recorder; import ctbrec.sites.mfc.MyFreeCams; -import ctbrec.ui.PaginatedScheduledService; -import ctbrec.ui.TabProvider; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.PaginatedScheduledService; +import ctbrec.ui.tabs.TabProvider; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.scene.Scene; import javafx.scene.control.Tab; diff --git a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsTableTab.java b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsTableTab.java index 9901fd1b..255489e2 100644 --- a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsTableTab.java +++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsTableTab.java @@ -41,11 +41,11 @@ import ctbrec.sites.mfc.MyFreeCamsModel; import ctbrec.sites.mfc.SessionState; import ctbrec.sites.mfc.User; import ctbrec.ui.DesktopIntegration; -import ctbrec.ui.TabSelectionListener; import ctbrec.ui.action.FollowAction; import ctbrec.ui.action.PlayAction; import ctbrec.ui.action.StartRecordingAction; import ctbrec.ui.controls.SearchBox; +import ctbrec.ui.tabs.TabSelectionListener; import javafx.beans.property.BooleanProperty; import javafx.beans.property.DoubleProperty; import javafx.beans.property.IntegerProperty; diff --git a/client/src/main/java/ctbrec/ui/sites/myfreecams/OnlineCamsUpdateService.java b/client/src/main/java/ctbrec/ui/sites/myfreecams/OnlineCamsUpdateService.java index 320aae5c..f3bdf31d 100644 --- a/client/src/main/java/ctbrec/ui/sites/myfreecams/OnlineCamsUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/OnlineCamsUpdateService.java @@ -7,7 +7,7 @@ import java.util.stream.Collectors; import ctbrec.Model; import ctbrec.sites.mfc.MyFreeCamsClient; -import ctbrec.ui.PaginatedScheduledService; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; public class OnlineCamsUpdateService extends PaginatedScheduledService { diff --git a/client/src/main/java/ctbrec/ui/sites/myfreecams/PopularModelService.java b/client/src/main/java/ctbrec/ui/sites/myfreecams/PopularModelService.java index 9d60eebd..5273588f 100644 --- a/client/src/main/java/ctbrec/ui/sites/myfreecams/PopularModelService.java +++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/PopularModelService.java @@ -6,7 +6,7 @@ import java.util.stream.Collectors; import ctbrec.Model; import ctbrec.sites.mfc.MyFreeCamsClient; -import ctbrec.ui.PaginatedScheduledService; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; public class PopularModelService extends PaginatedScheduledService { diff --git a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedService.java b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedService.java index b21a9c34..6e07a7d8 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedService.java +++ b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedService.java @@ -23,7 +23,7 @@ import ctbrec.io.HttpException; import ctbrec.sites.streamate.Streamate; import ctbrec.sites.streamate.StreamateHttpClient; import ctbrec.sites.streamate.StreamateModel; -import ctbrec.ui.PaginatedScheduledService; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedTab.java b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedTab.java index f79cc30f..bf63a378 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedTab.java +++ b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateFollowedTab.java @@ -1,8 +1,8 @@ package ctbrec.ui.sites.streamate; import ctbrec.sites.streamate.Streamate; -import ctbrec.ui.FollowedTab; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.FollowedTab; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.concurrent.WorkerStateEvent; import javafx.geometry.Insets; import javafx.scene.Scene; diff --git a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java index 465246c4..1aaf7929 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java @@ -4,8 +4,8 @@ import java.io.IOException; import ctbrec.sites.ConfigUI; import ctbrec.sites.streamate.Streamate; -import ctbrec.ui.TabProvider; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.tabs.TabProvider; public class StreamateSiteUi extends AbstractSiteUi { diff --git a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateTabProvider.java b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateTabProvider.java index d43ec25f..067eab20 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateTabProvider.java +++ b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateTabProvider.java @@ -9,8 +9,8 @@ import org.slf4j.LoggerFactory; import ctbrec.recorder.Recorder; import ctbrec.sites.streamate.Streamate; -import ctbrec.ui.TabProvider; -import ctbrec.ui.ThumbOverviewTab; +import ctbrec.ui.tabs.TabProvider; +import ctbrec.ui.tabs.ThumbOverviewTab; import javafx.scene.Scene; import javafx.scene.control.Tab; diff --git a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateUpdateService.java b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateUpdateService.java index 6dc6271d..d649420f 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateUpdateService.java @@ -21,7 +21,7 @@ import ctbrec.Model; import ctbrec.io.HttpException; import ctbrec.sites.streamate.Streamate; import ctbrec.sites.streamate.StreamateModel; -import ctbrec.ui.PaginatedScheduledService; +import ctbrec.ui.tabs.PaginatedScheduledService; import javafx.concurrent.Task; import okhttp3.Request; import okhttp3.Response; diff --git a/client/src/main/java/ctbrec/ui/DonateTabFx.java b/client/src/main/java/ctbrec/ui/tabs/DonateTabFx.java similarity index 98% rename from client/src/main/java/ctbrec/ui/DonateTabFx.java rename to client/src/main/java/ctbrec/ui/tabs/DonateTabFx.java index abd7cd37..d4a221ea 100644 --- a/client/src/main/java/ctbrec/ui/DonateTabFx.java +++ b/client/src/main/java/ctbrec/ui/tabs/DonateTabFx.java @@ -1,7 +1,8 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; +import ctbrec.ui.DesktopIntegration; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Button; diff --git a/client/src/main/java/ctbrec/ui/FollowedTab.java b/client/src/main/java/ctbrec/ui/tabs/FollowedTab.java similarity index 81% rename from client/src/main/java/ctbrec/ui/FollowedTab.java rename to client/src/main/java/ctbrec/ui/tabs/FollowedTab.java index d04fbe01..7da276a4 100644 --- a/client/src/main/java/ctbrec/ui/FollowedTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/FollowedTab.java @@ -1,4 +1,4 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; /** * Marker interface to mark tabs, which contain followed models diff --git a/client/src/main/java/ctbrec/ui/HelpTab.java b/client/src/main/java/ctbrec/ui/tabs/HelpTab.java similarity index 90% rename from client/src/main/java/ctbrec/ui/HelpTab.java rename to client/src/main/java/ctbrec/ui/tabs/HelpTab.java index c5d415f4..6da575be 100644 --- a/client/src/main/java/ctbrec/ui/HelpTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/HelpTab.java @@ -1,5 +1,6 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; +import ctbrec.ui.DesktopIntegration; import javafx.geometry.Insets; import javafx.scene.control.Button; import javafx.scene.control.Tab; diff --git a/client/src/main/java/ctbrec/ui/PaginatedScheduledService.java b/client/src/main/java/ctbrec/ui/tabs/PaginatedScheduledService.java similarity index 93% rename from client/src/main/java/ctbrec/ui/PaginatedScheduledService.java rename to client/src/main/java/ctbrec/ui/tabs/PaginatedScheduledService.java index bba88ef5..a8a3e4b1 100644 --- a/client/src/main/java/ctbrec/ui/PaginatedScheduledService.java +++ b/client/src/main/java/ctbrec/ui/tabs/PaginatedScheduledService.java @@ -1,4 +1,4 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; import java.util.List; diff --git a/client/src/main/java/ctbrec/ui/RecordedModelsTab.java b/client/src/main/java/ctbrec/ui/tabs/RecordedModelsTab.java similarity index 99% rename from client/src/main/java/ctbrec/ui/RecordedModelsTab.java rename to client/src/main/java/ctbrec/ui/tabs/RecordedModelsTab.java index ea07eeb8..272b3668 100644 --- a/client/src/main/java/ctbrec/ui/RecordedModelsTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/RecordedModelsTab.java @@ -1,4 +1,4 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; import java.io.IOException; import java.security.InvalidKeyException; @@ -27,6 +27,11 @@ import ctbrec.Recording; import ctbrec.StringUtil; import ctbrec.recorder.Recorder; import ctbrec.sites.Site; +import ctbrec.ui.AutosizeAlert; +import ctbrec.ui.DesktopIntegration; +import ctbrec.ui.JavaFxModel; +import ctbrec.ui.PreviewPopupHandler; +import ctbrec.ui.StreamSourceSelectionDialog; import ctbrec.ui.action.EditNotesAction; import ctbrec.ui.action.FollowAction; import ctbrec.ui.action.OpenRecordingsDir; diff --git a/client/src/main/java/ctbrec/ui/RecordingsTab.java b/client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java similarity index 99% rename from client/src/main/java/ctbrec/ui/RecordingsTab.java rename to client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java index 179feb21..9cfdf922 100644 --- a/client/src/main/java/ctbrec/ui/RecordingsTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java @@ -1,4 +1,4 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; import static ctbrec.Recording.State.*; import static javafx.scene.control.ButtonType.*; @@ -33,6 +33,12 @@ import ctbrec.recorder.ProgressListener; import ctbrec.recorder.Recorder; import ctbrec.recorder.download.hls.MergedHlsDownload; import ctbrec.sites.Site; +import ctbrec.ui.AutosizeAlert; +import ctbrec.ui.CamrecApplication; +import ctbrec.ui.DesktopIntegration; +import ctbrec.ui.FileDownload; +import ctbrec.ui.JavaFxRecording; +import ctbrec.ui.Player; import ctbrec.ui.controls.DateTimeCellFactory; import ctbrec.ui.controls.Toast; import javafx.application.Platform; diff --git a/client/src/main/java/ctbrec/ui/SiteTab.java b/client/src/main/java/ctbrec/ui/tabs/SiteTab.java similarity index 95% rename from client/src/main/java/ctbrec/ui/SiteTab.java rename to client/src/main/java/ctbrec/ui/tabs/SiteTab.java index 1b0fc0b1..e8d133ce 100644 --- a/client/src/main/java/ctbrec/ui/SiteTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/SiteTab.java @@ -1,4 +1,4 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; import ctbrec.sites.Site; import javafx.scene.Scene; diff --git a/client/src/main/java/ctbrec/ui/SiteTabPane.java b/client/src/main/java/ctbrec/ui/tabs/SiteTabPane.java similarity index 96% rename from client/src/main/java/ctbrec/ui/SiteTabPane.java rename to client/src/main/java/ctbrec/ui/tabs/SiteTabPane.java index 2902935f..32d337e3 100644 --- a/client/src/main/java/ctbrec/ui/SiteTabPane.java +++ b/client/src/main/java/ctbrec/ui/tabs/SiteTabPane.java @@ -1,6 +1,7 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; import ctbrec.sites.Site; +import ctbrec.ui.SiteUiFactory; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.geometry.Side; diff --git a/client/src/main/java/ctbrec/ui/TabProvider.java b/client/src/main/java/ctbrec/ui/tabs/TabProvider.java similarity index 90% rename from client/src/main/java/ctbrec/ui/TabProvider.java rename to client/src/main/java/ctbrec/ui/tabs/TabProvider.java index d755590f..f073f107 100644 --- a/client/src/main/java/ctbrec/ui/TabProvider.java +++ b/client/src/main/java/ctbrec/ui/tabs/TabProvider.java @@ -1,4 +1,4 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; import java.util.List; diff --git a/client/src/main/java/ctbrec/ui/TabSelectionListener.java b/client/src/main/java/ctbrec/ui/tabs/TabSelectionListener.java similarity index 80% rename from client/src/main/java/ctbrec/ui/TabSelectionListener.java rename to client/src/main/java/ctbrec/ui/tabs/TabSelectionListener.java index 318dbcb6..e91c7785 100644 --- a/client/src/main/java/ctbrec/ui/TabSelectionListener.java +++ b/client/src/main/java/ctbrec/ui/tabs/TabSelectionListener.java @@ -1,4 +1,4 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; public interface TabSelectionListener { public void selected(); diff --git a/client/src/main/java/ctbrec/ui/ThumbCell.java b/client/src/main/java/ctbrec/ui/tabs/ThumbCell.java similarity index 99% rename from client/src/main/java/ctbrec/ui/ThumbCell.java rename to client/src/main/java/ctbrec/ui/tabs/ThumbCell.java index f64e0d98..0d088643 100644 --- a/client/src/main/java/ctbrec/ui/ThumbCell.java +++ b/client/src/main/java/ctbrec/ui/tabs/ThumbCell.java @@ -1,4 +1,4 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; import static ctbrec.io.HttpConstants.*; @@ -23,6 +23,11 @@ import ctbrec.Config; import ctbrec.Model; import ctbrec.io.HttpException; import ctbrec.recorder.Recorder; +import ctbrec.ui.AutosizeAlert; +import ctbrec.ui.CamrecApplication; +import ctbrec.ui.PauseIndicator; +import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.StreamSourceSelectionDialog; import ctbrec.ui.action.PlayAction; import ctbrec.ui.controls.StreamPreview; import javafx.animation.FadeTransition; diff --git a/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java b/client/src/main/java/ctbrec/ui/tabs/ThumbOverviewTab.java similarity index 99% rename from client/src/main/java/ctbrec/ui/ThumbOverviewTab.java rename to client/src/main/java/ctbrec/ui/tabs/ThumbOverviewTab.java index 4f1b50db..8466d7d0 100644 --- a/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/ThumbOverviewTab.java @@ -1,4 +1,4 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; import static ctbrec.ui.controls.Dialogs.*; @@ -35,6 +35,11 @@ import ctbrec.recorder.Recorder; import ctbrec.sites.Site; import ctbrec.sites.mfc.MyFreeCamsClient; import ctbrec.sites.mfc.MyFreeCamsModel; +import ctbrec.ui.AutosizeAlert; +import ctbrec.ui.DesktopIntegration; +import ctbrec.ui.SiteUiFactory; +import ctbrec.ui.TipDialog; +import ctbrec.ui.TokenLabel; import ctbrec.ui.action.OpenRecordingsDir; import ctbrec.ui.controls.SearchBox; import ctbrec.ui.controls.SearchPopover; diff --git a/client/src/main/java/ctbrec/ui/ThumbOverviewTabSearchTask.java b/client/src/main/java/ctbrec/ui/tabs/ThumbOverviewTabSearchTask.java similarity index 97% rename from client/src/main/java/ctbrec/ui/ThumbOverviewTabSearchTask.java rename to client/src/main/java/ctbrec/ui/tabs/ThumbOverviewTabSearchTask.java index 1daa7ded..4a0d159f 100644 --- a/client/src/main/java/ctbrec/ui/ThumbOverviewTabSearchTask.java +++ b/client/src/main/java/ctbrec/ui/tabs/ThumbOverviewTabSearchTask.java @@ -1,4 +1,4 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; import static ctbrec.ui.controls.Dialogs.*; @@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory; import ctbrec.Model; import ctbrec.sites.Site; +import ctbrec.ui.SiteUiFactory; import ctbrec.ui.controls.SearchPopover; import ctbrec.ui.controls.SearchPopoverTreeList; import javafx.application.Platform; diff --git a/client/src/main/java/ctbrec/ui/UpdateTab.java b/client/src/main/java/ctbrec/ui/tabs/UpdateTab.java similarity index 91% rename from client/src/main/java/ctbrec/ui/UpdateTab.java rename to client/src/main/java/ctbrec/ui/tabs/UpdateTab.java index 3ff19b6d..494dbf6d 100644 --- a/client/src/main/java/ctbrec/ui/UpdateTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/UpdateTab.java @@ -1,10 +1,12 @@ -package ctbrec.ui; +package ctbrec.ui.tabs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ctbrec.io.HttpException; +import ctbrec.ui.CamrecApplication; import ctbrec.ui.CamrecApplication.Release; +import ctbrec.ui.DesktopIntegration; import ctbrec.ui.controls.Dialogs; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -19,7 +21,7 @@ import okhttp3.Response; public class UpdateTab extends Tab { - private static final transient Logger LOG = LoggerFactory.getLogger(UpdateTab.class); + private static final Logger LOG = LoggerFactory.getLogger(UpdateTab.class); private TextArea changelog;