Index: trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java	(revision 4223)
@@ -34,5 +34,5 @@
      * @param added A collection of newly-visible primitives
      */
-    void primtivesAdded(PrimitivesAddedEvent event);
+    void primitivesAdded(PrimitivesAddedEvent event);
 
     /**
@@ -42,5 +42,5 @@
      * @param removed A collection of newly-invisible primitives
      */
-    void primtivesRemoved(PrimitivesRemovedEvent event);
+    void primitivesRemoved(PrimitivesRemovedEvent event);
 
     /**
Index: trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java	(revision 4223)
@@ -28,9 +28,9 @@
     }
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {
         listener.processDatasetEvent(event);
     }
 
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         listener.processDatasetEvent(event);
     }
Index: trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java	(revision 4223)
@@ -23,5 +23,5 @@
     @Override
     public void fire(DataSetListener listener) {
-        listener.primtivesAdded(this);
+        listener.primitivesAdded(this);
     }
 
Index: trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java	(revision 4223)
@@ -23,5 +23,5 @@
     @Override
     public void fire(DataSetListener listener) {
-        listener.primtivesRemoved(this);
+        listener.primitivesRemoved(this);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java	(revision 4223)
@@ -223,10 +223,10 @@
      * Applies this resolution to a collection of primitives
      *
-     * @param primtives the collection of primitives
-     * @throws IllegalStateException thrown if this resolution is not resolved yet
-     */
-    public void applyTo(Collection<? extends OsmPrimitive> primtives) throws IllegalStateException {
-        if (primtives == null) return;
-        for (OsmPrimitive primitive: primtives) {
+     * @param primitives the collection of primitives
+     * @throws IllegalStateException thrown if this resolution is not resolved yet
+     */
+    public void applyTo(Collection<? extends OsmPrimitive> primitives) throws IllegalStateException {
+        if (primitives == null) return;
+        for (OsmPrimitive primitive: primitives) {
             if (primitive == null) {
                 continue;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java	(revision 4223)
@@ -275,9 +275,9 @@
     }
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {
         filterModel.executeFilters(event.getPrimitives());
     }
 
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         filterModel.executeFilters();
     }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 4223)
@@ -831,10 +831,10 @@
     public void wayNodesChanged(WayNodesChangedEvent event) {/* irrelevant in this context */}
 
-    public void primtivesAdded(final PrimitivesAddedEvent event) {
+    public void primitivesAdded(final PrimitivesAddedEvent event) {
         model.addRelations(event.getPrimitives());
         model.updateTitle();
     }
 
-    public void primtivesRemoved(final PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(final PrimitivesRemovedEvent event) {
         model.removeRelations(event.getPrimitives());
         model.updateTitle();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 4223)
@@ -739,6 +739,6 @@
         }
 
-        public void primtivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */}
-        public void primtivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/}
+        public void primitivesAdded(PrimitivesAddedEvent event) {/* ignored - handled by SelectionChangeListener */}
+        public void primitivesRemoved(PrimitivesRemovedEvent event) {/* ignored - handled by SelectionChangeListener*/}
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.java	(revision 4223)
@@ -36,5 +36,5 @@
     }
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {
         for (OsmPrimitive primitive:event.getPrimitives()) {
             addChangeset(new Changeset(primitive.getChangesetId()));
@@ -42,5 +42,5 @@
     }
 
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         for (OsmPrimitive primitive:event.getPrimitives()) {
             removeChangeset(new Changeset(primitive.getChangesetId()));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 4223)
@@ -279,18 +279,4 @@
         memberTable.addMouseListener(new MemberTableDblClickAdapter());
         memberTableModel.addMemberModelListener(memberTable);
-        // setup a cell editor with a small border
-        final JTextField cellEditorTextField = new JTextField();
-        cellEditorTextField.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
-        cellEditorTextField.addFocusListener(
-                new FocusAdapter() {
-                    @Override public void focusGained(FocusEvent e) {
-                        cellEditorTextField.selectAll();
-                    }
-                }
-        );
-        DefaultCellEditor cellEditor = new DefaultCellEditor(cellEditorTextField);
-        cellEditor.setClickCountToStart(1);
-        memberTable.getColumnModel().getColumn(0).setCellEditor(cellEditor);
-        memberTable.setRowHeight(cellEditorTextField.getPreferredSize().height);
 
         final JScrollPane scrollPane = new JScrollPane(memberTable);
@@ -361,4 +347,5 @@
         );
         tfRole.setEnabled(memberTable.getSelectedRowCount() > 0);
+        memberTable.setRowHeight(tfRole.getPreferredSize().height);
         SideButton btnApply = new SideButton(setRoleAction);
         btnApply.setPreferredSize(new Dimension(20,20));
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 4223)
@@ -107,7 +107,7 @@
 
     public void nodeMoved(NodeMovedEvent event) {/* ignore */}
-    public void primtivesAdded(PrimitivesAddedEvent event) {/* ignore */}
-
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {/* ignore */}
+
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         // ignore - the relation in the editor might become out of sync with the relation
         // in the dataset. We will deal with it when the relation editor is closed or
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 4223)
@@ -780,5 +780,5 @@
     }
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {
         for (OsmPrimitive p: event.getPrimitives()) {
             if (canShowAsLatest(p)) {
@@ -788,5 +788,5 @@
     }
 
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         for (OsmPrimitive p: event.getPrimitives()) {
             if (!p.isNew() && p.getId() == history.getId()) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java	(revision 4222)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java	(revision 4223)
@@ -282,5 +282,5 @@
      **/
 
-    public void primtivesAdded(PrimitivesAddedEvent event) {
+    public void primitivesAdded(PrimitivesAddedEvent event) {
         if (dirty)
             return;
@@ -288,5 +288,5 @@
     }
 
-    public void primtivesRemoved(PrimitivesRemovedEvent event) {
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
         dirty = true;
     }