Simplify RunnableWithArgument

The current implementation was gratuisiously complicated. A simple
run method with argument does the job, as there is no need for
it to implement the Runnable interface.

2 files changed, 9 insertions, 20 deletions

diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java
index bf22ffb..b8eaed4 100644
--- a/main/src/cgeo/geocaching/cgeocaches.java
+++ b/main/src/cgeo/geocaching/cgeocaches.java
@@ -2398,8 +2398,8 @@ public class cgeocaches extends AbstractListActivity {
                     createList(new RunnableWithArgument<Integer>() {
 
                         @Override
-                        public void run() {
-                            switchListById(getArgument());
+                        public void run(final Integer arg) {
+                            switchListById(arg);
                         }
                     });
                 }
@@ -2481,8 +2481,7 @@ public class cgeocaches extends AbstractListActivity {
                 // remove whitespaces added by autocompletion of Android keyboard
                 String listName = StringUtils.trim(input.getText().toString());
                 if (StringUtils.isNotBlank(listName)) {
-                    runnable.setArgument(listName);
-                    runnable.run();
+                    runnable.run(listName);
                 }
             }
         });
@@ -2499,15 +2498,13 @@ public class cgeocaches extends AbstractListActivity {
         handleListNameInput("", R.string.list_dialog_create_title, R.string.list_dialog_create, new RunnableWithArgument<String>() {
 
             @Override
-            public void run() {
-                String listName = getArgument();
-                int newId = app.createList(listName);
+            public void run(final String listName) {
+                final int newId = app.createList(listName);
 
                 if (newId >= 10) {
                     showToast(res.getString(R.string.list_dialog_create_ok));
                     if (runAfterwards != null) {
-                        runAfterwards.setArgument(newId);
-                        runAfterwards.run();
+                        runAfterwards.run(newId);
                     }
                 } else {
                     showToast(res.getString(R.string.list_dialog_create_err));
@@ -2521,8 +2518,7 @@ public class cgeocaches extends AbstractListActivity {
         handleListNameInput(list.title, R.string.list_dialog_rename_title, R.string.list_dialog_rename, new RunnableWithArgument<String>() {
 
             @Override
-            public void run() {
-                String listName = getArgument();
+            public void run(final String listName) {
                 app.renameList(listId, listName);
                 refreshCurrentList();
             }
diff --git a/main/src/cgeo/geocaching/utils/RunnableWithArgument.java b/main/src/cgeo/geocaching/utils/RunnableWithArgument.java
index 14cdcdf..6137efd 100644
--- a/main/src/cgeo/geocaching/utils/RunnableWithArgument.java
+++ b/main/src/cgeo/geocaching/utils/RunnableWithArgument.java
@@ -1,14 +1,7 @@
 package cgeo.geocaching.utils;
 
-public abstract class RunnableWithArgument<T> implements Runnable {
+public interface RunnableWithArgument<T> {
 
-    private T argument;
+    abstract void run(final T argument);
 
-    public void setArgument(final T argument) {
-        this.argument = argument;
-    }
-
-    public T getArgument() {
-        return argument;
-    }
 }