Changeset 6770 in josm for trunk/src/org


Ignore:
Timestamp:
2014-01-29T20:40:26+01:00 (6 years ago)
Author:
simon04
Message:

see #9104 - Do not suggest to combine conflicting values in order to reduce the wrong usage of semicolon values

Location:
trunk/src/org/openstreetmap/josm/gui/conflict/tags
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

    r6679 r6770  
    282282    protected void prepareDefaultTagDecisions() {
    283283        TagConflictResolverModel model = getTagConflictResolverModel();
    284         for (int i = 0; i < model.getRowCount(); i++) {
    285             MultiValueResolutionDecision decision = model.getDecision(i);
    286             List<String> values = decision.getValues();
    287             values.remove("");
    288             if (values.size() == 1) {
    289                 decision.keepOne(values.get(0));
    290             } else {
    291                 decision.keepAll();
    292             }
    293         }
     284        model.prepareDefaultTagDecisions();
    294285        model.rebuild();
    295286    }
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

    r6616 r6770  
    258258     */
    259259    public void prepareDefaultTagDecisions() {
     260        // Do not suggest to keep all values in order to reduce the wrong usage of semicolon values, see #9104!
     261        // Do not suggest to keep the single value in order to avoid long highways to become tunnels+bridges+...
     262
     263        /*
    260264        for (MultiValueResolutionDecision decision: decisions.values()) {
    261265            List<String> values = decision.getValues();
     
    267271            }
    268272        }
     273        */
    269274        rebuild();
    270275    }
Note: See TracChangeset for help on using the changeset viewer.