added MediaType enum literal case statements for image and unknown;

my impression is that so far, MediaType was primarily for video source identification, not for images; this may be a mismatch

Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaType.java

java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java

@@ -165,58 +165,64 @@ public class DomainFactoryImpl extends SharedDomainFactoryImpl implements Domain
     public TrackedRaceStatisticsDTO createTrackedRaceStatisticsDTO(TrackedRace trackedRace, Leaderboard leaderboard,
             RaceColumn raceColumn, Fleet fleet, Collection<MediaTrack> mediaTracks) {
         TrackedRaceStatisticsDTO statisticsDTO = new TrackedRaceStatisticsDTO();
-        
         // GPS data
         statisticsDTO.hasGPSData = trackedRace.hasGPSData();
-
         Competitor leaderOrWinner = null;
         TimePoint now = MillisecondsTimePoint.now();
         try {
-            if(trackedRace.isLive(now)) {
+            if (trackedRace.isLive(now)) {
                 leaderOrWinner = trackedRace.getOverallLeader(now);
             } else if (trackedRace.getEndOfRace() != null) {
-                for(Competitor competitor: leaderboard.getCompetitorsFromBestToWorst(raceColumn, now)) {
+                for (Competitor competitor : leaderboard.getCompetitorsFromBestToWorst(raceColumn, now)) {
                     Fleet fleetOfCompetitor = raceColumn.getFleetOfCompetitor(competitor);
-                    if(fleetOfCompetitor != null && fleetOfCompetitor.equals(fleet)) {
+                    if (fleetOfCompetitor != null && fleetOfCompetitor.equals(fleet)) {
                         leaderOrWinner = competitor;
                         break;
                     }
                 }
-            }                
+            }
-            if(leaderOrWinner != null) {
+            if (leaderOrWinner != null) {
                 statisticsDTO.hasLeaderOrWinnerData = true;
                 statisticsDTO.leaderOrWinner = convertToCompetitorDTO(leaderOrWinner);
                 GPSFixTrack<Competitor, GPSFixMoving> track = trackedRace.getTrack(leaderOrWinner);
-                if(track != null) {
+                if (track != null) {
                     statisticsDTO.averageGPSDataSampleInterval = track.getAverageIntervalBetweenFixes();
                 }
             }
         } catch (NoWindException e) {
         }
-        
+
         // Measured wind sources data
         statisticsDTO.measuredWindSourcesCount = Util.size(trackedRace.getWindSources(WindSourceType.EXPEDITION));
-        statisticsDTO.hasMeasuredWindData = statisticsDTO.measuredWindSourcesCount > 0; 
+        statisticsDTO.hasMeasuredWindData = statisticsDTO.measuredWindSourcesCount > 0;
 
         // leg progress data
         RaceDefinition race = trackedRace.getRace();
-        if(race.getCourse() != null) {
+        if (race.getCourse() != null) {
             statisticsDTO.hasLegProgressData = true;
             statisticsDTO.totalLegsCount = race.getCourse().getLegs().size();
             statisticsDTO.currentLegNo = trackedRace.getLastLegStarted(MillisecondsTimePoint.now());
         }
-        
+
         // media data
-        if(mediaTracks != null) {
+        if (mediaTracks != null) {
-            for(MediaTrack track: mediaTracks) {
+            for (MediaTrack track : mediaTracks) {
-                switch(track.mimeType.mediaType) {
+                switch (track.mimeType.mediaType) {
                 case audio:
                     statisticsDTO.hasAudioData = true;
-                    statisticsDTO.audioTracksCount = statisticsDTO.audioTracksCount == null ? 1 : statisticsDTO.audioTracksCount++;   
+                    statisticsDTO.audioTracksCount = statisticsDTO.audioTracksCount == null ? 1
+                            : statisticsDTO.audioTracksCount++;
                     break;
                 case video:
                     statisticsDTO.hasVideoData = true;
-                    statisticsDTO.videoTracksCount = statisticsDTO.videoTracksCount == null ? 1 : statisticsDTO.videoTracksCount++;   
+                    statisticsDTO.videoTracksCount = statisticsDTO.videoTracksCount == null ? 1
+                            : statisticsDTO.videoTracksCount++;
+                    break;
+                case image: // TODO should this add to an image count?
+                    break;
+                case unknown: // TODO should this add to an "unknown media" count? Probably not
+                    break;
+                default:
                     break;
                 }
             }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaManagementControl.java

@@ -123,6 +123,12 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem
                     } else {
                         reachableAudioTracks.add(mediaTrack);
                     }
+                case image: // no image media tracks produced by an image
+                    break;
+                case unknown: // we won't overlay an unknown media source
+                    break;
+                default:
+                    break;
                 }
             }
         }
@@ -144,6 +150,12 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem
                     } else {
                         reachableAudioTracks.add(mediaTrack);
                     }
+                case image: // images don't play as video tracks
+                    break;
+                case unknown: // unknown formats won't be played either
+                    break;
+                default:
+                    break;
                 }
             }
         }