Changeset 13071 in josm for trunk

Timestamp:

2017-11-02T13:36:17+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #12994 - Old style SideButton usage errors

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java

@@ -21 +21 @@
 import javax.swing.Action;
 import javax.swing.BorderFactory;
+import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -36 +37 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -55 +55 @@
     private JSplitPane spLists;
     private boolean canceled;
-    private SideButton btnContinue;
+    private JButton btnContinue;
 
     /**
@@ -89 +89 @@
         JPanel pnl = new JPanel(new FlowLayout());
         ContinueAction continueAction = new ContinueAction();
-        btnContinue = new SideButton(continueAction);
+        btnContinue = new JButton(continueAction);
         pnl.add(btnContinue);
         btnContinue.setFocusable(true);
@@ -95 +95 @@
         lstSelectedPrimitives.getSelectionModel().addListSelectionListener(continueAction);
 
-        pnl.add(new SideButton(new CancelAction()));
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/UploadSelection"))));
+        pnl.add(new JButton(new CancelAction()));
+        pnl.add(new JButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/UploadSelection"))));
         return pnl;
     }