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

some NPE bug fixes and adaptions

Browse Source
This commit is contained in:
Armin Zamani
2013-06-17 01:59:07 +02:00
parent 6f8a216470
commit 11bcbad070
4 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -23,3 +23,5 @@ sailing_debug0*
.DS_Store
java/com.sap.sailing.simulator/bin/com/sap/sailing/simulator/Simulator.gwt.xml
/mobile/google-play-services_lib/bin/*
/mobile/com.sap.sailing.racecommittee.app/res/values/keys.xml
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/utils/FlagAlphabetInterpretationTemplate.java
+4 -4
View File
@@ -26,18 +26,18 @@ public abstract class FlagAlphabetInterpretationTemplate {
if (upperFlag != null) {
if (upperFlag.equals(Flags.FIRSTSUBSTITUTE)) {
statusText = getTextForFirstSubstituteFlag();
} else if (upperFlag.equals(Flags.AP) && isDisplayed) {
statusText = getTextForAnsweringPennantFlag();
} else if (upperFlag.equals(Flags.AP) && lowerFlag.equals(Flags.ALPHA) && isDisplayed) {
statusText = getTextForAnsweringPennantWithAlphaFlags();
} else if (upperFlag.equals(Flags.AP) && lowerFlag.equals(Flags.HOTEL) && isDisplayed) {
statusText = getTextForAnsweringPennantWithHotelFlags();
} else if (upperFlag.equals(Flags.NOVEMBER) && isDisplayed) {
statusText = getTextForNovemberFlag();
} else if (upperFlag.equals(Flags.AP) && isDisplayed) {
statusText = getTextForAnsweringPennantFlag();
} else if (upperFlag.equals(Flags.NOVEMBER) && lowerFlag.equals(Flags.ALPHA) && isDisplayed) {
statusText = getTextForNovemberWithAlphaFlags();
} else if (upperFlag.equals(Flags.NOVEMBER) && lowerFlag.equals(Flags.HOTEL) && isDisplayed) {
statusText = getTextForNovemberWithHotelFlags();
} else if (upperFlag.equals(Flags.NOVEMBER) && isDisplayed) {
statusText = getTextForNovemberFlag();
}
}
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/coursedata/impl/CourseDataDeserializer.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class CourseDataDeserializer implements JsonDeserializer<CourseBase> {
@Override
public CourseBase deserialize(JSONObject object) throws JsonDeserializationException {
String courseName = object.get(CourseBaseJsonSerializer.FIELD_NAME).toString();
String courseName = (String) object.get(CourseBaseJsonSerializer.FIELD_NAME);
JSONArray jsonWaypoints = (JSONArray) object.get(CourseBaseJsonSerializer.FIELD_WAYPOINTS);
List<Waypoint> waypoints = new ArrayList<Waypoint>();
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/WindActivity.java
+43 -19
View File
@@ -3,9 +3,10 @@ package com.sap.sailing.racecommittee.app.ui.activities;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.location.Criteria;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
@@ -36,10 +37,10 @@ import com.sap.sailing.racecommittee.app.ui.views.CompassView;
import com.sap.sailing.racecommittee.app.ui.views.CompassView.CompassDirectionListener;
public class WindActivity extends BaseActivity implements CompassDirectionListener, LocationListener {
private final static int FIVE_SEC = 5000;
private final static int EVERY_POSITION_CHANGE = 0;
CompassView compassView;
EditText windBearingEditText;
EditText windSpeedEditText;
@@ -64,14 +65,18 @@ public class WindActivity extends BaseActivity implements CompassDirectionListen
longitudeEditText = (EditText) findViewById(R.id.et_position_lon);
windSpeedSeekBar = (SeekBar) findViewById(R.id.seekbar_wind_speed);
sendButton = (Button) findViewById(R.id.btn_wind_send);
locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
if (!locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
buildAlertMessageNoGps();
}
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, FIVE_SEC, EVERY_POSITION_CHANGE, this);
Criteria crit = new Criteria();
crit.setAccuracy(Criteria.ACCURACY_FINE);
String provider = locationManager.getBestProvider(crit, true);
onLocationChanged(locationManager.getLastKnownLocation(provider));
// Criteria crit = new Criteria();
// crit.setAccuracy(Criteria.ACCURACY_FINE);
// String provider = locationManager.getBestProvider(crit, true);
// onLocationChanged(locationManager.getLastKnownLocation(provider));
windSpeedSeekBar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
@@ -111,7 +116,8 @@ public class WindActivity extends BaseActivity implements CompassDirectionListen
}
});
sendButton.setEnabled(false);
windSpeedEditText.setOnFocusChangeListener(new OnFocusChangeListener() {
@Override
@@ -120,18 +126,37 @@ public class WindActivity extends BaseActivity implements CompassDirectionListen
windSpeedSeekBar.setProgress(Double.valueOf(windSpeedEditText.getText().toString()).intValue() * 10);
}
}
});
speedFormat = new DecimalFormat("#0.0");
bearingFormat = new DecimalFormat("###");
double enteredWindSpeed = AppPreferences.getWindSpeed(getBaseContext());
windSpeedSeekBar.setProgress(Double.valueOf(enteredWindSpeed).intValue() * 10);
windSpeedEditText.setText(speedFormat.format(enteredWindSpeed));
windBearingEditText.setText(bearingFormat.format(AppPreferences.getWindBearing(getBaseContext())));
}
private void buildAlertMessageNoGps() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage("Your GPS seems to be disabled, do you want to enable it?")
.setCancelable(false)
.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() {
public void onClick(final DialogInterface dialog, final int id) {
startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
}
})
.setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() {
public void onClick(final DialogInterface dialog, final int id) {
dialog.cancel();
}
});
final AlertDialog alert = builder.create();
alert.show();
}
protected void saveEntriesInPreferences(Wind wind) {
AppPreferences.setWindBearing(getBaseContext(), wind.getBearing().getDegrees());
AppPreferences.setWindSpeed(getBaseContext(), wind.getKnots());
@@ -161,40 +186,39 @@ public class WindActivity extends BaseActivity implements CompassDirectionListen
currentLocation = location;
latitudeEditText.setText(String.valueOf(location.getLatitude()));
longitudeEditText.setText(String.valueOf(location.getLongitude()));
sendButton.setEnabled(true);
}
@Override
public void onProviderDisabled(String provider) {
}
@Override
public void onProviderEnabled(String provider) {
locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, FIVE_SEC, EVERY_POSITION_CHANGE, this);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
}
protected static float round(float unrounded, int precision) {
BigDecimal decimal = new BigDecimal(unrounded);
BigDecimal round = decimal.setScale(precision, BigDecimal.ROUND_UP);
return round.floatValue();
}
private Wind getResultingWindFix() throws NumberFormatException {
if (currentLocation == null || windSpeedEditText.getText().toString().isEmpty() || windBearingEditText.getText().toString().isEmpty()) {
return null;
}
Position currentPosition = new DegreePosition(currentLocation.getLatitude(), currentLocation.getLongitude());
double windSpeed = Double.valueOf(windSpeedEditText.getText().toString().replace(",", "."));
double windBearing = Double.valueOf(windBearingEditText.getText().toString());
Bearing bearing = new DegreeBearingImpl(windBearing);
SpeedWithBearing speedBearing = new KnotSpeedWithBearingImpl(windSpeed, bearing);
return new WindImpl(currentPosition, MillisecondsTimePoint.now(), speedBearing);
}