refactoring: code duplication

3 files changed, 47 insertions, 37 deletions

diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index 4ab9af0..60116f9 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -13,13 +13,10 @@ import cgeo.geocaching.geopoint.GeopointFormatter;
 
 import org.apache.commons.lang3.StringUtils;
 
-import android.app.Dialog;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
@@ -28,7 +25,7 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-public class CoordinatesInputDialog extends Dialog {
+public class CoordinatesInputDialog extends NoTitleDialog {
 
     final private AbstractActivity context;
     final private IGeoData geo;
@@ -65,13 +62,6 @@ public class CoordinatesInputDialog extends Dialog {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        try {
-            requestWindowFeature(Window.FEATURE_NO_TITLE);
-            getWindow().setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-        } catch (Exception e) {
-            // nothing
-        }
-
         setContentView(R.layout.coordinatesinput_dialog);
 
         final Spinner spinner = (Spinner) findViewById(R.id.spinnerCoordinateFormats);
@@ -338,7 +328,7 @@ public class CoordinatesInputDialog extends Dialog {
         if (currentFormat == coordInputFormatEnum.Plain) {
             try {
                 gp = new Geopoint(eLat.getText().toString(), eLon.getText().toString());
-            } catch (Geopoint.ParseException e) {
+            } catch (final Geopoint.ParseException e) {
                 if (signalError) {
                     context.showToast(context.getResources().getString(R.string.err_parse_lat_lon));
                 }
@@ -347,20 +337,20 @@ public class CoordinatesInputDialog extends Dialog {
             return true;
         }
 
-        String latDir = bLat.getText().toString();
-        String lonDir = bLon.getText().toString();
-        String latDeg = eLatDeg.getText().toString();
-        String lonDeg = eLonDeg.getText().toString();
-        String latDegFrac = eLatMin.getText().toString();
-        String lonDegFrac = eLonMin.getText().toString();
-        String latMin = eLatMin.getText().toString();
-        String lonMin = eLonMin.getText().toString();
-        String latMinFrac = eLatSec.getText().toString();
-        String lonMinFrac = eLonSec.getText().toString();
-        String latSec = eLatSec.getText().toString();
-        String lonSec = eLonSec.getText().toString();
-        String latSecFrac = eLatSub.getText().toString();
-        String lonSecFrac = eLonSub.getText().toString();
+        final String latDir = bLat.getText().toString();
+        final String lonDir = bLon.getText().toString();
+        final String latDeg = eLatDeg.getText().toString();
+        final String lonDeg = eLonDeg.getText().toString();
+        final String latDegFrac = eLatMin.getText().toString();
+        final String lonDegFrac = eLonMin.getText().toString();
+        final String latMin = eLatMin.getText().toString();
+        final String lonMin = eLonMin.getText().toString();
+        final String latMinFrac = eLatSec.getText().toString();
+        final String lonMinFrac = eLonSec.getText().toString();
+        final String latSec = eLatSec.getText().toString();
+        final String lonSec = eLonSec.getText().toString();
+        final String latSecFrac = eLatSub.getText().toString();
+        final String lonSecFrac = eLonSub.getText().toString();
 
         switch (currentFormat) {
             case Deg:
diff --git a/main/src/cgeo/geocaching/ui/dialog/DateDialog.java b/main/src/cgeo/geocaching/ui/dialog/DateDialog.java
index a9c579c..18f8e2e 100644
--- a/main/src/cgeo/geocaching/ui/dialog/DateDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/DateDialog.java
@@ -3,15 +3,12 @@ package cgeo.geocaching.ui.dialog;
 import cgeo.geocaching.R;
 
 import android.app.Activity;
-import android.app.Dialog;
 import android.os.Bundle;
-import android.view.ViewGroup.LayoutParams;
-import android.view.Window;
 import android.widget.DatePicker;
 
 import java.util.Calendar;
 
-public class DateDialog extends Dialog {
+public class DateDialog extends NoTitleDialog {
 
     public interface DateDialogParent {
         abstract public void setDate(final Calendar date);
@@ -32,13 +29,6 @@ public class DateDialog extends Dialog {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        try {
-            requestWindowFeature(Window.FEATURE_NO_TITLE);
-            getWindow().setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-        } catch (Exception e) {
-            // nothing
-        }
-
         setContentView(R.layout.date);
 
         final DatePicker picker = (DatePicker) findViewById(R.id.picker);
diff --git a/main/src/cgeo/geocaching/ui/dialog/NoTitleDialog.java b/main/src/cgeo/geocaching/ui/dialog/NoTitleDialog.java
new file mode 100644
index 0000000..fc5ebe6
--- /dev/null
+++ b/main/src/cgeo/geocaching/ui/dialog/NoTitleDialog.java
@@ -0,0 +1,30 @@
+package cgeo.geocaching.ui.dialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
+
+public abstract class NoTitleDialog extends Dialog {
+
+    public NoTitleDialog(Context context) {
+        super(context);
+    }
+
+    public NoTitleDialog(Context context, int theme) {
+        super(context, theme);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        try {
+            requestWindowFeature(Window.FEATURE_NO_TITLE);
+            getWindow().setLayout(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+        } catch (final Exception e) {
+            // nothing
+        }
+    }
+}