null annotations in apps, contacts, calendar

2 files changed, 17 insertions, 14 deletions

diff --git a/main/src/cgeo/calendar/CalendarAddon.java b/main/src/cgeo/calendar/CalendarAddon.java
index 8737447..c5bb0a6 100644
--- a/main/src/cgeo/calendar/CalendarAddon.java
+++ b/main/src/cgeo/calendar/CalendarAddon.java
@@ -8,6 +8,7 @@ import cgeo.geocaching.ui.dialog.Dialogs;
 import cgeo.geocaching.utils.ProcessUtils;
 
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jdt.annotation.NonNull;
 
 import android.app.Activity;
 import android.content.DialogInterface;
@@ -27,7 +28,7 @@ public class CalendarAddon {
         return ProcessUtils.isIntentAvailable(ICalendar.INTENT, Uri.parse(ICalendar.URI_SCHEME + "://" + ICalendar.URI_HOST));
     }
 
-    public static void addToCalendarWithIntent(final Activity activity, final Geocache cache) {
+    public static void addToCalendarWithIntent(@NonNull final Activity activity, @NonNull final Geocache cache) {
         final Resources res = activity.getResources();
         if (CalendarAddon.isAvailable()) {
             final Date hiddenDate = cache.getHiddenDate();
@@ -51,7 +52,7 @@ public class CalendarAddon {
                     .append(res.getString(R.string.addon_download_prompt))
                     .toString(), new DialogInterface.OnClickListener() {
                 @Override
-                public void onClick(DialogInterface dialog, int id) {
+                public void onClick(final DialogInterface dialog, final int id) {
                     final Intent intent = new Intent(Intent.ACTION_VIEW);
                     intent.setData(Uri.parse(ICalendar.CALENDAR_ADDON_URI));
                     activity.startActivity(intent);
diff --git a/main/src/cgeo/calendar/ICalendar.java b/main/src/cgeo/calendar/ICalendar.java
index 6ecb6d5..19089f0 100644
--- a/main/src/cgeo/calendar/ICalendar.java
+++ b/main/src/cgeo/calendar/ICalendar.java
@@ -1,19 +1,21 @@
 package cgeo.calendar;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 public interface ICalendar {
-    static final String CALENDAR_ADDON_URI = "market://details?id=cgeo.calendar";
+    @NonNull static final String CALENDAR_ADDON_URI = "market://details?id=cgeo.calendar";
 
-    static final String INTENT = "cgeo.calendar.RESERVE";
+    @NonNull static final String INTENT = "cgeo.calendar.RESERVE";
 
-    static final String URI_SCHEME = "add";
-    static final String URI_HOST = "cgeo.org";
+    @NonNull static final String URI_SCHEME = "add";
+    @NonNull static final String URI_HOST = "cgeo.org";
 
-    static final String PARAM_SHORT_DESC = "shortDesc"; // cache short description
-    static final String PARAM_HIDDEN_DATE = "hiddenDate"; // cache hidden date in milliseconds
-    static final String PARAM_URL = "url"; // cache URL
-    static final String PARAM_NOTE = "note"; // personal note
-    static final String PARAM_NAME = "name"; // cache name
-    static final String PARAM_LOCATION = "location"; // cache location, or empty string
-    static final String PARAM_COORDS = "coords"; // cache coordinates, or empty string
-    static final String PARAM_START_TIME_MINUTES = "time"; // time of start
+    @NonNull static final String PARAM_SHORT_DESC = "shortDesc"; // cache short description
+    @NonNull static final String PARAM_HIDDEN_DATE = "hiddenDate"; // cache hidden date in milliseconds
+    @NonNull static final String PARAM_URL = "url"; // cache URL
+    @NonNull static final String PARAM_NOTE = "note"; // personal note
+    @NonNull static final String PARAM_NAME = "name"; // cache name
+    @NonNull static final String PARAM_LOCATION = "location"; // cache location, or empty string
+    @NonNull static final String PARAM_COORDS = "coords"; // cache coordinates, or empty string
+    @NonNull static final String PARAM_START_TIME_MINUTES = "time"; // time of start
 }