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

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

@@ -18 +18 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
@@ -23 +24 @@
 
 import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -195 +195 @@
 
             JPanel pnl1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
-            pnl1.add(new SideButton(new RetrieveRequestTokenAction()));
+            pnl1.add(new JButton(new RetrieveRequestTokenAction()));
             gc.fill = GridBagConstraints.HORIZONTAL;
             gc.weightx = 1.0;
@@ -269 +269 @@
         protected JPanel buildActionPanel() {
             JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
-            pnl.add(new SideButton(new BackAction()));
-            pnl.add(new SideButton(new RetrieveAccessTokenAction()));
+            pnl.add(new JButton(new BackAction()));
+            pnl.add(new JButton(new RetrieveAccessTokenAction()));
             return pnl;
         }
@@ -292 +292 @@
                 putValue(NAME, tr("Back"));
                 putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3"));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous"));
+                new ImageProvider("dialogs", "previous").getResource().getImageIcon(this);
             }
 
@@ -349 +349 @@
         protected JPanel buildActionPanel() {
             JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
-            pnl.add(new SideButton(new RestartAction()));
-            pnl.add(new SideButton(new TestAccessTokenAction()));
+            pnl.add(new JButton(new RestartAction()));
+            pnl.add(new JButton(new TestAccessTokenAction()));
             return pnl;
         }
@@ -368 +368 @@
                 putValue(NAME, tr("Restart"));
                 putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3"));
-                putValue(SMALL_ICON, ImageProvider.get("dialogs", "previous"));
+                new ImageProvider("dialogs", "previous").getResource().getImageIcon(this);
             }
 
@@ -389 +389 @@
         RetrieveRequestTokenAction() {
             putValue(NAME, tr("Retrieve Request Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
+            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to retrieve a Request Token"));
         }
@@ -425 +425 @@
         RetrieveAccessTokenAction() {
             putValue(NAME, tr("Retrieve Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
+            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to retrieve an Access Token"));
         }
@@ -462 +462 @@
         TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
+            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to test the Access Token"));
         }