Changeset 5832 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

Timestamp:

2013-04-07T17:00:16+02:00 (11 years ago)

Author:

stoecker

Message:

i18n update and javadoc fixes

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

@@ -17 +17 @@
 
 /**
- * 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 +142 @@
      * to <code>decision</code>.
      *
-     * @param row  the row
+     * @param row the row
      * @param decision the decision
      */
@@ -155 +155 @@
      * 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)