Changeset 10367 in josm for trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.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/FullyAutomaticAuthorizationUI.java (modified) (7 diffs)

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

@@ -19 +19 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -33 +34 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.preferences.server.UserNameValidator;
@@ -201 +201 @@
         tfPassword.getDocument().addDocumentListener(runAuthorisationAction);
         tfUserName.getDocument().addDocumentListener(runAuthorisationAction);
-        pnl.add(new SideButton(runAuthorisationAction));
+        pnl.add(new JButton(runAuthorisationAction));
         return pnl;
     }
@@ -236 +236 @@
         // the actions
         JPanel pnl1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        pnl1.add(new SideButton(new BackAction()));
-        pnl1.add(new SideButton(new TestAccessTokenAction()));
+        pnl1.add(new JButton(new BackAction()));
+        pnl1.add(new JButton(new TestAccessTokenAction()));
         gc.gridy = 2;
         pnl.add(pnl1, gc);
@@ -325 +325 @@
         RunAuthorisationAction() {
             putValue(NAME, tr("Authorize now"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
+            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to redirect you to the authorization form on the JOSM web site"));
             updateEnabledState();
@@ -362 +362 @@
             putValue(NAME, tr("Back"));
             putValue(SHORT_DESCRIPTION, tr("Run the automatic authorization steps again"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous"));
+            new ImageProvider("dialogs", "previous").getResource().getImageIcon(this);
         }
 
@@ -377 +377 @@
         TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("logo"));
+            new ImageProvider("logo").getResource().getImageIcon(this);
         }