eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 10:09:42 +00:00
Code Activity

renamed raceName to raceColumnName where appropriate

Browse Source 
Change-Id: I3fdc09864245543f4b40a1e0a1bdfb8441706e32
This commit is contained in:
Axel Uhl committed 2016-04-20 18:50:09 +02:00
1 parent d416b90b50
commit b39d958fcf
14 files changed
+37 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java
+1 -1
View File
@@ -189,7 +189,7 @@ public enum InMemoryDataStore implements DataStore {
}
private SimpleRaceLogIdentifier convertManagedRaceIdentifierToSimpleRaceLogIdentifier(ManagedRaceIdentifier id) {
return new SimpleRaceLogIdentifierImpl(id.getRaceGroup().getName(), id.getRaceName(), id.getFleet().getName());
return new SimpleRaceLogIdentifierImpl(id.getRaceGroup().getName(), id.getRaceColumnName(), id.getFleet().getName());
}
@Override
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
+3 -3
View File
@@ -202,7 +202,7 @@ public class OnlineDataManager extends DataManager {
ManagedRaceIdentifier identifier = managedRace.getIdentifier();
// no parameter encoding required here; the UrlHelper.generateUrl call uses Url.Builder which handles encoding
String raceGroupName = identifier.getRaceGroup().getName();
String raceColumnName = identifier.getRaceName();
String raceColumnName = identifier.getRaceColumnName();
String fleetName = identifier.getFleet().getName();
List<Util.Pair<String, Object>> params = new ArrayList<>();
@@ -229,7 +229,7 @@ public class OnlineDataManager extends DataManager {
ManagedRaceIdentifier identifier = managedRace.getIdentifier();
String raceGroupName = identifier.getRaceGroup().getName();
String raceColumnName = identifier.getRaceName();
String raceColumnName = identifier.getRaceColumnName();
String fleetName = identifier.getFleet().getName();
List<Util.Pair<String, Object>> params = new ArrayList<>();
@@ -257,7 +257,7 @@ public class OnlineDataManager extends DataManager {
ManagedRaceIdentifier identifier = managedRace.getIdentifier();
String raceGroupName = identifier.getRaceGroup().getName();
String raceColumnName = identifier.getRaceName();
String raceColumnName = identifier.getRaceColumnName();
String fleetName = identifier.getFleet().getName();
List<Util.Pair<String, Object>> params = new ArrayList<>();
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
+2 -2
View File
@@ -71,7 +71,7 @@ public class ManagedRacesDataParser implements DataParser<Collection<ManagedRace
}
}
private ManagedRace createManagedRace(RaceGroup raceGroup, SeriesBase series, Fleet fleet, String name,
private ManagedRace createManagedRace(RaceGroup raceGroup, SeriesBase series, Fleet fleet, String raceColumnName,
RaceLog raceLog, double factor, Double explicitFactor) {
ConfigurationLoader<RegattaConfiguration> configurationLoader = globalConfigurationLoader;
RegattaConfiguration localConfiguration = raceGroup.getRegattaConfiguration();
@@ -79,7 +79,7 @@ public class ManagedRacesDataParser implements DataParser<Collection<ManagedRace
configurationLoader = new MergingRegattaConfigurationLoader(localConfiguration, globalConfigurationLoader);
}
FleetIdentifier fleetIdentifier = new FleetIdentifierImpl(fleet, series, raceGroup);
ManagedRaceIdentifier identifier = new ManagedRaceIdentifierImpl(name, fleetIdentifier);
ManagedRaceIdentifier identifier = new ManagedRaceIdentifierImpl(raceColumnName, fleetIdentifier);
return new ManagedRaceImpl(identifier, new ManagedRaceCalculator(raceLog, author, configurationLoader), factor, explicitFactor);
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/ManagedRace.java
+6
View File
@@ -13,6 +13,12 @@ import com.sap.sse.common.Named;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.WithID;
/**
* A managed race's {@link #getName()} is the race column's name.
*
* @author Axel Uhl (d043530)
*
*/
public interface ManagedRace extends ManagedRaceIdentifier, Named, WithID {
/**
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/ManagedRaceIdentifier.java
+1 -1
View File
@@ -1,5 +1,5 @@
package com.sap.sailing.racecommittee.app.domain;
public interface ManagedRaceIdentifier extends FleetIdentifier {
public String getRaceName();
public String getRaceColumnName();
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceIdentifierImpl.java
+9 -9
View File
@@ -8,28 +8,28 @@ import com.sap.sailing.racecommittee.app.domain.ManagedRaceIdentifier;
public class ManagedRaceIdentifierImpl extends FleetIdentifierImpl implements ManagedRaceIdentifier {
private String raceName;
private String raceColumnName;
public ManagedRaceIdentifierImpl(String raceName, Fleet fleetWithRaceNames, SeriesBase series, RaceGroup raceGroup) {
public ManagedRaceIdentifierImpl(String raceColumnName, Fleet fleetWithRaceNames, SeriesBase series, RaceGroup raceGroup) {
super(fleetWithRaceNames, series, raceGroup);
this.raceName = raceName;
this.raceColumnName = raceColumnName;
}
public ManagedRaceIdentifierImpl(String raceName, FleetIdentifier identifier) {
this(raceName, identifier.getFleet(), identifier.getSeries(), identifier.getRaceGroup());
public ManagedRaceIdentifierImpl(String raceColumnName, FleetIdentifier identifier) {
this(raceColumnName, identifier.getFleet(), identifier.getSeries(), identifier.getRaceGroup());
}
public String getRaceName() {
return raceName;
public String getRaceColumnName() {
return raceColumnName;
}
@Override
public String getId() {
return String.format("%s.%s", super.getId(), escapeIdentifierFragment(getRaceName()));
return String.format("%s.%s", super.getId(), escapeIdentifierFragment(getRaceColumnName()));
}
@Override
public String toString() {
return getRaceName() + " - " + getFleet().getName();
return getRaceColumnName() + " - " + getFleet().getName();
}
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java
+2 -2
View File
@@ -64,11 +64,11 @@ public class ManagedRaceImpl implements ManagedRace {
@Override
public String getName() {
return identifier.getRaceName();
return identifier.getRaceColumnName();
}
@Override
public String getRaceName() {
public String getRaceColumnName() {
return getName();
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
+1 -1
View File
@@ -381,7 +381,7 @@ public class ProtestTimeDialogFragment extends AttachedDialogFragment implements
@Override
public String toString() {
return String.format("%s - %s", group.getDisplayName(true), race.getRaceName());
return String.format("%s - %s", group.getDisplayName(true), race.getRaceColumnName());
}
}
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java
+1 -1
View File
@@ -428,7 +428,7 @@ public class StartTimeFragment extends BaseFragment
if (races.getFleet().getName().equals(fleet.getA())) {
for (ManagedRace race : mGroupHeaders.get(races)) {
if (!getRace().equals(race) && race.getStatus() != RaceLogRaceStatus.FINISHED) {
Util.Pair<String, String> data = new Util.Pair<>(race.getRaceName(), null);
Util.Pair<String, String> data = new Util.Pair<>(race.getRaceColumnName(), null);
int position = mRaceAdapter.add(data);
if (position >= 0) {
if (mRaceId != null) {
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/RaceHelper.java
+5 -5
View File
@@ -36,7 +36,7 @@ public class RaceHelper {
raceName = getRaceGroupName(race);
raceName += getSeriesName(race.getSeries(), delimiter);
raceName += getFleetName(race.getFleet(), delimiter);
raceName += delimiter + race.getRaceName();
raceName += delimiter + race.getRaceColumnName();
}
return raceName;
@@ -51,7 +51,7 @@ public class RaceHelper {
String raceName = "";
if (race != null) {
raceName += race.getRaceName();
raceName += race.getRaceColumnName();
raceName += getFleetName(race.getFleet(), delimiter);
raceName += getSeriesName(race.getSeries(), delimiter);
raceName += delimiter + getRaceGroupName(race);
@@ -69,7 +69,7 @@ public class RaceHelper {
String raceName = "";
if (race != null) {
raceName += race.getRaceName();
raceName += race.getRaceColumnName();
raceName += getFleetName(race.getFleet(), delimiter);
}
@@ -83,7 +83,7 @@ public class RaceHelper {
if (race != null) {
int maxElements = 3;
raceName += race.getRaceName();
raceName += race.getRaceColumnName();
String groupName = getRaceGroupName(race);
String seriesName = getSeriesName(race.getSeries(), delimiter);
@@ -251,7 +251,7 @@ public class RaceHelper {
public static SimpleRaceLogIdentifier getSimpleRaceLogIdentifier(@Nullable ManagedRace race) {
SimpleRaceLogIdentifier identifier = null;
if (race != null) {
identifier = new SimpleRaceLogIdentifierImpl(race.getRaceGroup().getName(), race.getRaceName(), race.getFleet().getName());
identifier = new SimpleRaceLogIdentifierImpl(race.getRaceGroup().getName(), race.getRaceColumnName(), race.getFleet().getName());
}
return identifier;
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/WindHelper.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class WindHelper {
String raceName = raceState.getString("raceName");
boolean matchingLeaderboardName = leaderboardName != null && leaderboardName.equals(triple.getA());
boolean matchingFleetName = fleetName != null && fleetName.equals(triple.getC());
boolean matchingRaceName = raceName != null && raceName.equals(race.getRaceName());
boolean matchingRaceName = raceName != null && raceName.equals(race.getRaceColumnName());
if (matchingLeaderboardName && matchingFleetName && matchingRaceName){
if (raceState.getBoolean("trackedRaceLinked")){
isTracked = true;