Move tab related stuff to own package

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

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 {
 

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;

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;

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 {
 

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 {
 

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;
 

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;

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;

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;

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 {

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;
 

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;

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;

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;

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;

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 {
 

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;
 

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;

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;

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 {
 

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;
 

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;

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;

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;

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);

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;
 

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;

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;

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;

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 {
 

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;

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;

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;

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;

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 {
 

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;

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;

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;

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;

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 {

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;

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 {
 

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;
 

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;

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 {

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 {

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;

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;

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 {
 

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;
 

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;

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;

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

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;

client/src/main/java/ctbrec/ui/tabs/PaginatedScheduledService.java

@@ -1,4 +1,4 @@
-package ctbrec.ui;
+package ctbrec.ui.tabs;
 
 import java.util.List;
 

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;

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;

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;

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;

client/src/main/java/ctbrec/ui/tabs/TabProvider.java

@@ -1,4 +1,4 @@
-package ctbrec.ui;
+package ctbrec.ui.tabs;
 
 import java.util.List;
 

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();

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;

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;

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;

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;