[josm] 02/07: Merge tag 'upstream/0.0.svn10966+dfsg'

Bas Couwenberg sebastic at debian.org
Tue Sep 6 09:03:14 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit 6f35bab1f7abb043fe4e95e2581cc9b2981ba7f5
Merge: b803192 508cbe2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 6 09:29:26 2016 +0200

    Merge tag 'upstream/0.0.svn10966+dfsg'
    
    Upstream version 0.0.svn10966+dfsg

 .checkstyle                                        |     4 +-
 .classpath                                         |    11 +-
 .externalToolBuilders/revision.launch              |     8 +-
 .project                                           |     6 -
 .settings/edu.umd.cs.findbugs.core.prefs           |    66 +-
 .settings/sf.eclipse.javacc.prefs                  |     1 +
 README                                             |    16 +-
 REVISION                                           |     6 +-
 build.xml                                          |    60 +-
 data/defaultpresets.xml                            |   462 +-
 data/validator/combinations.mapcss                 |     3 +-
 data/validator/deprecated.mapcss                   |    36 +-
 data/validator/ignoretags.cfg                      |    11 +
 data_nodist/trans/ast.lang                         |   Bin 8848 -> 8856 bytes
 data_nodist/trans/be.lang                          |   Bin 17556 -> 17745 bytes
 data_nodist/trans/bg.lang                          |   Bin 2411 -> 2419 bytes
 data_nodist/trans/ca-valencia.lang                 |   Bin 7791 -> 7799 bytes
 data_nodist/trans/ca.lang                          |   Bin 10470 -> 10518 bytes
 data_nodist/trans/cs.lang                          |   Bin 10730 -> 10999 bytes
 data_nodist/trans/da.lang                          |   Bin 10056 -> 10337 bytes
 data_nodist/trans/de.lang                          |   Bin 11232 -> 11576 bytes
 data_nodist/trans/el.lang                          |   Bin 1413 -> 1421 bytes
 data_nodist/trans/en.lang                          |   Bin 9243 -> 9498 bytes
 data_nodist/trans/en_AU.lang                       |   Bin 1498 -> 1506 bytes
 data_nodist/trans/en_GB.lang                       |   Bin 2130 -> 2138 bytes
 data_nodist/trans/es.lang                          |   Bin 11885 -> 11948 bytes
 data_nodist/trans/et.lang                          |   Bin 1390 -> 1398 bytes
 data_nodist/trans/fi.lang                          |   Bin 3011 -> 3019 bytes
 data_nodist/trans/fr.lang                          |   Bin 11345 -> 11436 bytes
 data_nodist/trans/gl.lang                          |   Bin 2961 -> 2969 bytes
 data_nodist/trans/hu.lang                          |   Bin 11083 -> 11155 bytes
 data_nodist/trans/id.lang                          |   Bin 6701 -> 6709 bytes
 data_nodist/trans/it.lang                          |   Bin 10414 -> 10463 bytes
 data_nodist/trans/ja.lang                          |   Bin 11614 -> 11724 bytes
 data_nodist/trans/km.lang                          |   Bin 16871 -> 16879 bytes
 data_nodist/trans/lt.lang                          |   Bin 2012 -> 2020 bytes
 data_nodist/trans/nb.lang                          |   Bin 1689 -> 1697 bytes
 data_nodist/trans/nl.lang                          |   Bin 11726 -> 11777 bytes
 data_nodist/trans/pl.lang                          |   Bin 2845 -> 2853 bytes
 data_nodist/trans/pt.lang                          |   Bin 12858 -> 12931 bytes
 data_nodist/trans/pt_BR.lang                       |   Bin 10112 -> 10168 bytes
 data_nodist/trans/ru.lang                          |   Bin 17590 -> 18136 bytes
 data_nodist/trans/sk.lang                          |   Bin 10055 -> 10150 bytes
 data_nodist/trans/sv.lang                          |   Bin 1312 -> 1320 bytes
 data_nodist/trans/uk.lang                          |   Bin 18005 -> 18472 bytes
 data_nodist/trans/vi.lang                          |   Bin 10737 -> 10745 bytes
 data_nodist/trans/zh_CN.lang                       |   Bin 7566 -> 7608 bytes
 data_nodist/trans/zh_TW.lang                       |   Bin 4587 -> 4658 bytes
 eclipse/JOSM (Java 8).launch                       |     6 -
 gpl-2.0.txt                                        |    14 +-
 i18n/convmaps.pl                                   |     2 +-
 i18n/po/af.po                                      |   353 +-
 i18n/po/am.po                                      |   353 +-
 i18n/po/ar.po                                      |   357 +-
 i18n/po/ast.po                                     |   375 +-
 i18n/po/az.po                                      |   353 +-
 i18n/po/be.po                                      |   410 +-
 i18n/po/bg.po                                      |   365 +-
 i18n/po/bn.po                                      |   353 +-
 i18n/po/br.po                                      |   353 +-
 i18n/po/bs.po                                      |   353 +-
 i18n/po/ca.po                                      |   377 +-
 i18n/po/ca at valencia.po                             |   367 +-
 i18n/po/cs.po                                      |   394 +-
 i18n/po/cy.po                                      |   353 +-
 i18n/po/da.po                                      |   402 +-
 i18n/po/de.po                                      |   607 +-
 i18n/po/de_DE.po                                   |   353 +-
 i18n/po/el.po                                      |   357 +-
 i18n/po/en_AU.po                                   |   363 +-
 i18n/po/en_CA.po                                   |   353 +-
 i18n/po/en_GB.po                                   |   387 +-
 i18n/po/eo.po                                      |   353 +-
 i18n/po/es.po                                      |   543 +-
 i18n/po/et.po                                      |   359 +-
 i18n/po/eu.po                                      |   355 +-
 i18n/po/fa.po                                      |   353 +-
 i18n/po/fi.po                                      |   363 +-
 i18n/po/fil.po                                     |   353 +-
 i18n/po/fo.po                                      |   353 +-
 i18n/po/fr.po                                      |   375 +-
 i18n/po/ga.po                                      |   353 +-
 i18n/po/gl.po                                      |   359 +-
 i18n/po/he.po                                      |   357 +-
 i18n/po/hi.po                                      |   353 +-
 i18n/po/hr.po                                      |   353 +-
 i18n/po/ht.po                                      |   353 +-
 i18n/po/hu.po                                      |   381 +-
 i18n/po/hy.po                                      |   353 +-
 i18n/po/ia.po                                      |   353 +-
 i18n/po/id.po                                      |   365 +-
 i18n/po/is.po                                      |   355 +-
 i18n/po/it.po                                      |   377 +-
 i18n/po/ja.po                                      |   389 +-
 i18n/po/ka.po                                      |   353 +-
 i18n/po/km.po                                      |   361 +-
 i18n/po/ko.po                                      |   353 +-
 i18n/po/ky.po                                      |   353 +-
 i18n/po/lb.po                                      |   353 +-
 i18n/po/lo.po                                      |   353 +-
 i18n/po/lt.po                                      |   506 +-
 i18n/po/lv.po                                      |   353 +-
 i18n/po/mk.po                                      |   353 +-
 i18n/po/mr.po                                      |   353 +-
 i18n/po/ms.po                                      |   353 +-
 i18n/po/nb.po                                      |  1154 +-
 i18n/po/nds.po                                     |   353 +-
 i18n/po/nl.po                                      |   377 +-
 i18n/po/nn.po                                      |   353 +-
 i18n/po/oc.po                                      |   353 +-
 i18n/po/pa.po                                      |   353 +-
 i18n/po/pl.po                                      |   828 +-
 i18n/po/pt.po                                      |   391 +-
 i18n/po/pt_BR.po                                   |   593 +-
 i18n/po/rm.po                                      |   353 +-
 i18n/po/ro.po                                      |   353 +-
 i18n/po/ru.po                                      |   411 +-
 i18n/po/sk.po                                      |   434 +-
 i18n/po/sl.po                                      |   355 +-
 i18n/po/sq.po                                      |   353 +-
 i18n/po/sr.po                                      |   353 +-
 i18n/po/sv.po                                      |   371 +-
 i18n/po/ta.po                                      |   355 +-
 i18n/po/te.po                                      |   353 +-
 i18n/po/th.po                                      |   353 +-
 i18n/po/tr.po                                      |   357 +-
 i18n/po/ug.po                                      |   353 +-
 i18n/po/uk.po                                      |   406 +-
 i18n/po/ur.po                                      |   353 +-
 i18n/po/vi.po                                      |   375 +-
 i18n/po/wae.po                                     |   353 +-
 i18n/po/zh_CN.po                                   |   365 +-
 i18n/po/zh_TW.po                                   |   495 +-
 images/download_in_view.png                        |   Bin 0 -> 1258 bytes
 images/presets/accommodation/alpine_hut.svg        |   135 +
 images/presets/accommodation/alpine_hut_blue.png   |   Bin 346 -> 0 bytes
 images/presets/accommodation/basic_hut.svg         |   114 +
 images/presets/accommodation/basic_hut_blue.png    |   Bin 217 -> 0 bytes
 images/presets/accommodation/shelter_picnic.svg    |   150 +
 .../presets/accommodation/shelter_picnic_brown.png |   Bin 346 -> 0 bytes
 .../accommodation/shelter_public_transport.svg     |   126 +
 .../shelter_public_transport_brown.png             |   Bin 242 -> 0 bytes
 images/presets/accommodation/wilderness_hut.svg    |   142 +
 .../presets/accommodation/wilderness_hut_blue.png  |   Bin 212 -> 0 bytes
 images/presets/barrier/barrier.png                 |   Bin 441 -> 0 bytes
 images/presets/barrier/cattle_grid.png             |   Bin 272 -> 0 bytes
 images/presets/barrier/cattle_grid.svg             |   122 +
 images/presets/barrier/douane.png                  |   Bin 289 -> 0 bytes
 images/presets/barrier/douane.svg                  |    77 +
 images/presets/barrier/gate.png                    |   Bin 492 -> 0 bytes
 images/presets/barrier/gate.svg                    |   156 +
 images/presets/barrier/guard_rail.svg              |   118 +
 images/presets/barrier/jersey_barrier.svg          |   111 +
 images/presets/barrier/toll_station.png            |   Bin 545 -> 0 bytes
 images/presets/barrier/toll_station.svg            |   255 +
 images/presets/craft/beekeeper.svg                 |   211 +
 images/presets/craft/painter.png                   |   Bin 291 -> 0 bytes
 images/presets/craft/painter.svg                   |   124 +
 images/presets/craft/plumber.png                   |   Bin 268 -> 0 bytes
 images/presets/craft/plumber.svg                   |   230 +
 images/presets/craft/pottery.png                   |   Bin 354 -> 0 bytes
 images/presets/craft/pottery.svg                   |    84 +
 images/presets/craft/tiler.png                     |   Bin 90 -> 0 bytes
 images/presets/craft/tiler.svg                     |    94 +
 images/presets/craft/window_construction.png       |   Bin 275 -> 0 bytes
 images/presets/craft/window_construction.svg       |   135 +
 images/presets/education/college.png               |   Bin 476 -> 0 bytes
 images/presets/education/college.svg               |   152 +
 images/presets/education/driving_school.png        |   Bin 412 -> 0 bytes
 images/presets/education/driving_school.svg        |   176 +
 images/presets/education/library.svg               |   376 +
 images/presets/education/school.png                |   Bin 1783 -> 0 bytes
 images/presets/education/school.svg                |   260 +
 images/presets/education/university.png            |   Bin 305 -> 0 bytes
 images/presets/education/university.svg            |   150 +
 images/presets/food/biergarten.png                 |   Bin 1522 -> 0 bytes
 images/presets/food/biergarten.svg                 |   220 +
 images/presets/food/cafe.png                       |   Bin 1153 -> 0 bytes
 images/presets/food/cafe.svg                       |    77 +
 images/presets/food/drinking_water.png             |   Bin 523 -> 0 bytes
 images/presets/food/drinking_water.svg             |    75 +
 images/presets/food/fast_food.svg                  |    87 +
 images/presets/food/fastfood.png                   |   Bin 804 -> 0 bytes
 images/presets/food/food_court.png                 |   Bin 386 -> 0 bytes
 images/presets/food/food_court.svg                 |    69 +
 images/presets/food/ice_cream.svg                  |   178 +
 images/presets/food/icecream.png                   |   Bin 664 -> 0 bytes
 images/presets/food/pub.png                        |   Bin 682 -> 0 bytes
 images/presets/food/pub.svg                        |   201 +
 images/presets/landmark/beacon.png                 |   Bin 149 -> 0 bytes
 images/presets/landmark/beacon.svg                 |   108 +
 images/presets/landmark/boundary_stone.svg         |    79 +
 images/presets/landmark/cave_entrance.png          |   Bin 391 -> 0 bytes
 images/presets/landmark/cave_entrance.svg          |    97 +
 images/presets/landmark/chimney.png                |   Bin 546 -> 0 bytes
 images/presets/landmark/chimney.svg                |   173 +
 images/presets/landmark/hunting_stand.png          |   Bin 130 -> 0 bytes
 images/presets/landmark/hunting_stand.svg          |    88 +
 images/presets/landmark/pipeline.svg               |    93 +
 images/presets/landmark/tower.png                  |   Bin 183 -> 0 bytes
 images/presets/landmark/tower.svg                  |   100 +
 images/presets/landmark/trees_palm.png             |   Bin 487 -> 0 bytes
 images/presets/landmark/water_works.png            |   Bin 605 -> 0 bytes
 images/presets/landmark/water_works.svg            |   102 +
 images/presets/landuse/aquaculture.svg             |   108 +
 images/presets/landuse/basin.svg                   |    87 +
 images/presets/landuse/brownfield.svg              |   108 +
 images/presets/landuse/farmland.png                |   Bin 494 -> 0 bytes
 images/presets/landuse/farmland.svg                |   255 +
 images/presets/landuse/farmyard.png                |   Bin 462 -> 0 bytes
 images/presets/landuse/farmyard.svg                |   118 +
 images/presets/landuse/garages.png                 |   Bin 521 -> 0 bytes
 images/presets/landuse/garages.svg                 |   106 +
 images/presets/landuse/greenfield.svg              |   108 +
 images/presets/landuse/greenhouse_horticulture.png |   Bin 1230 -> 0 bytes
 images/presets/landuse/greenhouse_horticulture.svg |   164 +
 images/presets/landuse/landuse.png                 |   Bin 300 -> 0 bytes
 images/presets/landuse/landuse_water.png           |   Bin 292 -> 0 bytes
 .../plant.svg => landuse/plant_nursery.svg}        |     0
 images/presets/landuse/rail_light.png              |   Bin 326 -> 0 bytes
 images/presets/landuse/railway.svg                 |    43 +
 images/presets/landuse/reservoir.svg               |    81 +
 images/presets/landuse/vineyard.png                |   Bin 392 -> 0 bytes
 images/presets/landuse/vineyard.svg                |    78 +
 images/presets/leisure/bbq.png                     |   Bin 874 -> 0 bytes
 images/presets/leisure/bbq.svg                     |   132 +
 images/presets/leisure/beach_resort.svg            |   135 +
 images/presets/leisure/bench.png                   |   Bin 116 -> 0 bytes
 images/presets/leisure/bench.svg                   |   127 +
 images/presets/leisure/brothel.svg                 |   112 +
 images/presets/leisure/casino.svg                  |    42 +-
 images/presets/leisure/common.png                  |   Bin 206 -> 0 bytes
 images/presets/leisure/common.svg                  |    79 +
 images/presets/leisure/dog.png                     |   Bin 473 -> 0 bytes
 images/presets/leisure/dogpark.png                 |   Bin 724 -> 0 bytes
 images/presets/leisure/dogpark.svg                 |   826 ++
 images/presets/leisure/equestrian.png              |   Bin 356 -> 0 bytes
 images/presets/leisure/garden.png                  |   Bin 117 -> 0 bytes
 images/presets/leisure/garden.svg                  |   143 +
 images/presets/leisure/horse_riding.svg            |    76 +
 images/presets/leisure/nature_reserve.png          |   Bin 137 -> 0 bytes
 images/presets/leisure/nature_reserve.svg          |   156 +
 images/presets/leisure/nightclub.png               |   Bin 594 -> 0 bytes
 .../leisure/{discoball.svg => nightclub.svg}       |     0
 images/presets/leisure/park.png                    |   Bin 103 -> 0 bytes
 images/presets/leisure/park.svg                    |   167 +
 images/presets/leisure/picnic.png                  |   Bin 337 -> 0 bytes
 images/presets/leisure/picnic.svg                  |    82 +
 images/presets/leisure/sauna.png                   |   Bin 787 -> 0 bytes
 images/presets/leisure/sauna.svg                   |   137 +
 images/presets/leisure/stripclub.png               |   Bin 634 -> 0 bytes
 images/presets/leisure/stripclub.svg               |    73 +
 images/presets/leisure/theater.png                 |   Bin 712 -> 0 bytes
 images/presets/leisure/theater.svg                 |   164 +
 images/presets/leisure/water_park.png              |   Bin 150 -> 0 bytes
 images/presets/leisure/water_park.svg              |   111 +
 images/presets/misc/addresses.png                  |   Bin 1462 -> 0 bytes
 images/presets/misc/boundaries.png                 |   Bin 212 -> 0 bytes
 images/presets/misc/boundaries.svg                 |    73 +
 images/presets/misc/boundary_stone.png             |   Bin 160 -> 0 bytes
 images/presets/misc/cliff-pattern.png              |   Bin 124 -> 0 bytes
 images/presets/misc/cliff_pattern.svg              |    79 +
 images/presets/misc/contact.png                    |   Bin 2913 -> 0 bytes
 images/presets/misc/contact.svg                    |    50 +
 images/presets/misc/entrance-emergency.png         |   Bin 387 -> 0 bytes
 images/presets/misc/entrance-exit.png              |   Bin 304 -> 0 bytes
 images/presets/misc/entrance-main.png              |   Bin 372 -> 0 bytes
 images/presets/misc/entrance-service.png           |   Bin 374 -> 0 bytes
 images/presets/misc/entrance-yes.png               |   Bin 244 -> 0 bytes
 images/presets/misc/entrance_emergency.svg         |   101 +
 images/presets/misc/entrance_exit.svg              |   261 +
 images/presets/misc/entrance_main.svg              |   262 +
 images/presets/misc/entrance_service.svg           |   262 +
 images/presets/misc/entrance_yes.svg               |   262 +
 images/presets/misc/fixme-annotation.png           |   Bin 292 -> 0 bytes
 images/presets/misc/fixme.svg                      |   115 +
 images/presets/misc/fixme_annotation.svg           |   115 +
 images/presets/misc/flag.png                       |   Bin 498 -> 0 bytes
 images/presets/misc/flag.svg                       |   104 +
 images/presets/misc/fountain.png                   |   Bin 119 -> 0 bytes
 images/presets/misc/fountain.svg                   |    79 +
 images/presets/misc/housenumber.png                |   Bin 310 -> 0 bytes
 images/presets/misc/housenumber.svg                |    88 +
 images/presets/misc/housenumber_small.svg          |    88 +
 images/presets/misc/information/board.svg          |    40 +-
 .../presets/misc/information/informationoffice.svg |    35 +-
 images/presets/misc/information/map.svg            |    28 +-
 images/presets/misc/interpolation.png              |   Bin 132 -> 0 bytes
 images/presets/misc/interpolation.svg              |    92 +
 images/presets/misc/message.png                    |   Bin 359 -> 0 bytes
 images/presets/misc/monitoring_station.png         |   Bin 386 -> 0 bytes
 images/presets/misc/monitoring_station.svg         |   250 +
 images/presets/misc/multipolygon.png               |   Bin 120 -> 0 bytes
 images/presets/misc/multipolygon.svg               |    80 +
 images/presets/misc/name.svg                       |   100 +
 images/presets/misc/note-annotation.png            |   Bin 541 -> 0 bytes
 images/presets/misc/note-fixme-annotation.png      |   Bin 746 -> 0 bytes
 images/presets/misc/note.svg                       |   117 +
 images/presets/misc/note_annotation.svg            |   113 +
 images/presets/misc/note_fixme_annotation.svg      |   155 +
 images/presets/misc/path.png                       |   Bin 135 -> 0 bytes
 images/presets/misc/relations.png                  |   Bin 354 -> 0 bytes
 images/presets/misc/relations.svg                  |    91 +
 images/presets/misc/rock.svg                       |    18 +-
 images/presets/misc/route.svg                      |    99 +
 images/presets/misc/stone.svg                      |     4 +-
 images/presets/misc/streetlamp.png                 |   Bin 410 -> 0 bytes
 images/presets/misc/streetlamp.svg                 |    99 +
 images/presets/nautical/boatyard.png               |   Bin 473 -> 0 bytes
 images/presets/nautical/boatyard.svg               |    96 +
 images/presets/nautical/marina.png                 |   Bin 181 -> 0 bytes
 images/presets/nautical/marina.svg                 |   116 +
 images/presets/nautical/marine_fuel.png            |   Bin 1252 -> 0 bytes
 images/presets/nautical/marine_fuel.svg            |   109 +
 images/presets/nautical/slipway.png                |   Bin 304 -> 0 bytes
 images/presets/nautical/slipway.svg                |   110 +
 images/presets/place/capital.svg                   |    79 +
 images/presets/place/city.svg                      |    79 +
 images/presets/place/farm.svg                      |    79 +
 images/presets/place/hamlet.svg                    |    79 +
 images/presets/place/isolated_dwelling.svg         |    79 +
 images/presets/place/neighbourhood.svg             |    79 +
 images/presets/place/settlement/capital.png        |   Bin 155 -> 0 bytes
 images/presets/place/settlement/city.png           |   Bin 273 -> 0 bytes
 images/presets/place/settlement/farm.png           |   Bin 275 -> 0 bytes
 images/presets/place/settlement/hamlet.png         |   Bin 258 -> 0 bytes
 .../presets/place/settlement/isolated_dwelling.png |   Bin 153 -> 0 bytes
 images/presets/place/settlement/neighbourhood.png  |   Bin 265 -> 0 bytes
 images/presets/place/settlement/suburb.png         |   Bin 265 -> 0 bytes
 images/presets/place/settlement/town.png           |   Bin 235 -> 0 bytes
 images/presets/place/settlement/village.png        |   Bin 260 -> 0 bytes
 images/presets/place/suburb.svg                    |    79 +
 images/presets/place/town.svg                      |    79 +
 images/presets/place/village.svg                   |    79 +
 images/presets/power/power_source-biofuel.svg      |   360 +-
 images/presets/power/power_source-coal.svg         |   360 +-
 images/presets/power/power_source-gas.svg          |   360 +-
 images/presets/power/power_source-geothermal.svg   |    73 +-
 images/presets/power/power_source-nuclear.svg      |    92 +-
 images/presets/power/power_source-oil.svg          |   360 +-
 images/presets/power/power_source-sun.svg          |   162 +-
 images/presets/power/power_source-waste.svg        |   360 +-
 images/presets/power/power_source-water.svg        |    82 +-
 images/presets/power/power_source-wind.svg         |    80 +-
 images/presets/religion/wayside_cross.svg          |    64 +-
 images/presets/service/arts_centre.png             |   Bin 446 -> 0 bytes
 images/presets/service/community_centre.png        |   Bin 856 -> 0 bytes
 images/presets/service/community_centre.svg        |   184 +
 images/presets/service/embassy.png                 |   Bin 688 -> 0 bytes
 images/presets/service/embassy.svg                 |    71 +
 images/presets/service/excrement_bags.png          |   Bin 499 -> 0 bytes
 images/presets/service/excrement_bags.svg          |   101 +
 images/presets/service/post_box.png                |   Bin 285 -> 0 bytes
 images/presets/service/post_box.svg                |   102 +
 images/presets/service/post_office.png             |   Bin 428 -> 0 bytes
 images/presets/service/post_office.svg             |   105 +
 images/presets/service/recycling/trash-bin.svg     |    87 -
 images/presets/service/recycling/waste_basket.svg  |    82 +
 .../presets/service/recycling/waste_disposal.png   |   Bin 215 -> 0 bytes
 .../presets/service/recycling/waste_disposal.svg   |   116 +
 images/presets/service/studio.png                  |   Bin 406 -> 0 bytes
 images/presets/service/studio.svg                  |   122 +
 images/presets/service/surveillance.png            |   Bin 349 -> 0 bytes
 images/presets/service/surveillance.svg            |   109 +
 images/presets/service/townhall.png                |   Bin 433 -> 0 bytes
 images/presets/service/townhall.svg                |    77 +
 images/presets/shop/boutique.png                   |   Bin 1107 -> 0 bytes
 images/presets/shop/boutique.svg                   |   114 +
 images/presets/shop/clothes.svg                    |   501 +-
 images/presets/shop/convenience.png                |   Bin 395 -> 0 bytes
 images/presets/shop/convenience.svg                |   130 +
 images/presets/shop/copyshop.png                   |   Bin 575 -> 0 bytes
 images/presets/shop/copyshop.svg                   |   462 +
 images/presets/shop/curtain.png                    |   Bin 694 -> 0 bytes
 images/presets/shop/curtain.svg                    |    94 +
 images/presets/shop/diy_store.svg                  |     2 +-
 images/presets/shop/erotic.png                     |   Bin 951 -> 0 bytes
 images/presets/shop/erotic.svg                     |   162 +
 images/presets/shop/fabric.png                     |   Bin 812 -> 0 bytes
 images/presets/shop/fabric.svg                     |   233 +
 images/presets/shop/frame.png                      |   Bin 605 -> 0 bytes
 images/presets/shop/frame.svg                      |   102 +
 images/presets/shop/furniture.svg                  |   449 +-
 images/presets/shop/groceries/apple.png            |   Bin 434 -> 0 bytes
 images/presets/shop/groceries/bakery.png           |   Bin 178 -> 0 bytes
 images/presets/shop/groceries/bakery.svg           |   164 +
 images/presets/shop/groceries/butcher.png          |   Bin 84 -> 0 bytes
 images/presets/shop/groceries/butcher.svg          |   265 +
 images/presets/shop/groceries/deli.png             |   Bin 1046 -> 0 bytes
 images/presets/shop/groceries/deli.svg             |   101 +
 images/presets/shop/groceries/farm.svg             |   102 +
 images/presets/shop/groceries/greengrocer.png      |   Bin 766 -> 0 bytes
 images/presets/shop/groceries/greengrocer.svg      |   176 +
 images/presets/shop/groceries/pastry.svg           |   111 +
 images/presets/shop/groceries/seafood.png          |   Bin 415 -> 0 bytes
 images/presets/shop/groceries/seafood.svg          |   172 +
 images/presets/shop/hairdresser.svg                |   208 +-
 images/presets/shop/hardware.png                   |   Bin 509 -> 0 bytes
 images/presets/shop/hardware.svg                   |   847 ++
 images/presets/shop/hearing_aids.png               |   Bin 433 -> 0 bytes
 images/presets/shop/hearing_aids.svg               |   418 +
 images/presets/shop/kitchen.png                    |   Bin 1153 -> 0 bytes
 images/presets/shop/kitchen.svg                    |   103 +
 images/presets/shop/library.png                    |   Bin 147 -> 0 bytes
 images/presets/shop/marketplace.png                |   Bin 600 -> 0 bytes
 images/presets/shop/marketplace.svg                |   277 +
 images/presets/shop/mobile_phone.png               |   Bin 932 -> 0 bytes
 images/presets/shop/mobile_phone.svg               |    87 +
 images/presets/shop/musical_instrument.png         |   Bin 482 -> 0 bytes
 images/presets/shop/musical_instrument.svg         |   413 +
 images/presets/shop/paint.png                      |   Bin 291 -> 0 bytes
 images/presets/shop/paint.svg                      |    94 +
 images/presets/shop/stationery.png                 |   Bin 755 -> 0 bytes
 images/presets/shop/stationery.svg                 |   144 +
 images/presets/shop/tailor.svg                     |   636 +-
 images/presets/shop/travel.png                     |   Bin 1314 -> 0 bytes
 images/presets/shop/travel_agency.svg              |   324 +
 images/presets/shop/vacuum_cleaner.png             |   Bin 863 -> 0 bytes
 images/presets/shop/vacuum_cleaner.svg             |   157 +
 images/presets/shop/variety_store.png              |   Bin 601 -> 0 bytes
 images/presets/shop/variety_store.svg              |    87 +
 images/presets/shop/vehicle.svg                    |    24 +-
 images/presets/shop/video.png                      |   Bin 170 -> 0 bytes
 images/presets/shop/video.svg                      |   240 +
 images/presets/shop/video_games.png                |   Bin 226 -> 0 bytes
 images/presets/shop/video_games.svg                |   112 +
 images/presets/sightseeing/arts_centre.svg         |   130 +
 .../presets/sightseeing/palaeontological_site.png  |   Bin 922 -> 0 bytes
 .../presets/sightseeing/palaeontological_site.svg  |   110 +
 images/presets/sport/10pin.svg                     |    96 +-
 images/presets/sport/9pin.svg                      |   122 +
 images/presets/sport/athletics.png                 |   Bin 546 -> 0 bytes
 images/presets/sport/athletics.svg                 |    70 +
 images/presets/sport/beachvolleyball.png           |   Bin 653 -> 0 bytes
 images/presets/sport/beachvolleyball.svg           |    75 +
 images/presets/sport/centre.png                    |   Bin 241 -> 0 bytes
 images/presets/sport/chess.png                     |   Bin 74 -> 0 bytes
 images/presets/sport/chess.svg                     |   305 +
 images/presets/sport/dog_racing.svg                |    93 +
 images/presets/sport/equestrian.svg                |    76 +
 images/presets/sport/field_hockey.png              |   Bin 304 -> 0 bytes
 images/presets/sport/field_hockey.svg              |   113 +
 images/presets/sport/fishing.png                   |   Bin 145 -> 0 bytes
 images/presets/sport/fishing.svg                   |   127 +
 images/presets/sport/fitness_centre.png            |   Bin 1145 -> 0 bytes
 images/presets/sport/fitness_centre.svg            |   128 +
 images/presets/sport/ice_hockey.png                |   Bin 413 -> 0 bytes
 images/presets/sport/ice_hockey.svg                |   113 +
 images/presets/sport/ice_skating.svg               |   223 +
 images/presets/sport/karting.png                   |   Bin 755 -> 0 bytes
 images/presets/sport/karting.svg                   |   124 +
 images/presets/sport/motor.png                     |   Bin 699 -> 0 bytes
 images/presets/sport/motor.svg                     |   106 +
 images/presets/sport/pelota.png                    |   Bin 593 -> 0 bytes
 images/presets/sport/pelota.svg                    |   112 +
 images/presets/sport/pitch.png                     |   Bin 577 -> 0 bytes
 images/presets/sport/pitch.svg                     |   649 +
 images/presets/sport/rc_car.svg                    |    40 +-
 images/presets/sport/skating.png                   |   Bin 845 -> 0 bytes
 images/presets/sport/sports_centre.svg             |   222 +
 images/presets/sport/stadium.png                   |   Bin 580 -> 0 bytes
 images/presets/sport/stadium.svg                   |   143 +
 images/presets/sport/track.png                     |   Bin 130 -> 0 bytes
 images/presets/sport/track.svg                     |   168 +
 images/presets/sport/volleyball.svg                |     2 +-
 .../presets/transport/aerialway/magic_carpet.png   |   Bin 256 -> 0 bytes
 .../presets/transport/aerialway/magic_carpet.svg   |   205 +
 .../presets/transport/airport/parking_position.png |   Bin 180 -> 0 bytes
 .../presets/transport/airport/parking_position.svg |   100 +
 images/presets/transport/airport/runway.png        |   Bin 101 -> 0 bytes
 images/presets/transport/airport/runway.svg        |   150 +
 images/presets/transport/airport/taxiway.png       |   Bin 101 -> 0 bytes
 images/presets/transport/airport/taxiway.svg       |    94 +
 images/presets/transport/bus_small.png             |   Bin 329 -> 0 bytes
 images/presets/transport/bus_small.svg             |    94 +
 images/presets/transport/platform_bus.png          |   Bin 378 -> 0 bytes
 images/presets/transport/platform_bus.svg          |   185 +
 images/presets/transport/platform_rail.png         |   Bin 458 -> 0 bytes
 images/presets/transport/platform_rail.svg         |   189 +
 images/presets/transport/railway_halt.svg          |   143 +
 images/presets/transport/railway_small.png         |   Bin 121 -> 0 bytes
 images/presets/transport/station.png               |   Bin 882 -> 0 bytes
 images/presets/transport/station16.png             |   Bin 412 -> 0 bytes
 images/presets/transport/stop_position.svg         |    86 +
 images/presets/transport/taxi.svg                  |    14 +-
 images/presets/transport/underground.png           |   Bin 566 -> 0 bytes
 images/presets/transport/underground.svg           |   260 +
 images/presets/vehicle/charging_station.png        |   Bin 322 -> 0 bytes
 images/presets/vehicle/charging_station.svg        |    82 +
 .../turn_restrictions/no_left_turn_red.png         |   Bin 1298 -> 0 bytes
 .../turn_restrictions/no_left_turn_red.svg         |    65 +
 .../turn_restrictions/no_right_turn_red.png        |   Bin 1304 -> 0 bytes
 .../turn_restrictions/no_right_turn_red.svg        |    65 +
 .../turn_restrictions/no_straight_on_red.png       |   Bin 1291 -> 0 bytes
 .../turn_restrictions/no_straight_on_red.svg       |    68 +
 josm-latest.jnlp                                   |     2 +-
 josm.jnlp                                          |     2 +-
 optimize-images                                    |     4 +-
 scripts/TagInfoExtract.groovy                      |     8 +-
 src/com/drew/imaging/ImageProcessingException.java |     2 +-
 src/com/drew/imaging/PhotographicConversions.java  |     2 +-
 src/com/drew/imaging/jpeg/JpegMetadataReader.java  |     6 +-
 .../drew/imaging/jpeg/JpegProcessingException.java |     2 +-
 src/com/drew/imaging/jpeg/JpegSegmentData.java     |     5 +-
 src/com/drew/imaging/jpeg/JpegSegmentReader.java   |    24 +-
 src/com/drew/imaging/jpeg/JpegSegmentType.java     |    19 +-
 src/com/drew/imaging/jpeg/package.html             |     2 +-
 src/com/drew/imaging/package.html                  |     2 +-
 src/com/drew/imaging/tiff/TiffDataFormat.java      |     2 +-
 src/com/drew/imaging/tiff/TiffHandler.java         |     8 +-
 .../drew/imaging/tiff/TiffProcessingException.java |     2 +-
 src/com/drew/imaging/tiff/TiffReader.java          |    80 +-
 src/com/drew/imaging/tiff/package.html             |     2 +-
 src/com/drew/lang/BufferBoundsException.java       |     2 +-
 src/com/drew/lang/ByteArrayReader.java             |    10 +-
 src/com/drew/lang/CompoundException.java           |     2 +-
 src/com/drew/lang/DateUtil.java                    |    32 +
 src/com/drew/lang/GeoLocation.java                 |     4 +-
 src/com/drew/lang/NullOutputStream.java            |    43 -
 src/com/drew/lang/RandomAccessReader.java          |     4 +-
 src/com/drew/lang/Rational.java                    |     2 +-
 src/com/drew/lang/SequentialByteArrayReader.java   |     3 +-
 src/com/drew/lang/SequentialReader.java            |     2 +-
 src/com/drew/lang/StreamReader.java                |     3 +-
 src/com/drew/lang/StringUtil.java                  |     2 +-
 src/com/drew/lang/annotations/NotNull.java         |     2 +-
 src/com/drew/lang/annotations/Nullable.java        |     2 +-
 .../drew/lang/annotations/SuppressWarnings.java    |    42 -
 src/com/drew/lang/annotations/package.html         |     2 +-
 src/com/drew/lang/package.html                     |     2 +-
 src/com/drew/metadata/Age.java                     |     2 +-
 src/com/drew/metadata/DefaultTagDescriptor.java    |    51 -
 src/com/drew/metadata/Directory.java               |   176 +-
 src/com/drew/metadata/Face.java                    |     2 +-
 src/com/drew/metadata/Metadata.java                |   115 +-
 src/com/drew/metadata/MetadataException.java       |     2 +-
 src/com/drew/metadata/MetadataReader.java          |    42 -
 src/com/drew/metadata/Tag.java                     |    10 +-
 src/com/drew/metadata/TagDescriptor.java           |    79 +-
 src/com/drew/metadata/exif/ExifDescriptorBase.java |    53 +-
 src/com/drew/metadata/exif/ExifDirectoryBase.java  |    18 +-
 src/com/drew/metadata/exif/ExifIFD0Descriptor.java |     2 +-
 src/com/drew/metadata/exif/ExifIFD0Directory.java  |     6 +-
 .../drew/metadata/exif/ExifInteropDescriptor.java  |     2 +-
 .../drew/metadata/exif/ExifInteropDirectory.java   |     2 +-
 src/com/drew/metadata/exif/ExifReader.java         |    16 +-
 .../drew/metadata/exif/ExifSubIFDDescriptor.java   |     2 +-
 .../drew/metadata/exif/ExifSubIFDDirectory.java    |    65 +-
 .../metadata/exif/ExifThumbnailDescriptor.java     |    48 +-
 .../drew/metadata/exif/ExifThumbnailDirectory.java |    43 +-
 src/com/drew/metadata/exif/ExifTiffHandler.java    |    71 +-
 src/com/drew/metadata/exif/GpsDescriptor.java      |     4 +-
 src/com/drew/metadata/exif/GpsDirectory.java       |    43 +-
 .../exif/makernotes/CanonMakernoteDescriptor.java  |     9 +-
 .../exif/makernotes/CanonMakernoteDirectory.java   |     2 +-
 .../makernotes/CasioType1MakernoteDescriptor.java  |     8 +-
 .../makernotes/CasioType1MakernoteDirectory.java   |     2 +-
 .../makernotes/CasioType2MakernoteDescriptor.java  |     6 +-
 .../makernotes/CasioType2MakernoteDirectory.java   |     2 +-
 .../makernotes/FujifilmMakernoteDescriptor.java    |     2 +-
 .../makernotes/FujifilmMakernoteDirectory.java     |     2 +-
 .../exif/makernotes/KodakMakernoteDescriptor.java  |     2 +-
 .../exif/makernotes/KodakMakernoteDirectory.java   |     2 +-
 .../makernotes/KyoceraMakernoteDescriptor.java     |     2 +-
 .../exif/makernotes/KyoceraMakernoteDirectory.java |     2 +-
 .../exif/makernotes/LeicaMakernoteDescriptor.java  |     2 +-
 .../exif/makernotes/LeicaMakernoteDirectory.java   |     2 +-
 .../makernotes/NikonType1MakernoteDescriptor.java  |     2 +-
 .../makernotes/NikonType1MakernoteDirectory.java   |     2 +-
 .../makernotes/NikonType2MakernoteDescriptor.java  |    13 +-
 .../makernotes/NikonType2MakernoteDirectory.java   |     2 +-
 .../OlympusCameraSettingsMakernoteDescriptor.java  |  1357 ++
 .../OlympusCameraSettingsMakernoteDirectory.java   |   198 +
 .../OlympusEquipmentMakernoteDescriptor.java       |   370 +
 .../OlympusEquipmentMakernoteDirectory.java        |   117 +
 .../makernotes/OlympusMakernoteDescriptor.java     |    69 +-
 .../exif/makernotes/OlympusMakernoteDirectory.java |     2 +-
 .../makernotes/PanasonicMakernoteDescriptor.java   |     2 +-
 .../makernotes/PanasonicMakernoteDirectory.java    |     2 +-
 .../exif/makernotes/PentaxMakernoteDescriptor.java |     2 +-
 .../exif/makernotes/PentaxMakernoteDirectory.java  |     2 +-
 .../exif/makernotes/RicohMakernoteDescriptor.java  |     2 +-
 .../exif/makernotes/RicohMakernoteDirectory.java   |     2 +-
 .../exif/makernotes/SanyoMakernoteDescriptor.java  |     2 +-
 .../exif/makernotes/SanyoMakernoteDirectory.java   |     2 +-
 .../exif/makernotes/SigmaMakernoteDescriptor.java  |     2 +-
 .../exif/makernotes/SigmaMakernoteDirectory.java   |     2 +-
 .../makernotes/SonyType1MakernoteDescriptor.java   |     2 +-
 .../makernotes/SonyType1MakernoteDirectory.java    |     2 +-
 .../makernotes/SonyType6MakernoteDescriptor.java   |     2 +-
 .../makernotes/SonyType6MakernoteDirectory.java    |     2 +-
 src/com/drew/metadata/exif/makernotes/package.html |     2 +-
 src/com/drew/metadata/exif/package.html            |     2 +-
 .../drew/metadata/file/FileMetadataDescriptor.java |     8 +-
 .../drew/metadata/file/FileMetadataDirectory.java  |     2 +-
 src/com/drew/metadata/file/FileMetadataReader.java |    20 +
 src/com/drew/metadata/file/package.html            |     2 +-
 src/com/drew/metadata/iptc/IptcDescriptor.java     |   150 +-
 src/com/drew/metadata/iptc/IptcDirectory.java      |    83 +-
 src/com/drew/metadata/iptc/IptcReader.java         |    43 +-
 src/com/drew/metadata/iptc/Iso2022Converter.java   |    26 +-
 src/com/drew/metadata/iptc/package.html            |     2 +-
 .../drew/metadata/jpeg/JpegCommentDescriptor.java  |     2 +-
 .../drew/metadata/jpeg/JpegCommentDirectory.java   |     2 +-
 src/com/drew/metadata/jpeg/JpegCommentReader.java  |    12 +-
 src/com/drew/metadata/jpeg/JpegComponent.java      |    13 +-
 src/com/drew/metadata/jpeg/JpegDescriptor.java     |    66 +-
 src/com/drew/metadata/jpeg/JpegDirectory.java      |     2 +-
 src/com/drew/metadata/jpeg/JpegReader.java         |     2 +-
 src/com/drew/metadata/jpeg/package.html            |     2 +-
 src/com/drew/metadata/package.html                 |     2 +-
 .../drew/metadata/tiff/DirectoryTiffHandler.java   |     6 +-
 src/com/drew/metadata/tiff/package.html            |     2 +-
 .../debug/CheckThreadViolationRepaintManager.java  |    15 +-
 src/org/openstreetmap/josm/Main.java               |   283 +-
 .../josm/actions/CloseChangesetAction.java         |     3 +-
 .../josm/actions/DownloadOsmInViewAction.java      |    50 +
 .../josm/actions/ExtensionFileFilter.java          |     5 +-
 .../josm/actions/ImageryAdjustAction.java          |    21 +-
 .../josm/actions/MergeNodesAction.java             |     3 +-
 .../josm/actions/PreferenceToggleAction.java       |    23 +-
 .../josm/actions/ShowStatusReportAction.java       |    25 +-
 .../openstreetmap/josm/actions/ValidateAction.java |     2 +-
 .../josm/actions/mapmode/DrawAction.java           |   374 +-
 .../josm/actions/mapmode/ExtrudeAction.java        |    42 +-
 .../actions/mapmode/ImproveWayAccuracyAction.java  |   157 +-
 .../josm/actions/mapmode/ModifiersSpec.java        |    58 -
 .../josm/actions/mapmode/ParallelWayAction.java    |   262 +-
 .../josm/actions/mapmode/SelectAction.java         |     7 +-
 .../josm/actions/search/SearchCompiler.java        |     6 +-
 .../josm/actions/upload/ValidateUploadHook.java    |     5 +-
 .../josm/command/AddPrimitivesCommand.java         |     1 +
 src/org/openstreetmap/josm/command/Command.java    |    45 +-
 src/org/openstreetmap/josm/data/AutosaveTask.java  |     4 +-
 src/org/openstreetmap/josm/data/Bounds.java        |    75 +-
 src/org/openstreetmap/josm/data/Preferences.java   |   177 +-
 .../josm/data/cache/BufferedImageCacheEntry.java   |     3 -
 .../josm/data/cache/JCSCacheManager.java           |     6 +-
 .../josm/data/cache/JCSCachedTileLoaderJob.java    |     3 +-
 .../openstreetmap/josm/data/coor/EastNorth.java    |     8 +-
 src/org/openstreetmap/josm/data/coor/LatLon.java   |    30 +-
 src/org/openstreetmap/josm/data/gpx/GpxData.java   |    43 +
 src/org/openstreetmap/josm/data/gpx/GpxRoute.java  |    22 +
 .../josm/data/gpx/ImmutableGpxTrack.java           |    26 +-
 .../josm/data/gpx/ImmutableGpxTrackSegment.java    |    30 +-
 src/org/openstreetmap/josm/data/gpx/WayPoint.java  |    31 +
 .../josm/data/gpx/WithAttributes.java              |    22 +
 .../josm/data/imagery/TMSCachedTileLoader.java     |     3 +-
 src/org/openstreetmap/josm/data/osm/DataSet.java   |    40 +-
 .../josm/data/osm/DatasetFactory.java              |    62 -
 .../josm/data/osm/MultipolygonBuilder.java         |    20 +
 src/org/openstreetmap/josm/data/osm/Node.java      |    35 +-
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |     2 +-
 .../openstreetmap/josm/data/osm/PrimitiveData.java |    20 +-
 .../openstreetmap/josm/data/osm/QuadBuckets.java   |     5 +-
 src/org/openstreetmap/josm/data/osm/User.java      |    30 +-
 .../josm/data/osm/visitor/BoundingXYVisitor.java   |     3 +-
 .../osm/visitor/paint/AbstractMapRenderer.java     |    67 +-
 .../data/osm/visitor/paint/ArrowPaintHelper.java   |    51 +
 .../josm/data/osm/visitor/paint/LineClip.java      |   149 -
 .../josm/data/osm/visitor/paint/PaintColors.java   |    55 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |   647 +-
 .../osm/visitor/paint/WireframeMapRenderer.java    |   112 +-
 .../josm/data/preferences/AbstractProperty.java    |   229 +-
 .../data/preferences/AbstractToStringProperty.java |   161 +
 .../josm/data/preferences/BooleanProperty.java     |    23 +-
 .../josm/data/preferences/CachedProperty.java      |     4 +-
 .../josm/data/preferences/CachingProperty.java     |    48 +
 .../josm/data/preferences/CollectionProperty.java  |     4 +-
 .../josm/data/preferences/ColorProperty.java       |    62 +-
 .../josm/data/preferences/DoubleProperty.java      |    24 +-
 .../josm/data/preferences/IntegerProperty.java     |    22 +-
 .../josm/data/preferences/LongProperty.java        |    26 +-
 .../josm/data/preferences/PreferencesWriter.java   |    14 +-
 .../josm/data/preferences/StringProperty.java      |    23 +-
 .../josm/data/preferences/StrokeProperty.java      |   111 +
 .../josm/data/projection/AbstractProjection.java   |    52 +-
 .../josm/data/projection/CustomProjection.java     |   225 +-
 .../josm/data/projection/Projecting.java           |    50 +
 .../josm/data/projection/Projection.java           |    19 +-
 .../josm/data/projection/ShiftedProjecting.java    |    55 +
 .../josm/data/projection/proj/Mercator.java        |     5 +
 .../josm/data/projection/proj/ObliqueMercator.java |    22 +-
 .../josm/data/projection/proj/Proj.java            |    10 +
 .../josm/data/validation/OsmValidator.java         |     9 +-
 .../josm/data/validation/Severity.java             |     7 +-
 .../josm/data/validation/TestError.java            |     4 +
 .../data/validation/routines/DomainValidator.java  |    46 +-
 .../josm/data/validation/routines/package.html     |     3 +-
 .../josm/data/validation/tests/CrossingWays.java   |    12 +-
 .../josm/data/validation/tests/DuplicateNode.java  |     5 +-
 .../data/validation/tests/MapCSSTagChecker.java    |     3 +-
 src/org/openstreetmap/josm/gui/ExtendedDialog.java |    33 +-
 src/org/openstreetmap/josm/gui/GettingStarted.java |     4 +-
 .../josm/gui/HelpAwareOptionPane.java              |    13 +-
 .../openstreetmap/josm/gui/MainApplication.java    |   218 +-
 src/org/openstreetmap/josm/gui/MainMenu.java       |     4 +
 src/org/openstreetmap/josm/gui/MapFrame.java       |    17 +
 src/org/openstreetmap/josm/gui/MapScaler.java      |     6 +-
 src/org/openstreetmap/josm/gui/MapStatus.java      |    15 +-
 src/org/openstreetmap/josm/gui/MapView.java        |   119 +-
 src/org/openstreetmap/josm/gui/MapViewState.java   |   224 +-
 .../josm/gui/NavigatableComponent.java             |    47 +-
 src/org/openstreetmap/josm/gui/Notification.java   |    23 +-
 .../josm/gui/NotificationManager.java              |   108 +-
 .../josm/gui/OsmPrimitivRenderer.java              |     2 +-
 .../openstreetmap/josm/gui/ProgramArguments.java   |   226 +
 .../josm/gui/conflict/ConflictColors.java          |    28 +-
 .../tags/CombinePrimitiveResolverDialog.java       |     2 +
 .../tags/PasteTagsConflictResolverDialog.java      |     3 +
 .../conflict/tags/TagConflictResolverModel.java    |     2 +-
 .../datatransfer/AbstractStackTransferHandler.java |    67 +
 .../josm/gui/datatransfer/ClipboardUtils.java      |    16 +
 .../josm/gui/datatransfer/FileTransferHandler.java |    44 -
 .../josm/gui/datatransfer/LayerTransferable.java   |     3 +-
 .../josm/gui/datatransfer/OpenTransferHandler.java |    27 +
 .../josm/gui/datatransfer/OsmTransferHandler.java  |    41 +-
 .../gui/datatransfer/PrimitiveTransferable.java    |     2 +-
 .../gui/datatransfer/SingleLayerTransferable.java  |    56 -
 .../gui/datatransfer/data/LayerTransferData.java   |     4 +-
 .../datatransfer/data/OsmLayerTransferData.java    |     4 +-
 .../datatransfer/data/PrimitiveTransferData.java   |     7 +-
 .../importers/AbstractOsmDataPaster.java           |     2 +-
 .../gui/datatransfer/importers/OsmLinkPaster.java  |   114 +
 .../importers/PrimitiveDataPaster.java             |    21 +-
 .../josm/gui/dialogs/ChangesetDialog.java          |     6 +-
 .../josm/gui/dialogs/CommandStackDialog.java       |     7 +-
 .../josm/gui/dialogs/ConflictDialog.java           |    10 +-
 .../josm/gui/dialogs/ConflictResolutionDialog.java |   145 +-
 .../josm/gui/dialogs/LayerListDialog.java          |    32 +-
 .../josm/gui/dialogs/LayerListPopup.java           |     4 +-
 .../josm/gui/dialogs/RelationListDialog.java       |    20 +-
 .../josm/gui/dialogs/UserListDialog.java           |     3 +-
 .../josm/gui/dialogs/ValidatorDialog.java          |     3 +-
 .../dialogs/changeset/ChangesetCacheManager.java   |     8 +-
 .../dialogs/changeset/ChangesetContentPanel.java   |    14 +-
 .../changeset/query/ChangesetQueryDialog.java      |     7 +-
 .../dialogs/properties/PropertiesCellRenderer.java |    49 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |    30 +-
 .../gui/dialogs/relation/actions/CancelAction.java |     8 +-
 .../relation/actions/PasteMembersAction.java       |    13 +-
 .../relation/sort/WayConnectionTypeCalculator.java |     2 +-
 .../gui/dialogs/validator/ValidatorTreePanel.java  |   154 +-
 .../josm/gui/download/DownloadDialog.java          |    16 +-
 src/org/openstreetmap/josm/gui/draw/MapPath2D.java |    52 +
 .../openstreetmap/josm/gui/draw/MapViewPath.java   |   157 +
 .../openstreetmap/josm/gui/draw/SymbolShape.java   |   138 +
 .../openstreetmap/josm/gui/draw/package-info.java  |     6 +
 .../openstreetmap/josm/gui/help/HelpBrowser.java   |     7 +-
 .../josm/gui/history/HistoryBrowserDialog.java     |     8 +-
 .../josm/gui/io/CloseChangesetDialog.java          |     6 +-
 .../josm/gui/io/CredentialDialog.java              |     7 +-
 .../josm/gui/io/LayerNameAndFilePathTableCell.java |     2 +-
 .../josm/gui/io/SaveLayersDialog.java              |     7 +-
 .../openstreetmap/josm/gui/io/UploadDialog.java    |     9 +-
 .../josm/gui/io/UploadSelectionDialog.java         |     7 +-
 .../josm/gui/layer/AbstractTileSourceLayer.java    |   274 +-
 .../josm/gui/layer/CustomizeColor.java             |    36 +-
 src/org/openstreetmap/josm/gui/layer/GpxLayer.java |     9 +-
 .../openstreetmap/josm/gui/layer/ImageryLayer.java |     5 +
 src/org/openstreetmap/josm/gui/layer/Layer.java    |    63 +
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |    52 +-
 .../josm/gui/layer/ValidatorLayer.java             |    18 +-
 .../gui/layer/geoimage/CorrelateGpxWithImages.java |    18 +-
 .../josm/gui/layer/gpx/GpxDrawHelper.java          |    24 +-
 .../gui/layer/imagery/ColorfulImageProcessor.java  |     3 +-
 .../gui/layer/imagery/TileCoordinateConverter.java |    34 +-
 .../josm/gui/layer/markerlayer/MarkerLayer.java    |    10 +-
 .../josm/gui/mappaint/MapPaintStyles.java          |    15 +-
 .../josm/gui/mappaint/mapcss/Condition.java        |   815 +-
 .../josm/gui/mappaint/mapcss/ConditionFactory.java |   875 ++
 .../gui/mappaint/mapcss/ExpressionFactory.java     |     4 +-
 .../josm/gui/mappaint/mapcss/MapCSSParser.jj       |    55 +-
 .../gui/mappaint/mapcss/MapCSSStyleSource.java     |    10 +-
 .../josm/gui/mappaint/mapcss/Selector.java         |    63 +-
 .../gui/mappaint/styleelement/NodeElement.java     |   125 +-
 .../josm/gui/mappaint/styleelement/Symbol.java     |    87 +
 .../gui/oauth/FullyAutomaticAuthorizationUI.java   |     3 +-
 .../josm/gui/oauth/OAuthAuthorizationWizard.java   |     7 +-
 .../josm/gui/preferences/PreferenceDialog.java     |     7 +-
 .../gui/preferences/advanced/PreferencesTable.java |    10 +-
 .../gui/preferences/display/ColorPreference.java   |     2 +-
 .../gui/preferences/imagery/ImageryPreference.java |     9 +-
 .../gui/preferences/plugin/PluginListPanel.java    |     4 +-
 .../gui/preferences/plugin/PluginPreference.java   |    83 +-
 .../josm/gui/preferences/shortcut/PrefJPanel.java  |    16 +-
 .../preferences/validator/ValidatorPreference.java |     6 +-
 .../validator/ValidatorTestsPreference.java        |    12 +-
 .../josm/gui/tagging/presets/TaggingPreset.java    |    52 +-
 src/org/openstreetmap/josm/gui/util/GuiHelper.java |    41 +-
 .../josm/gui/widgets/NativeFileChooser.java        |     5 +-
 src/org/openstreetmap/josm/io/AbstractParser.java  |     1 +
 .../openstreetmap/josm/io/DiffResultProcessor.java |     4 +
 src/org/openstreetmap/josm/io/GeoJSONExporter.java |    31 +-
 src/org/openstreetmap/josm/io/GeoJSONWriter.java   |    84 +-
 src/org/openstreetmap/josm/io/NmeaReader.java      |    23 -
 .../josm/io/protocols/data/DataConnection.java     |    36 +
 .../josm/io/protocols/data/Handler.java            |    42 +
 .../josm/io/protocols/data/package-info.java       |     9 +
 .../openstreetmap/josm/plugins/PluginHandler.java  |     6 +-
 .../plugins/ReadLocalPluginInformationTask.java    |     5 +-
 .../plugins/ReadRemotePluginInformationTask.java   |     4 +-
 .../josm/tools/FilteredCollection.java             |    23 -
 src/org/openstreetmap/josm/tools/Geometry.java     |    39 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |    14 -
 .../openstreetmap/josm/tools/InputMapUtils.java    |    33 +-
 src/org/openstreetmap/josm/tools/ListenerList.java |   231 +
 src/org/openstreetmap/josm/tools/Logging.java      |   370 +
 .../josm/tools/OverpassTurboQueryWizard.java       |     4 +-
 src/org/openstreetmap/josm/tools/Predicates.java   |   141 -
 src/org/openstreetmap/josm/tools/Utils.java        |    30 +-
 .../josm/tools/bugreport/BugReport.java            |    33 +-
 .../josm/tools/bugreport/BugReportDialog.java      |    89 +-
 .../tools/bugreport/BugReportExceptionHandler.java |    96 +-
 .../josm/tools/bugreport/BugReportQueue.java       |   149 +
 .../josm/tools/bugreport/JosmUpdatePanel.java      |     2 +-
 .../josm/tools/bugreport/ReportedException.java    |    23 +-
 styles/standard/elemstyles.mapcss                  |   403 +-
 test/data/regress/1433/2008-08-14-16-04-58.gpx     | 11679 +++++++++++++++++
 test/data/regress/1433/2008-08-14-16-04-58.nmea    |  4715 +++++++
 test/data/regress/1853/PosData-20081216-115434.gpx | 12859 +++++++++++++++++++
 .../data/regress/1853/PosData-20081216-115434.nmea |  2572 ++++
 test/data/regress/2147/WG20080203171807.log.gpx    |  5853 +++++++++
 test/data/regress/2147/WG20080203171807.log.nmea   |  3410 +++++
 .../dialogs/ConflictResolutionDialogTestFT.java    |     2 +-
 .../josm/io/MultiFetchServerObjectReaderTest.java  |    32 +-
 .../josm/io/OsmServerBackreferenceReaderTest.java  |    29 +-
 .../openstreetmap/josm/tools/HttpClientTest.java   |    19 +-
 .../AbstractMapRendererPerformanceTestParent.java  |     9 +
 .../paint/StyledMapRendererPerformanceTest.java    |     6 +
 .../paint/WireframeMapRendererPerformanceTest.java |     6 +
 .../mapcss/MapCSSConditionPerformanceTest.java     |     2 +-
 test/unit/org/openstreetmap/josm/JOSMFixture.java  |    20 +-
 test/unit/org/openstreetmap/josm/MainTest.java     |    51 +-
 .../josm/actions/CombineWayActionTest.java         |    14 +-
 .../josm/actions/CreateCircleActionTest.java       |    54 +-
 .../actions/CreateMultipolygonActionTest.groovy    |     2 +-
 .../josm/actions/ExtensionFileFilterTest.java      |     2 +
 .../josm/actions/JoinAreasActionTest.java          |    13 +-
 .../josm/actions/OrthogonalizeActionTest.java      |    13 +-
 .../josm/actions/PurgeActionTest.java              |    13 +-
 .../josm/actions/UnJoinNodeWayActionTest.java      |    13 +-
 .../ChangesetContentDownloadTaskTest.java          |    13 +-
 .../ChangesetHeaderDownloadTaskTest.java           |    13 +-
 .../downloadtasks/ChangesetQueryTaskTest.java      |    13 +-
 .../actions/downloadtasks/DownloadGpsTaskTest.java |    13 +-
 .../downloadtasks/DownloadNotesTaskTest.java       |    13 +-
 .../actions/downloadtasks/DownloadOsmTaskTest.java |    13 +-
 .../downloadtasks/DownloadReferrersTaskTest.java   |    13 +-
 .../downloadtasks/DownloadTaskListTest.java        |    13 +-
 .../downloadtasks/PostDownloadHandlerTest.java     |    13 +-
 .../josm/actions/mapmode/AddNoteActionTest.java    |    13 +-
 .../josm/actions/mapmode/DeleteActionTest.java     |    13 +-
 .../josm/actions/mapmode/DrawActionTest.java       |    13 +-
 .../josm/actions/mapmode/ExtrudeActionTest.java    |    13 +-
 .../mapmode/ImproveWayAccuracyActionTest.java      |    13 +-
 .../actions/mapmode/ParallelWayActionTest.java     |    13 +-
 .../josm/actions/mapmode/PlayHeadDragModeTest.java |    13 +-
 .../josm/actions/mapmode/SelectActionTest.java     |    45 +-
 .../josm/actions/upload/FixDataHookTest.java       |    13 +-
 .../actions/upload/ValidateUploadHookTest.java     |    13 +-
 .../josm/command/AddPrimitivesCommandTest.java     |     5 +-
 .../josm/command/TransformNodesCommandTest.java    |    12 +-
 .../conflict/ConflictResolveCommandTest.java       |    12 +-
 .../DeletedStateConflictResolveCommandTest.java    |    12 +-
 .../ModifiedConflictResolveCommandTest.java        |    12 +-
 .../RelationMemberConflictResolverCommandTest.java |    12 +-
 .../conflict/TagConflictResolveCommandTest.java    |    12 +-
 .../VersionConflictResolveCommandTest.java         |    12 +-
 .../WayNodesConflictResolverCommandTest.java       |    12 +-
 .../corrector/ReverseWayNoTagCorrectorTest.java    |    13 +-
 .../josm/corrector/ReverseWayTagCorrectorTest.java |    13 +-
 .../org/openstreetmap/josm/data/BoundsTest.java    |    43 +
 .../josm/data/CustomConfiguratorTest.java          |    13 +-
 .../openstreetmap/josm/data/PreferencesTest.groovy |    42 -
 .../openstreetmap/josm/data/PreferencesTest.java   |    70 +
 .../josm/data/cache/JCSCacheManagerTest.java       |    13 +-
 .../data/cache/JCSCachedTileLoaderJobTest.java     |    11 +-
 .../josm/data/coor/CachedLatLonTest.java           |    12 +-
 .../josm/data/coor/EastNorthTest.java              |    52 +
 .../openstreetmap/josm/data/coor/LatLonTest.java   |    51 +-
 .../openstreetmap/josm/data/gpx/GpxDataTest.java   |    34 +
 .../openstreetmap/josm/data/gpx/GpxRouteTest.java  |    35 +
 .../data/gpx/ImmutableGpxTrackSegmentTest.java     |    34 +
 .../josm/data/gpx/ImmutableGpxTrackTest.java       |    34 +
 .../openstreetmap/josm/data/gpx/WayPointTest.java  |    37 +
 .../josm/data/gpx/WithAttributesTest.java          |    33 +
 .../josm/data/imagery/ImageryInfoTest.java         |    13 +-
 .../data/imagery/TemplatedWMSTileSourceTest.java   |    13 +-
 .../josm/data/imagery/WMTSTileSourceTest.java      |    13 +-
 .../josm/data/notes/NoteCommentTest.java           |    13 +-
 .../openstreetmap/josm/data/notes/NoteTest.java    |    12 +-
 .../josm/data/oauth/OAuthParametersTest.java       |    11 +-
 .../josm/data/oauth/SignpostAdaptersTest.java      |    13 +-
 .../josm/data/osm/APIDataSetTest.java              |    61 +-
 .../org/openstreetmap/josm/data/osm/BBoxTest.java  |    12 +-
 .../josm/data/osm/DataSetMergerTest.java           |    13 +-
 .../openstreetmap/josm/data/osm/FilterTest.java    |    13 +-
 .../josm/data/osm/MultipolygonBuilderTest.java     |    16 +-
 .../openstreetmap/josm/data/osm/NodeDataTest.java  |    44 +-
 .../org/openstreetmap/josm/data/osm/NodeTest.java  |    13 +-
 .../josm/data/osm/OsmPrimitiveKeyHandlingTest.java |    11 +-
 .../josm/data/osm/OsmPrimitiveTest.java            |    12 +-
 .../openstreetmap/josm/data/osm/OsmUtilsTest.java  |    13 +-
 .../josm/data/osm/QuadBucketsTest.java             |    98 +-
 .../openstreetmap/josm/data/osm/RelationTest.java  |    13 +-
 .../josm/data/osm/WaySegmentTest.java              |    13 +-
 .../josm/data/osm/history/HistoryNodeTest.java     |    13 +-
 .../josm/data/osm/history/HistoryRelationTest.java |    13 +-
 .../josm/data/osm/history/HistoryWayTest.java      |    13 +-
 .../visitor/MergeSourceBuildingVisitorTest.java    |    13 +-
 .../josm/data/preferences/ColorPropertyTest.java   |    82 +
 .../josm/data/preferences/StrokePropertyTest.java  |   108 +
 .../josm/data/projection/CustomProjectionTest.java |    73 +
 .../data/projection/ShiftedProjectionTest.java     |   148 +
 .../data/validation/tests/DuplicateNodeTest.java   |    13 +-
 .../data/validation/tests/InternetTagsTest.java    |    16 +-
 .../data/validation/tests/LongSegmentTest.java     |    13 +-
 .../validation/tests/MapCSSTagCheckerTest.java     |    13 +-
 .../validation/tests/MultipolygonTestTest.java     |    16 +-
 .../data/validation/tests/NameMismatchTest.java    |    13 +-
 .../tests/PublicTransportRouteTestTest.java        |    13 +-
 .../data/validation/tests/UntaggedNodeTest.java    |    16 +-
 .../validation/util/MultipleNameVisitorTest.java   |    13 +-
 .../josm/gui/JosmUserIdentityManagerTest.groovy    |     9 -
 .../openstreetmap/josm/gui/MapViewStateTest.java   |   100 +-
 .../josm/gui/TableCellRendererTest.java            |    54 +-
 .../josm/gui/bbox/SizeButtonTest.java              |    13 +-
 .../pair/nodes/NodeListMergeModelTest.java         |    40 +-
 .../conflict/pair/nodes/NodeListMergerTest.java    |    13 +-
 .../pair/properties/PropertiesMergeModelTest.java  |    16 +-
 .../pair/properties/PropertiesMergerTest.java      |    13 +-
 .../pair/relation/RelationMemberMergerTest.java    |    13 +-
 .../RelationMemberTableCellEditorTest.java         |    13 +-
 .../RelationMemberTableCellRendererTest.java       |    13 +-
 .../gui/conflict/pair/tags/TagMergeItemTest.java   |    13 +-
 .../gui/conflict/pair/tags/TagMergeModelTest.java  |    13 +-
 .../josm/gui/conflict/pair/tags/TagMergerTest.java |    13 +-
 .../tags/CombinePrimitiveResolverDialogTest.java   |    13 +-
 .../conflict/tags/MultiValueCellEditorTest.java    |    13 +-
 .../conflict/tags/MultiValueCellRendererTest.java  |    13 +-
 .../tags/PasteTagsConflictResolverDialogTest.java  |    13 +-
 .../RelationMemberConflictResolverModelTest.java   |    13 +-
 .../tags/RelationMemberConflictResolverTest.java   |    13 +-
 .../gui/correction/RoleCorrectionTableTest.java    |    13 +-
 .../gui/correction/TagCorrectionTableTest.java     |    13 +-
 .../gui/datatransfer/OsmTransferHandlerTest.java   |    72 +
 .../RelationMemberTransferableTest.java            |    13 +-
 .../datatransfer/importers/OsmLinkPasterTest.java  |    49 +
 .../josm/gui/dialogs/ConflictDialogTest.java       |    13 +-
 .../gui/dialogs/InspectPrimitiveDialogTest.java    |    15 +-
 .../josm/gui/dialogs/MapPaintDialogTest.java       |    13 +-
 .../changeset/ChangesetCacheManagerTest.java       |    13 +-
 .../changeset/ChangesetContentPanelTest.java       |    13 +-
 .../changeset/ChangesetDetailPanelTest.java        |    13 +-
 .../changeset/ChangesetDiscussionPanelTest.java    |    13 +-
 .../dialogs/changeset/ChangesetTagsPanelTest.java  |    13 +-
 .../query/AdvancedChangesetQueryPanelTest.java     |    13 +-
 .../query/BasicChangesetQueryPanelTest.java        |    13 +-
 .../changeset/query/UrlBasedQueryPanelTest.java    |    13 +-
 .../dialogs/properties/PropertiesDialogTest.java   |    13 +-
 .../properties/RecentTagCollectionTest.java        |    13 +-
 .../dialogs/relation/ChildRelationBrowserTest.java |    13 +-
 .../relation/GenericRelationEditorTest.java        |    13 +-
 .../MemberTableLinkedCellRendererTest.java         |    13 +-
 .../MemberTableMemberCellRendererTest.java         |    13 +-
 .../gui/dialogs/relation/MemberTableModelTest.java |    13 +-
 .../relation/MemberTableRoleCellRendererTest.java  |    13 +-
 .../relation/ReferringRelationsBrowserTest.java    |    13 +-
 .../relation/RelationTreeCellRendererTest.java     |    13 +-
 .../relation/SelectionTableCellRendererTest.java   |    13 +-
 .../gui/dialogs/relation/SelectionTableTest.java   |    13 +-
 .../dialogs/relation/sort/RelationSorterTest.java  |    34 +-
 .../sort/WayConnectionTypeCalculatorTest.java      |    36 +-
 .../dialogs/validator/ValidatorTreePanelTest.java  |    14 +-
 .../josm/gui/download/BookmarkSelectionTest.java   |    13 +-
 .../gui/download/BoundingBoxSelectionTest.java     |    13 +-
 .../josm/gui/download/PlaceSelectionTest.java      |    13 +-
 .../josm/gui/download/TileSelectionTest.java       |    13 +-
 .../josm/gui/help/HelpBrowserTest.java             |    13 +-
 .../josm/gui/help/HelpContentReaderTest.java       |    13 +-
 .../josm/gui/history/CoordinateInfoViewerTest.java |    13 +-
 .../josm/gui/history/HistoryBrowserDialogTest.java |    13 +-
 .../josm/gui/history/HistoryBrowserModelTest.java  |    13 +-
 .../josm/gui/history/HistoryLoadTaskTest.java      |    13 +-
 .../josm/gui/history/NodeListViewerTest.java       |    11 +
 .../josm/gui/io/ActionFlagsTableCellTest.java      |    13 +-
 .../josm/gui/io/BasicUploadSettingsPanelTest.java  |    13 +-
 .../josm/gui/io/ChangesetCellRendererTest.java     |    13 +-
 .../josm/gui/io/ChangesetManagementPanelTest.java  |    13 +-
 .../josm/gui/io/CredentialDialogTest.java          |    13 +-
 .../gui/io/LayerNameAndFilePathTableCellTest.java  |    13 +-
 .../josm/gui/io/SaveLayerInfoTest.java             |    11 +-
 .../josm/gui/io/SaveLayerTaskTest.java             |    41 +
 .../josm/gui/io/SaveLayersDialogTest.java          |    13 +-
 .../josm/gui/io/TagSettingsPanelTest.java          |    13 +-
 .../gui/io/UploadAndSaveProgressRendererTest.java  |    13 +-
 .../josm/gui/io/UploadDialogTest.java              |    13 +-
 .../gui/io/UploadParameterSummaryPanelTest.java    |    13 +-
 .../josm/gui/io/UploadPrimitivesTaskTest.java      |    13 +-
 .../gui/io/UploadStrategySelectionPanelTest.java   |    22 +-
 .../gui/io/UploadedObjectsSummaryPanelTest.java    |    13 +-
 .../gui/layer/AbstractMapViewPaintableTest.java    |    56 +
 .../openstreetmap/josm/gui/layer/GpxLayerTest.java |     4 +-
 .../openstreetmap/josm/gui/layer/LayerTest.java    |   209 +
 .../josm/gui/layer/OsmDataLayerTest.java           |    18 +-
 .../josm/gui/layer/gpx/GpxDrawHelperTest.java      |     4 +-
 .../gui/layer/markerlayer/MarkerLayerTest.java     |     4 +-
 .../josm/gui/mappaint/mapcss/ConditionTest.java    |    36 +-
 .../gui/mappaint/mapcss/KeyConditionTest.groovy    |    25 +-
 .../mappaint/mapcss/KeyValueConditionTest.groovy   |    18 +-
 .../gui/mappaint/mapcss/MapCSSParserTest.groovy    |    63 +-
 .../map/TaggingPresetPreferenceTestIT.java         |     4 +-
 .../openstreetmap/josm/io/GeoJSONWriterTest.java   |    27 +-
 .../org/openstreetmap/josm/io/NmeaReaderTest.java  |    66 +-
 .../josm/io/protocols/data/HandlerTest.java        |    47 +
 .../josm/io/remotecontrol/RemoteControlTest.java   |    57 +-
 .../josm/io/session/SessionWriterTest.java         |    34 +-
 .../josm/testutils/DatasetFactory.java             |   121 +
 .../josm/testutils/JOSMTestRules.java              |     9 +-
 .../org/openstreetmap/josm/tools/LoggingTest.java  |   287 +
 .../josm/tools/OverpassTurboQueryWizardTest.java   |     2 +-
 .../openstreetmap/josm/tools/PredicatesTest.java   |   222 -
 .../bugreport/BugReportExceptionHandlerTest.java   |    33 +-
 .../josm/tools/bugreport/BugReportTest.java        |    54 +-
 .../tools/template_engine/TemplateParserTest.java  |     2 +-
 tools/checkstyle/josm_filters.xml                  |    22 +
 tools/japicc/japi-compliance-checker.pl            |  9095 +++++++++++++
 1028 files changed, 114350 insertions(+), 18624 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git



More information about the Pkg-grass-devel mailing list