Changeset 10671 in josm
- Timestamp:
- 2016-07-29T00:06:51+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java
r9371 r10671 69 69 return trn("Resolve {0} tag conflict in relation {1}", "Resolve {0} tag conflicts in relation {1}", 70 70 getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId()); 71 default: 72 return ""; 71 73 } 72 return "";73 74 } 74 75 -
trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
r10378 r10671 147 147 case RELATION: 148 148 return appendRelation((Relation) p); 149 } 150 return this; 149 default: 150 return this; 151 } 151 152 } 152 153 … … 217 218 case WAY: return appendWay((Way) primitive); 218 219 case RELATION: return appendRelation((Relation) primitive); 220 default: break; 219 221 } 220 222 }
Note:
See TracChangeset
for help on using the changeset viewer.