Merge remote-tracking branch 'server/master'

java/com.sap.sailing.domain.common/META-INF/MANIFEST.MF

@@ -9,6 +9,7 @@ Bundle-ActivationPolicy: lazy
 Export-Package: com.sap.sailing.domain.common,
  com.sap.sailing.domain.common.filter,
  com.sap.sailing.domain.common.impl,
+ com.sap.sailing.domain.common.media,
  com.sap.sailing.domain.common.quadtree,
  com.sap.sailing.domain.common.quadtree.impl;x-friends:="com.sap.sailing.domain.test",
  com.sap.sailing.domain.common.racelog,

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaTrack.java

@@ -0,0 +1,138 @@
+package com.sap.sailing.domain.common.media;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * See http://my.opera.com/core/blog/2010/03/03/everything-you-need-to-know-about-html5-video-and-audio-2
+ * @author D047974
+ *
+ */
+public class MediaTrack implements Serializable {
+    
+    private static final long serialVersionUID = 1L;
+
+    public enum MimeType {
+        
+        mp4(MediaType.video, MediaSubType.mp4), ogv(MediaType.video, MediaSubType.ogg), qt(MediaType.video, MediaSubType.quicktime), mp3(MediaType.audio, MediaSubType.mpeg), ogg(MediaType.audio, MediaSubType.ogg), aac(MediaType.audio, MediaSubType.aac), webm(MediaType.video, MediaSubType.webm), youtube(MediaType.video, MediaSubType.youtube);
+        
+        public final MediaType mediaType;
+        public final MediaSubType mediaSubType;
+        
+        MimeType(MediaType mediaType, MediaSubType mediaSubType) {
+            this.mediaType = mediaType;
+            this.mediaSubType = mediaSubType;            
+        }
+        
+        @Override
+        public String toString() {
+            return mediaType.name() + '/' + mediaSubType.toString();
+        }
+    }
+    
+    public enum MediaType {
+        audio, video;
+    }
+
+    public enum MediaSubType {
+        ogg, mp4, mpeg, x_aiff, quicktime, aac, webm, youtube;
+        
+        public String toString() {
+            return name().replace('_', '-');
+        };
+        
+    }
+    
+    public enum Status {
+        UNDEFINED('?'), CANNOT_PLAY('-'), NOT_REACHABLE('#'), REACHABLE('+');
+        
+        private final char symbol;
+        
+        private Status(char symbol) {
+            this.symbol = symbol;
+        }
+        
+        public String toString() {
+            return String.valueOf(this.symbol); 
+        }
+    }
+
+    public String dbId;
+    public String title;
+    public String url;
+    public Date startTime;
+    public int durationInMillis;
+    public MimeType mimeType;
+    public Status status = Status.UNDEFINED;
+
+    public MediaTrack() {
+    }
+    
+    public MediaTrack(String title, String url, Date startTime, int durationInMillis, MimeType mimeType) {
+        this.title = title;
+        this.url = url;
+        this.startTime = startTime;
+        this.durationInMillis = durationInMillis;
+        this.mimeType = mimeType;
+    }
+    
+    public MediaTrack(String dbId, String title, String url, Date startTime, int durationInMillis, MimeType mimeType) {
+        this.dbId = dbId;
+        this.title = title;
+        this.url = url;
+        this.startTime = startTime;
+        this.durationInMillis = durationInMillis;
+        this.mimeType = mimeType;
+    }
+    
+    public String toString() {
+        return title + " - " + url + " [" + typeToString() + ']' + startTime + " [" + durationInMillis + status + ']';  
+    }
+    
+    public Date deriveEndTime() {
+        if (startTime != null) {
+            return new Date(startTime.getTime() + durationInMillis);
+        } else {
+            return null;
+        }
+    }
+
+    public String typeToString() {
+        return mimeType == null ? "undefined" : mimeType.toString();
+    }
+    
+    public boolean isYoutube() {
+        return (mimeType != null) && MediaSubType.youtube.equals(mimeType.mediaSubType);
+    }
+    
+    /**
+     * Checks for overlap of this start time and duration with the given startTime and endTime, excluding boundaries!
+     * Behaviour for given endTime being earlier than given startTime is not specified.
+     * endTime being null represents "open end". Open beginning is not allow, though!
+     * @param startTime Must not be null.
+     * @param endTime May be null representing "open end".
+     */
+    public boolean overlapsWith(Date startTime, Date endTime) {
+        if (this.startTime == null) {
+            return false;
+        } else {
+            return this.deriveEndTime().getTime() > startTime.getTime() && (endTime == null || this.startTime.getTime() < endTime.getTime());
+        }
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof MediaTrack) {
+            MediaTrack mediaTrack = (MediaTrack) obj;
+            return this.dbId == null? mediaTrack.dbId == null : this.dbId.equals(mediaTrack.dbId);
+        } else {
+            return false;
+        }
+    }
+    
+    @Override
+    public int hashCode() {
+        return this.dbId == null ? 0 : this.dbId.hashCode();
+    }
+
+}

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaUtil.java

@@ -0,0 +1,27 @@
+package com.sap.sailing.domain.common.media;
+
+import java.util.Date;
+
+public class MediaUtil {
+
+    public static int compareDatesAllowingNull(Date date1, Date date2) {
+        if (date1 == null) {
+            return date2 == null ? 0 : -1;
+        } else if (date2 == null) {
+            return 1;
+        } else {
+            return date1.compareTo(date2);
+        }
+    }
+
+    public static boolean equalsDatesAllowingNull(Date date1, Date date2) {
+        if (date1 == null) {
+            return date2 == null;
+        } else if (date2 == null) {
+            return false;
+        } else {
+            return date1.equals(date2);
+        }
+    }
+
+}