Merge remote branch 'stephanme/importwpt'

Conflicts:
	tests/src/cgeo/geocaching/files/GPXImporterTest.java
	tests/src/cgeo/geocaching/files/GPXParserTest.java
	tests/src/cgeo/geocaching/files/LocParserTest.java

1 files changed, 28 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/activity/Progress.java b/main/src/cgeo/geocaching/activity/Progress.java
index 6edf23e..16b7b40 100644
--- a/main/src/cgeo/geocaching/activity/Progress.java
+++ b/main/src/cgeo/geocaching/activity/Progress.java
@@ -27,6 +27,22 @@ public class Progress {
         }
     }
 
+    public synchronized void show(final Context context, final String title, final String message, final int style, final Message cancelMessage) {
+        if (dialog == null) {
+            dialog = new ProgressDialog(context);
+            dialog.setTitle(title);
+            dialog.setMessage(message);
+            dialog.setProgressStyle(style);
+            if (cancelMessage != null) {
+                dialog.setCancelable(true);
+                dialog.setCancelMessage(cancelMessage);
+            } else {
+                dialog.setCancelable(false);
+            }
+            dialog.show();
+        }
+    }
+
     public synchronized void setMessage(final String message) {
         if (dialog != null && dialog.isShowing()) {
             dialog.setMessage(message);
@@ -37,4 +53,16 @@ public class Progress {
         return dialog != null && dialog.isShowing();
     }
 
+    public synchronized void setMaxProgressAndReset(final int max) {
+        if (dialog != null && dialog.isShowing()) {
+            dialog.setMax(max);
+            dialog.setProgress(0);
+        }
+    }
+
+    public synchronized void setProgress(final int progress) {
+        if (dialog != null && dialog.isShowing()) {
+            dialog.setProgress(progress);
+        }
+    }
 }