From c5c1593dc03b04da3db7cd171cca827637e415a0 Mon Sep 17 00:00:00 2001 From: Jens Rommel Date: Thu, 15 Nov 2012 19:00:13 +0100 Subject: [PATCH] work commit --- .../gwt/ui/adminconsole/MediaPanel.java | 55 ++++++++++++++++-- .../gwt/ui/adminconsole/MediaTrackDialog.java | 31 +++++++++- .../gwt/ui/adminconsole/TimeFormatUtil.java | 38 ++++++++++++ .../sailing/gwt/ui/client/MediaService.java | 6 +- .../gwt/ui/client/MediaServiceAsync.java | 6 +- .../sailing/gwt/ui/client/StringMessages.java | 2 + .../gwt/ui/client/StringMessages.properties | 3 +- .../ui/client/StringMessages_de.properties | 3 +- .../gwt/ui/server/MediaServiceImpl.java | 58 +++++++++++++++---- .../gwt/ui/shared/media/MediaTrack.java | 15 ++++- 10 files changed, 192 insertions(+), 25 deletions(-) create mode 100644 java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TimeFormatUtil.java diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java index f3a5e0b1a4a..17dcb041acf 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java @@ -1,7 +1,7 @@ package com.sap.sailing.gwt.ui.adminconsole; +import java.util.Collection; import java.util.Comparator; -import java.util.List; import com.google.gwt.cell.client.ActionCell; import com.google.gwt.cell.client.EditTextCell; @@ -38,7 +38,7 @@ import com.sap.sailing.gwt.ui.shared.media.MediaTrack; */ public class MediaPanel extends FlowPanel { - private static final DateTimeFormat TIME_FORMAT = DateTimeFormat.getFormat(PredefinedFormat.HOUR24_MINUTE_SECOND); +// private static final DateTimeFormat TIME_FORMAT = DateTimeFormat.getFormat(PredefinedFormat.HOUR24_MINUTE_SECOND); private static final DateTimeFormat DATETIME_FORMAT = DateTimeFormat.getFormat(PredefinedFormat.DATE_TIME_MEDIUM); // private Calendar calender = new GregorianCalendar(); @@ -80,7 +80,7 @@ public class MediaPanel extends FlowPanel { protected void loadMediaTracks() { mediaTrackListDataProvider.getList().clear(); - mediaService.getAllMediaTracks(new AsyncCallback>() { + mediaService.getAllMediaTracks(new AsyncCallback>() { @Override public void onFailure(Throwable t) { @@ -88,7 +88,7 @@ public class MediaPanel extends FlowPanel { } @Override - public void onSuccess(List allMediaTracks) { + public void onSuccess(Collection allMediaTracks) { mediaTrackListDataProvider.getList().addAll(allMediaTracks); mediaTrackListDataProvider.refresh(); } @@ -255,12 +255,57 @@ public class MediaPanel extends FlowPanel { public void update(int index, MediaTrack mediaTrack, String newStartTime) { // Called when the user changes the value. mediaTrack.startTime = DATETIME_FORMAT.parse(newStartTime); - mediaTrackListDataProvider.refresh(); + mediaService.updateStartTime(mediaTrack, new AsyncCallback() { + + @Override + public void onFailure(Throwable t) { + errorReporter.reportError(t.toString()); + } + + @Override + public void onSuccess(Void allMediaTracks) { + mediaTrackListDataProvider.refresh(); + } + }); } }); mediaTracksTable.addColumn(startTimeColumn, stringMessages.startTime()); mediaTracksTable.setColumnWidth(startTimeColumn, 100, Unit.PCT); + // duration + Column durationColumn = new Column(new EditTextCell()) { + @Override + public String getValue(MediaTrack mediaTrack) { + return TimeFormatUtil.milliSecondsToHrsMinSec(mediaTrack.durationInMillis); + } + }; + durationColumn.setSortable(true); + sortHandler.setComparator(durationColumn, new Comparator() { + public int compare(MediaTrack mediaTrack1, MediaTrack mediaTrack2) { + return Integer.valueOf(mediaTrack1.durationInMillis).compareTo(Integer.valueOf(mediaTrack2.durationInMillis)); + } + }); + durationColumn.setFieldUpdater(new FieldUpdater() { + public void update(int index, MediaTrack mediaTrack, String newDuration) { + // Called when the user changes the value. + mediaTrack.durationInMillis = TimeFormatUtil.hrsMinSecToMilliSeconds(newDuration); + mediaService.updateDuration(mediaTrack, new AsyncCallback() { + + @Override + public void onFailure(Throwable t) { + errorReporter.reportError(t.toString()); + } + + @Override + public void onSuccess(Void allMediaTracks) { + mediaTrackListDataProvider.refresh(); + } + }); + } + }); + mediaTracksTable.addColumn(durationColumn, stringMessages.duration()); + mediaTracksTable.setColumnWidth(durationColumn, 100, Unit.PCT); + // delete action Column deleteActionColumn = new IdentityColumn(new ActionCell("X", new ActionCell.Delegate() { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackDialog.java index 8e1830ebfaa..d8d46307e80 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackDialog.java @@ -2,8 +2,10 @@ package com.sap.sailing.gwt.ui.adminconsole; import java.util.Date; +import com.google.gwt.dom.client.VideoElement; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; +import com.google.gwt.media.client.Video; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.Label; @@ -64,10 +66,37 @@ public class MediaTrackDialog extends DataEntryDialog { String title = nameBox.getValue(); String url = urlBox.getValue(); Date startTime = startTimeBox.getValue(); - MediaTrack result = new MediaTrack(title, url, startTime, mediaType, mediaSubType); + int durationInMillis = getMediaDuration(url, mediaType, mediaSubType); + MediaTrack result = new MediaTrack(title, url, startTime, durationInMillis, mediaType, mediaSubType); return result; } + private int getMediaDuration(String url, MediaType mediaType, MediaSubType mediaSubType) { + if (mediaType != null) { + switch (mediaType) { + case VIDEO: + Video videoControl = Video.createIfSupported(); + if (videoControl != null) { + videoControl.setSrc(url); + VideoElement videoElement = videoControl.getVideoElement(); + double result = videoElement.getDuration(); + videoElement.play(); + + long timeout = System.currentTimeMillis() + 5 * 1000; + while (System.currentTimeMillis() < timeout) { + if (videoElement.getReadyState() > 0) { + return (int) Math.round(videoElement.getDuration() * 1000); + } + } + } + default: + return 0; + } + } else { + return 0; + } + } + @Override protected Widget getAdditionalWidget() { VerticalPanel mainPanel = new VerticalPanel(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TimeFormatUtil.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TimeFormatUtil.java new file mode 100644 index 00000000000..a814ae873f5 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TimeFormatUtil.java @@ -0,0 +1,38 @@ +package com.sap.sailing.gwt.ui.adminconsole; + +import com.google.gwt.i18n.client.NumberFormat; +import com.sap.sailing.gwt.ui.client.NumberFormatterFactory; + +public class TimeFormatUtil { + + private static NumberFormat zeroPaddingNumberFormat_Min = NumberFormatterFactory.getDecimalFormat(2, 0); + private static NumberFormat zeroPaddingNumberFormat_Sec = NumberFormatterFactory.getDecimalFormat(2, 3); + + public static int hrsMinSecToMilliSeconds(String hrsMinSec) { + String[] segements = hrsMinSec.split(":"); + int milliseconds = 0; + switch (segements.length) { + case 3: + String hours = segements[0].trim(); + milliseconds = Integer.valueOf(hours) * 60 * 60 * 1000; + case 2: + String minutes = segements[segements.length - 2].trim(); + milliseconds = milliseconds + Integer.valueOf(minutes) * 60 * 1000; + case 1: + String seconds = segements[segements.length - 1].trim(); + milliseconds = milliseconds + Math.round(Float.valueOf(seconds) * 1000); + } + return milliseconds; + } + + public static String milliSecondsToHrsMinSec(int milliseconds) { + int hours = (milliseconds / (60 * 60 * 1000)); + int rest = (milliseconds % (60 * 60 * 1000)); + int minutes = (rest / (60 * 1000)); + rest = (rest % (60 * 1000)); + double seconds = (double) rest / 1000; + String result = String.valueOf(hours) + ':' + zeroPaddingNumberFormat_Min.format(minutes) + ':' + zeroPaddingNumberFormat_Sec.format(seconds); + return result; + } + +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaService.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaService.java index 43c4231ecec..4e45a335338 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaService.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaService.java @@ -13,10 +13,14 @@ public interface MediaService extends RemoteService { Collection getMediaTracksForRace(RegattaAndRaceIdentifier regattaAndRaceIdentifier); - List getAllMediaTracks(); + Collection getAllMediaTracks(); void addMediaTrack(MediaTrack mediaTrack); void deleteMediaTrack(MediaTrack mediaTrack); + void updateStartTime(MediaTrack mediaTrack); + + void updateDuration(MediaTrack mediaTrack); + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaServiceAsync.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaServiceAsync.java index 440dfe6a19c..29c4930058c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaServiceAsync.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaServiceAsync.java @@ -12,10 +12,14 @@ public interface MediaServiceAsync { void getMediaTracksForRace(RegattaAndRaceIdentifier regattaAndRaceIdentifier, AsyncCallback> callback); - void getAllMediaTracks(AsyncCallback> asyncCallback); + void getAllMediaTracks(AsyncCallback> asyncCallback); void addMediaTrack(MediaTrack mediaTrack, AsyncCallback asyncCallback); void deleteMediaTrack(MediaTrack mediaTrack, AsyncCallback asyncCallback); + void updateStartTime(MediaTrack mediaTrack, AsyncCallback asyncCallback); + + void updateDuration(MediaTrack mediaTrack, AsyncCallback asyncCallback); + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index 24712b7e58a..5a845a6fcc2 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -1,6 +1,7 @@ package com.sap.sailing.gwt.ui.client; import com.google.gwt.i18n.client.Messages; +import com.google.gwt.user.cellview.client.Header; public interface StringMessages extends Messages { String helloWorld(); @@ -404,4 +405,5 @@ public interface StringMessages extends Messages { String mimeType(); String title(); String reallyRemoveMediaTrack(String mediaTrackTitle); + String duration(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index 27bc5f19aeb..ddfd0c801b6 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -403,4 +403,5 @@ mediaPanel=Audio & Video url=URL mimeType=MIME Type title=Title -reallyRemoveMediaTrack=Do you really want to remove media track ''{0}''? \ No newline at end of file +reallyRemoveMediaTrack=Do you really want to remove media track ''{0}''? +duration=Duration (h:mm:ss.ms) \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 0cbc07b58b4..1d44f386535 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -404,4 +404,5 @@ mediaPanel=Audio & Video url=URL mimeType=MIME Type title=Titel -reallyRemoveMediaTrack=Möchten Sie ''{0}'' wirklich entfernen? \ No newline at end of file +reallyRemoveMediaTrack=Möchten Sie ''{0}'' wirklich entfernen? +duration=Dauer (h:mm:ss.ms) \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/MediaServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/MediaServiceImpl.java index 2c4bde6acad..dafc60deae6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/MediaServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/MediaServiceImpl.java @@ -4,44 +4,59 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Date; import java.util.List; -import java.util.logging.Logger; + +import org.osgi.framework.BundleContext; +import org.osgi.util.tracker.ServiceTracker; import com.google.gwt.user.server.rpc.RemoteServiceServlet; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.persistence.media.DBMediaTrack; import com.sap.sailing.domain.persistence.media.MediaDB; import com.sap.sailing.domain.persistence.media.MediaDBFactory; +import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.gwt.ui.client.MediaService; import com.sap.sailing.gwt.ui.shared.media.MediaTrack; import com.sap.sailing.gwt.ui.shared.media.MediaTrack.MediaSubType; import com.sap.sailing.gwt.ui.shared.media.MediaTrack.MediaType; +import com.sap.sailing.server.RacingEventService; public class MediaServiceImpl extends RemoteServiceServlet implements MediaService { - private static final Logger logger = Logger.getLogger(MediaServiceImpl.class.getName()); +// private static final Logger logger = Logger.getLogger(MediaServiceImpl.class.getName()); DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); + private ServiceTracker racingEventServiceTracker; + private static final long serialVersionUID = -8917349579281305977L; public MediaServiceImpl() { super(); + BundleContext context = Activator.getDefault(); + racingEventServiceTracker = new ServiceTracker( + context, RacingEventService.class.getName(), null); + racingEventServiceTracker.open(); } @Override public Collection getMediaTracksForRace(RegattaAndRaceIdentifier regattaAndRaceIdentifier) { - return getAllMediaTracks(); + TrackedRace trackedRace = racingEventServiceTracker.getService().getExistingTrackedRace(regattaAndRaceIdentifier); + if (trackedRace != null) { + Date raceStart = trackedRace.getStartOfTracking().asDate(); + Date raceEnd = trackedRace.getStartOfTracking().asDate(); + return createMediaTracksFromDB(mediaDB().queryOverlappingMediaTracks(raceStart , raceEnd)); + } else { + return Collections.emptyList(); + } } @Override - public List getAllMediaTracks() { + public Collection getAllMediaTracks() { List allDBMediaTracks = mediaDB().loadAllMediaTracks(); - List result = new ArrayList(); - for (DBMediaTrack dbMediaTrack : allDBMediaTracks) { - MediaTrack mediaTrack = createMediaTrackFromDB(dbMediaTrack); - result.add(mediaTrack ); - } + Collection result = createMediaTracksFromDB(allDBMediaTracks); return result; // try { // Date date = dateFormat.parse("2012-09-15 14:42:10 +0100"); @@ -56,16 +71,25 @@ public class MediaServiceImpl extends RemoteServiceServlet implements MediaServi // } } + private Collection createMediaTracksFromDB(Collection allDBMediaTracks) { + Collection result = new ArrayList(); + for (DBMediaTrack dbMediaTrack : allDBMediaTracks) { + MediaTrack mediaTrack = createMediaTrackFromDB(dbMediaTrack); + result.add(mediaTrack ); + } + return result; + } + private MediaTrack createMediaTrackFromDB(DBMediaTrack dbMediaTrack) { MediaType mediaType = MediaType.valueOf(dbMediaTrack.mimeType); MediaSubType mediaSubType = MediaSubType.valueOf(dbMediaTrack.mimeSubType); - MediaTrack mediaTrack = new MediaTrack(dbMediaTrack.title, dbMediaTrack.url, dbMediaTrack.startTime, mediaType, mediaSubType); + MediaTrack mediaTrack = new MediaTrack(dbMediaTrack.dbId, dbMediaTrack.title, dbMediaTrack.url, dbMediaTrack.startTime, dbMediaTrack.durationInMillis, mediaType, mediaSubType); return mediaTrack; } @Override public void addMediaTrack(MediaTrack mediaTrack) { - mediaDB().insertMediaTrack(mediaTrack.title, mediaTrack.url, mediaTrack.startTime, mediaTrack.type.name(), mediaTrack.subType.name()); + mediaDB().insertMediaTrack(mediaTrack.title, mediaTrack.url, mediaTrack.startTime, mediaTrack.durationInMillis, mediaTrack.type.name(), mediaTrack.subType.name()); } private MediaDB mediaDB() { @@ -74,6 +98,16 @@ public class MediaServiceImpl extends RemoteServiceServlet implements MediaServi @Override public void deleteMediaTrack(MediaTrack mediaTrack) { - mediaDB().deleteMediaTrack(mediaTrack.title); + mediaDB().deleteMediaTrack(mediaTrack.dbId); + } + + @Override + public void updateStartTime(MediaTrack mediaTrack) { + mediaDB().updateStartTime(mediaTrack.dbId, mediaTrack.startTime); + } + + @Override + public void updateDuration(MediaTrack mediaTrack) { + mediaDB().updateDuration(mediaTrack.dbId, mediaTrack.durationInMillis); } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/media/MediaTrack.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/media/MediaTrack.java index c436f7c503b..b34842c62d6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/media/MediaTrack.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/media/MediaTrack.java @@ -44,9 +44,11 @@ public class MediaTrack implements IsSerializable { public Date endTime; } + public String dbId; public String title; public String url; public Date startTime; + public int durationInMillis; public MediaType type; public MediaSubType subType; @@ -54,13 +56,20 @@ public class MediaTrack implements IsSerializable { super(); } - public MediaTrack(String title, String url, Date startTime, MediaType type, MediaSubType subType) { + public MediaTrack(String title, String url, Date startTime, int durationInMillis, MediaType mediaType, MediaSubType mediaSubType) { + this(null, title, url, startTime, durationInMillis, mediaType, mediaSubType); + } + + public MediaTrack(String dbId, String title, String url, Date startTime, int durationInMillis, MediaType mediaType, + MediaSubType mediaSubType) { super(); + this.dbId = dbId; this.title = title; this.url = url; this.startTime = startTime; - this.type = type; - this.subType = subType; + this.durationInMillis = durationInMillis; + this.type = mediaType; + this.subType = mediaSubType; } }