aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2013-09-13 09:27:40 +0200
committerSamuel Tardieu <sam@rfc1149.net>2013-09-13 09:46:36 +0200
commit48f881c71cb3ea50794c83d9d2ada091fc6c86c2 (patch)
tree26369dcf1e3282e243e3cbdc035fba6273b1eb6b /main
parent15282e600a818c2e4d3b5fc21e8a2d5143d818e5 (diff)
downloadcgeo-48f881c71cb3ea50794c83d9d2ada091fc6c86c2.zip
cgeo-48f881c71cb3ea50794c83d9d2ada091fc6c86c2.tar.gz
cgeo-48f881c71cb3ea50794c83d9d2ada091fc6c86c2.tar.bz2
refactoring: cgeocaches -> CacheListActivity
Diffstat (limited to 'main')
-rw-r--r--main/AndroidManifest.xml2
-rw-r--r--main/src/cgeo/geocaching/AbstractPopupActivity.java2
-rw-r--r--main/src/cgeo/geocaching/AddressListActivity.java2
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java4
-rw-r--r--main/src/cgeo/geocaching/CacheListActivity.java (renamed from main/src/cgeo/geocaching/cgeocaches.java)52
-rw-r--r--main/src/cgeo/geocaching/DataStore.java2
-rw-r--r--main/src/cgeo/geocaching/MainActivity.java8
-rw-r--r--main/src/cgeo/geocaching/NavigateAnyPointActivity.java2
-rw-r--r--main/src/cgeo/geocaching/SearchActivity.java10
-rw-r--r--main/src/cgeo/geocaching/maps/CGeoMap.java4
-rw-r--r--main/src/cgeo/geocaching/ui/AbstractUserClickListener.java6
-rw-r--r--main/src/cgeo/geocaching/ui/AddressListAdapter.java4
12 files changed, 49 insertions, 49 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 2d01358..e0a5598 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -137,7 +137,7 @@
android:configChanges="keyboardHidden|orientation" >
</activity>
<activity
- android:name=".cgeocaches"
+ android:name=".CacheListActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name" >
diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index da4888f..6314003 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -285,7 +285,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
showToast(res.getString(R.string.err_location_unknown));
return;
}
- cgeocaches.startActivityCoordinates(this, coords);
+ CacheListActivity.startActivityCoordinates(this, coords);
finish();
}
diff --git a/main/src/cgeo/geocaching/AddressListActivity.java b/main/src/cgeo/geocaching/AddressListActivity.java
index c984d28..dcccb66 100644
--- a/main/src/cgeo/geocaching/AddressListActivity.java
+++ b/main/src/cgeo/geocaching/AddressListActivity.java
@@ -66,7 +66,7 @@ public class AddressListActivity extends AbstractListActivity {
}
} else {
finish();
- cgeocaches.startActivityAddress(AddressListActivity.this, null, keyword);
+ CacheListActivity.startActivityAddress(AddressListActivity.this, null, keyword);
}
}
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 0497a69..46f73e2 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -519,7 +519,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
case CONTEXT_MENU_WAYPOINT_CACHES_AROUND:
final Waypoint waypointAround = cache.getWaypoint(index);
if (waypointAround != null) {
- cgeocaches.startActivityCoordinates(this, waypointAround.getCoords());
+ CacheListActivity.startActivityCoordinates(this, waypointAround.getCoords());
}
break;
@@ -588,7 +588,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
cache.openInBrowser(this);
return true;
case MENU_CACHES_AROUND:
- cgeocaches.startActivityCoordinates(this, cache.getCoords());
+ CacheListActivity.startActivityCoordinates(this, cache.getCoords());
return true;
case MENU_CALENDAR:
addToCalendarWithIntent();
diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/CacheListActivity.java
index 2c791a4..fb86bb9 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/CacheListActivity.java
@@ -80,7 +80,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-public class cgeocaches extends AbstractListActivity implements FilteredActivity, LoaderManager.LoaderCallbacks<SearchResult> {
+public class CacheListActivity extends AbstractListActivity implements FilteredActivity, LoaderManager.LoaderCallbacks<SearchResult> {
private static final int MAX_LIST_ITEMS = 1000;
private static final int MENU_REFRESH_STORED = 2;
@@ -152,7 +152,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
}
if (app.currentGeo().getSpeed() <= 5) { // use compass when speed is lower than 18 km/h) {
- final float northHeading = DirectionProvider.getDirectionNow(cgeocaches.this, direction);
+ final float northHeading = DirectionProvider.getDirectionNow(CacheListActivity.this, direction);
adapter.setActualHeading(northHeading);
}
}
@@ -211,7 +211,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
setAdapterCurrentCoordinates(false);
} catch (final Exception e) {
showToast(res.getString(R.string.err_detail_cache_find_any));
- Log.e("cgeocaches.loadCachesHandler", e);
+ Log.e("CacheListActivity.loadCachesHandler", e);
hideLoading();
showProgress(false);
@@ -224,7 +224,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
hideLoading();
showProgress(false);
} catch (final Exception e2) {
- Log.e("cgeocaches.loadCachesHandler.2", e2);
+ Log.e("CacheListActivity.loadCachesHandler.2", e2);
}
adapter.setSelectMode(false);
@@ -232,15 +232,15 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
private final Handler loadCachesHandler = new LoadCachesHandler(this);
- private static class LoadCachesHandler extends WeakReferenceHandler<cgeocaches> {
+ private static class LoadCachesHandler extends WeakReferenceHandler<CacheListActivity> {
- protected LoadCachesHandler(cgeocaches activity) {
+ protected LoadCachesHandler(CacheListActivity activity) {
super(activity);
}
@Override
public void handleMessage(Message msg) {
- final cgeocaches activity = getActivity();
+ final CacheListActivity activity = getActivity();
if (activity == null) {
return;
}
@@ -398,7 +398,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
private AbstractSearchLoader currentLoader;
private String newListName = StringUtils.EMPTY;
- public cgeocaches() {
+ public CacheListActivity() {
super(true);
}
@@ -481,7 +481,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
@Override
public void run(Integer listId) {
- new GPXImporter(cgeocaches.this, listId, importGpxAttachementFinishedHandler).importGPX();
+ new GPXImporter(CacheListActivity.this, listId, importGpxAttachementFinishedHandler).importGPX();
switchListById(listId);
}
}, true, 0);
@@ -656,7 +656,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
setMenuItemLabel(menu, MENU_REMOVE_FROM_HISTORY, R.string.cache_remove_from_history, R.string.cache_clear_history);
setMenuItemLabel(menu, MENU_EXPORT, R.string.export, R.string.export);
} catch (final RuntimeException e) {
- Log.e("cgeocaches.onPrepareOptionsMenu", e);
+ Log.e("CacheListActivity.onPrepareOptionsMenu", e);
}
return true;
@@ -832,7 +832,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
try {
adapterInfo = (AdapterContextMenuInfo) info;
} catch (final Exception e) {
- Log.w("cgeocaches.onCreateContextMenu", e);
+ Log.w("CacheListActivity.onCreateContextMenu", e);
}
if (adapterInfo == null || adapterInfo.position >= adapter.getCount()) {
@@ -889,7 +889,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
try {
adapterInfo = (AdapterContextMenuInfo) info;
} catch (final Exception e) {
- Log.w("cgeocaches.onContextItemSelected", e);
+ Log.w("CacheListActivity.onContextItemSelected", e);
}
final Geocache cache = adapterInfo != null ? getCacheFromAdapter(adapterInfo) : null;
@@ -1265,7 +1265,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
Log.i("Waiting for next cache " + delay + " ms");
} catch (final Exception e) {
- Log.e("cgeocaches.LoadDetailsThread.sleep", e);
+ Log.e("CacheListActivity.LoadDetailsThread.sleep", e);
}
}
@@ -1283,7 +1283,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
Log.i(e.getMessage());
return false;
} catch (final Exception e) {
- Log.e("cgeocaches.LoadDetailsThread", e);
+ Log.e("CacheListActivity.LoadDetailsThread", e);
}
last = System.currentTimeMillis();
@@ -1363,7 +1363,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
times = 0;
}
} catch (final InterruptedException e) {
- Log.e("cgeocaches.LoadFromWebThread.sleep", e);
+ Log.e("CacheListActivity.LoadFromWebThread.sleep", e);
}
}
@@ -1378,7 +1378,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
private final boolean removeListAfterwards;
public DropDetailsTask(boolean removeListAfterwards) {
- super(cgeocaches.this, null, res.getString(R.string.caches_drop_progress), true);
+ super(CacheListActivity.this, null, res.getString(R.string.caches_drop_progress), true);
this.removeListAfterwards = removeListAfterwards;
}
@@ -1429,7 +1429,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
showFooterLoadingCaches();
listFooter.setOnClickListener(null);
- getSupportLoaderManager().restartLoader(CacheListLoaderType.NEXT_PAGE.ordinal(), null, cgeocaches.this);
+ getSupportLoaderManager().restartLoader(CacheListLoaderType.NEXT_PAGE.ordinal(), null, CacheListActivity.this);
}
}
@@ -1576,7 +1576,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
}
public static void startActivityOffline(final Context context) {
- final Intent cachesIntent = new Intent(context, cgeocaches.class);
+ final Intent cachesIntent = new Intent(context, CacheListActivity.class);
cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.OFFLINE);
context.startActivity(cachesIntent);
}
@@ -1585,7 +1585,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
if (!isValidUsername(context, userName)) {
return;
}
- final Intent cachesIntent = new Intent(context, cgeocaches.class);
+ final Intent cachesIntent = new Intent(context, CacheListActivity.class);
cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.OWNER);
cachesIntent.putExtra(Intents.EXTRA_USERNAME, userName);
context.startActivity(cachesIntent);
@@ -1603,7 +1603,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
if (!isValidUsername(context, userName)) {
return;
}
- final Intent cachesIntent = new Intent(context, cgeocaches.class);
+ final Intent cachesIntent = new Intent(context, CacheListActivity.class);
cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.USERNAME);
cachesIntent.putExtra(Intents.EXTRA_USERNAME, userName);
context.startActivity(cachesIntent);
@@ -1629,20 +1629,20 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
if (!isValidCoords(context, coordsNow)) {
return;
}
- final Intent cachesIntent = new Intent(context, cgeocaches.class);
+ final Intent cachesIntent = new Intent(context, CacheListActivity.class);
cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.NEAREST);
cachesIntent.putExtra(Intents.EXTRA_COORDS, coordsNow);
context.startActivity(cachesIntent);
}
public static void startActivityHistory(Context context) {
- final Intent cachesIntent = new Intent(context, cgeocaches.class);
+ final Intent cachesIntent = new Intent(context, CacheListActivity.class);
cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.HISTORY);
context.startActivity(cachesIntent);
}
public static void startActivityAddress(final Context context, final Geopoint coords, final String address) {
- final Intent addressIntent = new Intent(context, cgeocaches.class);
+ final Intent addressIntent = new Intent(context, CacheListActivity.class);
addressIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.ADDRESS);
addressIntent.putExtra(Intents.EXTRA_COORDS, coords);
addressIntent.putExtra(Intents.EXTRA_ADDRESS, address);
@@ -1653,7 +1653,7 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
if (!isValidCoords(context, coords)) {
return;
}
- final Intent cachesIntent = new Intent(context, cgeocaches.class);
+ final Intent cachesIntent = new Intent(context, CacheListActivity.class);
cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.COORDINATE);
cachesIntent.putExtra(Intents.EXTRA_COORDS, coords);
context.startActivity(cachesIntent);
@@ -1672,14 +1672,14 @@ public class cgeocaches extends AbstractListActivity implements FilteredActivity
context.showToast(cgeoapplication.getInstance().getString(R.string.warn_no_keyword));
return;
}
- final Intent cachesIntent = new Intent(context, cgeocaches.class);
+ final Intent cachesIntent = new Intent(context, CacheListActivity.class);
cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.KEYWORD);
cachesIntent.putExtra(Intents.EXTRA_KEYWORD, keyword);
context.startActivity(cachesIntent);
}
public static void startActivityMap(final Context context, final SearchResult search) {
- final Intent cachesIntent = new Intent(context, cgeocaches.class);
+ final Intent cachesIntent = new Intent(context, CacheListActivity.class);
cachesIntent.putExtra(Intents.EXTRA_LIST_TYPE, CacheListType.MAP);
cachesIntent.putExtra(Intents.EXTRA_SEARCH, search);
context.startActivity(cachesIntent);
diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java
index 86946a0..d66b471 100644
--- a/main/src/cgeo/geocaching/DataStore.java
+++ b/main/src/cgeo/geocaching/DataStore.java
@@ -2989,7 +2989,7 @@ public class DataStore {
public static Set<String> getCachedMissingFromSearch(final SearchResult searchResult, final Set<Tile> tiles, final IConnector connector, final int maxZoom) {
- // get cached cgeocaches
+ // get cached CacheListActivity
final Set<String> cachedGeocodes = new HashSet<String>();
for (Tile tile : tiles) {
cachedGeocodes.addAll(cacheCache.getInViewport(tile.getViewport(), CacheType.ALL));
diff --git a/main/src/cgeo/geocaching/MainActivity.java b/main/src/cgeo/geocaching/MainActivity.java
index e4955b5..1db0cd4 100644
--- a/main/src/cgeo/geocaching/MainActivity.java
+++ b/main/src/cgeo/geocaching/MainActivity.java
@@ -284,7 +284,7 @@ public class MainActivity extends AbstractActivity {
startActivity(new Intent(this, SettingsActivity.class));
return true;
case R.id.menu_history:
- cgeocaches.startActivityHistory(this);
+ CacheListActivity.startActivityHistory(this);
return true;
case R.id.menu_scan:
startScannerApplication();
@@ -367,7 +367,7 @@ public class MainActivity extends AbstractActivity {
@Override
public void run(final Integer selectedListId) {
Settings.saveLastList(selectedListId);
- cgeocaches.startActivityOffline(MainActivity.this);
+ CacheListActivity.startActivityOffline(MainActivity.this);
}
});
return true;
@@ -568,7 +568,7 @@ public class MainActivity extends AbstractActivity {
}
nearestView.setPressed(true);
- cgeocaches.startActivityNearest(this, app.currentGeo().getCoords());
+ CacheListActivity.startActivityNearest(this, app.currentGeo().getCoords());
}
/**
@@ -577,7 +577,7 @@ public class MainActivity extends AbstractActivity {
*/
public void cgeoFindByOffline(final View v) {
findByOffline.setPressed(true);
- cgeocaches.startActivityOffline(this);
+ CacheListActivity.startActivityOffline(this);
}
/**
diff --git a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
index fa81e73..ddafb51 100644
--- a/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
+++ b/main/src/cgeo/geocaching/NavigateAnyPointActivity.java
@@ -443,7 +443,7 @@ public class NavigateAnyPointActivity extends AbstractActivity {
return;
}
- cgeocaches.startActivityCoordinates(this, coords);
+ CacheListActivity.startActivityCoordinates(this, coords);
finish();
}
diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java
index dc204d0..c6c13cf 100644
--- a/main/src/cgeo/geocaching/SearchActivity.java
+++ b/main/src/cgeo/geocaching/SearchActivity.java
@@ -142,7 +142,7 @@ public class SearchActivity extends AbstractActivity {
}
if (keywordSearch) { // keyword fallback, if desired by caller
- cgeocaches.startActivityKeyword(this, query.trim());
+ CacheListActivity.startActivityKeyword(this, query.trim());
return true;
}
@@ -281,7 +281,7 @@ public class SearchActivity extends AbstractActivity {
}
} else {
try {
- cgeocaches.startActivityCoordinates(this, new Geopoint(StringUtils.trim(latText), StringUtils.trim(lonText)));
+ CacheListActivity.startActivityCoordinates(this, new Geopoint(StringUtils.trim(latText), StringUtils.trim(lonText)));
} catch (final Geopoint.ParseException e) {
showToast(res.getString(e.resource));
}
@@ -305,7 +305,7 @@ public class SearchActivity extends AbstractActivity {
return;
}
- cgeocaches.startActivityKeyword(this, StringUtils.trim(keyText));
+ CacheListActivity.startActivityKeyword(this, StringUtils.trim(keyText));
}
private class FindByAddressListener implements View.OnClickListener {
@@ -344,7 +344,7 @@ public class SearchActivity extends AbstractActivity {
return;
}
- cgeocaches.startActivityUserName(this, StringUtils.trim(usernameText));
+ CacheListActivity.startActivityUserName(this, StringUtils.trim(usernameText));
}
private void findByOwnerFn() {
@@ -359,7 +359,7 @@ public class SearchActivity extends AbstractActivity {
return;
}
- cgeocaches.startActivityOwner(this, StringUtils.trim(usernameText));
+ CacheListActivity.startActivityOwner(this, StringUtils.trim(usernameText));
}
private class FindByGeocodeListener implements View.OnClickListener {
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 2677b33..fcd0a17 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -9,7 +9,7 @@ import cgeo.geocaching.StoredList;
import cgeo.geocaching.Waypoint;
import cgeo.geocaching.DataStore;
import cgeo.geocaching.cgeoapplication;
-import cgeo.geocaching.cgeocaches;
+import cgeo.geocaching.CacheListActivity;
import cgeo.geocaching.activity.ActivityMixin;
import cgeo.geocaching.connector.ConnectorFactory;
import cgeo.geocaching.connector.gc.Login;
@@ -690,7 +690,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
selectMapTheme();
return true;
case R.id.menu_as_list: {
- cgeocaches.startActivityMap(activity, new SearchResult(getGeocodesForCachesInViewport()));
+ CacheListActivity.startActivityMap(activity, new SearchResult(getGeocodesForCachesInViewport()));
return true;
}
case R.id.menu_strategy_fastest: {
diff --git a/main/src/cgeo/geocaching/ui/AbstractUserClickListener.java b/main/src/cgeo/geocaching/ui/AbstractUserClickListener.java
index b717568..f8cfb8a 100644
--- a/main/src/cgeo/geocaching/ui/AbstractUserClickListener.java
+++ b/main/src/cgeo/geocaching/ui/AbstractUserClickListener.java
@@ -1,7 +1,7 @@
package cgeo.geocaching.ui;
import cgeo.geocaching.R;
-import cgeo.geocaching.cgeocaches;
+import cgeo.geocaching.CacheListActivity;
import cgeo.geocaching.activity.AbstractActivity;
import cgeo.geocaching.network.Network;
@@ -53,10 +53,10 @@ abstract class AbstractUserClickListener implements View.OnClickListener {
public void onClick(DialogInterface dialog, int item) {
switch (item) {
case 0:
- cgeocaches.startActivityOwner(context, name.toString());
+ CacheListActivity.startActivityOwner(context, name.toString());
return;
case 1:
- cgeocaches.startActivityUserName(context, name.toString());
+ CacheListActivity.startActivityUserName(context, name.toString());
return;
case 2:
context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.geocaching.com/profile/?u=" + Network.encode(name.toString()))));
diff --git a/main/src/cgeo/geocaching/ui/AddressListAdapter.java b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
index 736c036..c70d123 100644
--- a/main/src/cgeo/geocaching/ui/AddressListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/AddressListAdapter.java
@@ -2,9 +2,9 @@ package cgeo.geocaching.ui;
import butterknife.InjectView;
+import cgeo.geocaching.CacheListActivity;
import cgeo.geocaching.R;
import cgeo.geocaching.cgeoapplication;
-import cgeo.geocaching.cgeocaches;
import cgeo.geocaching.geopoint.Geopoint;
import cgeo.geocaching.geopoint.Units;
@@ -61,7 +61,7 @@ public class AddressListAdapter extends ArrayAdapter<Address> {
@Override
public void onClick(final View v) {
final Activity activity = (Activity) v.getContext();
- cgeocaches.startActivityAddress(activity, new Geopoint(address.getLatitude(), address.getLongitude()), StringUtils.defaultString(address.getAddressLine(0)));
+ CacheListActivity.startActivityAddress(activity, new Geopoint(address.getLatitude(), address.getLongitude()), StringUtils.defaultString(address.getAddressLine(0)));
activity.finish();
}
});