Changeset 13478 in josm for trunk/src/org

Timestamp:

2018-03-01T10:08:48+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #16034 - wrong use of SideButton

File:

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

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

@@ -26 +26 @@
 import javax.swing.Action;
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -37 +38 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.TagCollection;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.tagging.TagTableColumnModelBuilder;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -121 +121 @@
             r.getModel().addPropertyChangeListener(applyAction);
         }
-        pnl.add(new SideButton(applyAction));
+        pnl.add(new JButton(applyAction));
 
         // -- cancel button
         CancelAction cancelAction = new CancelAction();
-        pnl.add(new SideButton(cancelAction));
+        pnl.add(new JButton(cancelAction));
 
         return pnl;