aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/list
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/list')
-rw-r--r--main/src/cgeo/geocaching/list/AbstractList.java2
-rw-r--r--main/src/cgeo/geocaching/list/StoredList.java36
2 files changed, 17 insertions, 21 deletions
diff --git a/main/src/cgeo/geocaching/list/AbstractList.java b/main/src/cgeo/geocaching/list/AbstractList.java
index 9b57b3a..5a20b9d 100644
--- a/main/src/cgeo/geocaching/list/AbstractList.java
+++ b/main/src/cgeo/geocaching/list/AbstractList.java
@@ -8,7 +8,7 @@ public abstract class AbstractList {
public final int id;
public final String title;
- private static SparseArray<AbstractList> LISTS = new SparseArray<>();
+ private final static SparseArray<AbstractList> LISTS = new SparseArray<>();
public AbstractList(final int id, final String title) {
this.id = id;
diff --git a/main/src/cgeo/geocaching/list/StoredList.java b/main/src/cgeo/geocaching/list/StoredList.java
index 53632a0..abb6af1 100644
--- a/main/src/cgeo/geocaching/list/StoredList.java
+++ b/main/src/cgeo/geocaching/list/StoredList.java
@@ -24,12 +24,12 @@ import java.util.Comparator;
import java.util.List;
public final class StoredList extends AbstractList {
- public static final int TEMPORARY_LIST_ID = 0;
- public static final StoredList TEMPORARY_LIST = new StoredList(TEMPORARY_LIST_ID, "<temporary>", 0); // Never displayed
+ private static final int TEMPORARY_LIST_ID = 0;
+ public static final StoredList TEMPORARY_LIST = new StoredList(TEMPORARY_LIST_ID, "<temporary>", 0); // Never displayed
public static final int STANDARD_LIST_ID = 1;
private final int count; // this value is only valid as long as the list is not changed by other database operations
- public StoredList(int id, String title, int count) {
+ public StoredList(final int id, final String title, final int count) {
super(id, title);
this.count = count;
}
@@ -48,7 +48,7 @@ public final class StoredList extends AbstractList {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -69,10 +69,6 @@ public final class StoredList extends AbstractList {
res = app.getResources();
}
- public void promptForListSelection(final int titleId, @NonNull final Action1<Integer> runAfterwards) {
- promptForListSelection(titleId, runAfterwards, false, -1);
- }
-
public void promptForListSelection(final int titleId, @NonNull final Action1<Integer> runAfterwards, final boolean onlyConcreteLists, final int exceptListId) {
promptForListSelection(titleId, runAfterwards, onlyConcreteLists, exceptListId, StringUtils.EMPTY);
}
@@ -81,18 +77,18 @@ public final class StoredList extends AbstractList {
final List<AbstractList> lists = getMenuLists(onlyConcreteLists, exceptListId);
final List<CharSequence> listsTitle = new ArrayList<>();
- for (AbstractList list : lists) {
+ for (final AbstractList list : lists) {
listsTitle.add(list.getTitleAndCount());
}
final CharSequence[] items = new CharSequence[listsTitle.size()];
final Activity activity = activityRef.get();
- AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+ final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle(res.getString(titleId));
builder.setItems(listsTitle.toArray(items), new DialogInterface.OnClickListener() {
@Override
- public void onClick(DialogInterface dialogInterface, int itemId) {
+ public void onClick(final DialogInterface dialogInterface, final int itemId) {
final AbstractList list = lists.get(itemId);
if (list == PseudoList.NEW_LIST) {
// create new list on the fly
@@ -106,12 +102,12 @@ public final class StoredList extends AbstractList {
builder.create().show();
}
- public static List<AbstractList> getMenuLists(boolean onlyConcreteLists, int exceptListId) {
+ public static List<AbstractList> getMenuLists(final boolean onlyConcreteLists, final int exceptListId) {
final List<AbstractList> lists = new ArrayList<>();
lists.addAll(getSortedLists());
- if (exceptListId > StoredList.TEMPORARY_LIST_ID) {
- StoredList exceptList = DataStore.getList(exceptListId);
+ if (exceptListId > StoredList.TEMPORARY_LIST.id) {
+ final StoredList exceptList = DataStore.getList(exceptListId);
if (exceptList != null) {
lists.remove(exceptList);
}
@@ -138,7 +134,7 @@ public final class StoredList extends AbstractList {
Collections.sort(lists, new Comparator<StoredList>() {
@Override
- public int compare(StoredList lhs, StoredList rhs) {
+ public int compare(final StoredList lhs, final StoredList rhs) {
// have the standard list at the top
if (lhs.id == STANDARD_LIST_ID) {
return -1;
@@ -153,7 +149,7 @@ public final class StoredList extends AbstractList {
return lists;
}
- public void promptForListCreation(@NonNull final Action1<Integer> runAfterwards, String newListName) {
+ public void promptForListCreation(@NonNull final Action1<Integer> runAfterwards, final String newListName) {
handleListNameInput(newListName, R.string.list_dialog_create_title, R.string.list_dialog_create, new Action1<String>() {
// We need to update the list cache by creating a new StoredList object here.
@@ -177,7 +173,7 @@ public final class StoredList extends AbstractList {
});
}
- private void handleListNameInput(final String defaultValue, int dialogTitle, int buttonTitle, final Action1<String> runnable) {
+ private void handleListNameInput(final String defaultValue, final int dialogTitle, final int buttonTitle, final Action1<String> runnable) {
final Activity activity = activityRef.get();
if (activity == null) {
return;
@@ -187,7 +183,7 @@ public final class StoredList extends AbstractList {
@Override
public void call(final String input) {
// remove whitespaces added by autocompletion of Android keyboard
- String listName = StringUtils.trim(input);
+ final String listName = StringUtils.trim(input);
if (StringUtils.isNotBlank(listName)) {
runnable.call(listName);
}
@@ -225,8 +221,8 @@ public final class StoredList extends AbstractList {
/**
* Return the given list, if it is a concrete list. Return the default list otherwise.
*/
- public static int getConcreteList(int listId) {
- if (listId == PseudoList.ALL_LIST.id || listId == TEMPORARY_LIST_ID || listId == PseudoList.HISTORY_LIST.id) {
+ public static int getConcreteList(final int listId) {
+ if (listId == PseudoList.ALL_LIST.id || listId == TEMPORARY_LIST.id || listId == PseudoList.HISTORY_LIST.id) {
return STANDARD_LIST_ID;
}
return listId;
generated by cgit v1.1 at 2025-11-10 16:36:31 +0000