Index: trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 9702)
+++ trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 9703)
@@ -412,9 +412,11 @@
         @Override
         public T remove(Object o) {
-            modCount++;
-            @SuppressWarnings("unchecked") K key = (K) o;
-            int bucket = getBucket(fHash, key);
-
-            return bucket < 0 ? null : doRemove(bucket);
+            synchronized (Storage.this) {
+                modCount++;
+                @SuppressWarnings("unchecked") K key = (K) o;
+                int bucket = getBucket(fHash, key);
+
+                return bucket < 0 ? null : doRemove(bucket);
+            }
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/SideButton.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SideButton.java	(revision 9702)
+++ trunk/src/org/openstreetmap/josm/gui/SideButton.java	(revision 9703)
@@ -57,5 +57,5 @@
                 @Override
                 public void propertyChange(PropertyChangeEvent evt) {
-                    if (evt.getPropertyName() == javax.swing.Action.SMALL_ICON) {
+                    if (javax.swing.Action.SMALL_ICON.equals(evt.getPropertyName())) {
                         fixIcon(null);
                     }
Index: trunk/src/org/openstreetmap/josm/io/NmeaReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 9702)
+++ trunk/src/org/openstreetmap/josm/io/NmeaReader.java	(revision 9703)
@@ -50,8 +50,4 @@
         public String getType() {
             return this.type;
-        }
-
-        public boolean equals(String type) {
-            return this.type.equals(type);
         }
     }