3 files changed, 39 insertions, 14 deletions
diff --git a/main/src/cgeo/geocaching/cgSelectMapfile.java b/main/src/cgeo/geocaching/cgSelectMapfile.java
index 200ee65..3757c4f 100644
--- a/main/src/cgeo/geocaching/cgSelectMapfile.java
+++ b/main/src/cgeo/geocaching/cgSelectMapfile.java
@@ -1,9 +1,11 @@
 package cgeo.geocaching;
 
 import cgeo.geocaching.files.FileList;
+import cgeo.geocaching.files.IFileSelectionView;
 import cgeo.geocaching.files.LocalStorage;
-import cgeo.geocaching.ui.MapfileListAdapter;
+import cgeo.geocaching.ui.FileSelectionListAdapter;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
@@ -11,7 +13,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-public class cgSelectMapfile extends FileList<MapfileListAdapter> {
+public class cgSelectMapfile extends FileList<FileSelectionListAdapter> implements IFileSelectionView {
 
     public cgSelectMapfile() {
         super("map");
@@ -25,6 +27,7 @@ public class cgSelectMapfile extends FileList<MapfileListAdapter> {
         mapFile = Settings.getMapFile();
     }
 
+    @Override
     public void close() {
 
         Intent intent = new Intent();
@@ -36,8 +39,8 @@ public class cgSelectMapfile extends FileList<MapfileListAdapter> {
     }
 
     @Override
-    protected MapfileListAdapter getAdapter(List<File> files) {
-        return new MapfileListAdapter(this, files);
+    protected FileSelectionListAdapter getAdapter(List<File> files) {
+        return new FileSelectionListAdapter(this, files);
     }
 
     @Override
@@ -56,12 +59,19 @@ public class cgSelectMapfile extends FileList<MapfileListAdapter> {
         setTitle(res.getString(R.string.map_file_select_title));
     }
 
-    public String getCurrentMapfile() {
+    @Override
+    public String getCurrentFile() {
         return mapFile;
     }
 
-    public void setMapfile(String newMapfile) {
-        mapFile = newMapfile;
+    @Override
+    public void setCurrentFile(String newFile) {
+        mapFile = newFile;
+    }
+
+    @Override
+    public Context getContext() {
+        return this;
     }
 
 }
diff --git a/main/src/cgeo/geocaching/files/IFileSelectionView.java b/main/src/cgeo/geocaching/files/IFileSelectionView.java
new file mode 100644
index 0000000..5bbc1b2
--- /dev/null
+++ b/main/src/cgeo/geocaching/files/IFileSelectionView.java
@@ -0,0 +1,15 @@
+package cgeo.geocaching.files;
+
+import android.content.Context;
+
+public interface IFileSelectionView {
+
+    Context getContext();
+
+    String getCurrentFile();
+
+    void setCurrentFile(String string);
+
+    void close();
+
+}
diff --git a/main/src/cgeo/geocaching/ui/MapfileListAdapter.java b/main/src/cgeo/geocaching/ui/FileSelectionListAdapter.java
index f0e0aa8..28f9705 100644
--- a/main/src/cgeo/geocaching/ui/MapfileListAdapter.java
+++ b/main/src/cgeo/geocaching/ui/FileSelectionListAdapter.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching.ui;
 
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgSelectMapfile;
+import cgeo.geocaching.files.IFileSelectionView;
 import cgeo.geocaching.utils.Log;
 
 import android.app.Activity;
@@ -15,13 +15,13 @@ import android.widget.TextView;
 import java.io.File;
 import java.util.List;
 
-public class MapfileListAdapter extends ArrayAdapter<File> {
+public class FileSelectionListAdapter extends ArrayAdapter<File> {
 
-    private cgSelectMapfile parentView;
+    private IFileSelectionView parentView;
     private LayoutInflater inflater;
 
-    public MapfileListAdapter(cgSelectMapfile parentIn, List<File> listIn) {
-        super(parentIn, 0, listIn);
+    public FileSelectionListAdapter(IFileSelectionView parentIn, List<File> listIn) {
+        super(parentIn.getContext(), 0, listIn);
 
         parentView = parentIn;
     }
@@ -54,7 +54,7 @@ public class MapfileListAdapter extends ArrayAdapter<File> {
             holder = (ViewHolder) v.getTag();
         }
 
-        File current = new File(parentView.getCurrentMapfile());
+        File current = new File(parentView.getCurrentFile());
 
         if (file.equals(current)) {
             holder.filename.setTypeface(holder.filename.getTypeface(), Typeface.BOLD);
@@ -81,7 +81,7 @@ public class MapfileListAdapter extends ArrayAdapter<File> {
         // tap on item
         @Override
         public void onClick(View view) {
-            parentView.setMapfile(file.toString());
+            parentView.setCurrentFile(file.toString());
             parentView.close();
         }
     }