| 1 | ### Eclipse Workspace Patch 1.0
|
|---|
| 2 | #P core
|
|---|
| 3 | Index: src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
|
|---|
| 4 | ===================================================================
|
|---|
| 5 | --- src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 3373)
|
|---|
| 6 | +++ src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (working copy)
|
|---|
| 7 | @@ -122,7 +122,7 @@
|
|---|
| 8 | }
|
|---|
| 9 |
|
|---|
| 10 | if (uri == null)
|
|---|
| 11 | - return new Marker(wpt.getCoor(), name_desc, wpt.getString("symbol"), parentLayer, time, offset);
|
|---|
| 12 | + return new Marker(wpt.getCoor(), name_desc, wpt.getString("sym"), parentLayer, time, offset);
|
|---|
| 13 | else if (uri.endsWith(".wav"))
|
|---|
| 14 | return AudioMarker.create(wpt.getCoor(), name_desc, uri, parentLayer, time, offset);
|
|---|
| 15 | else if (uri.endsWith(".png") || uri.endsWith(".jpg") || uri.endsWith(".jpeg") || uri.endsWith(".gif"))
|
|---|
| 16 | Index: images/markers/Bridge.png
|
|---|
| 17 | ===================================================================
|
|---|
| 18 | Cannot display: file marked as a binary type.
|
|---|
| 19 | svn:mime-type = application/octet-stream
|
|---|
| 20 |
|
|---|
| 21 | Property changes on: images/markers/Bridge.png
|
|---|
| 22 | ___________________________________________________________________
|
|---|
| 23 | Added: svn:mime-type
|
|---|
| 24 | + application/octet-stream
|
|---|
| 25 |
|
|---|
| 26 | Index: images/markers/Crossing.png
|
|---|
| 27 | ===================================================================
|
|---|
| 28 | Cannot display: file marked as a binary type.
|
|---|
| 29 | svn:mime-type = application/octet-stream
|
|---|
| 30 |
|
|---|
| 31 | Property changes on: images/markers/Crossing.png
|
|---|
| 32 | ___________________________________________________________________
|
|---|
| 33 | Added: svn:mime-type
|
|---|
| 34 | + application/octet-stream
|
|---|
| 35 |
|
|---|
