eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-25 06:58:39 +00:00
Code Activity

Merge branch 'master' into bug4811

Browse Source
This commit is contained in:
Axel Uhl
2021-04-28 09:57:48 +02:00
parent 66e742cc50 3029ae98af
commit 5783bcfc5b
55 changed files with 753 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java
+2 -16
View File
@@ -143,25 +143,11 @@ public class MediaTrack implements Serializable, WithQualifiedObjectIdentifier {
}
public boolean beginsAfter(Date date) {
if (date == null) {
return false;
} else if (startTime.asDate().after(date)) {
return true;
} else {
return false;
}
return startTime != null && date != null && startTime.asDate().after(date);
}
public boolean endsBefore(Date date) {
if (date == null) {
return false;
} else if (duration == null) {
return false; //null-duration implies open-ended!
} else if (deriveEndTime().asDate().before(date)) {
return true;
} else {
return false;
}
return date != null && deriveEndTime() != null && deriveEndTime().asDate().before(date);
}
@Override