Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 10423) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 10424) @@ -62,5 +62,4 @@ import org.openstreetmap.josm.gui.DefaultNameFormatter; import org.openstreetmap.josm.gui.MainMenu; -import org.openstreetmap.josm.gui.SideButton; import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAfterSelection; import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAtEndAction; @@ -358,7 +357,7 @@ protected static JPanel buildOkCancelButtonPanel(OKAction okAction, CancelAction cancelAction) { JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER)); - pnl.add(new SideButton(okAction)); - pnl.add(new SideButton(cancelAction)); - pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/RelationEditor")))); + pnl.add(new JButton(okAction)); + pnl.add(new JButton(cancelAction)); + pnl.add(new JButton(new ContextSensitiveHelpAction(ht("/Dialog/RelationEditor")))); return pnl; } @@ -489,5 +488,5 @@ ); tfRole.setEnabled(memberTable.getSelectedRowCount() > 0); - SideButton btnApply = new SideButton(setRoleAction); + JButton btnApply = new JButton(setRoleAction); btnApply.setPreferredSize(new Dimension(20, 20)); btnApply.setText(""); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 10423) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 10424) @@ -11,4 +11,5 @@ import javax.swing.AbstractAction; +import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JList; @@ -24,5 +25,4 @@ import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.gui.OsmPrimitivRenderer; -import org.openstreetmap.josm.gui.SideButton; import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor; @@ -68,10 +68,10 @@ ReloadAction reloadAction = new ReloadAction(); referrers.getModel().addListDataListener(reloadAction); - pnl.add(new SideButton(reloadAction)); + pnl.add(new JButton(reloadAction)); pnl.add(cbReadFull); editAction = new EditAction(); referrers.getSelectionModel().addListSelectionListener(editAction); - pnl.add(new SideButton(editAction)); + pnl.add(new JButton(editAction)); add(pnl, BorderLayout.SOUTH); } @@ -92,5 +92,5 @@ ReloadAction() { putValue(SHORT_DESCRIPTION, tr("Load parent relations")); - putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); + new ImageProvider("dialogs", "refresh").getResource().attachImageIcon(this); putValue(NAME, tr("Reload")); refreshEnabled(); @@ -146,5 +146,5 @@ EditAction() { putValue(SHORT_DESCRIPTION, tr("Edit the currently selected relation")); - putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); + new ImageProvider("dialogs", "edit").getResource().attachImageIcon(this); putValue(NAME, tr("Edit")); refreshEnabled(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java (revision 10423) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java (revision 10424) @@ -43,5 +43,5 @@ super(memberTable, memberTableModel, tagModel, layer, editor, tfRole); putValue(SHORT_DESCRIPTION, tr("Cancel the updates and close the dialog")); - putValue(SMALL_ICON, ImageProvider.get("cancel")); + new ImageProvider("cancel").getResource().attachImageIcon(this); putValue(NAME, tr("Cancel")); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/OKAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/OKAction.java (revision 10423) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/OKAction.java (revision 10424) @@ -33,5 +33,5 @@ super(memberTable, memberTableModel, tagModel, layer, editor, tfRole); putValue(SHORT_DESCRIPTION, tr("Apply the updates and close the dialog")); - putValue(SMALL_ICON, ImageProvider.get("ok")); + new ImageProvider("ok").getResource().attachImageIcon(this); putValue(NAME, tr("OK")); setEnabled(true); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java (revision 10423) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java (revision 10424) @@ -36,5 +36,5 @@ this.tfRole = tfRole; putValue(SHORT_DESCRIPTION, tr("Sets a role for the selected members")); - putValue(SMALL_ICON, ImageProvider.get("apply")); + new ImageProvider("apply").getResource().attachImageIcon(this); putValue(NAME, tr("Apply Role")); updateEnabledState(); Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 10423) +++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 10424) @@ -23,4 +23,5 @@ import javax.swing.AbstractAction; +import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComponent; @@ -38,5 +39,4 @@ import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.gui.MapView; -import org.openstreetmap.josm.gui.SideButton; import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction; import org.openstreetmap.josm.gui.help.HelpUtil; @@ -84,5 +84,5 @@ /** the download action and button */ private final DownloadAction actDownload = new DownloadAction(); - protected final SideButton btnDownload = new SideButton(actDownload); + protected final JButton btnDownload = new JButton(actDownload); private void makeCheckBoxRespondToEnter(JCheckBox cb) { @@ -199,7 +199,7 @@ // -- cancel button - SideButton btnCancel; + JButton btnCancel; CancelAction actCancel = new CancelAction(); - btnCancel = new SideButton(actCancel); + btnCancel = new JButton(actCancel); pnl.add(btnCancel); InputMapUtils.enableEnter(btnCancel); @@ -210,5 +210,5 @@ // -- help button - SideButton btnHelp = new SideButton(new ContextSensitiveHelpAction(getRootPane().getClientProperty("help").toString())); + JButton btnHelp = new JButton(new ContextSensitiveHelpAction(getRootPane().getClientProperty("help").toString())); pnl.add(btnHelp); InputMapUtils.enableEnter(btnHelp); @@ -484,5 +484,5 @@ CancelAction() { putValue(NAME, tr("Cancel")); - putValue(SMALL_ICON, ImageProvider.get("cancel")); + new ImageProvider("cancel").getResource().attachImageIcon(this); putValue(SHORT_DESCRIPTION, tr("Click to close the dialog and to abort downloading")); } @@ -502,5 +502,5 @@ DownloadAction() { putValue(NAME, tr("Download")); - putValue(SMALL_ICON, ImageProvider.get("download")); + new ImageProvider("download").getResource().attachImageIcon(this); putValue(SHORT_DESCRIPTION, tr("Click to download the currently selected area")); setEnabled(!Main.isOffline(OnlineResource.OSM_API)); Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 10423) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 10424) @@ -19,4 +19,5 @@ import javax.swing.AbstractAction; import javax.swing.BorderFactory; +import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JLabel; @@ -26,5 +27,4 @@ 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.oauth.AdvancedOAuthPropertiesPanel; import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard; @@ -200,5 +200,5 @@ gc.fill = GridBagConstraints.NONE; gc.weightx = 0.0; - add(new SideButton(new AuthoriseNowAction()), gc); + add(new JButton(new AuthoriseNowAction()), gc); // filler - grab remaining space @@ -273,6 +273,6 @@ // -- action buttons JPanel btns = new JPanel(new FlowLayout(FlowLayout.LEFT)); - btns.add(new SideButton(new RenewAuthorisationAction())); - btns.add(new SideButton(new TestAuthorisationAction())); + btns.add(new JButton(new RenewAuthorisationAction())); + btns.add(new JButton(new TestAuthorisationAction())); gc.gridy = 4; gc.gridx = 0; @@ -312,5 +312,5 @@ putValue(NAME, tr("Authorize now")); putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process")); - putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); + new ImageProvider("oauth", "oauth-small").getResource().attachImageIcon(this); } @@ -342,5 +342,5 @@ putValue(NAME, tr("New Access Token")); putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process and generate a new Access Token")); - putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); + new ImageProvider("oauth", "oauth-small").getResource().attachImageIcon(this); } } @@ -356,6 +356,5 @@ putValue(NAME, tr("Test Access Token")); putValue(SHORT_DESCRIPTION, tr("Click test access to the OSM server with the current access token")); - putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); - + new ImageProvider("oauth", "oauth-small").getResource().attachImageIcon(this); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 10423) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 10424) @@ -17,4 +17,5 @@ import javax.swing.AbstractAction; +import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComponent; @@ -28,5 +29,4 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.preferences.CollectionProperty; -import org.openstreetmap.josm.gui.SideButton; import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator; @@ -53,5 +53,5 @@ private final HistoryComboBox tfOsmServerUrl = new HistoryComboBox(); private transient ApiUrlValidator valOsmServerUrl; - private SideButton btnTest; + private JButton btnTest; /** indicates whether to use the default OSM URL or not */ private JCheckBox cbUseDefaultServerUrl; @@ -116,5 +116,5 @@ ValidateApiUrlAction actTest = new ValidateApiUrlAction(); tfOsmServerUrl.getEditorComponent().getDocument().addDocumentListener(actTest); - btnTest = new SideButton(actTest); + btnTest = new JButton(actTest); add(btnTest, gc); }