Ticket #23555: 23305-new-button.patch

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

@@ -240 +240 @@
         CancelAction cancelAction = new CancelAction();
         pnl.add(new JButton(cancelAction));
 
+        if (Config.getPref().getBoolean("combine-conflict-precise", true)) {
+            // -- accept single button
+            pnl.add(new JButton(new AcceptSimpleAction()));
+        }
+
         // -- help button
         helpAction = new ContextSensitiveHelpAction();
         pnl.add(new JButton(helpAction));
@@ -444 +449 @@
         }
     }
 
+    protected class AcceptSimpleAction extends AbstractAction {
+        /**
+         * Constructs a new {@code AcceptSingleAction}.
+         */
+        public AcceptSimpleAction() {
+            putValue(Action.SHORT_DESCRIPTION, tr("Accept all tag keys with only one value"));
+            putValue(Action.NAME, tr("Accept simple"));
+            new ImageProvider("apply").getResource().attachImageIcon(this);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent arg0) {
+            prepareDefaultDecisions(true);
+        }
+    }
+
     private void adjustDividerLocation() {
         int numTagDecisions = modelTagConflictResolver.getNumDecisions();
         int numRelationDecisions = modelRelConflictResolver.getNumDecisions();