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

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Apr 29 20:43:23 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 fd43e90397b35476195620154e7325710e6ef685
Merge: e8e93a5 213bf80
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 29 21:32:12 2016 +0200

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

 .classpath                                         |     3 +-
 REVISION                                           |    10 +-
 build.xml                                          |     5 +-
 data/defaultpresets.xml                            |   116 +-
 data/security/DST_Root_CA_X3.pem                   |    20 +
 data/security/StartCom_Certification_Authority.pem |    44 +
 data/validator/addresses.mapcss                    |    14 +-
 data/validator/combinations.mapcss                 |     6 +-
 data/validator/deprecated.mapcss                   |    35 +
 data/validator/geometry.mapcss                     |    31 +-
 data/validator/ignoretags.cfg                      |    12 +-
 .../projection-regression-test-data-java9          | 18950 -----------------
 data_nodist/trans/ast.lang                         |   Bin 8727 -> 8985 bytes
 data_nodist/trans/be.lang                          |   Bin 15876 -> 17233 bytes
 data_nodist/trans/bg.lang                          |   Bin 2401 -> 2409 bytes
 data_nodist/trans/ca-valencia.lang                 |   Bin 7811 -> 7819 bytes
 data_nodist/trans/ca.lang                          |   Bin 10330 -> 10610 bytes
 data_nodist/trans/cs.lang                          |   Bin 10150 -> 10579 bytes
 data_nodist/trans/da.lang                          |   Bin 9384 -> 9889 bytes
 data_nodist/trans/de.lang                          |   Bin 10469 -> 11011 bytes
 data_nodist/trans/el.lang                          |   Bin 1403 -> 1411 bytes
 data_nodist/trans/en.lang                          |   Bin 8672 -> 9069 bytes
 data_nodist/trans/en_AU.lang                       |   Bin 1488 -> 1496 bytes
 data_nodist/trans/en_GB.lang                       |   Bin 1954 -> 2128 bytes
 data_nodist/trans/es.lang                          |   Bin 11288 -> 11696 bytes
 data_nodist/trans/et.lang                          |   Bin 1436 -> 1444 bytes
 data_nodist/trans/fi.lang                          |   Bin 3074 -> 3082 bytes
 data_nodist/trans/fr.lang                          |   Bin 10586 -> 10961 bytes
 data_nodist/trans/gl.lang                          |   Bin 2951 -> 2959 bytes
 data_nodist/trans/hu.lang                          |   Bin 10819 -> 11195 bytes
 data_nodist/trans/id.lang                          |   Bin 6723 -> 6731 bytes
 data_nodist/trans/it.lang                          |   Bin 9875 -> 10154 bytes
 data_nodist/trans/ja.lang                          |   Bin 11391 -> 11831 bytes
 data_nodist/trans/km.lang                          |   Bin 16178 -> 16921 bytes
 data_nodist/trans/lt.lang                          |   Bin 1952 -> 2074 bytes
 data_nodist/trans/nb.lang                          |   Bin 1679 -> 1687 bytes
 data_nodist/trans/nl.lang                          |   Bin 10987 -> 11587 bytes
 data_nodist/trans/pl.lang                          |   Bin 2781 -> 2789 bytes
 data_nodist/trans/pt.lang                          |   Bin 13220 -> 13343 bytes
 data_nodist/trans/pt_BR.lang                       |   Bin 9740 -> 10058 bytes
 data_nodist/trans/ru.lang                          |   Bin 16502 -> 17259 bytes
 data_nodist/trans/sk.lang                          |   Bin 9452 -> 9906 bytes
 data_nodist/trans/sv.lang                          |   Bin 1340 -> 1348 bytes
 data_nodist/trans/uk.lang                          |   Bin 16801 -> 17662 bytes
 data_nodist/trans/vi.lang                          |   Bin 10530 -> 10845 bytes
 data_nodist/trans/zh_CN.lang                       |   Bin 5854 -> 6037 bytes
 data_nodist/trans/zh_TW.lang                       |   Bin 4647 -> 4655 bytes
 geticons.pl                                        |    22 +-
 i18n/po/af.po                                      |   622 +-
 i18n/po/am.po                                      |   622 +-
 i18n/po/ar.po                                      |   628 +-
 i18n/po/ast.po                                     |   703 +-
 i18n/po/az.po                                      |   622 +-
 i18n/po/be.po                                      |  3160 +--
 i18n/po/bg.po                                      |   689 +-
 i18n/po/bn.po                                      |   624 +-
 i18n/po/br.po                                      |   624 +-
 i18n/po/bs.po                                      |   622 +-
 i18n/po/ca.po                                      |   755 +-
 i18n/po/ca at valencia.po                             |   677 +-
 i18n/po/cs.po                                      |   732 +-
 i18n/po/cy.po                                      |   622 +-
 i18n/po/da.po                                      |   736 +-
 i18n/po/de.po                                      |  1233 +-
 i18n/po/de_DE.po                                   |   624 +-
 i18n/po/el.po                                      |   689 +-
 i18n/po/en_AU.po                                   |   670 +-
 i18n/po/en_CA.po                                   |   622 +-
 i18n/po/en_GB.po                                   |  1081 +-
 i18n/po/eo.po                                      |   624 +-
 i18n/po/es.po                                      |   727 +-
 i18n/po/et.po                                      |   690 +-
 i18n/po/eu.po                                      |   628 +-
 i18n/po/fa.po                                      |   622 +-
 i18n/po/fi.po                                      |   665 +-
 i18n/po/fil.po                                     |   622 +-
 i18n/po/fo.po                                      |   622 +-
 i18n/po/fr.po                                      |   717 +-
 i18n/po/ga.po                                      |   622 +-
 i18n/po/gl.po                                      |   680 +-
 i18n/po/he.po                                      |   628 +-
 i18n/po/hi.po                                      |   622 +-
 i18n/po/hr.po                                      |   627 +-
 i18n/po/ht.po                                      |   622 +-
 i18n/po/hu.po                                      |  1262 +-
 i18n/po/hy.po                                      |   624 +-
 i18n/po/ia.po                                      |   622 +-
 i18n/po/id.po                                      |   665 +-
 i18n/po/is.po                                      |   626 +-
 i18n/po/it.po                                      |   893 +-
 i18n/po/ja.po                                      |   778 +-
 i18n/po/ka.po                                      |   624 +-
 i18n/po/km.po                                      |   683 +-
 i18n/po/ko.po                                      |   626 +-
 i18n/po/ky.po                                      |   622 +-
 i18n/po/{wae.po => lb.po}                          |   640 +-
 i18n/po/lo.po                                      |   624 +-
 i18n/po/lt.po                                      |  1104 +-
 i18n/po/lv.po                                      |   624 +-
 i18n/po/mk.po                                      |   624 +-
 i18n/po/mr.po                                      |   625 +-
 i18n/po/ms.po                                      |   624 +-
 i18n/po/nb.po                                      |   628 +-
 i18n/po/nds.po                                     |   622 +-
 i18n/po/nl.po                                      |   793 +-
 i18n/po/nn.po                                      |   622 +-
 i18n/po/oc.po                                      |   624 +-
 i18n/po/pa.po                                      |   622 +-
 i18n/po/pl.po                                      |   754 +-
 i18n/po/pt.po                                      |   791 +-
 i18n/po/pt_BR.po                                   |   720 +-
 i18n/po/rm.po                                      |   622 +-
 i18n/po/ro.po                                      |   624 +-
 i18n/po/ru.po                                      |   787 +-
 i18n/po/sk.po                                      |   730 +-
 i18n/po/sl.po                                      |   626 +-
 i18n/po/sq.po                                      |   624 +-
 i18n/po/sr.po                                      |   622 +-
 i18n/po/sv.po                                      |   689 +-
 i18n/po/ta.po                                      |   626 +-
 i18n/po/te.po                                      |   622 +-
 i18n/po/th.po                                      |   622 +-
 i18n/po/tr.po                                      |   628 +-
 i18n/po/ug.po                                      |   622 +-
 i18n/po/uk.po                                      |   730 +-
 i18n/po/ur.po                                      |   622 +-
 i18n/po/vi.po                                      |   700 +-
 i18n/po/wae.po                                     |   622 +-
 i18n/po/zh_CN.po                                   |   703 +-
 i18n/po/zh_TW.po                                   |  1113 +-
 images/dialogs/layerlist/colorfulness.png          |   Bin 0 -> 1318 bytes
 images/dialogs/layerlist/gamma.png                 |   Bin 489 -> 1282 bytes
 images/dialogs/layerlist/sharpness.png             |   Bin 0 -> 1247 bytes
 images/dialogs/layerlist/transparency.png          |   Bin 337 -> 1371 bytes
 images/dialogs/layerlist/visibility.png            |   Bin 0 -> 880 bytes
 images/dialogs/mappaint/josm_small.png             |   Bin 808 -> 0 bytes
 images/misc/showhide.png                           |   Bin 693 -> 0 bytes
 images/presets/bicycle_road.svg                    |   121 -
 images/presets/level_crossing.png                  |   Bin 442 -> 0 bytes
 .../icons/hicolor/128x128/apps/josm-latest.png     |   Bin 0 -> 18674 bytes
 .../icons/hicolor/192x192/apps/josm-latest.png     |   Bin 0 -> 31922 bytes
 .../share/icons/hicolor/22x22/apps/josm-latest.png |   Bin 0 -> 1693 bytes
 .../share/icons/hicolor/24x24/apps/josm-latest.png |   Bin 0 -> 1886 bytes
 .../icons/hicolor/256x256/apps/josm-latest.png     |   Bin 0 -> 46400 bytes
 .../share/icons/hicolor/36x36/apps/josm-latest.png |   Bin 0 -> 3293 bytes
 .../share/icons/hicolor/40x40/apps/josm-latest.png |   Bin 0 -> 3779 bytes
 .../share/icons/hicolor/42x42/apps/josm-latest.png |   Bin 0 -> 4140 bytes
 .../icons/hicolor/512x512/apps/josm-latest.png     |   Bin 0 -> 92544 bytes
 .../share/icons/hicolor/64x64/apps/josm-latest.png |   Bin 0 -> 7221 bytes
 .../share/icons/hicolor/72x72/apps/josm-latest.png |   Bin 0 -> 8436 bytes
 .../share/icons/hicolor/80x80/apps/josm-latest.png |   Bin 0 -> 9884 bytes
 .../share/icons/hicolor/8x8/apps/josm-latest.png   |   Bin 0 -> 614 bytes
 .../share/icons/hicolor/96x96/apps/josm-latest.png |   Bin 0 -> 12503 bytes
 .../usr/share/icons/hicolor/128x128/apps/josm.png  |   Bin 0 -> 18674 bytes
 .../usr/share/icons/hicolor/192x192/apps/josm.png  |   Bin 0 -> 31922 bytes
 .../usr/share/icons/hicolor/22x22/apps/josm.png    |   Bin 0 -> 1693 bytes
 .../usr/share/icons/hicolor/24x24/apps/josm.png    |   Bin 0 -> 1886 bytes
 .../usr/share/icons/hicolor/256x256/apps/josm.png  |   Bin 0 -> 46400 bytes
 .../usr/share/icons/hicolor/36x36/apps/josm.png    |   Bin 0 -> 3293 bytes
 .../usr/share/icons/hicolor/40x40/apps/josm.png    |   Bin 0 -> 3779 bytes
 .../usr/share/icons/hicolor/42x42/apps/josm.png    |   Bin 0 -> 4140 bytes
 .../usr/share/icons/hicolor/512x512/apps/josm.png  |   Bin 0 -> 92544 bytes
 .../usr/share/icons/hicolor/64x64/apps/josm.png    |   Bin 0 -> 7221 bytes
 .../usr/share/icons/hicolor/72x72/apps/josm.png    |   Bin 0 -> 8436 bytes
 .../usr/share/icons/hicolor/80x80/apps/josm.png    |   Bin 0 -> 9884 bytes
 .../usr/share/icons/hicolor/8x8/apps/josm.png      |   Bin 0 -> 614 bytes
 .../usr/share/icons/hicolor/96x96/apps/josm.png    |   Bin 0 -> 12503 bytes
 scripts/SyncEditorImageryIndex.groovy              |    21 +-
 .../commons/jcs/access/PartitionedCacheAccess.java |    15 +-
 .../disk/jdbc/hsql/HSQLDiskCacheFactory.java       |     2 -
 .../lateral/socket/tcp/LateralTCPSender.java       |    27 +-
 .../remote/AbstractRemoteCacheListener.java        |    51 +-
 .../remote/AbstractRemoteCacheNoWaitFacade.java    |   200 +-
 .../commons/jcs/auxiliary/remote/RemoteCache.java  |     4 +-
 .../auxiliary/remote/RemoteCacheAttributes.java    |    14 +-
 .../jcs/auxiliary/remote/RemoteCacheFactory.java   |    31 +-
 .../remote/RemoteCacheFailoverRunner.java          |   263 +-
 .../jcs/auxiliary/remote/RemoteCacheListener.java  |    13 +-
 .../jcs/auxiliary/remote/RemoteCacheManager.java   |     2 +-
 .../auxiliary/remote/RemoteCacheNoWaitFacade.java  |    20 +-
 .../remote/behavior/IRemoteCacheAttributes.java    |     8 +-
 .../remote/http/client/RemoteHttpCacheFactory.java |    11 +-
 .../remote/http/client/RemoteHttpCacheManager.java |     8 +-
 .../http/client/RemoteHttpClientListener.java      |    13 +-
 .../http/server/AbstractRemoteCacheService.java    |    16 +-
 .../http/server/RemoteCacheServiceAdaptor.java     |   172 -
 .../remote/http/server/RemoteHttpCacheService.java |    11 +-
 .../remote/http/server/RemoteHttpCacheServlet.java |   226 +-
 .../http/server/RemoteHttpCacheSeviceFactory.java  |    91 -
 .../remote/util/RemoteCacheRequestFactory.java     |   118 +-
 .../jcs/engine/memory/fifo/FIFOMemoryCache.java    |     7 +-
 .../apache/commons/jcs/utils/access/JCSWorker.java |     3 +-
 src/org/openstreetmap/josm/Main.java               |    19 +-
 .../openstreetmap/josm/actions/AboutAction.java    |    20 +-
 .../josm/actions/AbstractMergeAction.java          |    42 +-
 .../josm/actions/AutoScaleAction.java              |     6 +-
 .../josm/actions/CombineWayAction.java             |    16 -
 .../josm/actions/CopyCoordinatesAction.java        |     2 +-
 .../josm/actions/CreateCircleAction.java           |     2 +-
 .../josm/actions/CreateMultipolygonAction.java     |     6 +
 .../josm/actions/DialogsToggleAction.java          |     9 -
 .../josm/actions/DownloadAlongAction.java          |    13 +-
 .../josm/actions/ImageryAdjustAction.java          |    20 +-
 .../josm/actions/JoinAreasAction.java              |    20 +-
 src/org/openstreetmap/josm/actions/JosmAction.java |    20 +-
 .../josm/actions/OrthogonalizeAction.java          |    40 +-
 .../josm/actions/OverpassDownloadAction.java       |    12 +-
 .../josm/actions/ReportBugAction.java              |    35 +-
 .../openstreetmap/josm/actions/SaveActionBase.java |     4 +-
 .../actions/SelectNonBranchingWaySequences.java    |     5 +-
 .../josm/actions/ShowStatusReportAction.java       |   127 +-
 .../openstreetmap/josm/actions/SplitWayAction.java |    73 +-
 .../josm/actions/UnJoinNodeWayAction.java          |     2 +-
 .../josm/actions/UpdateDataAction.java             |    15 +-
 .../josm/actions/UpdateModifiedAction.java         |     4 +-
 .../AbstractChangesetDownloadTask.java             |   146 +
 .../downloadtasks/AbstractDownloadTask.java        |    35 +-
 .../ChangesetContentDownloadTask.java              |   159 +
 .../ChangesetHeaderDownloadTask.java               |   225 +-
 .../actions/downloadtasks/ChangesetQueryTask.java  |   139 +
 .../actions/downloadtasks/DownloadNotesTask.java   |    13 +-
 .../DownloadOsmChangeCompressedTask.java           |     6 +-
 .../downloadtasks/DownloadOsmChangeTask.java       |     5 +-
 .../downloadtasks/DownloadOsmCompressedTask.java   |     6 +-
 .../actions/downloadtasks/DownloadTaskList.java    |    13 +-
 .../josm/actions/mapmode/AddNoteAction.java        |     1 +
 .../josm/actions/mapmode/DrawAction.java           |    30 +-
 .../josm/actions/mapmode/ExtrudeAction.java        |    22 +-
 .../actions/mapmode/ImproveWayAccuracyAction.java  |    33 +-
 .../josm/actions/mapmode/ParallelWayAction.java    |     3 +-
 .../josm/actions/mapmode/ParallelWays.java         |    24 +-
 .../josm/actions/mapmode/SelectAction.java         |     3 +-
 .../openstreetmap/josm/actions/package-info.java   |     7 +
 .../actions/relation/AddSelectionToRelations.java  |     4 +-
 .../actions/relation/RecentRelationsAction.java    |     2 +-
 .../josm/actions/search/SearchAction.java          |    30 +-
 .../josm/actions/search/SearchCompiler.java        |     6 +-
 .../josm/actions/upload/UploadNotesTask.java       |     8 +-
 .../openstreetmap/josm/command/DeleteCommand.java  |     4 +-
 .../openstreetmap/josm/command/PurgeCommand.java   |     1 +
 .../openstreetmap/josm/command/SelectCommand.java  |     1 +
 .../openstreetmap/josm/command/package-info.java   |     7 +
 .../openstreetmap/josm/corrector/Correction.java   |     6 -
 .../josm/corrector/ReverseWayTagCorrector.java     |     2 +
 .../josm/corrector/RoleCorrection.java             |    21 -
 .../josm/corrector/RoleCorrectionTable.java        |    13 -
 .../josm/corrector/TagCorrection.java              |    30 -
 .../josm/corrector/TagCorrectionTable.java         |    13 -
 .../openstreetmap/josm/corrector/TagCorrector.java |     4 +
 src/org/openstreetmap/josm/data/AutosaveTask.java  |     2 +-
 .../josm/data/CustomConfigurator.java              |     4 -
 src/org/openstreetmap/josm/data/Preferences.java   |    32 +-
 .../josm/data/cache/ICachedLoaderJob.java          |     7 +-
 .../josm/data/cache/ICachedLoaderListener.java     |     4 +
 .../josm/data/cache/JCSCachedTileLoaderJob.java    |     3 +-
 .../openstreetmap/josm/data/coor/Coordinate.java   |    10 -
 src/org/openstreetmap/josm/data/coor/LatLon.java   |    37 +-
 .../openstreetmap/josm/data/coor/QuadTiling.java   |    25 +-
 .../josm/data/correction/Correction.java           |    10 +
 .../josm/data/correction/RoleCorrection.java       |    35 +
 .../josm/data/correction/TagCorrection.java        |    49 +
 .../josm/data/correction/package-info.java         |     6 +
 .../openstreetmap/josm/data/gpx/Extensions.java    |     9 +-
 src/org/openstreetmap/josm/data/gpx/GpxData.java   |    86 +-
 .../josm/data/imagery/ImageryInfo.java             |     2 +-
 .../josm/data/imagery/ImageryLayerInfo.java        |     4 +-
 .../josm/data/imagery/TMSCachedTileLoaderJob.java  |    15 +-
 .../josm/data/imagery/WMTSTileSource.java          |     8 +-
 src/org/openstreetmap/josm/data/notes/Note.java    |    42 +-
 .../openstreetmap/josm/data/notes/NoteComment.java |    20 +-
 .../josm/data/notes/package-info.java              |     6 +
 src/org/openstreetmap/josm/data/osm/BBox.java      |    22 +-
 src/org/openstreetmap/josm/data/osm/DataSet.java   |     5 +-
 src/org/openstreetmap/josm/data/osm/Filter.java    |    71 +-
 src/org/openstreetmap/josm/data/osm/Node.java      |     1 +
 src/org/openstreetmap/josm/data/osm/NoteData.java  |    24 +-
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |   110 +-
 .../openstreetmap/josm/data/osm/PrimitiveData.java |    25 +-
 .../openstreetmap/josm/data/osm/QuadBuckets.java   |    46 +-
 src/org/openstreetmap/josm/data/osm/Storage.java   |    21 +-
 .../josm/data/osm/event/DatasetEventManager.java   |     4 +-
 .../josm/data/osm/event/SelectionEventManager.java |     3 +-
 .../josm/data/osm/history/HistoryOsmPrimitive.java |     8 +
 .../osm/visitor/MergeSourceBuildingVisitor.java    |    18 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |     2 +-
 .../visitor/paint/relations/MultipolygonCache.java |     2 +-
 src/org/openstreetmap/josm/data/package-info.java  |     6 +
 .../josm/data/preferences/LongProperty.java        |    35 +
 .../josm/data/projection/AbstractProjection.java   |     4 +-
 .../josm/data/projection/CustomProjection.java     |    42 +-
 .../josm/data/projection/Ellipsoid.java            |     9 +-
 .../ProjectionConfigurationException.java          |     7 -
 .../josm/data/projection/datum/NTV2GridShift.java  |    17 -
 .../data/projection/datum/NTV2GridShiftFile.java   |    23 +-
 .../josm/data/projection/datum/NTV2SubGrid.java    |    28 +-
 .../josm/data/projection/datum/NTV2Util.java       |    17 -
 .../josm/data/projection/package-info.java         |     6 +
 .../josm/data/projection/proj/AbstractProj.java    |    24 +-
 .../josm/data/projection/proj/AlbersEqualArea.java |    23 +-
 .../data/projection/proj/DoubleStereographic.java  |    27 +-
 .../projection/proj/LambertAzimuthalEqualArea.java |     3 +-
 .../projection/proj/LambertConformalConic.java     |    48 +-
 .../josm/data/projection/proj/LonLat.java          |     4 +-
 .../josm/data/projection/proj/ObliqueMercator.java |    27 +-
 .../data/projection/proj/PolarStereographic.java   |    13 +-
 .../josm/data/projection/proj/Proj.java            |     6 +-
 .../data/projection/proj/SwissObliqueMercator.java |     8 +-
 .../josm/data/validation/OsmValidator.java         |     2 +
 .../josm/data/validation/PaintVisitor.java         |    30 +-
 .../openstreetmap/josm/data/validation/Test.java   |    12 +-
 .../josm/data/validation/TestError.java            |    28 +-
 .../josm/data/validation/package-info.java         |     6 +
 .../data/validation/routines/DomainValidator.java  |    46 +-
 .../data/validation/routines/EmailValidator.java   |    11 -
 .../data/validation/routines/UrlValidator.java     |     8 -
 .../josm/data/validation/tests/LongSegment.java    |     3 +
 .../data/validation/tests/MultipolygonTest.java    |     2 +-
 .../data/validation/tests/OpeningHourTest.java     |     2 +-
 .../data/validation/tests/OverlappingWays.java     |     6 +-
 .../validation/tests/PublicTransportRouteTest.java |    17 +-
 .../data/validation/tests/RelationChecker.java     |     4 +-
 .../data/validation/tests/SimilarNamedWays.java    |    10 +-
 .../josm/data/validation/tests/TagChecker.java     |     5 +-
 .../data/validation/tests/UnconnectedWays.java     |     6 +-
 .../josm/data/validation/tests/UntaggedNode.java   |     4 +-
 .../josm/data/validation/util/Entities.java        |    11 +-
 .../data/validation/util/MultipleNameVisitor.java  |     3 +
 .../josm/data/validation/util/NameVisitor.java     |    15 +-
 .../josm/gui/DefaultNameFormatter.java             |    12 +-
 .../josm/gui/ExceptionDialogUtil.java              |     2 +-
 src/org/openstreetmap/josm/gui/ExtendedDialog.java |    18 +-
 src/org/openstreetmap/josm/gui/FileDrop.java       |    48 +-
 .../josm/gui/HelpAwareOptionPane.java              |    21 +-
 .../openstreetmap/josm/gui/MainApplication.java    |    56 +-
 src/org/openstreetmap/josm/gui/MapFrame.java       |    17 +-
 src/org/openstreetmap/josm/gui/MapMover.java       |    11 +-
 src/org/openstreetmap/josm/gui/MapScaler.java      |    93 +-
 src/org/openstreetmap/josm/gui/MapSlider.java      |     6 +-
 src/org/openstreetmap/josm/gui/MapView.java        |   168 +-
 .../josm/gui/NavigatableComponent.java             |    40 +-
 .../josm/gui/NotificationManager.java              |    10 +-
 .../openstreetmap/josm/gui/PleaseWaitDialog.java   |     4 +-
 .../openstreetmap/josm/gui/PleaseWaitRunnable.java |     2 +-
 .../openstreetmap/josm/gui/SelectionManager.java   |    11 +-
 src/org/openstreetmap/josm/gui/SplashScreen.java   |    15 +-
 .../josm/gui/bbox/SlippyMapBBoxChooser.java        |    12 +-
 .../josm/gui/bbox/SlippyMapControler.java          |     4 +-
 .../josm/gui/bbox/TileSelectionBBoxChooser.java    |    23 +-
 .../josm/gui/conflict/ConflictColors.java          |    35 +
 .../josm/gui/conflict/pair/ListMerger.java         |    12 +-
 .../gui/conflict/pair/nodes/NodeListMerger.java    |     3 +-
 .../conflict/pair/properties/PropertiesMerger.java |     3 +-
 .../pair/relation/RelationMemberMerger.java        |     3 +-
 .../tags/CombinePrimitiveResolverDialog.java       |     2 +-
 .../tags/PasteTagsConflictResolverDialog.java      |     4 +-
 .../correction}/CorrectionTable.java               |    34 +-
 .../correction}/CorrectionTableModel.java          |    40 +-
 .../josm/gui/correction/RoleCorrectionTable.java   |    21 +
 .../correction}/RoleCorrectionTableModel.java      |    21 +-
 .../josm/gui/correction/TagCorrectionTable.java    |    21 +
 .../correction}/TagCorrectionTableModel.java       |    21 +-
 .../josm/gui/correction/package-info.java          |     6 +
 .../josm/gui/dialogs/ChangesetDialog.java          |    31 +-
 .../josm/gui/dialogs/ConflictResolutionDialog.java |     3 +-
 .../DeleteFromRelationConfirmationDialog.java      |     4 +-
 .../josm/gui/dialogs/DialogsPanel.java             |    54 +-
 .../josm/gui/dialogs/FilterDialog.java             |    36 +-
 .../josm/gui/dialogs/LayerListDialog.java          |   767 +-
 .../josm/gui/dialogs/MapPaintDialog.java           |     6 +-
 .../josm/gui/dialogs/NotesDialog.java              |     6 +-
 .../josm/gui/dialogs/OsmIdSelectionDialog.java     |     4 +-
 .../josm/gui/dialogs/ToggleDialog.java             |     5 +-
 .../dialogs/changeset/ChangesetCacheManager.java   |    27 +-
 .../changeset/ChangesetContentDownloadTask.java    |   220 -
 .../dialogs/changeset/ChangesetContentPanel.java   |     3 +-
 .../dialogs/changeset/ChangesetDetailPanel.java    |    17 +-
 .../changeset/ChangesetDiscussionPanel.java        |    16 +-
 .../dialogs/changeset/ChangesetDownloadTask.java   |    14 -
 .../changeset/DownloadChangesetContentAction.java  |     1 +
 .../changeset/SingleChangesetDownloadPanel.java    |     1 +
 .../query/AdvancedChangesetQueryPanel.java         |    31 +-
 .../changeset/query/ChangesetQueryTask.java        |   212 -
 .../gui/dialogs/layer/ActivateLayerAction.java     |   139 +
 .../josm/gui/dialogs/layer/DeleteLayerAction.java  |    76 +
 .../josm/gui/dialogs/layer/DuplicateAction.java    |    96 +
 .../gui/dialogs/layer/IEnabledStateUpdating.java   |    13 +
 .../gui/dialogs/layer/LayerVisibilityAction.java   |   437 +
 .../josm/gui/dialogs/layer/MergeAction.java        |   124 +
 .../josm/gui/dialogs/layer/MoveDownAction.java     |    40 +
 .../josm/gui/dialogs/layer/MoveUpAction.java       |    40 +
 .../gui/dialogs/layer/ShowHideLayerAction.java     |   111 +
 .../josm/gui/dialogs/layer/package-info.java       |     6 +
 .../dialogs/properties/PropertiesCellRenderer.java |     2 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |    15 +-
 .../dialogs/properties/RecentTagCollection.java    |     4 +-
 .../josm/gui/dialogs/properties/TagEditHelper.java |     8 +-
 .../dialogs/relation/GenericRelationEditor.java    |   457 +-
 .../josm/gui/dialogs/relation/IRelationEditor.java |     8 +
 .../josm/gui/dialogs/relation/MemberTable.java     |    13 +-
 .../dialogs/relation/MemberTableCellRenderer.java  |     7 -
 .../relation/MemberTableMemberCellRenderer.java    |     1 +
 .../gui/dialogs/relation/MemberTableModel.java     |    20 +-
 .../dialogs/relation/MemberTransferHandler.java    |     2 +-
 .../relation/ParentRelationLoadingTask.java        |     8 +-
 .../josm/gui/dialogs/relation/RelationEditor.java  |    12 +-
 .../josm/gui/dialogs/relation/RunnableAction.java  |    17 -
 .../josm/gui/dialogs/relation/SelectionTable.java  |    33 +-
 .../relation/SelectionTableCellRenderer.java       |    62 +-
 .../relation/SelectionTableColumnModel.java        |    18 +-
 .../gui/dialogs/relation/SelectionTableModel.java  |     9 +-
 .../gui/dialogs/relation/actions/ApplyAction.java  |     3 +-
 .../DownloadSelectedIncompleteMembersAction.java   |     4 +-
 .../dialogs/relation/actions/ReverseAction.java    |     1 -
 .../gui/dialogs/relation/sort/RelationNodeMap.java |     2 +-
 .../relation/sort/WayConnectionTypeCalculator.java |    32 +-
 .../josm/gui/download/DownloadDialog.java          |     3 +-
 .../josm/gui/help/HelpContentReader.java           |    10 +-
 .../josm/gui/help/HelpContentReaderException.java  |    37 +-
 src/org/openstreetmap/josm/gui/help/Helpful.java   |     9 +
 .../josm/gui/help/MissingHelpContentException.java |    18 +-
 .../josm/gui/history/CoordinateInfoViewer.java     |    41 +-
 .../josm/gui/history/HistoryBrowserDialog.java     |     4 +-
 .../gui/history/HistoryBrowserDialogManager.java   |     2 +-
 .../josm/gui/history/HistoryBrowserModel.java      |    31 +-
 .../josm/gui/history/HistoryLoadTask.java          |   107 +-
 .../gui/history/NodeListTableCellRenderer.java     |     4 +-
 .../RelationMemberListTableCellRenderer.java       |     6 +-
 .../josm/gui/history/VersionTable.java             |     5 +
 .../josm/gui/history/VersionTableColumnModel.java  |    15 +-
 .../openstreetmap/josm/gui/io/AbstractIOTask.java  |     6 -
 .../josm/gui/io/AbstractPrimitiveTask.java         |   196 +
 .../josm/gui/io/CloseChangesetDialog.java          |     4 +-
 .../josm/gui/io/DownloadOpenChangesetsTask.java    |     3 +-
 .../josm/gui/io/DownloadPrimitivesTask.java        |   140 +-
 .../josm/gui/io/LayerNameAndFilePathTableCell.java |     1 +
 .../josm/gui/io/SaveLayersDialog.java              |     2 +-
 .../josm/gui/io/UpdatePrimitivesTask.java          |   109 +-
 .../josm/gui/io/UploadAndSaveProgressRenderer.java |    30 +-
 .../openstreetmap/josm/gui/io/UploadDialog.java    |    20 +-
 .../josm/gui/io/UploadParameterSummaryPanel.java   |     1 +
 .../josm/gui/io/UploadPrimitivesTask.java          |     4 +-
 .../josm/gui/io/UploadSelectionDialog.java         |     4 +-
 .../josm/gui/layer/AbstractMapViewPaintable.java   |    43 +
 .../josm/gui/layer/AbstractTileSourceLayer.java    |    36 +-
 .../josm/gui/layer/AlignImageryPanel.java          |     2 +-
 src/org/openstreetmap/josm/gui/layer/GpxLayer.java |     9 +-
 .../openstreetmap/josm/gui/layer/ImageryLayer.java |   382 +-
 src/org/openstreetmap/josm/gui/layer/Layer.java    |    34 +-
 .../josm/gui/layer/LayerPositionStrategy.java      |   113 +
 .../josm/gui/layer/MapViewPaintable.java           |    52 +
 .../openstreetmap/josm/gui/layer/NoteLayer.java    |     4 +-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |    10 +-
 .../josm/gui/layer/ValidatorLayer.java             |     5 +
 src/org/openstreetmap/josm/gui/layer/WMSLayer.java |     3 -
 .../openstreetmap/josm/gui/layer/WMTSLayer.java    |     7 +-
 .../gui/layer/geoimage/CorrelateGpxWithImages.java |     8 +-
 .../josm/gui/layer/geoimage/GeoImageLayer.java     |    13 +-
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |    32 +-
 .../gui/layer/gpx/DownloadAlongTrackAction.java    |    16 +-
 .../gui/layer/gpx/DownloadWmsAlongTrackAction.java |    30 +-
 .../josm/gui/layer/markerlayer/MarkerLayer.java    |    15 +-
 .../openstreetmap/josm/gui/mappaint/Cascade.java   |     5 +-
 .../josm/gui/mappaint/DividedScale.java            |     6 +-
 .../josm/gui/mappaint/StyleCache.java              |    16 +-
 .../josm/gui/mappaint/mapcss/CSSColors.java        |     5 +-
 .../josm/gui/mappaint/mapcss/Condition.java        |    46 +-
 .../gui/mappaint/mapcss/ExpressionFactory.java     |   120 +-
 .../gui/mappaint/mapcss/MapCSSStyleSource.java     |     2 +-
 .../josm/gui/mappaint/mapcss/Selector.java         |     8 +-
 .../gui/mappaint/styleelement/LineElement.java     |    22 +-
 .../gui/mappaint/styleelement/NodeElement.java     |    20 +-
 .../gui/mappaint/styleelement/StyleElement.java    |    18 +-
 .../gui/oauth/FullyAutomaticAuthorizationUI.java   |    42 +-
 .../gui/oauth/FullyAutomaticPropertiesPanel.java   |    24 +-
 .../josm/gui/oauth/ManualAuthorizationUI.java      |    41 +-
 .../josm/gui/oauth/OAuthAuthorizationWizard.java   |     3 +-
 .../gui/oauth/SemiAutomaticAuthorizationUI.java    |    20 +-
 src/org/openstreetmap/josm/gui/package-info.java   |     6 +
 .../josm/gui/preferences/PreferenceDialog.java     |     3 +-
 .../josm/gui/preferences/PreferenceTabbedPane.java |     2 +-
 .../josm/gui/preferences/SourceEditor.java         |    26 +-
 .../josm/gui/preferences/ToolbarPreferences.java   |     8 -
 .../josm/gui/preferences/advanced/ListEditor.java  |    26 +-
 .../gui/preferences/advanced/PreferencesTable.java |   215 +-
 .../gui/preferences/display/ColorPreference.java   |    12 +-
 .../gui/preferences/display/GPXSettingsPanel.java  |     4 +-
 .../gui/preferences/display/LafPreference.java     |     6 +-
 .../preferences/display/LanguagePreference.java    |    15 +-
 .../preferences/imagery/CacheContentsPanel.java    |     6 +-
 .../gui/preferences/imagery/ImageryPreference.java |    19 +-
 .../gui/preferences/map/MapPaintPreference.java    |    21 +-
 .../preferences/map/TaggingPresetPreference.java   |    23 +-
 .../gui/preferences/plugin/PluginListPanel.java    |    14 +-
 .../gui/preferences/plugin/PluginPreference.java   |    16 +-
 .../LambertCC9ZonesProjectionChoice.java           |     2 +-
 .../projection/LambertProjectionChoice.java        |     2 +-
 .../projection/ListProjectionChoice.java           |     2 +-
 .../OAuthAuthenticationPreferencesPanel.java       |    37 +-
 .../preferences/server/OsmApiUrlInputPanel.java    |    23 +-
 .../gui/preferences/server/UserNameValidator.java  |    20 +-
 .../josm/gui/preferences/shortcut/PrefJPanel.java  |    86 +-
 .../josm/gui/progress/NullProgressMonitor.java     |    17 +
 .../gui/progress/PleaseWaitProgressMonitor.java    |     6 +-
 .../openstreetmap/josm/gui/tagging/TagTable.java   |    65 +-
 .../gui/tagging/ac/AutoCompletingComboBox.java     |     8 +-
 .../gui/tagging/ac/AutoCompletionItemPriority.java |    43 +-
 .../josm/gui/tagging/ac/AutoCompletionList.java    |    25 +-
 .../josm/gui/tagging/presets/TaggingPreset.java    |     2 +-
 .../gui/tagging/presets/TaggingPresetItem.java     |     6 +-
 .../gui/tagging/presets/TaggingPresetMenu.java     |    49 +-
 .../presets/TaggingPresetNameTemplateList.java     |     4 +-
 .../tagging/presets/items/ComboMultiSelect.java    |     2 +-
 .../josm/gui/tagging/presets/items/Roles.java      |     4 +-
 .../josm/gui/tagging/presets/items/Text.java       |     1 +
 src/org/openstreetmap/josm/gui/util/GuiHelper.java |    52 +
 .../josm/gui/widgets/ComboBoxHistory.java          |    18 -
 .../gui/widgets/CompileSearchTextDecorator.java    |     2 +-
 .../gui/widgets/DefaultTextComponentValidator.java |    40 +
 .../josm/gui/widgets/FileChooserManager.java       |     2 +-
 .../josm/gui/widgets/JosmImageView.java            |    24 +-
 .../openstreetmap/josm/gui/widgets/JosmTable.java  |    16 +
 .../josm/gui/widgets/MultiSplitLayout.java         |    15 +-
 .../josm/gui/widgets/NativeFileChooser.java        |     5 +-
 src/org/openstreetmap/josm/io/CachedFile.java      |    19 +
 .../josm/io/CertificateAmendment.java              |   159 +
 src/org/openstreetmap/josm/io/ChangesetQuery.java  |     9 +
 src/org/openstreetmap/josm/io/GpxReader.java       |     2 +-
 src/org/openstreetmap/josm/io/NMEAImporter.java    |     2 +-
 src/org/openstreetmap/josm/io/NmeaReader.java      |     6 +-
 src/org/openstreetmap/josm/io/NoteReader.java      |    11 +-
 src/org/openstreetmap/josm/io/OsmApi.java          |     8 +-
 .../openstreetmap/josm/io/OsmChangesetParser.java  |    26 +-
 .../josm/io/OsmServerChangesetReader.java          |     2 +-
 .../josm/io/OsmServerLocationReader.java           |     2 +-
 src/org/openstreetmap/josm/io/OsmServerWriter.java |    24 +-
 src/org/openstreetmap/josm/io/OsmWriter.java       |     5 +-
 .../josm/io/StreamProgressUpdater.java             |     2 +-
 src/org/openstreetmap/josm/io/package-info.java    |     6 +
 .../io/remotecontrol/RemoteControlHttpsServer.java |     2 +-
 .../josm/io/remotecontrol/RequestProcessor.java    |    13 +-
 .../io/remotecontrol/handler/AddWayHandler.java    |     2 +-
 .../io/remotecontrol/handler/ImageryHandler.java   |     6 +-
 .../remotecontrol/handler/LoadAndZoomHandler.java  |    10 +-
 .../io/remotecontrol/handler/LoadDataHandler.java  |     2 +-
 .../remotecontrol/handler/LoadObjectHandler.java   |     2 +-
 .../josm/io/session/GeoImageSessionExporter.java   |     2 +-
 .../josm/io/session/GpxTracksSessionExporter.java  |     2 +-
 .../josm/io/session/ImagerySessionExporter.java    |     8 +-
 .../josm/io/session/MarkerSessionExporter.java     |     2 +-
 .../josm/io/session/NoteSessionExporter.java       |     2 +-
 .../josm/io/session/OsmDataSessionExporter.java    |     2 +-
 src/org/openstreetmap/josm/package-info.java       |     6 +
 .../josm/plugins/PluginException.java              |    25 +-
 .../openstreetmap/josm/plugins/PluginHandler.java  |   107 +-
 .../josm/plugins/PluginInformation.java            |     4 +-
 .../josm/plugins/PluginListParseException.java     |    29 +-
 .../josm/plugins/PluginListParser.java             |     2 +-
 .../openstreetmap/josm/plugins/PluginProxy.java    |     2 +-
 .../plugins/ReadLocalPluginInformationTask.java    |     8 +-
 .../plugins/ReadRemotePluginInformationTask.java   |     2 +-
 .../openstreetmap/josm/plugins/package-info.java   |     6 +
 .../josm/tools/BugReportExceptionHandler.java      |   301 -
 src/org/openstreetmap/josm/tools/CopyList.java     |     2 +-
 src/org/openstreetmap/josm/tools/Diff.java         |    40 +-
 src/org/openstreetmap/josm/tools/HttpClient.java   |     6 +-
 src/org/openstreetmap/josm/tools/I18n.java         |     2 -
 .../openstreetmap/josm/tools/ImageProvider.java    |    27 +-
 .../josm/tools/OverpassTurboQueryWizard.java       |     7 +-
 src/org/openstreetmap/josm/tools/Pair.java         |    15 -
 .../openstreetmap/josm/tools/PlatformHookOsx.java  |     2 +-
 .../josm/tools/PlatformHookUnixoid.java            |    13 +-
 .../josm/tools/PlatformHookWindows.java            |     2 +-
 src/org/openstreetmap/josm/tools/Predicates.java   |    45 +
 src/org/openstreetmap/josm/tools/Utils.java        |     6 +-
 .../openstreetmap/josm/tools/WindowGeometry.java   |    14 +-
 .../openstreetmap/josm/tools/XmlObjectParser.java  |     4 -
 .../tools/bugreport/BugReportExceptionHandler.java |   251 +
 .../josm/tools/bugreport/BugReportSender.java      |   182 +
 .../josm/tools/bugreport/DebugTextDisplay.java     |    39 +
 .../openstreetmap/josm/tools/date/DateUtils.java   |    13 +-
 src/org/openstreetmap/josm/tools/package-info.java |     6 +
 .../template_engine/ContextSwitchTemplate.java     |    12 +-
 styles/standard/elemstyles.mapcss                  |   748 +-
 test/data/regress/12639/history.xml                | 21137 +++++++++++++++++++
 .../josm/data/osm/KeyValuePerformanceTest.java     |    12 +-
 test/unit/org/openstreetmap/josm/JOSMFixture.java  |     8 +
 .../josm/actions/OrthogonalizeActionTest.java      |    24 +-
 .../downloadtasks/DownloadReferrersTaskTest.java   |    53 +
 .../downloadtasks/DownloadTaskListTest.java        |    30 +
 .../josm/data/notes/NoteCommentTest.java           |    38 +
 .../openstreetmap/josm/data/notes/NoteTest.java    |    69 +
 .../openstreetmap/josm/data/osm/NodeDataTest.java  |    31 +
 .../openstreetmap/josm/data/osm/WayDataTest.java   |    31 +
 .../data/projection/ProjectionRegressionTest.java  |    23 +-
 .../validation/routines/DomainValidatorTest.java   |     9 +
 .../validation/routines/EmailValidatorTest.java    |     8 +
 .../routines/InetAddressValidatorTest.java         |     9 +
 .../validation/routines/RegexValidatorTest.java    |     8 +
 .../data/validation/routines/UrlValidatorTest.java |     8 +
 .../data/validation/tests/LongSegmentTest.java     |    59 +
 .../tests/PublicTransportRouteTestTest.java        |     9 +
 .../josm/gui/MainApplicationTest.java              |    78 +
 .../josm/gui/TableCellRendererTest.java            |   116 +
 .../gui/correction/RoleCorrectionTableTest.java    |    77 +
 .../gui/correction/TagCorrectionTableTest.java     |    88 +
 .../josm/gui/dialogs/LayerListDialogTest.java      |    71 -
 .../josm/gui/dialogs/MapPaintDialogTest.java       |    29 +
 .../dialogs/layer/LayerVisibilityActionTest.java   |    90 +
 .../dialogs/properties/PropertiesDialogTest.java   |    21 +-
 .../relation/GenericRelationEditorTest.java        |   104 +-
 .../relation/SelectionTableCellRendererTest.java   |     3 +-
 .../gui/dialogs/relation/SelectionTableTest.java   |    89 +
 .../actions/RelationEditorActionsTest.java         |    32 +-
 .../josm/gui/help/HelpBrowserTest.java             |     6 +-
 .../josm/gui/help/HelpContentReaderTest.java       |    41 +
 .../josm/gui/history/CoordinateInfoViewerTest.java |    10 +
 .../josm/gui/history/HistoryBrowserDialogTest.java |    10 +
 .../josm/gui/history/HistoryBrowserModelTest.java  |    91 +
 .../josm/gui/history/HistoryLoadTaskTest.java      |    73 +
 .../gui/io/UploadAndSaveProgressRendererTest.java  |    48 +
 .../josm/gui/io/UploadDialogTest.java              |    17 +
 .../gui/layer/markerlayer/MarkerLayerTest.java     |    67 +
 .../josm/gui/preferences/PreferencesTestUtils.java |     1 +
 .../gui/preferences/advanced/ListEditorTest.java   |    48 +
 .../preferences/advanced/PreferencesTableTest.java |    68 +
 .../gui/preferences/audio/AudioPreferenceTest.java |     4 +
 .../gui/tagging/presets/items/CheckGroupTest.java  |    42 +
 .../josm/gui/tagging/presets/items/CheckTest.java  |    39 +
 .../josm/gui/tagging/presets/items/ComboTest.java  |    39 +
 .../tagging/presets/items/ItemSeparatorTest.java   |    40 +
 .../josm/gui/tagging/presets/items/KeyTest.java    |    39 +
 .../josm/gui/tagging/presets/items/LabelTest.java  |    39 +
 .../josm/gui/tagging/presets/items/LinkTest.java   |    50 +
 .../gui/tagging/presets/items/MultiSelectTest.java |    39 +
 .../gui/tagging/presets/items/OptionalTest.java    |    40 +
 .../gui/tagging/presets/items/PresetLinkTest.java  |    44 +
 .../josm/gui/tagging/presets/items/RolesTest.java  |    40 +
 .../josm/gui/tagging/presets/items/SpaceTest.java  |    40 +
 .../josm/gui/tagging/presets/items/TextTest.java   |    39 +
 .../josm/io/CertificateAmendmentTest.java          |    98 +
 .../openstreetmap/josm/io/NoteImporterTest.java    |    10 +-
 .../org/openstreetmap/josm/io/NoteReaderTest.java  |     6 +-
 .../unit/org/openstreetmap/josm/io/OsmApiTest.java |    50 +
 .../remotecontrol/handler/AddWayHandlerTest.java   |   104 +
 .../remotecontrol/handler/ImageryHandlerTest.java  |    78 +
 .../handler/LoadAndZoomHandlerTest.java            |    78 +
 .../handler/LoadObjectHandlerTest.java             |    76 +
 .../josm/plugins/PluginDownloadExceptionTest.java  |    37 +
 .../josm/plugins/PluginExceptionTest.java          |    38 +
 .../josm/plugins/PluginHandlerTest.java            |    26 +
 .../josm/plugins/PluginHandlerTestIT.java          |    26 +-
 .../josm/plugins/PluginListParseExceptionTest.java |    35 +
 .../josm/tools/BugReportExceptionHandlerTest.java  |    56 -
 .../bugreport/BugReportExceptionHandlerTest.java   |    48 +
 .../josm/tools/bugreport/BugReportSenderTest.java  |    42 +
 .../josm/tools/date/DateUtilsTest.java             |   109 +
 656 files changed, 67480 insertions(+), 48913 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