eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-31 00:07:14 +00:00
Code Activity

formatting and whitespace changes only

Browse Source 
Change-Id: I7e6f2c921d3c47d9adbee50eba4df6996b42564e
This commit is contained in:
Axel Uhl committed 2016-04-24 12:13:08 +02:00
1 parent 93cebb0deb
commit 7b145d5b9c
2 files changed
-22
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/ui/fragments/raceinfo/WindFragment.java
-14
View File
@@ -187,14 +187,12 @@ public class WindFragment extends BaseFragment implements CompassDirectionListen
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if (mHeaderWindSensor != null && getRace() != null && getRaceState() != null && getRaceState().getWindFix() != null) {
SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm", getResources().getConfiguration().locale);
Wind wind = getRaceState().getWindFix();
mHeaderWindSensor.setText(getString(R.string.wind_sensor, dateFormat.format(wind.getTimePoint().asDate()), wind.getFrom().getDegrees(), wind
.getKnots()));
}
setupButtons();
setupWindSpeedPicker();
setupLayouts(false);
@@ -236,12 +234,10 @@ public class WindFragment extends BaseFragment implements CompassDirectionListen
mAccuracy.setAccuracy(-1);
}
}
if (!timeOnly) {
mSetData.setEnabled(mCurrentLocation != null);
mSetDataMulti.setEnabled(mCurrentLocation != null);
}
if (mCurrentLocation != null) {
if (!timeOnly) {
double latitude = mCurrentLocation.getLatitude();
@@ -430,25 +426,17 @@ public class WindFragment extends BaseFragment implements CompassDirectionListen
@Override
public void onResume() {
super.onResume();
mRacesByGroup = ((RacingActivity) getActivity()).getRacesByGroup();
mManagedRaces = RaceHelper.getManagedRacesAsList(mRacesByGroup, getRace());
mSelectedRaces = new ArrayList<>();
sendIntent(AppConstants.INTENT_ACTION_TIME_HIDE);
// connect googleApiClient and register position poller
resumeApiClient();
//register receiver to be notified if race is tracked
IntentFilter filter = new IntentFilter(AppConstants.INTENT_ACTION_IS_TRACKING);
LocalBroadcastManager.getInstance(getActivity()).registerReceiver(mReceiver, filter);
// Contact server and ask if race is tracked and map is allowed to show.
WindHelper.isTrackedRace(getActivity(), getRace());
sendIntent(AppConstants.INTENT_ACTION_TIME_HIDE);
}
@@ -462,9 +450,7 @@ public class WindFragment extends BaseFragment implements CompassDirectionListen
saveEntriesInPreferences(wind);
switch (getArguments().getInt(START_MODE, 0)) {
case 1:
// sendIntent(AppConstants.INTENT_ACTION_SHOW_MAIN_CONTENT);
break;
default:
openMainScheduleFragment();
break;
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/RaceHelper.java
-8
View File
@@ -78,29 +78,22 @@ public class RaceHelper {
public static String getShortReverseRaceName(@Nullable ManagedRace race, @Nullable String delimiter, @NonNull ManagedRace race2) {
delimiter = getDefaultDelimiter(delimiter);
String raceName = "";
if (race != null) {
int maxElements = 3;
raceName += race.getRaceName();
String groupName = getRaceGroupName(race);
String seriesName = getSeriesName(race.getSeries(), delimiter);
String fleetName = getFleetName(race.getFleet(), delimiter);
if (groupName.equals(getRaceGroupName(race2))) {
maxElements -= 1;
}
if (maxElements == 2 && seriesName.equals(getSeriesName(race2.getSeries(), delimiter))) {
maxElements -= 1;
}
if (maxElements == 1 && fleetName.equals(getFleetName(race2.getFleet(), delimiter))) {
maxElements -= 1;
}
if (maxElements >= 1) {
raceName += fleetName;
}
@@ -111,7 +104,6 @@ public class RaceHelper {
raceName += delimiter + groupName;
}
}
return raceName;
}