Changeset 13478 in josm
- Timestamp:
- 2018-03-01T10:08:48+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
r12678 r13478 26 26 import javax.swing.Action; 27 27 import javax.swing.ImageIcon; 28 import javax.swing.JButton; 28 29 import javax.swing.JDialog; 29 30 import javax.swing.JLabel; … … 37 38 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 38 39 import org.openstreetmap.josm.data.osm.TagCollection; 39 import org.openstreetmap.josm.gui.SideButton;40 40 import org.openstreetmap.josm.gui.tagging.TagTableColumnModelBuilder; 41 41 import org.openstreetmap.josm.gui.util.GuiHelper; … … 121 121 r.getModel().addPropertyChangeListener(applyAction); 122 122 } 123 pnl.add(new SideButton(applyAction));123 pnl.add(new JButton(applyAction)); 124 124 125 125 // -- cancel button 126 126 CancelAction cancelAction = new CancelAction(); 127 pnl.add(new SideButton(cancelAction));127 pnl.add(new JButton(cancelAction)); 128 128 129 129 return pnl;
Note:
See TracChangeset
for help on using the changeset viewer.