Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java	(revision 5831)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java	(revision 5832)
@@ -17,5 +17,5 @@
 
 /**
- * This is the {@link TableModel} used in the tables of the {@link TagMerger}.
+ * This is the {@link javax.swing.table.TableModel} used in the tables of the {@link TagMerger}.
  *
  * The model can {@link #populate(OsmPrimitive, OsmPrimitive)} itself from the conflicts
@@ -142,5 +142,5 @@
      * to <code>decision</code>.
      *
-     * @param row  the row
+     * @param row the row
      * @param decision the decision
      */
@@ -155,8 +155,7 @@
      * to <code>decision</code>.
      *
-     * @param row  the array of row indices
+     * @param rows the array of row indices
      * @param decision the decision
      */
-
     public void decide(int [] rows, MergeDecisionType decision) {
         if (rows == null || rows.length == 0)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 5831)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 5832)
@@ -23,7 +23,5 @@
  * This model manages a list of conflicting relation members.
  *
- * It can be used as {@link TableModel}.
- *
- *
+ * It can be used as {@link javax.swing.table.TableModel}.
  */
 public class RelationMemberConflictResolverModel extends DefaultTableModel {
@@ -251,6 +249,5 @@
      * Builds a collection of commands executing the decisions made in this model.
      *
-     * @param newPrimitive the primitive which members shall refer to if the
-     * decision is {@link RelationMemberConflictDecisionType#REPLACE}
+     * @param newPrimitive the primitive which members shall refer to
      * @return a list of commands
      */
@@ -290,6 +287,5 @@
      * to the decisions managed by this model.
      *
-     * @param newPrimitive the primitive which members shall refer to if the
-     * decision is {@link RelationMemberConflictDecisionType#REPLACE}
+     * @param newPrimitive the primitive which members shall refer to
      *
      * @return the set of relations which have to be modified according
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java	(revision 5831)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java	(revision 5832)
@@ -20,5 +20,5 @@
 /**
  * This is a UI widget for resolving tag conflicts, i.e. differences of the tag values
- * of multiple {@link OsmPrimitive}s.
+ * of multiple {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s.
  *
  *
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java	(revision 5831)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java	(revision 5832)
@@ -32,5 +32,5 @@
 /**
  * This is non-modal dialog, always showing on top, which displays history information
- * about a given {@link OsmPrimitive}.
+ * about a given {@link org.openstreetmap.josm.data.osm.OsmPrimitive}.
  *
  */
Index: trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java	(revision 5831)
+++ trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java	(revision 5832)
@@ -17,5 +17,5 @@
 /**
  * RelationMemberListViewer is a UI component which displays the  list of relation members of two
- * version of a {@link Relation} in a {@link History}.
+ * version of a {@link org.openstreetmap.josm.data.osm.Relation} in a {@link org.openstreetmap.josm.data.osm.history.History}.
  *
  * <ul>
Index: trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java	(revision 5831)
+++ trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java	(revision 5832)
@@ -13,5 +13,5 @@
 /**
  * TagInfoViewer is a UI component which displays the list of tags of two
- * version of a {@link OsmPrimitive} in a {@link History}.
+ * version of a {@link org.openstreetmap.josm.data.osm.OsmPrimitive} in a {@link org.openstreetmap.josm.data.osm.history.History}.
  *
  * <ul>
Index: trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java	(revision 5831)
+++ trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java	(revision 5832)
@@ -14,5 +14,5 @@
 
 /**
- * The {@link TableCellRenderer} for a list of tagsin {@link HistoryBrower}
+ * The {@link TableCellRenderer} for a list of tags in {@link HistoryBrowser}
  *
  */
Index: trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java	(revision 5831)
+++ trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java	(revision 5832)
@@ -8,5 +8,5 @@
 
 /**
- * The {@link TableColumnModel} for the table with the list of tags
+ * The {@link javax.swing.table.TableColumnModel} for the table with the list of tags
  *
  */
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java	(revision 5831)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySpecification.java	(revision 5832)
@@ -4,5 +4,5 @@
 /**
  * An UploadStrategySpecification consists of the parameter describing the strategy
- * for uploading a collection of {@link OsmPrimitive}.
+ * for uploading a collection of {@link org.openstreetmap.josm.data.osm.OsmPrimitive}.
  *
  * This includes:
@@ -12,6 +12,4 @@
  * <li>whether to close the changeset used after the upload</li>
  * </ul>
- *
- *
  */
 public class UploadStrategySpecification  {
@@ -50,5 +48,5 @@
     /**
      * Replies the upload strategy
-     * @return
+     * @return the upload strategy
      */
     public UploadStrategy getStrategy() {
Index: trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java	(revision 5831)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java	(revision 5832)
@@ -22,5 +22,5 @@
 
 /**
- * Reads the history of an {@link OsmPrimitive} from the OSM API server.
+ * Reads the history of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} from the OSM API server.
  *
  */