From 540c45191c819d5498a1075d7f38e0ed6501850e Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 15 Apr 2014 12:12:02 +0200
Subject: Help FindBugs another way

---
 main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'main/src')

diff --git a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
index d6ce598..b2ce11a 100644
--- a/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
+++ b/main/src/cgeo/geocaching/ui/dialog/CoordinatesInputDialog.java
@@ -359,11 +359,11 @@ public class CoordinatesInputDialog extends NoTitleDialog {
                         current = new Geopoint(latDir, latDeg, latMin, latSec, latSecFrac, lonDir, lonDeg, lonMin, lonSec, lonSecFrac);
                         break;
                     case Plain:
-                        // This case has been handled above. Help FindBugs by asserting that current cannot be null even here
-                        assert current != null;
+                        // This case has been handled above
                 }
             }
-            if (current.isValid()) {
+            // The null check is necessary to keep FindBugs happy
+            if (current != null && current.isValid()) {
                 gp = current;
                 return true;
             }
-- 
cgit v1.1