Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 17597) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 17598) @@ -9,7 +9,5 @@ import java.awt.FlowLayout; import java.awt.Font; -import java.awt.GridBagConstraints; import java.awt.GridBagLayout; -import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ComponentAdapter; @@ -48,4 +46,5 @@ import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.CheckParameterUtil; +import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.InputMapUtils; @@ -112,20 +111,6 @@ JPanel pnl = new JPanel(new GridBagLayout()); pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - GridBagConstraints gc = new GridBagConstraints(); - - // the oauth logo in the header - gc.anchor = GridBagConstraints.NORTHWEST; - gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 1.0; - gc.gridwidth = 2; - ImageProvider logoProv = new ImageProvider("oauth", "oauth-logo").setMaxHeight(100); - JLabel lbl = new JLabel(logoProv.get()); - lbl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - lbl.setOpaque(true); - pnl.add(lbl, gc); // OAuth in a nutshell ... - gc.gridy = 1; - gc.insets = new Insets(5, 0, 0, 5); HtmlPanel pnlMessage = new HtmlPanel(); pnlMessage.setText("" @@ -135,25 +120,16 @@ ); pnlMessage.enableClickableHyperlinks(); - pnl.add(pnlMessage, gc); + pnl.add(pnlMessage, GBC.eol().fill(GBC.HORIZONTAL)); // the authorisation procedure - gc.gridy = 2; - gc.gridwidth = 1; - gc.weightx = 0.0; - lbl = new JLabel(tr("Please select an authorization procedure: ")); + JLabel lbl = new JLabel(tr("Please select an authorization procedure: ")); lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN)); - pnl.add(lbl, gc); - - gc.gridx = 1; - gc.gridwidth = 1; - gc.weightx = 1.0; - pnl.add(cbAuthorisationProcedure, gc); + pnl.add(lbl, GBC.std()); + + pnl.add(cbAuthorisationProcedure, GBC.eol().fill(GBC.HORIZONTAL)); cbAuthorisationProcedure.addItemListener(new AuthorisationProcedureChangeListener()); lbl.setLabelFor(cbAuthorisationProcedure); if (!Config.getUrls().getDefaultOsmApiUrl().equals(apiUrl)) { - gc.gridy = 3; - gc.gridwidth = 2; - gc.gridx = 0; final HtmlPanel pnlWarning = new HtmlPanel(); final HTMLEditorKit kit = (HTMLEditorKit) pnlWarning.getEditorPane().getEditorKit(); @@ -168,5 +144,5 @@ + "

" + ""); - pnl.add(pnlWarning, gc); + pnl.add(pnlWarning, GBC.eop().fill()); } @@ -206,5 +182,5 @@ setTitle(tr("Get an Access Token for ''{0}''", apiUrl)); - this.setMinimumSize(new Dimension(500, 400)); + this.setMinimumSize(new Dimension(500, 300)); pnlFullyAutomaticAuthorisationUI = new FullyAutomaticAuthorizationUI(apiUrl, executor);