Merge pull request #359 from gezb/301

Fix for issue #301 - include Apache commons lang library

1 files changed, 9 insertions, 7 deletions

diff --git a/src/cgeo/geocaching/cgWaypoint.java b/src/cgeo/geocaching/cgWaypoint.java
index 7746c2c..6b437f6 100644
--- a/src/cgeo/geocaching/cgWaypoint.java
+++ b/src/cgeo/geocaching/cgWaypoint.java
@@ -2,6 +2,8 @@ package cgeo.geocaching;
 
 import java.util.ArrayList;
 
+import org.apache.commons.lang3.StringUtils;
+
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.widget.TextView;
@@ -32,22 +34,22 @@ public class cgWaypoint {
 	}
 
 	public void merge(final cgWaypoint old) {
-		if (prefix == null || prefix.length() == 0) {
+		if (StringUtils.isBlank(prefix)) {
 			prefix = old.prefix;
 		}
-		if (lookup == null || lookup.length() == 0) {
+		if (StringUtils.isBlank(lookup)) {
 			lookup = old.lookup;
 		}
-		if (name == null || name.length() == 0) {
+		if (StringUtils.isBlank(name)) {
 			name = old.name;
 		}
-		if (latlon == null || latlon.length() == 0) {
+		if (StringUtils.isBlank(latlon)) {
 			latlon = old.latlon;
 		}
-		if (latitudeString == null || latitudeString.length() == 0) {
+		if (StringUtils.isBlank(latitudeString)) {
 			latitudeString = old.latitudeString;
 		}
-		if (longitudeString == null || longitudeString.length() == 0) {
+		if (StringUtils.isBlank(longitudeString)) {
 			longitudeString = old.longitudeString;
 		}
 		if (latitude == null) {
@@ -56,7 +58,7 @@ public class cgWaypoint {
 		if (longitude == null) {
 			longitude = old.longitude;
 		}
-		if (note == null || note.length() == 0) {
+		if (StringUtils.isBlank(note)) {
 			note = old.note;
 		}
 		if (note != null && old.note != null) {