diff options
author | Bananeweizen <bananeweizen@gmx.de> | 2011-10-03 13:47:07 +0200 |
---|---|---|
committer | Bananeweizen <bananeweizen@gmx.de> | 2011-10-03 13:47:07 +0200 |
commit | f52b1f0c1a58978efd5e8478f29484cb1f3b421e (patch) | |
tree | 39080018d83b12407a7df47153431464173e5e19 /main/src/cgeo/geocaching/cgeowaypoint.java | |
parent | e99ed4d71470da9efe59f4b363762d105dbfdc6d (diff) | |
download | cgeo-f52b1f0c1a58978efd5e8478f29484cb1f3b421e.zip cgeo-f52b1f0c1a58978efd5e8478f29484cb1f3b421e.tar.gz cgeo-f52b1f0c1a58978efd5e8478f29484cb1f3b421e.tar.bz2 |
fix #120: make settings static (no singleton)
* Settings can no longer be instantiated, everything is static instead.
* Most option values are no longer cached in fields. This has been done
for clarity during the refactoring. I will add some performance tests
afterwards and may re-introduce those fields for caching the option
values.
Sorry, if anyone gets merge issues afterwards. There was no easier way
to implement this...
Diffstat (limited to 'main/src/cgeo/geocaching/cgeowaypoint.java')
-rw-r--r-- | main/src/cgeo/geocaching/cgeowaypoint.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/cgeowaypoint.java b/main/src/cgeo/geocaching/cgeowaypoint.java index 5f3c7e8..e6ef877 100644 --- a/main/src/cgeo/geocaching/cgeowaypoint.java +++ b/main/src/cgeo/geocaching/cgeowaypoint.java @@ -107,7 +107,7 @@ public class cgeowaypoint extends AbstractActivity { waitDialog.dismiss(); waitDialog = null; } - Log.e(cgSettings.tag, "cgeowaypoint.loadWaypointHandler: " + e.toString()); + Log.e(Settings.tag, "cgeowaypoint.loadWaypointHandler: " + e.toString()); } } @@ -153,7 +153,7 @@ public class cgeowaypoint extends AbstractActivity { } if (geo == null) { - geo = app.startGeo(this, geoUpdate, base, settings, 0, 0); + geo = app.startGeo(this, geoUpdate, base, 0, 0); } waitDialog = ProgressDialog.show(this, null, res.getString(R.string.waypoint_loading), true); @@ -166,10 +166,9 @@ public class cgeowaypoint extends AbstractActivity { public void onResume() { super.onResume(); - settings.load(); if (geo == null) { - geo = app.startGeo(this, geoUpdate, base, settings, 0, 0); + geo = app.startGeo(this, geoUpdate, base, 0, 0); } if (waitDialog == null) { @@ -272,7 +271,7 @@ public class cgeowaypoint extends AbstractActivity { loadWaypointHandler.sendMessage(new Message()); } catch (Exception e) { - Log.e(cgSettings.tag, "cgeowaypoint.loadWaypoint.run: " + e.toString()); + Log.e(Settings.tag, "cgeowaypoint.loadWaypoint.run: " + e.toString()); } } } |