From b3c993e15779bc34a734eebcee491fb468a07a07 Mon Sep 17 00:00:00 2001 From: Daniel Sulik Date: Sat, 11 Jan 2025 15:47:22 +0100 Subject: [PATCH] Renaming --- .../com/faforever/client/replay/ReplayCardController.java | 5 ++--- .../java/com/faforever/client/replay/ReplayService.java | 7 +++---- ...eplayWatchingService.java => ReplayWatchedService.java} | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) rename src/main/java/com/faforever/client/replay/{ReplayWatchingService.java => ReplayWatchedService.java} (87%) diff --git a/src/main/java/com/faforever/client/replay/ReplayCardController.java b/src/main/java/com/faforever/client/replay/ReplayCardController.java index 33fcbf7dc7..af9aa19331 100644 --- a/src/main/java/com/faforever/client/replay/ReplayCardController.java +++ b/src/main/java/com/faforever/client/replay/ReplayCardController.java @@ -45,7 +45,6 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; @@ -56,7 +55,7 @@ public class ReplayCardController extends VaultEntityCardController { private final UiService uiService; private final ReplayService replayService; - private final ReplayWatchingService replayWatchingService; + private final ReplayWatchedService replayWatchedService; private final TimeService timeService; private final MapService mapService; private final RatingService ratingService; @@ -142,7 +141,7 @@ protected void onInitialize() { replayWatchedLabel.visibleProperty().bind(replayWatchedLabel.textProperty().isNotEmpty()); replayWatchedLabel.textProperty().bind( entity.map(Replay::id).when(showing).map( - replayWatchingService::getReplayWatchedDateTime).map(timeService::asDate).map(date -> { + replayWatchedService::getReplayWatchedDateTime).map(timeService::asDate).map(date -> { if( date != null ) { replayTileRoot.setStyle("-fx-border-color: -card-watched-color;"); replayTileRoot.setStyle("-fx-border-width: 7;"); diff --git a/src/main/java/com/faforever/client/replay/ReplayService.java b/src/main/java/com/faforever/client/replay/ReplayService.java index f1e1094bfa..66edaf0fa8 100644 --- a/src/main/java/com/faforever/client/replay/ReplayService.java +++ b/src/main/java/com/faforever/client/replay/ReplayService.java @@ -21,7 +21,6 @@ import com.faforever.client.notification.NotificationService; import com.faforever.client.notification.PersistentNotification; import com.faforever.client.preferences.DataPrefs; -import com.faforever.client.preferences.Preferences; import com.faforever.client.task.TaskService; import com.faforever.client.user.LoginService; import com.faforever.client.util.FileSizeReader; @@ -103,7 +102,7 @@ public class ReplayService { private final ReplayMapper replayMapper; private final DataPrefs dataPrefs; private final ObjectFactory replayDownloadTaskFactory; - private final ReplayWatchingService replayWatchingService; + private final ReplayWatchedService replayWatchedService; @VisibleForTesting static Integer parseSupComVersion(ReplayDataParser parser) { @@ -261,7 +260,7 @@ public void runReplay(Replay item) { if (item.replayFile() != null) { try { runReplayFile(item.replayFile()); - this.replayWatchingService.updateReplayWatchHistory(item.id()); + this.replayWatchedService.updateReplayWatchHistory(item.id()); } catch (Exception e) { log.error("Could not read replay file `{}`", item.replayFile(), e); notificationService.addImmediateErrorNotification(e, "replay.couldNotParse"); @@ -336,7 +335,7 @@ private void runOnlineReplay(int replayId) { downloadReplay(replayId).thenAccept((path) -> { try { runReplayFile(path); - this.replayWatchingService.updateReplayWatchHistory(replayId); + this.replayWatchedService.updateReplayWatchHistory(replayId); } catch (IOException | CompressorException e) { throw new RuntimeException(e); } diff --git a/src/main/java/com/faforever/client/replay/ReplayWatchingService.java b/src/main/java/com/faforever/client/replay/ReplayWatchedService.java similarity index 87% rename from src/main/java/com/faforever/client/replay/ReplayWatchingService.java rename to src/main/java/com/faforever/client/replay/ReplayWatchedService.java index 2865275c2c..fa740877db 100644 --- a/src/main/java/com/faforever/client/replay/ReplayWatchingService.java +++ b/src/main/java/com/faforever/client/replay/ReplayWatchedService.java @@ -12,7 +12,7 @@ @Service @Slf4j @RequiredArgsConstructor -public class ReplayWatchingService { +public class ReplayWatchedService { private final Preferences preferences; @@ -22,7 +22,7 @@ boolean wasReplayWatched(Integer replayId) { OffsetDateTime getReplayWatchedDateTime(Integer replayId) { if (wasReplayWatched(replayId)) { - return preferences.getReplayHistory().getWatchedReplayMap().get(replayId); + return preferences.getReplayHistory().getWatchedReplayMap().get(replayId); } else { return null; }