Changeset 10367 in josm for trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

Timestamp:

2016-06-12T23:40:12+02:00 (8 years ago)

Author:

stoecker

Message:

don't use SideButton outside side panel

File:

• trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -26 +26 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -42 +43 @@
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -99 +99 @@
         pnlManualAuthorisationUI.addPropertyChangeListener(actAcceptAccessToken);
 
-        pnl.add(new SideButton(actAcceptAccessToken));
-        pnl.add(new SideButton(new CancelAction()));
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/OAuthAuthorisationWizard"))));
+        pnl.add(new JButton(actAcceptAccessToken));
+        pnl.add(new JButton(new CancelAction()));
+        pnl.add(new JButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/OAuthAuthorisationWizard"))));
 
         return pnl;
@@ -351 +351 @@
         CancelAction() {
             putValue(NAME, tr("Cancel"));
-            putValue(SMALL_ICON, ImageProvider.get("cancel"));
+            new ImageProvider("cancel").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the dialog and cancel authorization"));
         }
@@ -373 +373 @@
         AcceptAccessTokenAction() {
             putValue(NAME, tr("Accept Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("ok"));
+            new ImageProvider("ok").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the dialog and accept the Access Token"));
             updateEnabledState(null);