Changeset 13478 in josm for trunk/src/org


Ignore:
Timestamp:
2018-03-01T10:08:48+01:00 (22 months ago)
Author:
Don-vip
Message:

fix #16034 - wrong use of SideButton

File:
1 edited

Legend:

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

    r12678 r13478  
    2626import javax.swing.Action;
    2727import javax.swing.ImageIcon;
     28import javax.swing.JButton;
    2829import javax.swing.JDialog;
    2930import javax.swing.JLabel;
     
    3738import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    3839import org.openstreetmap.josm.data.osm.TagCollection;
    39 import org.openstreetmap.josm.gui.SideButton;
    4040import org.openstreetmap.josm.gui.tagging.TagTableColumnModelBuilder;
    4141import org.openstreetmap.josm.gui.util.GuiHelper;
     
    121121            r.getModel().addPropertyChangeListener(applyAction);
    122122        }
    123         pnl.add(new SideButton(applyAction));
     123        pnl.add(new JButton(applyAction));
    124124
    125125        // -- cancel button
    126126        CancelAction cancelAction = new CancelAction();
    127         pnl.add(new SideButton(cancelAction));
     127        pnl.add(new JButton(cancelAction));
    128128
    129129        return pnl;
Note: See TracChangeset for help on using the changeset viewer.