Changeset 13761 in josm for trunk/src/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2018-05-13T22:09:06+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
r11553 r13761 143 143 public String getChosenValue() { 144 144 switch(type) { 145 case UNDECIDED: throw new IllegalStateException(tr("Not decided yet ."));145 case UNDECIDED: throw new IllegalStateException(tr("Not decided yet")); 146 146 case KEEP_ONE: return value; 147 147 case SUM_ALL_NUMERIC: return tags.getSummedValues(getKey()); … … 238 238 if (primitive == null) return; 239 239 if (!isDecided()) 240 throw new IllegalStateException(tr("Not decided yet ."));240 throw new IllegalStateException(tr("Not decided yet")); 241 241 String key = tags.getKeys().iterator().next(); 242 242 if (type.equals(MultiValueDecisionType.KEEP_NONE)) { … … 274 274 CheckParameterUtil.ensureParameterNotNull(primitive, "primitive"); 275 275 if (!isDecided()) 276 throw new IllegalStateException(tr("Not decided yet ."));276 throw new IllegalStateException(tr("Not decided yet")); 277 277 String key = tags.getKeys().iterator().next(); 278 278 return new ChangePropertyCommand(primitive, key, getChosenValue()); … … 290 290 CheckParameterUtil.ensureParameterNotNull(primitives, "primitives"); 291 291 if (!isDecided()) 292 throw new IllegalStateException(tr("Not decided yet ."));292 throw new IllegalStateException(tr("Not decided yet")); 293 293 String key = tags.getKeys().iterator().next(); 294 294 return new ChangePropertyCommand(primitives, key, getChosenValue());
Note:
See TracChangeset
for help on using the changeset viewer.