some name refactoring and cleanup of new image and video base classes

java/com.sap.sse.common/src/com/sap/sse/common/media/AbstractMediaDescriptor.java

@@ -11,7 +11,7 @@ import java.util.HashSet;
  * @author pgtaboada
  *
  */
-public abstract class AbstractMediaMetadata implements MediaMetadata, Serializable {
+public abstract class AbstractMediaDescriptor implements MediaDescriptor, Serializable {
     private static final long serialVersionUID = -6671425870632517274L;
 
     protected String title;
@@ -33,7 +33,7 @@ public abstract class AbstractMediaMetadata implements MediaMetadata, Serializab
      * @param url
      * @param mimeType
      */
-    public AbstractMediaMetadata(URL url, MimeType mimeType, Date createdAtDate) {
+    public AbstractMediaDescriptor(URL url, MimeType mimeType, Date createdAtDate) {
         this.mimeType = mimeType;
         this.url = url;
         this.createdAtDate = createdAtDate;

java/com.sap.sse.common/src/com/sap/sse/common/media/ImageDescriptor.java

@@ -1,6 +1,6 @@
 package com.sap.sse.common.media;
 
-public interface ImageMetadata extends MediaMetadata {
+public interface ImageDescriptor extends MediaDescriptor {
     public int getWidthInPx();
 
     public int getHeightInPx();

java/com.sap.sse.common/src/com/sap/sse/common/media/ImageDescriptorImpl.java

@@ -4,7 +4,7 @@ import java.net.URL;
 import java.util.Date;
 
 
-public class ImageMetadataImpl extends AbstractMediaMetadata {
+public class ImageDescriptorImpl extends AbstractMediaDescriptor implements ImageDescriptor {
     private static final long serialVersionUID = -702731462768602331L;
 
     private int widthInPx;
@@ -14,13 +14,13 @@ public class ImageMetadataImpl extends AbstractMediaMetadata {
      * @param imageURL
      * @param size
      */
-    public ImageMetadataImpl(URL imageURL, ImageSize size, Date createdAtDate) {
+    public ImageDescriptorImpl(URL imageURL, ImageSize size, Date createdAtDate) {
         super(imageURL, MimeType.image, createdAtDate);
         this.widthInPx = size.getWidth();
         this.heightInPx = size.getHeight();
     }
 
-    public ImageMetadataImpl(URL imageURL, int heightInPx, int widthInPx, Date createdAtDate) {
+    public ImageDescriptorImpl(URL imageURL, int heightInPx, int widthInPx, Date createdAtDate) {
         super(imageURL, MimeType.image, createdAtDate);
         this.widthInPx = widthInPx;
         this.heightInPx = heightInPx;

java/com.sap.sse.common/src/com/sap/sse/common/media/MediaDescriptor.java

@@ -6,7 +6,7 @@ import java.util.Date;
 /**
  * A common media interface for all kinds of media like images or videos. 
  */
-public interface MediaMetadata {
+public interface MediaDescriptor {
     public MimeType getMimeType();
 
     public URL getURL();

java/com.sap.sse.common/src/com/sap/sse/common/media/VideoDescriptor.java

@@ -0,0 +1,9 @@
+package com.sap.sse.common.media;
+
+import java.net.URL;
+
+public interface VideoDescriptor extends MediaDescriptor {
+    public int getLengthInSeconds();
+    
+    public URL getThumbnailURL();
+}

java/com.sap.sse.common/src/com/sap/sse/common/media/VideoDescriptorImpl.java

@@ -3,7 +3,7 @@ package com.sap.sse.common.media;
 import java.net.URL;
 import java.util.Date;
 
-public class VideoMetadataImpl extends AbstractMediaMetadata {
+public class VideoDescriptorImpl extends AbstractMediaDescriptor implements VideoDescriptor {
     private static final long serialVersionUID = 2651747912466590862L;
 
     private int lengthInSeconds;
@@ -15,10 +15,11 @@ public class VideoMetadataImpl extends AbstractMediaMetadata {
      */
     private URL thumbnailURL;
     
-    public VideoMetadataImpl(URL url, MimeType mimeType, Date createdAtDate) {
+    public VideoDescriptorImpl(URL url, MimeType mimeType, Date createdAtDate) {
         super(url, mimeType, createdAtDate);
     }
 
+    @Override
     public int getLengthInSeconds() {
         return lengthInSeconds;
     }
@@ -27,6 +28,7 @@ public class VideoMetadataImpl extends AbstractMediaMetadata {
         this.lengthInSeconds = lengthInSeconds;
     }
 
+    @Override
     public URL getThumbnailURL() {
         return thumbnailURL;
     }

java/com.sap.sse.common/src/com/sap/sse/common/media/VideoMetadata.java

@@ -1,7 +0,0 @@
-package com.sap.sse.common.media;
-
-public interface VideoMetadata extends MediaMetadata {
-    public int getLengthInSeconds();
-    
-    public String getThumbnailRef();
-}