Changeset 10525 in josm for trunk

Timestamp:

2016-07-10T14:56:47+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12994 - Old style SideButton usage errors

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -49 +49 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -180 +179 @@
 
         // -- upload button
-        btnUpload = new SideButton(new UploadAction(this));
+        btnUpload = new JButton(new UploadAction(this));
         pnl.add(btnUpload);
         btnUpload.setFocusable(true);
@@ -187 +186 @@
         // -- cancel button
         CancelAction cancelAction = new CancelAction(this);
-        pnl.add(new SideButton(cancelAction));
+        pnl.add(new JButton(cancelAction));
         getRootPane().registerKeyboardAction(
                 cancelAction,
@@ -193 +192 @@
                 JComponent.WHEN_IN_FOCUSED_WINDOW
         );
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/Upload"))));
+        pnl.add(new JButton(new ContextSensitiveHelpAction(ht("/Dialog/Upload"))));
         HelpUtil.setHelpContext(getRootPane(), ht("/Dialog/Upload"));
         return pnl;