Changeset 9143 in josm for trunk

Timestamp:

2015-12-24T18:24:19+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12217 - conflict resolver does not update apply button after (all) relation decisions (keep/remove) have been resolved (patch by cmuelle8) + fix warnings

File:

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

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java

@@ -3 +3 @@
 
 import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.EventObject;
 
@@ -12 +14 @@
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 
+/**
+ * Table cell editor for relation member conflict resolver table.
+ * @since 2070
+ */
 public class RelationMemberConflictDecisionEditor extends JosmComboBox<RelationMemberConflictDecisionType> implements TableCellEditor {
+
+    private final transient CellEditorSupport tableCellEditorSupport;
+    private RelationMemberConflictDecisionType originalValue;
 
     /**
@@ -29 +38 @@
     @Override
     public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+        addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                stopCellEditing();
+            }
+        });
         setSelectedItem(value);
         this.originalValue = (RelationMemberConflictDecisionType) value;
         return this;
     }
-
-    private final transient CellEditorSupport tableCellEditorSupport;
-    private RelationMemberConflictDecisionType originalValue;
 
     @Override