- Timestamp:
- 2018-06-11T00:03:29+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/osm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
r13911 r13912 20 20 21 21 import org.openstreetmap.josm.spi.preferences.Config; 22 import org.openstreetmap.josm.tools.LanguageInfo;23 22 import org.openstreetmap.josm.tools.Utils; 24 23 … … 725 724 */ 726 725 protected abstract void keysChangedImpl(Map<String, String> originalKeys); 727 728 @Override729 public String getName() {730 return get("name");731 }732 733 @Override734 public String getLocalName() {735 for (String s : LanguageInfo.getLanguageCodes(null)) {736 String val = get("name:" + s);737 if (val != null)738 return val;739 }740 741 return getName();742 }743 726 744 727 /*------------------------------------- -
trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java
r13911 r13912 324 324 * @return the name of this primitive 325 325 */ 326 String getName(); 326 default String getName() { 327 return get("name"); 328 } 327 329 328 330 /** … … 333 335 * @see LanguageInfo#getLanguageCodes 334 336 */ 335 String getLocalName(); 337 default String getLocalName() { 338 for (String s : LanguageInfo.getLanguageCodes(null)) { 339 String val = get("name:" + s); 340 if (val != null) 341 return val; 342 } 343 344 return getName(); 345 } 336 346 337 347 /**
Note:
See TracChangeset
for help on using the changeset viewer.