davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Code cleanup

This commit is contained in:
0xb00bface 2021-12-21 15:58:43 +01:00
parent e0426d7c86
commit 3c145f4924
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/java/ctbrec/Recording.java
View File

@ -56,7 +56,7 @@ public class Recording implements Serializable, Callable<Recording> {
WAITING("waiting"), WAITING("waiting"),
FAILED("failed"); FAILED("failed");
private String desc; private final String desc;
State(String desc) { State(String desc) {
this.desc = desc; this.desc = desc;
@ -123,10 +123,8 @@ public class Recording implements Serializable, Callable<Recording> {
String recordingsDir = Config.getInstance().getSettings().recordingsDir; String recordingsDir = Config.getInstance().getSettings().recordingsDir;
File recordingsFile = new File(recordingsDir, path); File recordingsFile = new File(recordingsDir, path);
absoluteFile = recordingsFile; absoluteFile = recordingsFile;
return absoluteFile;
} else {
return absoluteFile;
} }
return absoluteFile;
} }
public void setAbsoluteFile(File absoluteFile) { public void setAbsoluteFile(File absoluteFile) {
@ -237,15 +235,11 @@ public class Recording implements Serializable, Callable<Recording> {
return true; return true;
if (obj == null) if (obj == null)
return false; return false;
if (!(obj instanceof Recording)) if (!(obj instanceof Recording other))
return false; return false;
Recording other = (Recording) obj;
if (getId() == null) { if (getId() == null) {
if (other.getId() != null) return other.getId() == null;
return false; } else return getId().equals(other.getId());
} else if (!getId().equals(other.getId()))
return false;
return true;
} }
@Override @Override