Index: /trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 16656)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 16657)
@@ -489,5 +489,5 @@
      * Builds a default tooltip text for the primitive <code>primitive</code>.
      *
-     * @param primitive the primitmive
+     * @param primitive the primitive
      * @return the tooltip text
      */
@@ -647,5 +647,5 @@
      * Builds a default tooltip text for an HistoryOsmPrimitive <code>primitive</code>.
      *
-     * @param primitive the primitmive
+     * @param primitive the primitive
      * @return the tooltip text
      */
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 16656)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 16657)
@@ -673,5 +673,5 @@
     /**
      * Selects all members which refer to {@link OsmPrimitive}s in the collections
-     * <code>primitmives</code>. Does nothing is primitives is null.
+     * <code>primitives</code>. Does nothing is primitives is null.
      *
      * @param primitives the collection of primitives
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 16656)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 16657)
@@ -74,5 +74,5 @@
 
     /**
-     * two identical nodes, even in id and version. No confict expected.
+     * two identical nodes, even in id and version. No conflict expected.
      *
      * Can happen if data is loaded in two layers and then merged from one layer
Index: /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 16656)
+++ /trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 16657)
@@ -490,5 +490,5 @@
         TimeZone.setDefault(DateUtils.UTC);
 
-        // Force log handers to reacquire reference to (junit's fake) stdout/stderr
+        // Force log handlers to reacquire reference to (junit's fake) stdout/stderr
         for (Handler handler : Logging.getLogger().getHandlers()) {
             if (handler instanceof Logging.ReacquiringConsoleHandler) {
@@ -700,5 +700,5 @@
 
     /**
-     * The junit timeout statement has problems when switchting timezones. This one does not.
+     * The junit timeout statement has problems when switching timezones. This one does not.
      * @author Michael Zangl
      */