Index: trunk/test/unit/org/openstreetmap/josm/data/osm/TagCollectionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/TagCollectionTest.java	(revision 14300)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/TagCollectionTest.java	(revision 14302)
@@ -44,8 +44,8 @@
 
     private void assertTagCounts(TagCollection collection, int a, int b, int c, int d) {
-        assertEquals(a, collection.getTagOccurence(tagA));
-        assertEquals(b, collection.getTagOccurence(tagB));
-        assertEquals(c, collection.getTagOccurence(tagC));
-        assertEquals(d, collection.getTagOccurence(tagD));
+        assertEquals(a, collection.getTagOccurrence(tagA));
+        assertEquals(b, collection.getTagOccurrence(tagB));
+        assertEquals(c, collection.getTagOccurrence(tagC));
+        assertEquals(d, collection.getTagOccurrence(tagD));
     }
 
@@ -92,5 +92,5 @@
     public void testUnionOfAllPrimitivesCollectionOfQextendsTagged() {
         TagCollection c = TagCollection.unionOfAllPrimitives(Arrays.asList(tagA));
-        assertEquals(1, c.getTagOccurence(tagA));
+        assertEquals(1, c.getTagOccurrence(tagA));
 
         TagCollection d = TagCollection.unionOfAllPrimitives(Arrays.asList(tagA, tagC));
@@ -187,8 +187,8 @@
     public void testGetTagCount() {
         TagCollection c = new TagCollection(Arrays.asList(tagA, tagC, tagC));
-        assertEquals(2, c.getTagOccurence(tagC));
-        assertEquals(0, c.getTagOccurence(tagB));
-        assertEquals(0, c.getTagOccurence(tagNullKey));
-        assertEquals(0, c.getTagOccurence(tagNullValue));
+        assertEquals(2, c.getTagOccurrence(tagC));
+        assertEquals(0, c.getTagOccurrence(tagB));
+        assertEquals(0, c.getTagOccurrence(tagNullKey));
+        assertEquals(0, c.getTagOccurrence(tagNullValue));
     }
 
@@ -415,5 +415,5 @@
         TagCollection collection = d.getTagsFor("k");
         assertTagCounts(collection, 1, 1, 0, 0);
-        assertEquals(1, collection.getTagOccurence(tagEmpty));
+        assertEquals(1, collection.getTagOccurrence(tagEmpty));
     }
 
@@ -426,5 +426,5 @@
         TagCollection collection = d.getTagsFor(Arrays.asList("k", "k2"));
         assertTagCounts(collection, 1, 1, 1, 0);
-        assertEquals(1, collection.getTagOccurence(tagEmpty));
+        assertEquals(1, collection.getTagOccurrence(tagEmpty));
     }
 
@@ -628,6 +628,6 @@
         TagCollection c = c1.intersect(c2);
         assertEquals(2, c.getKeys().size());
-        assertEquals(1, c.getTagOccurence(tagA));
-        assertEquals(1, c.getTagOccurence(tagD));
+        assertEquals(1, c.getTagOccurrence(tagA));
+        assertEquals(1, c.getTagOccurrence(tagD));
     }
 
@@ -641,6 +641,6 @@
         TagCollection c = c1.minus(c2);
         assertEquals(2, c.getKeys().size());
-        assertEquals(1, c.getTagOccurence(tagC));
-        assertEquals(1, c.getTagOccurence(tagEmpty));
+        assertEquals(1, c.getTagOccurrence(tagC));
+        assertEquals(1, c.getTagOccurrence(tagEmpty));
     }
 
@@ -653,9 +653,9 @@
         TagCollection c2 = new TagCollection(Arrays.asList(tagA, tagB, tagD));
         TagCollection c = c1.union(c2);
-        assertEquals(2, c.getTagOccurence(tagA));
-        assertEquals(1, c.getTagOccurence(tagB));
-        assertEquals(1, c.getTagOccurence(tagC));
-        assertEquals(2, c.getTagOccurence(tagD));
-        assertEquals(1, c.getTagOccurence(tagEmpty));
+        assertEquals(2, c.getTagOccurrence(tagA));
+        assertEquals(1, c.getTagOccurrence(tagB));
+        assertEquals(1, c.getTagOccurrence(tagC));
+        assertEquals(2, c.getTagOccurrence(tagD));
+        assertEquals(1, c.getTagOccurrence(tagEmpty));
     }
 
@@ -669,6 +669,6 @@
         TagCollection c = c1.emptyTagsForKeysMissingIn(c2);
         assertEquals(2, c.getKeys().size());
-        assertEquals(1, c.getTagOccurence(new Tag(tagC.getKey(), "")));
-        assertEquals(1, c.getTagOccurence(tagEmpty));
+        assertEquals(1, c.getTagOccurrence(new Tag(tagC.getKey(), "")));
+        assertEquals(1, c.getTagOccurrence(tagEmpty));
     }