From 198a9c6893a5493e875e399f72916ac33005e1ad Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Tue, 5 Feb 2019 14:44:21 +0100 Subject: [PATCH] Rename Recorder.getModelsRecording to Recorder.getModels --- client/src/main/java/ctbrec/ui/RecordedModelsTab.java | 6 +++--- .../java/ctbrec/ui/settings/ActionSettingsPanel.java | 2 +- common/src/main/java/ctbrec/recorder/LocalRecorder.java | 4 ++-- common/src/main/java/ctbrec/recorder/OnlineMonitor.java | 2 +- common/src/main/java/ctbrec/recorder/Recorder.java | 9 +++++++-- common/src/main/java/ctbrec/recorder/RemoteRecorder.java | 2 +- .../java/ctbrec/recorder/server/RecorderServlet.java | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/RecordedModelsTab.java b/client/src/main/java/ctbrec/ui/RecordedModelsTab.java index 020512c5..bc90a159 100644 --- a/client/src/main/java/ctbrec/ui/RecordedModelsTab.java +++ b/client/src/main/java/ctbrec/ui/RecordedModelsTab.java @@ -279,11 +279,11 @@ public class RecordedModelsTab extends Tab implements TabSelectionListener { } private void pauseAll(ActionEvent evt) { - new PauseAction(getTabPane(), recorder.getModelsRecording(), recorder).execute(); + new PauseAction(getTabPane(), recorder.getModels(), recorder).execute(); } private void resumeAll(ActionEvent evt) { - new ResumeAction(getTabPane(), recorder.getModelsRecording(), recorder).execute(); + new ResumeAction(getTabPane(), recorder.getModels(), recorder).execute(); } void initializeUpdateService() { @@ -343,7 +343,7 @@ public class RecordedModelsTab extends Tab implements TabSelectionListener { LOG.trace("Updating recorded models"); List recordings = recorder.getRecordings(); List onlineModels = recorder.getOnlineModels(); - return recorder.getModelsRecording() + return recorder.getModels() .stream() .map(m -> new JavaFxModel(m)) .peek(fxm -> { diff --git a/client/src/main/java/ctbrec/ui/settings/ActionSettingsPanel.java b/client/src/main/java/ctbrec/ui/settings/ActionSettingsPanel.java index 012e6515..65078b41 100644 --- a/client/src/main/java/ctbrec/ui/settings/ActionSettingsPanel.java +++ b/client/src/main/java/ctbrec/ui/settings/ActionSettingsPanel.java @@ -253,7 +253,7 @@ public class ActionSettingsPanel extends TitledPane { Label l = new Label("Models"); layout.add(l, 0, row); - modelSelectionPane = new ListSelectionPane(recorder.getModelsRecording(), Collections.emptyList()); + modelSelectionPane = new ListSelectionPane(recorder.getModels(), Collections.emptyList()); layout.add(modelSelectionPane, 1, row++); GridPane.setValignment(l, VPos.TOP); GridPane.setHgrow(modelSelectionPane, Priority.ALWAYS); diff --git a/common/src/main/java/ctbrec/recorder/LocalRecorder.java b/common/src/main/java/ctbrec/recorder/LocalRecorder.java index f5ab28c5..0c1d871d 100644 --- a/common/src/main/java/ctbrec/recorder/LocalRecorder.java +++ b/common/src/main/java/ctbrec/recorder/LocalRecorder.java @@ -289,7 +289,7 @@ public class LocalRecorder implements Recorder { } @Override - public List getModelsRecording() { + public List getModels() { lock.lock(); try { return Collections.unmodifiableList(new ArrayList<>(models)); @@ -300,7 +300,7 @@ public class LocalRecorder implements Recorder { @Override public List getOnlineModels() { - return getModelsRecording() + return getModels() .stream() .filter(m -> { try { diff --git a/common/src/main/java/ctbrec/recorder/OnlineMonitor.java b/common/src/main/java/ctbrec/recorder/OnlineMonitor.java index 15370194..ab4088e1 100644 --- a/common/src/main/java/ctbrec/recorder/OnlineMonitor.java +++ b/common/src/main/java/ctbrec/recorder/OnlineMonitor.java @@ -42,7 +42,7 @@ public class OnlineMonitor extends Thread { running = true; while (running) { Instant begin = Instant.now(); - List models = recorder.getModelsRecording(); + List models = recorder.getModels(); // remove models, which are not recorded anymore for (Iterator iterator = states.keySet().iterator(); iterator.hasNext();) { diff --git a/common/src/main/java/ctbrec/recorder/Recorder.java b/common/src/main/java/ctbrec/recorder/Recorder.java index 4fcdce1a..18e42537 100644 --- a/common/src/main/java/ctbrec/recorder/Recorder.java +++ b/common/src/main/java/ctbrec/recorder/Recorder.java @@ -17,12 +17,17 @@ public interface Recorder { public void switchStreamSource(Model model) throws IOException, InvalidKeyException, NoSuchAlgorithmException, IllegalStateException; /** - * Returns, if a model is in the list of models to record. This does not reflect, if there currently is a recording running. The model might be offline + * Returns true, if a model is in the list of models to record. This does not reflect, if there currently is a recording running. The model might be offline * aswell. */ public boolean isRecording(Model model); - public List getModelsRecording(); + /** + * Get the list of all models, which are tracked by ctbrec + * + * @return a List of Model objects, which might be empty + */ + public List getModels(); public List getRecordings() throws IOException, InvalidKeyException, NoSuchAlgorithmException, IllegalStateException; diff --git a/common/src/main/java/ctbrec/recorder/RemoteRecorder.java b/common/src/main/java/ctbrec/recorder/RemoteRecorder.java index f64e68e2..442c535d 100644 --- a/common/src/main/java/ctbrec/recorder/RemoteRecorder.java +++ b/common/src/main/java/ctbrec/recorder/RemoteRecorder.java @@ -138,7 +138,7 @@ public class RemoteRecorder implements Recorder { } @Override - public List getModelsRecording() { + public List getModels() { if(!lastSync.equals(Instant.EPOCH) && lastSync.isBefore(Instant.now().minusSeconds(60))) { throw new RuntimeException("Last sync was over a minute ago"); } diff --git a/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java b/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java index 19113064..44a894ec 100644 --- a/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java +++ b/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java @@ -75,7 +75,7 @@ public class RecorderServlet extends AbstractCtbrecServlet { case "list": resp.getWriter().write("{\"status\": \"success\", \"msg\": \"List of models\", \"models\": ["); JsonAdapter modelAdapter = new ModelJsonAdapter(); - List models = recorder.getModelsRecording(); + List models = recorder.getModels(); for (Iterator iterator = models.iterator(); iterator.hasNext();) { Model model = iterator.next(); resp.getWriter().write(modelAdapter.toJson(model));