Jens Rommel
3f6700210c
Merge branch 'master' into jens--media-synch
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/MediaTrackYoutubeDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TimeFormatUtil.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/MediaPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelectionDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaSelector.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/AbstractPopupWindow.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/PopupWindowPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubePopupWindow.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/popup/YoutubeWindowPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/DialogBoxExt.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AbstractMediaPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AudioPlayer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
2013-04-19 11:15:35 +02:00
Armin Zamani
b501d1ca6f
Merge branch 'racecommittee_integrated' of
...
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
Jens Rommel
08429d5a92
Turn test bundles to fragments.
...
- Builds with maven, except know local issue with selenium tests on my machine (due to Selenium/Firefox version mismatch)
- domain.test not suitable for a test fragment, since it contains larger parts of integration-tests using many different down-stream bundles.
2013-01-21 15:58:13 +01:00
Axel Uhl
d6b41f05a6
apply a waiting sleep in the NMEA SentenceReader only if the underlying stream is not ready()
2013-01-14 13:11:37 +01:00
Axel Uhl
bb7e39165d
made getInstance() synchronized on SentenceFactory which avoids a race condition during factory initialization
2013-01-08 20:48:42 +01:00
Axel Uhl
544caf2d84
removed accidentally commited files from bin/ directories and added corresponding .gitignore entries
2013-01-08 20:20:19 +01:00
Axel Uhl
b590b8a44e
made stuff public that is required by test cases
2013-01-07 18:15:10 +01:00
Axel Uhl
da7a5022e9
made PositionParser public as well because it's required by the test cases
2013-01-07 14:01:15 +01:00
Axel Uhl
da565bf914
made NMEA parser classes public but hid package in the OSGi manifest except for the test bundle
2013-01-07 13:30:06 +01:00
Axel Uhl
3a60d61d75
extended marineapi for proprietary WIBAT message emitted by SailTimer WindVane
2013-01-07 10:32:55 +01:00
Axel Uhl
d95c025ce0
fetched marineapi-0.5 sources from SVN and put into source bundles net.sf.marineapi[.test]
2013-01-07 09:36:29 +01:00
Jens Rommel
Armin Zamani
Axel Uhl