Changeset 9143 in josm for trunk/src/org


Ignore:
Timestamp:
2015-12-24T18:24:19+01:00 (4 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java

    r8510 r9143  
    33
    44import java.awt.Component;
     5import java.awt.event.ActionEvent;
     6import java.awt.event.ActionListener;
    57import java.util.EventObject;
    68
     
    1214import org.openstreetmap.josm.gui.widgets.JosmComboBox;
    1315
     16/**
     17 * Table cell editor for relation member conflict resolver table.
     18 * @since 2070
     19 */
    1420public class RelationMemberConflictDecisionEditor extends JosmComboBox<RelationMemberConflictDecisionType> implements TableCellEditor {
     21
     22    private final transient CellEditorSupport tableCellEditorSupport;
     23    private RelationMemberConflictDecisionType originalValue;
    1524
    1625    /**
     
    2938    @Override
    3039    public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
     40        addActionListener(new ActionListener() {
     41            @Override
     42            public void actionPerformed(ActionEvent e) {
     43                stopCellEditing();
     44            }
     45        });
    3146        setSelectedItem(value);
    3247        this.originalValue = (RelationMemberConflictDecisionType) value;
    3348        return this;
    3449    }
    35 
    36     private final transient CellEditorSupport tableCellEditorSupport;
    37     private RelationMemberConflictDecisionType originalValue;
    3850
    3951    @Override
Note: See TracChangeset for help on using the changeset viewer.