Changeset 7751 in josm for trunk/src/org

Timestamp:

2014-11-26T23:32:32+01:00 (10 years ago)

Author:

Don-vip

Message:

see #10775 - allow to sum all numeric values as conflict resolution also for capacity:*=* and step_count

File:

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

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

@@ -29 +29 @@
     /** the selected value if {@link #type} is {@link MultiValueDecisionType#KEEP_ONE} */
     private String value;
+
+    private static final String[] SUMMABLE_KEYS = new String[] {
+        "capacity(:.+)?", "step_count"
+    };
 
     /**
@@ -197 +201 @@
      */
     public boolean canSumAllNumeric() {
-        return "capacity".equals(getKey()) && canKeepAll();
+        if (!canKeepAll()) {
+            return false;
+        }
+        for (String key : SUMMABLE_KEYS) {
+            if (getKey().matches(key)) {
+                return true;
+            }
+        }
+        return false;
     }
 
@@ -225 +237 @@
      *
      */
-    public void applyTo(OsmPrimitive primitive) throws IllegalStateException{
+    public void applyTo(OsmPrimitive primitive) {
         if (primitive == null) return;
         if (!isDecided())
             throw new IllegalStateException(tr("Not decided yet."));
         String key = tags.getKeys().iterator().next();
-        String value = getChosenValue();
         if (type.equals(MultiValueDecisionType.KEEP_NONE)) {
             primitive.remove(key);
         } else {
-            primitive.put(key, value);
+            primitive.put(key, getChosenValue());
         }
     }
@@ -244 +255 @@
      * @throws IllegalStateException thrown if this resolution is not resolved yet
      */
-    public void applyTo(Collection<? extends OsmPrimitive> primitives) throws IllegalStateException {
+    public void applyTo(Collection<? extends OsmPrimitive> primitives) {
         if (primitives == null) return;
         for (OsmPrimitive primitive: primitives) {
@@ -262 +273 @@
      * @throws IllegalStateException thrown if this resolution is not resolved yet
      */
-    public Command buildChangeCommand(OsmPrimitive primitive) throws IllegalArgumentException, IllegalStateException {
+    public Command buildChangeCommand(OsmPrimitive primitive) {
         CheckParameterUtil.ensureParameterNotNull(primitive, "primitive");
         if (!isDecided())