Changeset 10527 in josm for trunk

Timestamp:

2016-07-12T21:38:23+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12994 - Old style SideButton usage errors

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -25 +25 @@
 import javax.swing.AbstractAction;
 import javax.swing.Action;
+import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -42 +43 @@
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -117 +117 @@
     private ContextSensitiveHelpAction helpAction;
     /** the apply button */
-    private SideButton btnApply;
+    private JButton btnApply;
 
     /**
@@ -199 +199 @@
         pnlTagConflictResolver.getModel().addPropertyChangeListener(applyAction);
         pnlRelationMemberConflictResolver.getModel().addPropertyChangeListener(applyAction);
-        btnApply = new SideButton(applyAction);
+        btnApply = new JButton(applyAction);
         btnApply.setFocusable(true);
         pnl.add(btnApply);
@@ -205 +205 @@
         // -- cancel button
         CancelAction cancelAction = new CancelAction();
-        pnl.add(new SideButton(cancelAction));
+        pnl.add(new JButton(cancelAction));
 
         // -- help button
         helpAction = new ContextSensitiveHelpAction();
-        pnl.add(new SideButton(helpAction));
+        pnl.add(new JButton(helpAction));
 
         return pnl;