public final String getCombinedNoteAndUserNote() {
        final String userNote = this.waypoint.getUserNote();
        if (this.waypoint.isUserDefined()) {
            return userNote;
        } else {
            final StringBuilder newNote = new StringBuilder(this.waypoint.getNote());
            if (StringUtils.isNotEmpty(userNote)) {
                newNote.append(LF_SEPARATOR_LF);
                newNote.append(userNote);
            }
            return newNote.toString();
        }
    }
Combine note and user note. Separated with Separator "\n--\n"

@return string with combined note
main/src/main/java/cgeo/geocaching/models/WaypointUserNoteCombiner.java