From 3c145f4924a68a48800fa377d89b6288d444301b Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Tue, 21 Dec 2021 15:58:43 +0100 Subject: [PATCH] Code cleanup --- common/src/main/java/ctbrec/Recording.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/ctbrec/Recording.java b/common/src/main/java/ctbrec/Recording.java index 12d59727..5c7f821d 100644 --- a/common/src/main/java/ctbrec/Recording.java +++ b/common/src/main/java/ctbrec/Recording.java @@ -56,7 +56,7 @@ public class Recording implements Serializable, Callable { WAITING("waiting"), FAILED("failed"); - private String desc; + private final String desc; State(String desc) { this.desc = desc; @@ -123,10 +123,8 @@ public class Recording implements Serializable, Callable { String recordingsDir = Config.getInstance().getSettings().recordingsDir; File recordingsFile = new File(recordingsDir, path); absoluteFile = recordingsFile; - return absoluteFile; - } else { - return absoluteFile; } + return absoluteFile; } public void setAbsoluteFile(File absoluteFile) { @@ -237,15 +235,11 @@ public class Recording implements Serializable, Callable { return true; if (obj == null) return false; - if (!(obj instanceof Recording)) + if (!(obj instanceof Recording other)) return false; - Recording other = (Recording) obj; if (getId() == null) { - if (other.getId() != null) - return false; - } else if (!getId().equals(other.getId())) - return false; - return true; + return other.getId() == null; + } else return getId().equals(other.getId()); } @Override