From f4ad1a4f617c90ff51f4b9a240811647c6967ae4 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Fri, 12 Jun 2020 18:25:28 +0200 Subject: [PATCH] Move ConfigUI interface from common module to client --- client/src/main/java/ctbrec/ui/SiteUI.java | 2 +- client/src/main/java/ctbrec/ui/settings/SettingsTab.java | 2 +- client/src/main/java/ctbrec/ui/sites/AbstractConfigUI.java | 1 - client/src/main/java/ctbrec/ui/sites/ConfigUI.java | 2 +- client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java | 2 +- client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java | 2 +- client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java | 2 +- .../main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java | 2 +- client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java | 2 +- .../main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java | 2 +- .../src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java | 2 +- .../main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java | 2 +- client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java | 2 +- .../main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java | 2 +- .../main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java | 2 +- 15 files changed, 14 insertions(+), 15 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/SiteUI.java b/client/src/main/java/ctbrec/ui/SiteUI.java index 4168ce5c..60289650 100644 --- a/client/src/main/java/ctbrec/ui/SiteUI.java +++ b/client/src/main/java/ctbrec/ui/SiteUI.java @@ -3,7 +3,7 @@ package ctbrec.ui; import java.io.IOException; import ctbrec.Model; -import ctbrec.sites.ConfigUI; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public interface SiteUI { diff --git a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java index 167d4fbc..f1fb312e 100644 --- a/client/src/main/java/ctbrec/ui/settings/SettingsTab.java +++ b/client/src/main/java/ctbrec/ui/settings/SettingsTab.java @@ -30,13 +30,13 @@ import ctbrec.Settings.DirectoryStructure; import ctbrec.StringUtil; import ctbrec.io.ModelJsonAdapter; import ctbrec.recorder.Recorder; -import ctbrec.sites.ConfigUI; import ctbrec.sites.Site; import ctbrec.ui.AutosizeAlert; import ctbrec.ui.SiteUiFactory; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.controls.DirectorySelectionBox; import ctbrec.ui.controls.ProgramSelectionBox; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabSelectionListener; import javafx.collections.FXCollections; import javafx.geometry.HPos; diff --git a/client/src/main/java/ctbrec/ui/sites/AbstractConfigUI.java b/client/src/main/java/ctbrec/ui/sites/AbstractConfigUI.java index 69e2fd9a..afbd4815 100644 --- a/client/src/main/java/ctbrec/ui/sites/AbstractConfigUI.java +++ b/client/src/main/java/ctbrec/ui/sites/AbstractConfigUI.java @@ -6,7 +6,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ctbrec.Config; -import ctbrec.sites.ConfigUI; public abstract class AbstractConfigUI implements ConfigUI { diff --git a/client/src/main/java/ctbrec/ui/sites/ConfigUI.java b/client/src/main/java/ctbrec/ui/sites/ConfigUI.java index 33d97ec8..6e7e4906 100644 --- a/client/src/main/java/ctbrec/ui/sites/ConfigUI.java +++ b/client/src/main/java/ctbrec/ui/sites/ConfigUI.java @@ -1,4 +1,4 @@ -package ctbrec.sites; +package ctbrec.ui.sites; import javafx.scene.Parent; 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 0c1ace01..b2406e07 100644 --- a/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/bonga/BongaCamsSiteUi.java @@ -7,11 +7,11 @@ import java.util.concurrent.LinkedBlockingQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ctbrec.sites.ConfigUI; import ctbrec.sites.bonga.BongaCams; import ctbrec.sites.bonga.BongaCamsHttpClient; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public class BongaCamsSiteUi extends AbstractSiteUi { 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 f7544018..ad5ebdc9 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4SiteUi.java @@ -7,11 +7,11 @@ import java.util.concurrent.LinkedBlockingQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ctbrec.sites.ConfigUI; import ctbrec.sites.cam4.Cam4; import ctbrec.sites.cam4.Cam4HttpClient; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; import javafx.application.Platform; 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 b5a76dd1..9c923af4 100644 --- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaSiteUi.java @@ -2,9 +2,9 @@ package ctbrec.ui.sites.camsoda; import java.io.IOException; -import ctbrec.sites.ConfigUI; import ctbrec.sites.camsoda.Camsoda; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public class CamsodaSiteUi extends AbstractSiteUi { 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 a72633a1..73a5e616 100644 --- a/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/chaturbate/ChaturbateSiteUi.java @@ -2,9 +2,9 @@ package ctbrec.ui.sites.chaturbate; import java.io.IOException; -import ctbrec.sites.ConfigUI; import ctbrec.sites.chaturbate.Chaturbate; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public class ChaturbateSiteUi extends AbstractSiteUi { 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 de179f0c..2e160aae 100644 --- a/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/fc2live/Fc2LiveSiteUi.java @@ -6,13 +6,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ctbrec.Model; -import ctbrec.sites.ConfigUI; import ctbrec.sites.fc2live.Fc2Live; import ctbrec.sites.fc2live.Fc2Model; import ctbrec.ui.JavaFxModel; import ctbrec.ui.Player; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public class Fc2LiveSiteUi extends AbstractSiteUi { 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 aa76756a..024ec4bf 100644 --- a/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/flirt4free/Flirt4FreeSiteUi.java @@ -2,9 +2,9 @@ package ctbrec.ui.sites.flirt4free; import java.io.IOException; -import ctbrec.sites.ConfigUI; import ctbrec.sites.flirt4free.Flirt4Free; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public class Flirt4FreeSiteUi extends AbstractSiteUi { 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 4f98b469..5975a489 100644 --- a/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/jasmin/LiveJasminSiteUi.java @@ -8,11 +8,11 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ctbrec.sites.ConfigUI; import ctbrec.sites.jasmin.LiveJasmin; import ctbrec.sites.jasmin.LiveJasminHttpClient; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public class LiveJasminSiteUi extends AbstractSiteUi { 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 d1766650..785f8308 100644 --- a/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/myfreecams/MyFreeCamsSiteUi.java @@ -2,9 +2,9 @@ package ctbrec.ui.sites.myfreecams; import java.io.IOException; -import ctbrec.sites.ConfigUI; import ctbrec.sites.mfc.MyFreeCams; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public class MyFreeCamsSiteUi extends AbstractSiteUi { diff --git a/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java b/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java index 54d14085..a6e7389d 100644 --- a/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/showup/ShowupSiteUi.java @@ -7,10 +7,10 @@ import java.util.concurrent.LinkedBlockingQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ctbrec.sites.ConfigUI; import ctbrec.sites.showup.Showup; import ctbrec.ui.controls.Dialogs; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public class ShowupSiteUi extends AbstractSiteUi { 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 1aaf7929..6fdd754f 100644 --- a/client/src/main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/streamate/StreamateSiteUi.java @@ -2,9 +2,9 @@ package ctbrec.ui.sites.streamate; import java.io.IOException; -import ctbrec.sites.ConfigUI; import ctbrec.sites.streamate.Streamate; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public class StreamateSiteUi extends AbstractSiteUi { diff --git a/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java b/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java index 6f5ca88a..a7462903 100644 --- a/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java +++ b/client/src/main/java/ctbrec/ui/sites/stripchat/StripchatSiteUi.java @@ -2,9 +2,9 @@ package ctbrec.ui.sites.stripchat; import java.io.IOException; -import ctbrec.sites.ConfigUI; import ctbrec.sites.stripchat.Stripchat; import ctbrec.ui.sites.AbstractSiteUi; +import ctbrec.ui.sites.ConfigUI; import ctbrec.ui.tabs.TabProvider; public class StripchatSiteUi extends AbstractSiteUi {