diff options
author | Bananeweizen <bananeweizen@gmx.de> | 2014-05-20 20:44:13 +0200 |
---|---|---|
committer | Bananeweizen <bananeweizen@gmx.de> | 2014-05-20 20:44:13 +0200 |
commit | c664b8d4af8968911671258d9eda644692ec2769 (patch) | |
tree | e4c9d7de3cfa60415c49937ffc2f49168fc9335c | |
parent | bec64dc776e33094f399c188e5a4a299801e45b0 (diff) | |
download | cgeo-c664b8d4af8968911671258d9eda644692ec2769.zip cgeo-c664b8d4af8968911671258d9eda644692ec2769.tar.gz cgeo-c664b8d4af8968911671258d9eda644692ec2769.tar.bz2 |
fix compile errors
6 files changed, 4 insertions, 11 deletions
diff --git a/main/src/cgeo/geocaching/LogCacheActivity.java b/main/src/cgeo/geocaching/LogCacheActivity.java index 64fe429..0a9d804 100644 --- a/main/src/cgeo/geocaching/LogCacheActivity.java +++ b/main/src/cgeo/geocaching/LogCacheActivity.java @@ -25,7 +25,6 @@ import org.apache.commons.lang3.StringUtils; import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; -import android.app.Dialog; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; diff --git a/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java b/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java index ff9a165..eb56f0b 100644 --- a/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java +++ b/main/src/cgeo/geocaching/network/OAuthAuthorizationActivity.java @@ -4,7 +4,6 @@ import butterknife.InjectView; import cgeo.geocaching.Intents; import cgeo.geocaching.R; -import cgeo.geocaching.activity.AbstractActionBarActivity; import cgeo.geocaching.activity.AbstractActivity; import cgeo.geocaching.utils.BundleUtils; import cgeo.geocaching.utils.Log; diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java index b4d1292..84d4466 100644 --- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java +++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java @@ -3,7 +3,6 @@ package cgeo.geocaching.ui.dialog; import cgeo.geocaching.Geocache; import cgeo.geocaching.R; import cgeo.geocaching.activity.AbstractActivity; -import cgeo.geocaching.activity.ActivityMixin; import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.geopoint.GeopointFormatter; import cgeo.geocaching.sensors.IGeoData; @@ -12,9 +11,7 @@ import cgeo.geocaching.settings.Settings.CoordInputFormatEnum; import cgeo.geocaching.utils.EditUtils; import org.apache.commons.lang3.StringUtils; -import org.eclipse.jdt.annotation.NonNull; -import android.app.Dialog; import android.os.Bundle; import android.support.v4.app.DialogFragment; import android.text.Editable; @@ -30,8 +27,6 @@ import android.widget.EditText; import android.widget.Spinner; import android.widget.TextView; -import java.lang.ref.WeakReference; - public class CoordinatesInputDialog extends DialogFragment { final private IGeoData geo; diff --git a/tests/src/cgeo/geocaching/TrackableTest.java b/tests/src/cgeo/geocaching/TrackableTest.java index 2d9c773..a2d6471 100644 --- a/tests/src/cgeo/geocaching/TrackableTest.java +++ b/tests/src/cgeo/geocaching/TrackableTest.java @@ -19,12 +19,12 @@ public class TrackableTest extends AndroidTestCase { public static void testTrackableUrl() { final Trackable trackable = createTrackable("TB1234"); - assertThat(trackable.getUrl()).isEqualTo("http://www.geocaching.com//track/details.aspx?tracker=TB1234"); + assertThat(trackable.getBrowserUrl()).isEqualTo("http://www.geocaching.com//track/details.aspx?tracker=TB1234"); } public static void testGeokretUrl() { Trackable geokret = createTrackable("GK82A2"); - assertThat(geokret.getUrl()).isEqualTo("http://geokrety.org/konkret.php?id=33442"); + assertThat(geokret.getBrowserUrl()).isEqualTo("http://geokrety.org/konkret.php?id=33442"); } public static void testLoggable() { diff --git a/tests/src/cgeo/geocaching/connector/trackable/TravelBugConnectorTest.java b/tests/src/cgeo/geocaching/connector/trackable/TravelBugConnectorTest.java index 8d80822..93b79c5 100644 --- a/tests/src/cgeo/geocaching/connector/trackable/TravelBugConnectorTest.java +++ b/tests/src/cgeo/geocaching/connector/trackable/TravelBugConnectorTest.java @@ -22,7 +22,7 @@ public class TravelBugConnectorTest extends TestCase { public static void testGetUrl() { final Trackable trackable = new Trackable(); trackable.setGeocode("TB2345"); - assertThat(getConnector().getUrl(trackable)).isEqualTo("http://www.geocaching.com//track/details.aspx?tracker=TB2345"); + assertThat(getConnector().getBrowserUrl(trackable)).isEqualTo("http://www.geocaching.com//track/details.aspx?tracker=TB2345"); } public static void testOnlineSearchBySecretCode() { diff --git a/tests/src/cgeo/geocaching/files/GPXParserTest.java b/tests/src/cgeo/geocaching/files/GPXParserTest.java index 08e2662..0f85109 100644 --- a/tests/src/cgeo/geocaching/files/GPXParserTest.java +++ b/tests/src/cgeo/geocaching/files/GPXParserTest.java @@ -320,7 +320,7 @@ public class GPXParserTest extends AbstractResourceInstrumentationTestCase { assertThat(waymark).isNotNull(); assertThat(waymark.getGeocode()).isEqualTo("WM7BM7"); assertThat(waymark.getName()).isEqualTo("Roman water pipe Kornwestheim"); - assertThat(StringUtils.isNotBlank(waymark.getUrl())).isTrue(); // connector must be able to create it + assertThat(StringUtils.isNotBlank(waymark.getBrowserUrl())).isTrue(); // connector must be able to create it assertThat(waymark.getType()).isEqualTo(CacheType.UNKNOWN); assertThat(waymark.getSize()).isEqualTo(CacheSize.UNKNOWN); } |