Index: trunk/src/org/openstreetmap/josm/data/notes/Note.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/notes/Note.java	(revision 12539)
+++ trunk/src/org/openstreetmap/josm/data/notes/Note.java	(revision 12540)
@@ -79,5 +79,8 @@
     }
 
-    /** @return The unique OSM ID of this note */
+    /**
+     * Returns the unique OSM ID of this note.
+     * @return The unique OSM ID of this note
+     */
     public long getId() {
         return id;
@@ -92,10 +95,16 @@
     }
 
-    /** @return The geographic location of the note */
+    /**
+     * Returns the geographic location of the note.
+     * @return The geographic location of the note
+     */
     public LatLon getLatLon() {
         return latLon;
     }
 
-    /** @return Date that this note was submitted */
+    /**
+     * Returns the date at which this note was submitted.
+     * @return Date that this note was submitted
+     */
     public Date getCreatedAt() {
         return DateUtils.cloneDate(createdAt);
@@ -110,5 +119,8 @@
     }
 
-    /** @return Date that this note was closed. Null if it is still open. */
+    /**
+     * Returns the date at which this note was closed.
+     * @return Date that this note was closed. Null if it is still open.
+     */
     public Date getClosedAt() {
         return DateUtils.cloneDate(closedAt);
@@ -123,5 +135,8 @@
     }
 
-    /** @return The open or closed state of this note */
+    /**
+     * Returns the open or closed state of this note.
+     * @return The open or closed state of this note
+     */
     public State getState() {
         return state;
@@ -136,5 +151,8 @@
     }
 
-    /** @return An ordered list of comments associated with this note */
+    /**
+     * Returns the list of comments associated with this note.
+     * @return An ordered list of comments associated with this note
+     */
     public List<NoteComment> getComments() {
         return comments;
Index: trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java	(revision 12539)
+++ trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java	(revision 12540)
@@ -58,20 +58,32 @@
     }
 
-    /** @return Plain text of user's comment */
+    /**
+     * Returns Plain text of user's comment.
+     * @return Plain text of user's comment
+     */
     public String getText() {
         return text;
     }
 
-    /** @return JOSM's User object for the user who made this comment */
+    /**
+     * Returns the user who made this comment.
+     * @return JOSM's User object for the user who made this comment
+     */
     public User getUser() {
         return user;
     }
 
-    /** @return The time at which this comment was created */
+    /**
+     * Returns the time at which this comment was created.
+     * @return The time at which this comment was created
+     */
     public Date getCommentTimestamp() {
         return DateUtils.cloneDate(commentTimestamp);
     }
 
-    /** @return the action associated with this note */
+    /**
+     * Returns the action associated with this note.
+     * @return the action associated with this note
+     */
     public Action getNoteAction() {
         return action;
@@ -86,5 +98,8 @@
     }
 
-    /** @return true if this is a new comment/action and needs to be uploaded to the API */
+    /**
+     * Determines if this is a new comment/action and needs to be uploaded to the API
+     * @return true if this is a new comment/action and needs to be uploaded to the API
+     */
     public boolean isNew() {
         return isNew;
Index: trunk/src/org/openstreetmap/josm/data/osm/NoteData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 12539)
+++ trunk/src/org/openstreetmap/josm/data/osm/NoteData.java	(revision 12540)
@@ -265,5 +265,8 @@
     }
 
-    /** @return The current comparator being used to sort the note list */
+    /**
+     * Returns the current comparator being used to sort the note list.
+     * @return The current comparator being used to sort the note list
+     */
     public Comparator<Note> getCurrentSortMethod() {
         return comparator;
Index: trunk/src/org/openstreetmap/josm/gui/NoteSortDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NoteSortDialog.java	(revision 12539)
+++ trunk/src/org/openstreetmap/josm/gui/NoteSortDialog.java	(revision 12540)
@@ -73,5 +73,8 @@
     }
 
-    /** @return Note comparator that the user has selected */
+    /**
+     * Returns the Note comparator that the user has selected.
+     * @return Note comparator that the user has selected
+     */
     public Comparator<Note> getSelectedComparator() {
         if (dateSort.isSelected()) {