eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

Merge branch 'master' into gwt25

Browse Source
This commit is contained in:
Axel Uhl
2013-01-09 20:57:44 +01:00
parent dcd27ccd79 5bda9263b9
commit 000f0d448f
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+12 -1
View File
@@ -31,6 +31,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.RunnableFuture;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.servlet.ServletContext;
@@ -2368,7 +2370,16 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
boolean trackWind, boolean correctWindByDeclination, boolean simulateWithStartTimeNow) {
Regatta regatta;
if (regattaIdentifier == null) {
regatta = getService().createRegatta(replayRaceDTO.rsc, replayRaceDTO.boat_class,
String boatClass = replayRaceDTO.boat_class;
for (String genderIndicator : new String[] { "Man", "Woman", "Men", "Women", "M", "W" }) {
Pattern p = Pattern.compile("(( - )|-| )"+genderIndicator+"$");
Matcher m = p.matcher(boatClass.trim());
if (m.find()) {
boatClass = boatClass.trim().substring(0, m.start(1));
break;
}
}
regatta = getService().createRegatta(replayRaceDTO.rsc, boatClass.trim(),
RegattaImpl.getFullName(replayRaceDTO.rsc, replayRaceDTO.boat_class),
Collections.singletonList(new SeriesImpl("Default", /* isMedal */false, Collections
.singletonList(new FleetImpl("Default")), /* race column names */new ArrayList<String>(),