Changeset 10527 in josm


Ignore:
Timestamp:
2016-07-12T21:38:23+02:00 (5 years ago)
Author:
Don-vip
Message:

fix #12994 - Old style SideButton usage errors

File:
1 edited

Legend:

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

    r10369 r10527  
    2525import javax.swing.AbstractAction;
    2626import javax.swing.Action;
     27import javax.swing.JButton;
    2728import javax.swing.JDialog;
    2829import javax.swing.JLabel;
     
    4243import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
    4344import org.openstreetmap.josm.gui.DefaultNameFormatter;
    44 import org.openstreetmap.josm.gui.SideButton;
    4545import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
    4646import org.openstreetmap.josm.gui.help.HelpUtil;
     
    117117    private ContextSensitiveHelpAction helpAction;
    118118    /** the apply button */
    119     private SideButton btnApply;
     119    private JButton btnApply;
    120120
    121121    /**
     
    199199        pnlTagConflictResolver.getModel().addPropertyChangeListener(applyAction);
    200200        pnlRelationMemberConflictResolver.getModel().addPropertyChangeListener(applyAction);
    201         btnApply = new SideButton(applyAction);
     201        btnApply = new JButton(applyAction);
    202202        btnApply.setFocusable(true);
    203203        pnl.add(btnApply);
     
    205205        // -- cancel button
    206206        CancelAction cancelAction = new CancelAction();
    207         pnl.add(new SideButton(cancelAction));
     207        pnl.add(new JButton(cancelAction));
    208208
    209209        // -- help button
    210210        helpAction = new ContextSensitiveHelpAction();
    211         pnl.add(new SideButton(helpAction));
     211        pnl.add(new JButton(helpAction));
    212212
    213213        return pnl;
Note: See TracChangeset for help on using the changeset viewer.