diff options
author | Samuel Tardieu <sam@rfc1149.net> | 2015-02-16 22:55:46 +0100 |
---|---|---|
committer | Samuel Tardieu <sam@rfc1149.net> | 2015-02-16 22:55:46 +0100 |
commit | 9e4c5b5882ba0c6d0b26fe65718e15ac87a2b555 (patch) | |
tree | 4f8f73982ec0865b42595add1b7c5b5d88b969ff /main/src/cgeo/geocaching/utils | |
parent | 02d7eda64bc7827bc82ddbf969ba537abe542919 (diff) | |
download | cgeo-9e4c5b5882ba0c6d0b26fe65718e15ac87a2b555.zip cgeo-9e4c5b5882ba0c6d0b26fe65718e15ac87a2b555.tar.gz cgeo-9e4c5b5882ba0c6d0b26fe65718e15ac87a2b555.tar.bz2 |
Rename DateUtils into CalendarUtils
cgeo uses android.text.format.DateUtils, having a utility class with the
same name in a different package might be confusing.
Diffstat (limited to 'main/src/cgeo/geocaching/utils')
-rw-r--r-- | main/src/cgeo/geocaching/utils/CalendarUtils.java (renamed from main/src/cgeo/geocaching/utils/DateUtils.java) | 6 | ||||
-rw-r--r-- | main/src/cgeo/geocaching/utils/Formatter.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/utils/DateUtils.java b/main/src/cgeo/geocaching/utils/CalendarUtils.java index dfed110..ed3b18c 100644 --- a/main/src/cgeo/geocaching/utils/DateUtils.java +++ b/main/src/cgeo/geocaching/utils/CalendarUtils.java @@ -5,9 +5,9 @@ import cgeo.geocaching.Geocache; import java.util.Calendar; import java.util.Date; -public final class DateUtils { +public final class CalendarUtils { - private DateUtils() { + private CalendarUtils() { // utility class } @@ -33,7 +33,7 @@ public final class DateUtils { return false; } final Date hiddenDate = cache.getHiddenDate(); - return hiddenDate != null && DateUtils.daysSince(hiddenDate.getTime()) > 0; + return hiddenDate != null && CalendarUtils.daysSince(hiddenDate.getTime()) > 0; } /** diff --git a/main/src/cgeo/geocaching/utils/Formatter.java b/main/src/cgeo/geocaching/utils/Formatter.java index 9b96aae..db649d8 100644 --- a/main/src/cgeo/geocaching/utils/Formatter.java +++ b/main/src/cgeo/geocaching/utils/Formatter.java @@ -89,7 +89,7 @@ public abstract class Formatter { * @return the formatted string */ public static String formatShortDateVerbally(final long date) { - final int diff = cgeo.geocaching.utils.DateUtils.daysSince(date); + final int diff = CalendarUtils.daysSince(date); switch (diff) { case 0: return CgeoApplication.getInstance().getString(R.string.log_today); @@ -194,7 +194,7 @@ public abstract class Formatter { } public static String formatDaysAgo(final long date) { - final int days = cgeo.geocaching.utils.DateUtils.daysSince(date); + final int days = CalendarUtils.daysSince(date); switch (days) { case 0: return CgeoApplication.getInstance().getString(R.string.log_today); |