fix #2937: Merging of personal note not OK

2 files changed, 5 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 9649f5f..9a7d013 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -1138,7 +1138,7 @@ public class Geocache implements ICache, IWaypoint {
     }
 
     public void setPersonalNote(String personalNote) {
-        this.personalNote = personalNote;
+        this.personalNote = StringUtils.trimToNull(personalNote);
     }
 
     public void setDisabled(boolean disabled) {
diff --git a/main/src/cgeo/geocaching/PersonalNote.java b/main/src/cgeo/geocaching/PersonalNote.java
index 3a0f177..2ae5812 100644
--- a/main/src/cgeo/geocaching/PersonalNote.java
+++ b/main/src/cgeo/geocaching/PersonalNote.java
@@ -34,7 +34,7 @@ public class PersonalNote {
         this.isOffline = cache.isOffline();
     }
 
-    public PersonalNote mergeWith(final PersonalNote other) {
+    public final PersonalNote mergeWith(final PersonalNote other) {
         if (StringUtils.isEmpty(cgeoNote) && StringUtils.isEmpty(other.cgeoNote)) {
             return mergeOnlyProviderNotes(other);
         }
@@ -92,7 +92,7 @@ public class PersonalNote {
     }
 
     @Override
-    public String toString() {
+    public final String toString() {
         final StringBuffer buffer = new StringBuffer();
         if (cgeoNote != null) {
             buffer.append(MERGED_PREFIX).append(cgeoNote).append("\n").append(SEPARATOR);
@@ -101,11 +101,11 @@ public class PersonalNote {
         return buffer.toString();
     }
 
-    public String getCgeoNote() {
+    public final String getCgeoNote() {
         return cgeoNote;
     }
 
-    public String getProviderNote() {
+    public final String getProviderNote() {
         return providerNote;
     }