Changeset 4283 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2011-08-07T12:06:49+02:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
r4282 r4283 248 248 249 249 private final TemplateEngineDataProvider dataProvider; 250 private final String text; 251 250 252 public final Icon symbol; 251 253 public final MarkerLayer parentLayer; … … 269 271 270 272 this.dataProvider = dataProvider; 273 this.text = null; 274 } 275 276 public Marker(LatLon ll, String text, String iconName, MarkerLayer parentLayer, double time, double offset) { 277 setCoor(ll); 278 279 this.offset = offset; 280 this.time = time; 281 // /* ICON(markers/) */"Bridge" 282 // /* ICON(markers/) */"Crossing" 283 this.symbol = ImageProvider.getIfAvailable("markers",iconName); 284 this.parentLayer = parentLayer; 285 286 this.dataProvider = null; 287 this.text = text; 271 288 } 272 289 … … 344 361 */ 345 362 public String getText() { 346 TemplateEntryProperty property = getTextTemplate(); 347 if (property.getUpdateCount() != textVersion) { 348 TemplateEntry templateEntry = property.get(); 349 StringBuilder sb = new StringBuilder(); 350 templateEntry.appendText(sb, this); 351 352 cachedText = sb.toString(); 353 textVersion = property.getUpdateCount(); 354 } 355 return cachedText; 363 if (text != null) 364 return text; 365 else { 366 TemplateEntryProperty property = getTextTemplate(); 367 if (property.getUpdateCount() != textVersion) { 368 TemplateEntry templateEntry = property.get(); 369 StringBuilder sb = new StringBuilder(); 370 templateEntry.appendText(sb, this); 371 372 cachedText = sb.toString(); 373 textVersion = property.getUpdateCount(); 374 } 375 return cachedText; 376 } 356 377 } 357 378
Note:
See TracChangeset
for help on using the changeset viewer.