From 0d0c42c895d463ddf31b1e3468c3a70bda79b1da Mon Sep 17 00:00:00 2001 From: jafea7 Date: Fri, 11 Apr 2025 15:27:28 +1000 Subject: [PATCH] Comment unused code --- .../ui/settings/CtbrecPreferencesStorage.java | 26 +++++++++---------- .../sites/dreamcam/DreamcamUpdateService.java | 2 +- .../ui/sites/winktv/WinkTvConfigUI.java | 6 ++--- .../src/main/java/ctbrec/ui/tabs/HelpTab.java | 2 +- .../recorded/AbstractRecordedModelsTab.java | 2 +- .../ui/tabs/recorded/RecordLaterTab.java | 4 +-- .../recorded/RecordedModelsPerSiteTab.java | 6 ++--- .../ui/tabs/recorded/RecordedModelsTab.java | 4 +-- .../sites/chaturbate/ChaturbateModel.java | 2 +- .../ctbrec/sites/dreamcam/DreamcamModel.java | 2 +- .../sites/stripchat/StripchatHttpClient.java | 1 - .../ctbrec/recorder/server/ConfigServlet.java | 8 +++--- .../ctbrec/recorder/server/DebugServlet.java | 16 ++++++------ 13 files changed, 40 insertions(+), 41 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/settings/CtbrecPreferencesStorage.java b/client/src/main/java/ctbrec/ui/settings/CtbrecPreferencesStorage.java index 30f17451..ac025bf0 100644 --- a/client/src/main/java/ctbrec/ui/settings/CtbrecPreferencesStorage.java +++ b/client/src/main/java/ctbrec/ui/settings/CtbrecPreferencesStorage.java @@ -3,7 +3,7 @@ package ctbrec.ui.settings; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.time.LocalTime; -import java.util.Arrays; +// import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -362,18 +362,18 @@ public class CtbrecPreferencesStorage implements PreferencesStorage { return false; } - private boolean setUnchecked(String key, Object n) throws IllegalAccessException, NoSuchFieldException, InvocationTargetException { - var field = BoundField.of(settings, key); - var o = field.get(); - if (n instanceof List && o instanceof List) { - var list = (List)o; - list.clear(); - list.addAll((List)n); - } else { - field.set(n); // NOSONAR - } - return true; - } + // private boolean setUnchecked(String key, Object n) throws IllegalAccessException, NoSuchFieldException, InvocationTargetException { + // var field = BoundField.of(settings, key); + // var o = field.get(); + // if (n instanceof List && o instanceof List) { + // var list = (List)o; + // list.clear(); + // list.addAll((List)n); + // } else { + // field.set(n); // NOSONAR + // } + // return true; + // } private void saveValue(Exec exe) { try { diff --git a/client/src/main/java/ctbrec/ui/sites/dreamcam/DreamcamUpdateService.java b/client/src/main/java/ctbrec/ui/sites/dreamcam/DreamcamUpdateService.java index b413b8aa..213cdada 100644 --- a/client/src/main/java/ctbrec/ui/sites/dreamcam/DreamcamUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/dreamcam/DreamcamUpdateService.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; public class DreamcamUpdateService extends PaginatedScheduledService { private static final Logger LOG = LoggerFactory.getLogger(DreamcamUpdateService.class); - private static final String API_URL = "https://api.dreamcam.co.kr/v1/live"; + // private static final String API_URL = "https://api.dreamcam.co.kr/v1/live"; private static final int modelsPerPage = 64; private Dreamcam site; private String url; diff --git a/client/src/main/java/ctbrec/ui/sites/winktv/WinkTvConfigUI.java b/client/src/main/java/ctbrec/ui/sites/winktv/WinkTvConfigUI.java index d3c3cc42..b6e94ed2 100644 --- a/client/src/main/java/ctbrec/ui/sites/winktv/WinkTvConfigUI.java +++ b/client/src/main/java/ctbrec/ui/sites/winktv/WinkTvConfigUI.java @@ -6,13 +6,13 @@ import ctbrec.ui.settings.SettingsTab; import ctbrec.ui.sites.AbstractConfigUI; import javafx.geometry.Insets; import javafx.scene.Parent; -import javafx.scene.control.ToggleGroup; +// import javafx.scene.control.ToggleGroup; import javafx.scene.control.Button; import javafx.scene.control.CheckBox; -import javafx.scene.control.RadioButton; +// import javafx.scene.control.RadioButton; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; -import javafx.scene.layout.HBox; +// import javafx.scene.layout.HBox; public class WinkTvConfigUI extends AbstractConfigUI { private final WinkTv site; diff --git a/client/src/main/java/ctbrec/ui/tabs/HelpTab.java b/client/src/main/java/ctbrec/ui/tabs/HelpTab.java index e9e4af77..846b36fd 100644 --- a/client/src/main/java/ctbrec/ui/tabs/HelpTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/HelpTab.java @@ -12,7 +12,7 @@ import javafx.scene.layout.BorderPane; import javafx.scene.layout.VBox; import lombok.extern.slf4j.Slf4j; -import java.awt.Desktop; +// import java.awt.Desktop; import java.io.File; import java.io.IOException; diff --git a/client/src/main/java/ctbrec/ui/tabs/recorded/AbstractRecordedModelsTab.java b/client/src/main/java/ctbrec/ui/tabs/recorded/AbstractRecordedModelsTab.java index 1166c8f6..f5f0f8c4 100644 --- a/client/src/main/java/ctbrec/ui/tabs/recorded/AbstractRecordedModelsTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/recorded/AbstractRecordedModelsTab.java @@ -33,7 +33,7 @@ import ctbrec.ui.tabs.TabSelectionListener; import ctbrec.ui.tabs.recorded.ModelImportExport.ExportOptions; import javafx.application.Platform; import javafx.beans.property.SimpleObjectProperty; -import javafx.beans.property.SimpleStringProperty; +// import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringPropertyBase; import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordLaterTab.java b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordLaterTab.java index 18af8132..ceace6b7 100644 --- a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordLaterTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordLaterTab.java @@ -9,7 +9,7 @@ import ctbrec.ui.action.AbstractModelAction.Result; import ctbrec.ui.action.CheckModelAccountAction; import ctbrec.ui.action.StopRecordingAction; import ctbrec.ui.controls.Dialogs; -import ctbrec.ui.tabs.TabSelectionListener; +// import ctbrec.ui.tabs.TabSelectionListener; import javafx.application.Platform; import javafx.concurrent.ScheduledService; import javafx.concurrent.Task; @@ -26,7 +26,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; -public class RecordLaterTab extends AbstractRecordedModelsTab implements TabSelectionListener { +public class RecordLaterTab extends AbstractRecordedModelsTab { private static final Logger LOG = LoggerFactory.getLogger(RecordLaterTab.class); private ScheduledService> updateService; diff --git a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsPerSiteTab.java b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsPerSiteTab.java index a68acad4..340a10f3 100644 --- a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsPerSiteTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsPerSiteTab.java @@ -6,15 +6,15 @@ import ctbrec.sites.Site; import ctbrec.ui.action.PauseAction; import ctbrec.ui.action.ResumeAction; import ctbrec.ui.controls.Dialogs; -import ctbrec.ui.tabs.TabSelectionListener; +// import ctbrec.ui.tabs.TabSelectionListener; import javafx.event.ActionEvent; import java.util.List; import java.util.Objects; import java.util.function.Predicate; -import java.util.stream.Collectors; +// import java.util.stream.Collectors; -public class RecordedModelsPerSiteTab extends RecordedModelsTab implements TabSelectionListener { +public class RecordedModelsPerSiteTab extends RecordedModelsTab { public RecordedModelsPerSiteTab(String title, Recorder recorder, Site site) { super(title, recorder, List.of(site)); diff --git a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsTab.java b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsTab.java index aa59aa17..c1ee1018 100644 --- a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedModelsTab.java @@ -10,7 +10,7 @@ import ctbrec.ui.action.AbstractModelAction.Result; import ctbrec.ui.action.*; import ctbrec.ui.controls.DateTimeCellFactory; import ctbrec.ui.controls.Dialogs; -import ctbrec.ui.tabs.TabSelectionListener; +// import ctbrec.ui.tabs.TabSelectionListener; import javafx.application.Platform; import javafx.beans.value.ChangeListener; import javafx.concurrent.ScheduledService; @@ -48,7 +48,7 @@ import java.util.function.Predicate; import static ctbrec.Recording.State.RECORDING; -public class RecordedModelsTab extends AbstractRecordedModelsTab implements TabSelectionListener { +public class RecordedModelsTab extends AbstractRecordedModelsTab { private static final Logger LOG = LoggerFactory.getLogger(RecordedModelsTab.class); private ScheduledService> updateService; diff --git a/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java b/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java index 39d27a61..faf93c2f 100644 --- a/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java +++ b/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java @@ -6,7 +6,7 @@ import com.iheartradio.m3u8.data.MasterPlaylist; import com.iheartradio.m3u8.data.Playlist; import com.iheartradio.m3u8.data.PlaylistData; import ctbrec.AbstractModel; -import ctbrec.Config; +// import ctbrec.Config; import ctbrec.StringUtil; import ctbrec.io.HttpException; import ctbrec.io.json.ObjectMapperFactory; diff --git a/common/src/main/java/ctbrec/sites/dreamcam/DreamcamModel.java b/common/src/main/java/ctbrec/sites/dreamcam/DreamcamModel.java index 6115cd22..973e71ea 100644 --- a/common/src/main/java/ctbrec/sites/dreamcam/DreamcamModel.java +++ b/common/src/main/java/ctbrec/sites/dreamcam/DreamcamModel.java @@ -34,7 +34,7 @@ public class DreamcamModel extends AbstractModel { private static final String API_URL = "https://bss.dreamcamtrue.com"; private int[] resolution = new int[2]; private JSONObject modelInfo; - private boolean VRMode = false; + // private boolean VRMode = false; private transient Instant lastInfoRequest = Instant.EPOCH; diff --git a/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java b/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java index 768c1410..142dd6ca 100644 --- a/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java +++ b/common/src/main/java/ctbrec/sites/stripchat/StripchatHttpClient.java @@ -240,5 +240,4 @@ public class StripchatHttpClient extends HttpClient { return false; } } - } diff --git a/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java b/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java index 4be32da2..4607d903 100644 --- a/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java +++ b/server/src/main/java/ctbrec/recorder/server/ConfigServlet.java @@ -6,10 +6,10 @@ import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.time.LocalTime; -import java.util.Arrays; -import java.util.Collections; -import java.util.Enumeration; -import java.util.*; +// import java.util.Arrays; +// import java.util.Collections; +// import java.util.Enumeration; +// import java.util.*; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; diff --git a/server/src/main/java/ctbrec/recorder/server/DebugServlet.java b/server/src/main/java/ctbrec/recorder/server/DebugServlet.java index 9d575dce..9c54ca62 100644 --- a/server/src/main/java/ctbrec/recorder/server/DebugServlet.java +++ b/server/src/main/java/ctbrec/recorder/server/DebugServlet.java @@ -1,22 +1,22 @@ package ctbrec.recorder.server; -import ctbrec.Config; +// import ctbrec.Config; import ctbrec.io.HttpClient; import ctbrec.recorder.Recorder; import ctbrec.recorder.SimplifiedLocalRecorder; -import lombok.RequiredArgsConstructor; +// import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.json.JSONObject; +// import org.json.JSONObject; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.PrintWriter; -import java.io.StringWriter; +// import java.io.PrintWriter; +// import java.io.StringWriter; import java.net.URLDecoder; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.text.MessageFormat; +// import java.text.MessageFormat; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.*; @@ -53,8 +53,8 @@ public class DebugServlet extends AbstractCtbrecServlet { var stacks = Thread.getAllStackTraces(); var box = new Object() { String text = ""; };//stacks.toString(); - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); + // StringWriter sw = new StringWriter(); + // PrintWriter pw = new PrintWriter(sw); // e.printStackTrace(pw); stacks.forEach((thread, stack) -> {