[josm] 02/10: Merge tag 'upstream/0.0.svn9900+dfsg'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Mar 1 21:39:09 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 73cf1cc3a05e677cb7e87c033c167a6823354e09
Merge: a73898d 428e590
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Mar 1 06:34:03 2016 +0100
Merge tag 'upstream/0.0.svn9900+dfsg'
Upstream version 0.0.svn9900+dfsg
README | 2 +-
REVISION | 6 +-
build.xml | 224 +-
data/defaultpresets.xml | 1712 +-
data/maps.xsd | 9 +-
data/overpass-turbo-ffs.js | 1 -
data/overpass-wizard.js | 1 +
data/preferences.xsd | 152 +-
data/validator/combinations.mapcss | 38 +-
data/validator/deprecated.mapcss | 253 +-
data/validator/geometry.mapcss | 30 +
data/validator/highway.mapcss | 11 +
data/validator/ignoretags.cfg | 21 +-
data/validator/numeric.mapcss | 8 +-
data/validator/power.mapcss | 18 -
data/validator/religion.mapcss | 2 +-
data/validator/unnecessary.mapcss | 2 +-
data_nodist/btnmeatrack_2016-01-25.nmea | 99 +
data_nodist/neubrandenburg.osm.bz2 | Bin 2079678 -> 2639451 bytes
data_nodist/projection/epsg | 962 +-
data_nodist/projection/josm-epsg | 87 +-
data_nodist/projection/projection-reference-data | 99435 +++++++++++++++++++
.../projection/projection-reference-data.csv | 420 -
.../projection/projection-regression-test-data | 3410 +-
.../projection-regression-test-data-java9 | 16722 +++-
data_nodist/trans/ast.lang | Bin 8723 -> 8725 bytes
data_nodist/trans/be.lang | Bin 15872 -> 15874 bytes
data_nodist/trans/bg.lang | Bin 2397 -> 2399 bytes
data_nodist/trans/ca-valencia.lang | Bin 7807 -> 7809 bytes
data_nodist/trans/ca.lang | Bin 10326 -> 10328 bytes
data_nodist/trans/cs.lang | Bin 10033 -> 10079 bytes
data_nodist/trans/da.lang | Bin 9330 -> 9382 bytes
data_nodist/trans/de.lang | Bin 10330 -> 10388 bytes
data_nodist/trans/el.lang | Bin 1399 -> 1401 bytes
data_nodist/trans/en.lang | Bin 8561 -> 8603 bytes
data_nodist/trans/en_AU.lang | Bin 1484 -> 1486 bytes
data_nodist/trans/en_GB.lang | Bin 1910 -> 1952 bytes
data_nodist/trans/es.lang | Bin 11229 -> 11231 bytes
data_nodist/trans/et.lang | Bin 1432 -> 1434 bytes
data_nodist/trans/fi.lang | Bin 3070 -> 3072 bytes
data_nodist/trans/fr.lang | Bin 10582 -> 10584 bytes
data_nodist/trans/gl.lang | Bin 2947 -> 2949 bytes
data_nodist/trans/hu.lang | Bin 9765 -> 10817 bytes
data_nodist/trans/id.lang | Bin 6719 -> 6721 bytes
data_nodist/trans/it.lang | Bin 9871 -> 9873 bytes
data_nodist/trans/ja.lang | Bin 11387 -> 11389 bytes
data_nodist/trans/km.lang | Bin 16174 -> 16176 bytes
data_nodist/trans/lt.lang | Bin 1948 -> 1950 bytes
data_nodist/trans/nb.lang | Bin 1675 -> 1677 bytes
data_nodist/trans/nl.lang | Bin 10945 -> 10985 bytes
data_nodist/trans/pl.lang | Bin 2929 -> 2779 bytes
data_nodist/trans/pt.lang | Bin 12576 -> 13218 bytes
data_nodist/trans/pt_BR.lang | Bin 8111 -> 9738 bytes
data_nodist/trans/ru.lang | Bin 16277 -> 16365 bytes
data_nodist/trans/sk.lang | Bin 9405 -> 9450 bytes
data_nodist/trans/sv.lang | Bin 1336 -> 1338 bytes
data_nodist/trans/uk.lang | Bin 16696 -> 16799 bytes
data_nodist/trans/vi.lang | Bin 10526 -> 10528 bytes
data_nodist/trans/zh_CN.lang | Bin 5850 -> 5852 bytes
data_nodist/trans/zh_TW.lang | Bin 4643 -> 4645 bytes
i18n/po/af.po | 1532 +-
i18n/po/am.po | 1532 +-
i18n/po/ar.po | 1558 +-
i18n/po/ast.po | 1812 +-
i18n/po/az.po | 1532 +-
i18n/po/be.po | 1830 +-
i18n/po/bg.po | 1698 +-
i18n/po/bn.po | 1532 +-
i18n/po/br.po | 1532 +-
i18n/po/bs.po | 1532 +-
i18n/po/ca.po | 1888 +-
i18n/po/ca at valencia.po | 1755 +-
i18n/po/cs.po | 1891 +-
i18n/po/cy.po | 1532 +-
i18n/po/da.po | 1951 +-
i18n/po/de.po | 1891 +-
i18n/po/de_DE.po | 1532 +-
i18n/po/el.po | 1616 +-
i18n/po/en_AU.po | 1788 +-
i18n/po/en_CA.po | 1532 +-
i18n/po/en_GB.po | 3171 +-
i18n/po/eo.po | 1538 +-
i18n/po/es.po | 1941 +-
i18n/po/et.po | 1654 +-
i18n/po/eu.po | 1578 +-
i18n/po/fa.po | 1532 +-
i18n/po/fi.po | 1797 +-
i18n/po/fil.po | 1532 +-
i18n/po/fo.po | 1532 +-
i18n/po/fr.po | 1890 +-
i18n/po/ga.po | 1532 +-
i18n/po/gl.po | 1682 +-
i18n/po/he.po | 1568 +-
i18n/po/hi.po | 1532 +-
i18n/po/hr.po | 1562 +-
i18n/po/ht.po | 1532 +-
i18n/po/hu.po | 2554 +-
i18n/po/hy.po | 1532 +-
i18n/po/ia.po | 1532 +-
i18n/po/id.po | 1740 +-
i18n/po/is.po | 1610 +-
i18n/po/it.po | 1788 +-
i18n/po/ja.po | 1825 +-
i18n/po/ka.po | 1532 +-
i18n/po/km.po | 1713 +-
i18n/po/ko.po | 1532 +-
i18n/po/ky.po | 1532 +-
i18n/po/lo.po | 1532 +-
i18n/po/lt.po | 1841 +-
i18n/po/lv.po | 1530 +-
i18n/po/mk.po | 1532 +-
i18n/po/mr.po | 1532 +-
i18n/po/ms.po | 1532 +-
i18n/po/nb.po | 1604 +-
i18n/po/nds.po | 1532 +-
i18n/po/nl.po | 1968 +-
i18n/po/nn.po | 1532 +-
i18n/po/oc.po | 1530 +-
i18n/po/pa.po | 1532 +-
i18n/po/pl.po | 2042 +-
i18n/po/pt.po | 2115 +-
i18n/po/pt_BR.po | 3652 +-
i18n/po/rm.po | 1532 +-
i18n/po/ro.po | 1532 +-
i18n/po/ru.po | 1876 +-
i18n/po/sk.po | 1827 +-
i18n/po/sl.po | 1548 +-
i18n/po/sq.po | 1532 +-
i18n/po/sr.po | 1532 +-
i18n/po/sv.po | 1870 +-
i18n/po/ta.po | 1532 +-
i18n/po/te.po | 1532 +-
i18n/po/th.po | 1532 +-
i18n/po/tr.po | 1574 +-
i18n/po/ug.po | 1532 +-
i18n/po/uk.po | 1912 +-
i18n/po/ur.po | 1532 +-
i18n/po/vi.po | 1781 +-
i18n/po/zh_CN.po | 1806 +-
i18n/po/zh_TW.po | 1780 +-
images/Mf_multipolygon.svg | 110 +
images/dialogs/layerlist/scale.svg | 18 +
images/dialogs/mappaint/error_small.png | Bin 253 -> 0 bytes
images/icons/natural_peak.n.16.png | Bin 0 -> 502 bytes
images/icons/natural_tree.n.16.png | Bin 0 -> 544 bytes
images/no_upload.svg | 39 +
images/presets/Stop.png | Bin 1343 -> 0 bytes
images/presets/busway.png | Bin 724 -> 0 bytes
images/presets/citylimit.png | Bin 877 -> 0 bytes
images/presets/cycleway.png | Bin 1162 -> 0 bytes
images/presets/dam.png | Bin 481 -> 0 bytes
images/presets/foot_and_cycleway_combined.png | Bin 1008 -> 0 bytes
images/presets/foot_and_cycleway_segregated.png | Bin 950 -> 0 bytes
images/presets/footway.png | Bin 843 -> 0 bytes
images/presets/mountain_pass.png | Bin 400 -> 0 bytes
images/presets/passingplace.png | Bin 398 -> 0 bytes
images/presets/power.png | Bin 165 -> 0 bytes
images/presets/rail_preserved.png | Bin 148 -> 0 bytes
images/presets/railway.svg | 98 -
images/presets/railway_switch.svg | 123 -
images/presets/river.png | Bin 354 -> 0 bytes
images/presets/silo.png | Bin 0 -> 592 bytes
images/presets/speed_camera.png | Bin 196 -> 0 bytes
images/presets/spring.png | Bin 388 -> 0 bytes
images/presets/steps.png | Bin 708 -> 0 bytes
images/presets/track1.png | Bin 176 -> 0 bytes
images/presets/turntable.png | Bin 552 -> 0 bytes
images/presets/water.png | Bin 358 -> 0 bytes
images/presets/waterfall.png | Bin 269 -> 0 bytes
images/presets/waypoints.png | Bin 714 -> 0 bytes
images/presets/weir.png | Bin 236 -> 0 bytes
images/statusline/easting.svg | 14 +
images/statusline/northing.svg | 14 +
netbeans/nbbuild.xml | 117 +-
netbeans/nbproject/configs/unit-test.properties | 1 +
netbeans/nbproject/genfiles.properties | 12 +-
netbeans/nbproject/private/config.properties | 1 +
.../private/configs/local_preferences.properties | 1 +
.../nbproject/private/configs/unit-test.properties | 1 +
netbeans/nbproject/project.properties | 63 +-
netbeans/nbproject/project.xml | 5 +-
scripts/BuildProjectionDefinitions.java | 46 +-
scripts/SyncEditorImageryIndex.groovy | 430 +
scripts/TagInfoExtract.groovy | 468 +
scripts/sync_editor-imagery-index.groovy | 267 -
scripts/taginfoextract.groovy | 468 -
src/org/apache/commons/jcs/access/CacheAccess.java | 12 +-
.../commons/jcs/access/PartitionedCacheAccess.java | 2 +-
.../commons/jcs/access/behavior/ICacheAccess.java | 12 +-
src/org/apache/commons/jcs/admin/JCSAdminBean.java | 10 +-
src/org/apache/commons/jcs/admin/JCSJMXBean.java | 8 +-
.../commons/jcs/admin/servlet/JCSAdminServlet.java | 1 -
.../AbstractAuxiliaryCacheEventLogging.java | 60 +-
.../jcs/auxiliary/AuxiliaryCacheFactory.java | 6 +-
.../jcs/auxiliary/disk/AbstractDiskCache.java | 78 +-
.../jcs/auxiliary/disk/PurgatoryElement.java | 12 +-
.../jcs/auxiliary/disk/block/BlockDisk.java | 14 +-
.../jcs/auxiliary/disk/block/BlockDiskCache.java | 4 +-
.../auxiliary/disk/block/BlockDiskKeyStore.java | 106 +-
.../auxiliary/disk/indexed/IndexedDiskCache.java | 48 +-
.../jcs/auxiliary/disk/jdbc/JDBCDiskCache.java | 4 +-
.../auxiliary/disk/jdbc/mysql/MySQLDiskCache.java | 2 +-
.../jcs/auxiliary/lateral/LateralCache.java | 6 +-
.../jcs/auxiliary/lateral/LateralCacheNoWait.java | 6 +-
.../lateral/LateralCacheNoWaitFacade.java | 2 +-
.../lateral/LateralElementDescriptor.java | 2 +-
.../lateral/socket/tcp/LateralTCPCacheFactory.java | 2 +-
.../socket/tcp/LateralTCPDiscoveryListener.java | 2 +-
.../lateral/socket/tcp/LateralTCPService.java | 12 +-
.../remote/AbstractRemoteAuxiliaryCache.java | 2 +-
.../remote/AbstractRemoteCacheListener.java | 3 +-
.../remote/AbstractRemoteCacheNoWaitFacade.java | 4 +-
.../jcs/auxiliary/remote/RemoteCacheFactory.java | 1 +
.../remote/RemoteCacheFailoverRunner.java | 4 +-
.../jcs/auxiliary/remote/RemoteCacheManager.java | 222 +-
.../jcs/auxiliary/remote/RemoteCacheMonitor.java | 35 +-
.../jcs/auxiliary/remote/RemoteCacheNoWait.java | 32 +-
.../jcs/auxiliary/remote/RemoteCacheRestore.java | 129 -
.../commons/jcs/auxiliary/remote/RemoteUtils.java | 162 +-
.../remote/http/client/RemoteHttpCacheClient.java | 8 +-
.../http/server/AbstractRemoteCacheService.java | 6 +-
.../auxiliary/remote/server/RemoteCacheServer.java | 10 +-
.../remote/server/RemoteCacheStartupServlet.java | 227 +-
.../remote/value/RemoteCacheResponse.java | 2 +-
.../jcs/engine/ZombieCacheServiceNonLocal.java | 37 +-
.../apache/commons/jcs/engine/behavior/ICache.java | 32 +-
.../commons/jcs/engine/behavior/ICacheElement.java | 10 +-
.../engine/behavior/ICacheElementSerialized.java | 2 +-
.../jcs/engine/behavior/ICacheEventQueue.java | 2 +-
.../commons/jcs/engine/behavior/ICacheManager.java | 42 -
.../commons/jcs/engine/behavior/ICacheRestore.java | 37 -
.../commons/jcs/engine/behavior/ICacheService.java | 6 +-
.../jcs/engine/behavior/ICacheServiceNonLocal.java | 4 +-
.../commons/jcs/engine/control/CompositeCache.java | 18 +-
.../engine/control/CompositeCacheConfigurator.java | 353 +-
.../jcs/engine/control/CompositeCacheManager.java | 161 +-
.../commons/jcs/engine/control/group/GroupId.java | 2 +-
.../AbstractDoubleLinkedListMemoryCache.java | 68 +-
.../jcs/engine/memory/AbstractMemoryCache.java | 8 +-
.../jcs/engine/memory/behavior/IMemoryCache.java | 2 +-
.../jcs/engine/memory/lru/LHMLRUMemoryCache.java | 47 +-
.../jcs/engine/memory/lru/LRUMemoryCache.java | 2 +-
.../memory/soft/SoftReferenceMemoryCache.java | 388 +
.../commons/jcs/engine/memory/soft/package.html | 25 +
.../util/DefaultMemoryElementDescriptor.java | 55 +
.../memory/util/MemoryElementDescriptor.java | 12 +-
.../util/SoftReferenceElementDescriptor.java | 62 +
.../commons/jcs/utils/config/OptionConverter.java | 22 +-
.../apache/commons/jcs/utils/net/HostNameUtil.java | 8 +-
.../commons/jcs/utils/struct/BoundedQueue.java | 94 -
.../jcs/utils/threadpool/ThreadPoolManager.java | 40 +-
src/org/openstreetmap/josm/Main.java | 11 +-
.../josm/actions/AutoScaleAction.java | 24 +-
.../josm/actions/CloseChangesetAction.java | 2 +-
.../josm/actions/CombineWayAction.java | 52 +-
.../josm/actions/CreateMultipolygonAction.java | 2 +
.../josm/actions/DeleteLayerAction.java | 46 +
.../josm/actions/DownloadAlongAction.java | 5 +-
.../josm/actions/DownloadReferrersAction.java | 38 +-
.../josm/actions/ExpertToggleAction.java | 4 +-
.../josm/actions/ExtensionFileFilter.java | 103 +-
.../josm/actions/FullscreenToggleAction.java | 4 +-
.../josm/actions/GpxExportAction.java | 2 +-
.../josm/actions/JoinAreasAction.java | 23 +-
.../josm/actions/JoinNodeWayAction.java | 6 +-
src/org/openstreetmap/josm/actions/JosmAction.java | 6 +-
.../josm/actions/MergeNodesAction.java | 2 +-
.../openstreetmap/josm/actions/OpenFileAction.java | 4 +-
.../josm/actions/OrthogonalizeAction.java | 11 +-
.../josm/actions/OverpassDownloadAction.java | 5 +-
.../josm/actions/RenameLayerAction.java | 8 +-
.../openstreetmap/josm/actions/SaveActionBase.java | 56 +-
.../josm/actions/SelectByInternalPointAction.java | 54 +-
.../josm/actions/SessionSaveAsAction.java | 10 +-
.../josm/actions/ShowStatusReportAction.java | 5 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 9 +-
.../ToggleUploadDiscouragedLayerAction.java | 15 +-
.../openstreetmap/josm/actions/UnGlueAction.java | 54 +-
.../openstreetmap/josm/actions/UploadAction.java | 24 +-
.../openstreetmap/josm/actions/ZoomInAction.java | 2 +-
.../openstreetmap/josm/actions/ZoomOutAction.java | 2 +-
.../actions/downloadtasks/DownloadGpsTask.java | 2 -
.../DownloadOsmChangeCompressedTask.java | 2 +-
.../actions/downloadtasks/DownloadOsmTask.java | 3 +-
.../downloadtasks/DownloadReferrersTask.java | 58 -
.../josm/actions/mapmode/DeleteAction.java | 27 +-
.../josm/actions/mapmode/DrawAction.java | 9 +-
.../josm/actions/mapmode/ExtrudeAction.java | 11 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 36 +-
.../josm/actions/mapmode/MapMode.java | 14 +-
.../actions/relation/AddSelectionToRelations.java | 7 +
.../actions/relation/DeleteRelationsAction.java | 13 +-
.../actions/relation/RecentRelationsAction.java | 184 +
.../josm/actions/search/SearchAction.java | 28 +-
.../josm/actions/search/SearchCompiler.java | 62 +-
.../actions/upload/RelationUploadOrderHook.java | 3 +-
.../josm/actions/upload/UploadNotesTask.java | 4 +-
.../josm/actions/upload/ValidateUploadHook.java | 15 +-
src/org/openstreetmap/josm/command/AddCommand.java | 24 +-
.../josm/command/AddPrimitivesCommand.java | 45 +-
.../openstreetmap/josm/command/ChangeCommand.java | 31 +-
.../josm/command/ChangeNodesCommand.java | 31 +-
.../josm/command/ChangePropertyCommand.java | 31 +-
.../josm/command/ChangePropertyKeyCommand.java | 38 +-
.../command/ChangeRelationMemberRoleCommand.java | 49 +-
src/org/openstreetmap/josm/command/Command.java | 63 +-
.../openstreetmap/josm/command/DeleteCommand.java | 33 +-
.../openstreetmap/josm/command/MoveCommand.java | 59 +-
.../openstreetmap/josm/command/PurgeCommand.java | 52 +-
.../josm/command/RemoveNodesCommand.java | 31 +-
.../openstreetmap/josm/command/RotateCommand.java | 35 +-
.../openstreetmap/josm/command/ScaleCommand.java | 37 +-
.../openstreetmap/josm/command/SelectCommand.java | 31 +-
.../josm/command/SequenceCommand.java | 36 +-
.../josm/command/TransformNodesCommand.java | 31 +-
.../josm/command/conflict/ConflictAddCommand.java | 24 +-
.../command/conflict/ConflictResolveCommand.java | 25 +-
.../conflict/CoordinateConflictResolveCommand.java | 28 +-
.../DeletedStateConflictResolveCommand.java | 28 +-
.../conflict/ModifiedConflictResolveCommand.java | 24 +-
.../RelationMemberConflictResolverCommand.java | 38 +-
.../conflict/TagConflictResolveCommand.java | 31 +-
.../conflict/VersionConflictResolveCommand.java | 24 +-
.../conflict/WayNodesConflictResolverCommand.java | 31 +-
.../josm/corrector/ReverseWayNoTagCorrector.java | 39 +-
.../josm/corrector/ReverseWayTagCorrector.java | 26 +-
src/org/openstreetmap/josm/data/AutosaveTask.java | 2 +-
src/org/openstreetmap/josm/data/Bounds.java | 37 +-
.../josm/data/CustomConfigurator.java | 67 +-
src/org/openstreetmap/josm/data/DataSource.java | 30 +-
src/org/openstreetmap/josm/data/Preferences.java | 946 +-
.../openstreetmap/josm/data/ProjectionBounds.java | 10 +
src/org/openstreetmap/josm/data/Version.java | 18 +-
.../josm/data/cache/JCSCachedTileLoaderJob.java | 20 +-
.../openstreetmap/josm/data/conflict/Conflict.java | 25 +-
.../josm/data/conflict/ConflictCollection.java | 30 +-
.../openstreetmap/josm/data/coor/Coordinate.java | 29 +-
src/org/openstreetmap/josm/data/coor/LatLon.java | 119 +-
src/org/openstreetmap/josm/data/gpx/GpxData.java | 21 +
src/org/openstreetmap/josm/data/gpx/WayPoint.java | 37 +-
.../josm/data/imagery/ImageryInfo.java | 147 +-
.../josm/data/imagery/ImageryLayerInfo.java | 101 +-
src/org/openstreetmap/josm/data/imagery/Shape.java | 19 +-
.../josm/data/imagery/TemplatedWMSTileSource.java | 9 +-
.../josm/data/imagery/WMTSTileSource.java | 247 +-
src/org/openstreetmap/josm/data/notes/Note.java | 28 +-
.../openstreetmap/josm/data/notes/NoteComment.java | 8 +-
.../josm/data/oauth/OAuthParameters.java | 158 +-
.../openstreetmap/josm/data/oauth/OAuthToken.java | 31 +-
.../josm/data/osm/AbstractPrimitive.java | 173 +-
src/org/openstreetmap/josm/data/osm/Changeset.java | 34 +-
.../josm/data/osm/ChangesetCache.java | 23 +
src/org/openstreetmap/josm/data/osm/DataSet.java | 11 +-
src/org/openstreetmap/josm/data/osm/Filter.java | 2 +-
.../openstreetmap/josm/data/osm/FilterMatcher.java | 65 +-
.../openstreetmap/josm/data/osm/FilterWorker.java | 8 +-
src/org/openstreetmap/josm/data/osm/INode.java | 20 +
.../openstreetmap/josm/data/osm/IPrimitive.java | 175 +
src/org/openstreetmap/josm/data/osm/IRelation.java | 23 +
src/org/openstreetmap/josm/data/osm/IWay.java | 18 +
.../josm/data/osm/MultipolygonBuilder.java | 96 +-
src/org/openstreetmap/josm/data/osm/NodeData.java | 1 +
.../josm/data/osm/NodePositionComparator.java | 11 +-
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 51 +-
.../openstreetmap/josm/data/osm/PrimitiveData.java | 5 +-
.../openstreetmap/josm/data/osm/QuadBuckets.java | 23 +-
src/org/openstreetmap/josm/data/osm/Relation.java | 20 +-
.../openstreetmap/josm/data/osm/RelationData.java | 1 +
.../josm/data/osm/RelationMember.java | 17 +-
.../josm/data/osm/RelationMemberData.java | 37 +-
.../josm/data/osm/RelationToChildReference.java | 45 +-
.../josm/data/osm/SimplePrimitiveId.java | 27 +-
src/org/openstreetmap/josm/data/osm/Storage.java | 10 +-
src/org/openstreetmap/josm/data/osm/Tag.java | 108 +-
src/org/openstreetmap/josm/data/osm/TagMap.java | 254 +
src/org/openstreetmap/josm/data/osm/User.java | 17 +-
src/org/openstreetmap/josm/data/osm/Way.java | 6 -
src/org/openstreetmap/josm/data/osm/WayData.java | 1 +
.../openstreetmap/josm/data/osm/WaySegment.java | 11 +-
.../josm/data/osm/event/DatasetEventManager.java | 8 +-
.../josm/data/osm/event/SelectionEventManager.java | 8 +-
.../josm/data/osm/history/HistoryOsmPrimitive.java | 24 +-
.../josm/data/osm/visitor/BoundingXYVisitor.java | 2 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 169 +-
.../josm/data/preferences/AbstractSetting.java | 69 +
.../josm/data/preferences/BooleanProperty.java | 3 +
.../josm/data/preferences/CollectionProperty.java | 3 +
.../josm/data/preferences/ColorProperty.java | 3 +
.../josm/data/preferences/DoubleProperty.java | 44 +
.../josm/data/preferences/EnumProperty.java | 34 +
.../josm/data/preferences/IntegerProperty.java | 3 +
.../josm/data/preferences/ListListSetting.java | 101 +
.../josm/data/preferences/ListSetting.java | 65 +
.../josm/data/preferences/MapListSetting.java | 100 +
.../data/preferences/ParametrizedEnumProperty.java | 10 +-
.../josm/data/preferences/PreferencesReader.java | 353 +
.../josm/data/preferences/PreferencesWriter.java | 144 +
.../josm/data/preferences/Setting.java | 86 +
.../josm/data/preferences/SettingVisitor.java | 32 +
.../josm/data/preferences/StringProperty.java | 3 +
.../josm/data/preferences/StringSetting.java | 45 +
.../josm/data/projection/AbstractProjection.java | 37 +-
.../josm/data/projection/CustomProjection.java | 179 +-
.../josm/data/projection/Ellipsoid.java | 25 +-
.../josm/data/projection/Projection.java | 14 +-
.../josm/data/projection/Projections.java | 92 +-
.../projection/datum/NTV2GridShiftFileWrapper.java | 2 +-
.../josm/data/projection/proj/AbstractProj.java | 75 +-
.../josm/data/projection/proj/AlbersEqualArea.java | 219 +
.../josm/data/projection/proj/CassiniSoldner.java | 99 +
.../data/projection/proj/DoubleStereographic.java | 5 +-
.../projection/proj/ICentralMeridianProvider.java | 19 +
.../data/projection/proj/IScaleFactorProvider.java | 21 +
.../projection/proj/LambertAzimuthalEqualArea.java | 281 +
.../projection/proj/LambertConformalConic.java | 4 +-
.../josm/data/projection/proj/LonLat.java | 5 +
.../josm/data/projection/proj/Mercator.java | 99 +-
.../josm/data/projection/proj/ObliqueMercator.java | 435 +
.../data/projection/proj/PolarStereographic.java | 183 +
.../josm/data/projection/proj/Proj.java | 9 +
.../josm/data/projection/proj/ProjParameters.java | 11 +
.../data/projection/proj/SwissObliqueMercator.java | 12 +-
.../data/projection/proj/TransverseMercator.java | 1 -
.../josm/data/validation/OsmValidator.java | 2 +-
.../josm/data/validation/PaintVisitor.java | 41 +-
.../openstreetmap/josm/data/validation/Test.java | 36 +-
.../validation/routines/AbstractValidator.java | 17 -
.../data/validation/routines/DomainValidator.java | 1901 +-
.../data/validation/routines/EmailValidator.java | 103 +-
.../validation/routines/InetAddressValidator.java | 109 +-
.../data/validation/routines/RegexValidator.java | 44 +-
.../data/validation/routines/UrlValidator.java | 196 +-
.../josm/data/validation/routines/package.html | 22 +-
.../josm/data/validation/tests/Coastlines.java | 4 +-
.../data/validation/tests/DuplicateRelation.java | 33 +-
.../josm/data/validation/tests/DuplicateWay.java | 21 +-
.../josm/data/validation/tests/Highways.java | 3 +-
.../josm/data/validation/tests/InternetTags.java | 10 +-
.../data/validation/tests/MapCSSTagChecker.java | 62 +-
.../data/validation/tests/MultipolygonTest.java | 317 +-
.../data/validation/tests/OpeningHourTest.java | 9 +-
.../josm/data/validation/tests/PowerLines.java | 7 +-
.../data/validation/tests/RelationChecker.java | 29 +-
.../josm/data/validation/tests/TagChecker.java | 34 +-
.../josm/data/validation/tests/UntaggedNode.java | 2 +-
.../josm/data/validation/tests/UntaggedWay.java | 8 +-
.../josm/gui/ConditionalOptionPaneUtil.java | 29 +-
.../josm/gui/DefaultNameFormatter.java | 42 +-
.../josm/gui/ExceptionDialogUtil.java | 4 +-
src/org/openstreetmap/josm/gui/ExtendedDialog.java | 10 +-
.../josm/gui/HelpAwareOptionPane.java | 7 +-
.../openstreetmap/josm/gui/IconToggleButton.java | 14 +-
.../josm/gui/JosmUserIdentityManager.java | 38 +-
.../openstreetmap/josm/gui/MainApplication.java | 2 -
src/org/openstreetmap/josm/gui/MainMenu.java | 192 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 3 +-
src/org/openstreetmap/josm/gui/MapMover.java | 31 +-
src/org/openstreetmap/josm/gui/MapSlider.java | 46 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 43 +-
src/org/openstreetmap/josm/gui/MapView.java | 18 +-
.../josm/gui/NavigatableComponent.java | 185 +-
.../josm/gui/OsmPrimitivRenderer.java | 16 +-
.../openstreetmap/josm/gui/PleaseWaitDialog.java | 3 +-
src/org/openstreetmap/josm/gui/SideButton.java | 7 +-
src/org/openstreetmap/josm/gui/SplashScreen.java | 3 +-
.../josm/gui/bbox/SlippyMapBBoxChooser.java | 4 +-
.../josm/gui/conflict/pair/ConflictResolver.java | 25 +
.../josm/gui/conflict/pair/IConflictResolver.java | 2 +
.../josm/gui/conflict/pair/ListMerger.java | 7 +
.../conflict/pair/properties/PropertiesMerger.java | 48 +-
.../conflict/pair/tags/TagMergeColumnModel.java | 34 -
.../josm/gui/conflict/pair/tags/TagMergeModel.java | 7 +
.../josm/gui/conflict/pair/tags/TagMerger.java | 29 +-
.../tags/CombinePrimitiveResolverDialog.java | 2 +-
.../tags/PasteTagsConflictResolverDialog.java | 69 +-
.../tags/RelationMemberConflictDecision.java | 49 +-
.../tags/RelationMemberConflictResolver.java | 20 +-
.../gui/conflict/tags/TagConflictResolver.java | 3 +-
.../tags/TagConflictResolverColumnModel.java | 48 -
.../conflict/tags/TagConflictResolverTable.java | 106 +-
.../gui/datatransfer/PrimitiveTransferable.java | 95 +
.../datatransfer/RelationMemberTransferable.java | 96 +
.../josm/gui/dialogs/ConflictDialog.java | 277 +-
.../josm/gui/dialogs/ConflictResolutionDialog.java | 3 +-
.../DeleteFromRelationConfirmationDialog.java | 6 +-
.../josm/gui/dialogs/FilterTableModel.java | 24 +-
.../josm/gui/dialogs/LayerListDialog.java | 93 +-
.../josm/gui/dialogs/MapPaintDialog.java | 52 +-
.../josm/gui/dialogs/MenuItemSearchDialog.java | 132 +
.../josm/gui/dialogs/RelationListDialog.java | 28 +-
.../josm/gui/dialogs/SelectionListDialog.java | 27 +-
.../josm/gui/dialogs/ToggleDialog.java | 17 +-
.../josm/gui/dialogs/changeset/ChangesetAware.java | 17 +
.../dialogs/changeset/ChangesetCacheManager.java | 18 +-
.../dialogs/changeset/ChangesetContentPanel.java | 171 +-
.../dialogs/changeset/ChangesetDetailPanel.java | 82 +-
.../changeset/DownloadChangesetContentAction.java | 60 +
.../query/AdvancedChangesetQueryPanel.java | 3 +-
.../gui/dialogs/properties/PresetListPanel.java | 2 +-
.../gui/dialogs/properties/PropertiesDialog.java | 100 +-
.../dialogs/properties/SearchBasedRowFilter.java | 57 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 348 +-
.../gui/dialogs/relation/ChildRelationBrowser.java | 3 +-
.../dialogs/relation/GenericRelationEditor.java | 1263 +-
.../josm/gui/dialogs/relation/IRelationEditor.java | 47 +
.../josm/gui/dialogs/relation/MemberTable.java | 86 +-
.../relation/MemberTableMemberCellRenderer.java | 9 +-
.../gui/dialogs/relation/MemberTableModel.java | 73 +-
.../dialogs/relation/MemberTransferHandler.java | 122 +
.../relation/ReferringRelationsBrowser.java | 3 +-
.../relation/ReferringRelationsBrowserModel.java | 9 +-
.../dialogs/relation/RelationDialogManager.java | 29 +-
.../josm/gui/dialogs/relation/RelationEditor.java | 153 +-
.../relation/SelectionTableCellRenderer.java | 9 +-
.../actions/AbstractRelationEditorAction.java | 51 +
.../relation/actions/AddFromSelectionAction.java | 62 +
.../actions/AddSelectedAfterSelection.java | 50 +
.../relation/actions/AddSelectedAtEndAction.java | 49 +
.../relation/actions/AddSelectedAtStartAction.java | 49 +
.../actions/AddSelectedBeforeSelection.java | 50 +
.../gui/dialogs/relation/actions/ApplyAction.java | 66 +
.../gui/dialogs/relation/actions/CancelAction.java | 109 +
.../relation/actions/CopyMembersAction.java | 41 +
.../actions/DeleteCurrentRelationAction.java | 55 +
.../actions/DownloadIncompleteMembersAction.java | 62 +
.../DownloadSelectedIncompleteMembersAction.java | 59 +
.../relation/actions/DuplicateRelationAction.java | 54 +
.../gui/dialogs/relation/actions/EditAction.java | 71 +
.../dialogs/relation/actions/MoveDownAction.java | 45 +
.../gui/dialogs/relation/actions/MoveUpAction.java | 45 +
.../gui/dialogs/relation/actions/OKAction.java | 48 +
.../relation/actions/PasteMembersAction.java | 83 +
.../dialogs/relation/actions/RefreshAction.java | 143 +
.../gui/dialogs/relation/actions/RemoveAction.java | 46 +
.../relation/actions/RemoveSelectedAction.java | 48 +
.../dialogs/relation/actions/ReverseAction.java | 41 +
.../gui/dialogs/relation/actions/SavingAction.java | 199 +
.../SelectPrimitivesForSelectedMembersAction.java | 42 +
.../actions/SelectedMembersForSelectionAction.java | 50 +
.../dialogs/relation/actions/SetRoleAction.java | 105 +
.../gui/dialogs/relation/actions/SortAction.java | 45 +
.../dialogs/relation/actions/SortBelowAction.java | 40 +
.../josm/gui/download/BookmarkList.java | 30 +-
.../josm/gui/download/BookmarkSelection.java | 11 +-
.../josm/gui/download/BoundingBoxSelection.java | 3 +-
.../josm/gui/download/DownloadDialog.java | 6 +-
.../josm/gui/download/PlaceSelection.java | 49 +-
.../josm/gui/download/SlippyMapChooser.java | 4 +-
.../josm/gui/download/TileSelection.java | 3 +-
.../openstreetmap/josm/gui/help/HelpBrowser.java | 218 +-
.../josm/gui/help/HelpBrowserHistory.java | 39 +-
.../openstreetmap/josm/gui/help/IHelpBrowser.java | 39 +
.../josm/gui/history/CoordinateInfoViewer.java | 174 +-
.../josm/gui/history/HistoryBrowser.java | 19 +-
.../josm/gui/history/HistoryBrowserDialog.java | 82 +-
.../josm/gui/history/HistoryBrowserModel.java | 23 +-
.../josm/gui/history/NodeListViewer.java | 47 +-
.../josm/gui/history/TagTableCellRenderer.java | 8 +-
.../josm/gui/history/VersionInfoPanel.java | 85 +-
.../openstreetmap/josm/gui/io/AbstractIOTask.java | 2 +-
.../josm/gui/io/AbstractUploadDialog.java | 12 +-
.../josm/gui/io/ActionFlagsTableCell.java | 30 +-
.../josm/gui/io/BasicUploadSettingsPanel.java | 31 +-
.../josm/gui/io/ChangesetManagementPanel.java | 1 -
.../josm/gui/io/CloseChangesetDialog.java | 9 +-
.../josm/gui/io/CredentialDialog.java | 2 +-
.../josm/gui/io/DownloadFileTask.java | 4 +-
.../openstreetmap/josm/gui/io/IUploadDialog.java | 66 +
.../josm/gui/io/LayerNameAndFilePathTableCell.java | 35 +-
.../josm/gui/io/OpenChangesetComboBoxModel.java | 2 +-
.../openstreetmap/josm/gui/io/SaveLayerInfo.java | 25 +-
.../josm/gui/io/SaveLayersDialog.java | 93 +-
.../openstreetmap/josm/gui/io/SaveLayersModel.java | 53 +-
.../josm/gui/io/SaveLayersTableColumnModel.java | 15 +-
.../josm/gui/io/TagSettingsPanel.java | 94 +-
.../openstreetmap/josm/gui/io/UploadDialog.java | 293 +-
.../openstreetmap/josm/gui/io/UploadLayerTask.java | 2 +-
.../josm/gui/io/UploadParameterSummaryPanel.java | 4 +-
.../josm/gui/io/UploadPrimitivesTask.java | 3 +-
.../josm/gui/io/UploadSelectionDialog.java | 9 +-
.../josm/gui/io/UploadStrategySelectionPanel.java | 31 +-
.../josm/gui/io/UploadStrategySpecification.java | 52 +-
.../gui/layer/AbstractCachedTileSourceLayer.java | 4 +-
.../josm/gui/layer/AbstractModifiableLayer.java | 21 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 377 +-
.../josm/gui/layer/AlignImageryPanel.java | 9 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 2 +-
src/org/openstreetmap/josm/gui/layer/Layer.java | 53 +-
.../josm/gui/layer/NativeScaleLayer.java | 269 +
.../openstreetmap/josm/gui/layer/NoteLayer.java | 7 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 171 +-
.../openstreetmap/josm/gui/layer/SaveToFile.java | 33 +
src/org/openstreetmap/josm/gui/layer/TMSLayer.java | 38 +-
.../josm/gui/layer/UploadToServer.java | 58 +
src/org/openstreetmap/josm/gui/layer/WMSLayer.java | 31 +-
.../openstreetmap/josm/gui/layer/WMTSLayer.java | 60 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 571 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 177 +-
.../josm/gui/layer/geoimage/ImageEntry.java | 17 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 15 +-
.../gui/layer/gpx/ChooseTrackVisibilityAction.java | 54 +-
.../josm/gui/layer/gpx/CustomizeDrawingAction.java | 3 +-
.../josm/gui/layer/gpx/DownloadAlongPanel.java | 8 +-
.../gui/layer/gpx/DownloadAlongTrackAction.java | 20 +-
.../gui/layer/gpx/DownloadWmsAlongTrackAction.java | 111 +-
.../josm/gui/layer/gpx/GpxDrawHelper.java | 39 +-
.../josm/gui/layer/markerlayer/ImageMarker.java | 11 +-
.../josm/gui/layer/markerlayer/Marker.java | 2 +-
.../josm/gui/layer/markerlayer/PlayHeadMarker.java | 33 +-
.../openstreetmap/josm/gui/mappaint/Cascade.java | 10 +
.../josm/gui/mappaint/DividedScale.java | 21 +-
.../josm/gui/mappaint/ElemStyles.java | 7 +-
.../openstreetmap/josm/gui/mappaint/Keyword.java | 9 +-
.../josm/gui/mappaint/MapPaintStyles.java | 31 +-
src/org/openstreetmap/josm/gui/mappaint/Range.java | 18 +-
.../josm/gui/mappaint/StyleCache.java | 74 +-
.../josm/gui/mappaint/StyleElementList.java | 12 +-
.../openstreetmap/josm/gui/mappaint/StyleKeys.java | 1 +
.../josm/gui/mappaint/StyleSetting.java | 19 +-
.../josm/gui/mappaint/StyleSource.java | 57 +-
.../josm/gui/mappaint/mapcss/Condition.java | 28 +
.../gui/mappaint/mapcss/ExpressionFactory.java | 34 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 12 +-
.../josm/gui/mappaint/mapcss/MapCSSRule.java | 27 +-
.../gui/mappaint/mapcss/MapCSSStyleSource.java | 15 +-
.../gui/mappaint/styleelement/AreaElement.java | 34 +-
.../gui/mappaint/styleelement/BoxTextElement.java | 49 +-
.../styleelement/LabelCompositionStrategy.java | 45 +-
.../gui/mappaint/styleelement/LineElement.java | 33 +-
.../gui/mappaint/styleelement/LineTextElement.java | 13 +-
.../josm/gui/mappaint/styleelement/MapImage.java | 31 +-
.../gui/mappaint/styleelement/NodeElement.java | 40 +-
.../mappaint/styleelement/RepeatImageElement.java | 30 +-
.../gui/mappaint/styleelement/StyleElement.java | 57 +-
.../josm/gui/mappaint/styleelement/TextLabel.java | 30 +-
.../josm/gui/mappaint/xml/XmlStyleSource.java | 3 +-
.../gui/oauth/AdvancedOAuthPropertiesPanel.java | 63 +-
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 39 +-
.../josm/gui/oauth/ManualAuthorizationUI.java | 9 +-
.../josm/gui/oauth/OAuthAuthorizationWizard.java | 61 +-
.../gui/oauth/OsmOAuthAuthorizationClient.java | 43 +-
.../josm/gui/oauth/RetrieveRequestTokenTask.java | 10 +-
.../gui/oauth/SemiAutomaticAuthorizationUI.java | 17 +-
.../gui/preferences/DefaultPreferenceSetting.java | 2 +-
.../josm/gui/preferences/PreferenceDialog.java | 4 +-
.../josm/gui/preferences/PreferenceTabbedPane.java | 8 +-
.../josm/gui/preferences/SourceEditor.java | 83 +-
.../josm/gui/preferences/SourceEntry.java | 27 +-
.../preferences/advanced/AbstractListEditor.java | 44 +
.../advanced/AbstractTableListEditor.java | 160 +
.../preferences/advanced/AdvancedPreference.java | 48 +-
.../preferences/advanced/ExportProfileAction.java | 28 +-
.../josm/gui/preferences/advanced/ListEditor.java | 22 +-
.../gui/preferences/advanced/ListListEditor.java | 174 +-
.../gui/preferences/advanced/MapListEditor.java | 166 +-
.../josm/gui/preferences/advanced/PrefEntry.java | 2 +-
.../gui/preferences/advanced/PreferencesTable.java | 10 +-
.../gui/preferences/advanced/StringEditor.java | 2 +-
.../gui/preferences/audio/AudioPreference.java | 3 +-
.../gui/preferences/display/ColorPreference.java | 10 +
.../gui/preferences/display/DrawingPreference.java | 3 +
.../gui/preferences/display/LafPreference.java | 48 +-
.../gui/preferences/imagery/AddImageryDialog.java | 2 +-
.../gui/preferences/imagery/AddWMSLayerPanel.java | 2 +-
.../gui/preferences/imagery/AddWMTSLayerPanel.java | 12 +-
.../gui/preferences/imagery/ImageryPreference.java | 10 +-
.../josm/gui/preferences/map/BackupPreference.java | 3 +-
.../gui/preferences/plugin/PluginPreference.java | 122 +-
.../preferences/plugin/PluginPreferencesModel.java | 61 +-
.../projection/CodeProjectionChoice.java | 52 +-
.../projection/ProjectionPreference.java | 8 +-
.../projection/UTMProjectionChoice.java | 3 +-
.../remotecontrol/RemoteControlPreference.java | 6 +-
.../server/AuthenticationPreferencesPanel.java | 13 +-
.../OAuthAuthenticationPreferencesPanel.java | 39 +-
.../preferences/server/OsmApiUrlInputPanel.java | 25 +-
.../gui/preferences/server/ProxyPreference.java | 4 +-
.../preferences/server/ServerAccessPreference.java | 7 +-
.../josm/gui/preferences/shortcut/PrefJPanel.java | 7 +-
.../ValidatorTagCheckerRulesPreference.java | 1 -
.../validator/ValidatorTestsPreference.java | 3 +-
.../josm/gui/progress/AbstractProgressMonitor.java | 2 +-
.../josm/gui/progress/ChildProgress.java | 2 +-
.../josm/gui/progress/ProgressMonitorExecutor.java | 2 +-
.../josm/gui/progress/ProgressTaskId.java | 16 +-
.../josm/gui/tagging/TagEditorModel.java | 114 +-
.../josm/gui/tagging/TagEditorPanel.java | 20 +-
.../openstreetmap/josm/gui/tagging/TagModel.java | 41 +-
.../openstreetmap/josm/gui/tagging/TagTable.java | 36 +-
.../gui/tagging/TagTableColumnModelBuilder.java | 113 +
.../gui/tagging/ac/AutoCompletingComboBox.java | 10 +-
.../josm/gui/tagging/ac/AutoCompletionManager.java | 6 +-
.../josm/gui/tagging/presets/TaggingPreset.java | 37 +-
.../gui/tagging/presets/TaggingPresetItem.java | 4 +-
.../gui/tagging/presets/TaggingPresetReader.java | 2 +-
.../tagging/presets/TaggingPresetSearchDialog.java | 4 +-
.../TaggingPresetSearchPrimitiveDialog.java | 11 +-
.../gui/tagging/presets/TaggingPresetSelector.java | 194 +-
.../gui/tagging/presets/TaggingPresetType.java | 19 +-
.../josm/gui/tagging/presets/items/Check.java | 246 +-
.../josm/gui/tagging/presets/items/CheckGroup.java | 136 +-
.../josm/gui/tagging/presets/items/Combo.java | 215 +-
.../tagging/presets/items/ComboMultiSelect.java | 1076 +-
.../gui/tagging/presets/items/ItemSeparator.java | 71 +-
.../josm/gui/tagging/presets/items/Key.java | 102 +-
.../josm/gui/tagging/presets/items/KeyedItem.java | 348 +-
.../josm/gui/tagging/presets/items/Label.java | 100 +-
.../josm/gui/tagging/presets/items/Link.java | 88 +-
.../gui/tagging/presets/items/MultiSelect.java | 139 +-
.../josm/gui/tagging/presets/items/Optional.java | 54 +-
.../josm/gui/tagging/presets/items/PresetLink.java | 107 +-
.../josm/gui/tagging/presets/items/Roles.java | 272 +-
.../josm/gui/tagging/presets/items/Space.java | 69 +-
.../josm/gui/tagging/presets/items/Text.java | 470 +-
.../josm/gui/tagging/presets/items/TextItem.java | 89 +-
.../gui/tagging/presets/items/package-info.java | 12 +-
.../josm/gui/tagging/presets/package-info.java | 12 +-
.../openstreetmap/josm/gui/util/CursorManager.java | 2 +-
src/org/openstreetmap/josm/gui/util/GuiHelper.java | 80 +
.../josm/gui/util/HighlightHelper.java | 4 +-
.../josm/gui/widgets/ComboBoxHistory.java | 34 +-
.../josm/gui/widgets/FileChooserManager.java | 187 +-
.../josm/gui/widgets/HistoryComboBox.java | 31 +-
.../openstreetmap/josm/gui/widgets/ImageLabel.java | 14 +-
.../josm/gui/widgets/JMultilineLabel.java | 1 +
.../josm/gui/widgets/JosmComboBox.java | 17 +-
.../josm/gui/widgets/JosmHTMLFactory.java | 74 +-
.../josm/gui/widgets/JosmImageView.java | 342 +-
.../openstreetmap/josm/gui/widgets/JosmTable.java | 107 +
.../josm/gui/widgets/NativeFileChooser.java | 3 +-
.../josm/gui/widgets/OsmPrimitivesTable.java | 47 +-
.../josm/gui/widgets/QuadStateCheckBox.java | 29 +-
.../gui/widgets/SearchTextResultListPanel.java | 177 +
.../josm/io/BoundingBoxDownloader.java | 14 +-
src/org/openstreetmap/josm/io/CachedFile.java | 53 +-
src/org/openstreetmap/josm/io/Compression.java | 14 -
src/org/openstreetmap/josm/io/GpxExporter.java | 2 +-
src/org/openstreetmap/josm/io/GpxImporter.java | 35 +-
src/org/openstreetmap/josm/io/NmeaReader.java | 9 +-
src/org/openstreetmap/josm/io/NoteImporter.java | 41 +-
src/org/openstreetmap/josm/io/NoteReader.java | 2 +-
src/org/openstreetmap/josm/io/OsmApi.java | 21 +-
.../openstreetmap/josm/io/OsmBzip2Exporter.java | 7 +-
.../openstreetmap/josm/io/OsmBzip2Importer.java | 28 -
src/org/openstreetmap/josm/io/OsmConnection.java | 53 +-
src/org/openstreetmap/josm/io/OsmExporter.java | 3 +-
src/org/openstreetmap/josm/io/OsmGzipExporter.java | 7 +-
src/org/openstreetmap/josm/io/OsmGzipImporter.java | 28 -
src/org/openstreetmap/josm/io/OsmImporter.java | 6 +-
src/org/openstreetmap/josm/io/OsmServerReader.java | 11 +-
src/org/openstreetmap/josm/io/OsmServerWriter.java | 3 +
src/org/openstreetmap/josm/io/OsmZipImporter.java | 28 -
.../josm/io/StreamProgressUpdater.java | 2 +-
src/org/openstreetmap/josm/io/XmlWriter.java | 24 +-
.../josm/io/auth/DefaultAuthenticator.java | 65 +-
.../josm/io/imagery/ImageryReader.java | 152 +-
.../josm/io/remotecontrol/AddTagsDialog.java | 3 +-
.../josm/io/remotecontrol/DNSName.java | 3 +-
.../io/remotecontrol/handler/AddNodeHandler.java | 4 +-
.../io/remotecontrol/handler/ImportHandler.java | 2 +-
.../io/remotecontrol/handler/RequestHandler.java | 28 +-
.../josm/io/session/AbstractSessionExporter.java | 43 +
.../josm/io/session/GenericSessionExporter.java | 227 +
.../josm/io/session/GeoImageSessionExporter.java | 28 +-
.../josm/io/session/GeoImageSessionImporter.java | 5 +-
.../josm/io/session/GpxTracksSessionExporter.java | 170 +-
.../josm/io/session/GpxTracksSessionImporter.java | 7 +-
.../josm/io/session/ImagerySessionExporter.java | 53 +-
.../josm/io/session/ImagerySessionImporter.java | 6 +-
.../josm/io/session/MarkerSessionExporter.java | 33 +-
.../josm/io/session/MarkerSessionImporter.java | 4 +
.../josm/io/session/NoteSessionExporter.java | 31 +
.../josm/io/session/NoteSessionImporter.java | 53 +
.../josm/io/session/OsmDataSessionExporter.java | 202 +-
.../josm/io/session/OsmDataSessionImporter.java | 6 +-
.../josm/io/session/SessionLayerExporter.java | 4 +
.../josm/io/session/SessionLayerImporter.java | 4 +
.../josm/io/session/SessionReader.java | 72 +-
.../josm/io/session/SessionWriter.java | 71 +-
src/org/openstreetmap/josm/plugins/Plugin.java | 2 +-
.../josm/plugins/PluginDownloadException.java | 35 +-
.../josm/plugins/PluginDownloadTask.java | 24 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 88 +-
.../plugins/ReadRemotePluginInformationTask.java | 4 +-
src/org/openstreetmap/josm/tools/AudioPlayer.java | 10 +-
src/org/openstreetmap/josm/tools/ColorScale.java | 2 +-
.../openstreetmap/josm/tools/ExceptionUtil.java | 115 +-
src/org/openstreetmap/josm/tools/ExifReader.java | 48 +-
src/org/openstreetmap/josm/tools/FontsManager.java | 2 +-
src/org/openstreetmap/josm/tools/HttpClient.java | 22 +-
src/org/openstreetmap/josm/tools/I18n.java | 2 +-
.../openstreetmap/josm/tools/ImageProvider.java | 135 +-
.../openstreetmap/josm/tools/ImageResource.java | 4 +-
src/org/openstreetmap/josm/tools/MultiMap.java | 42 +-
.../josm/tools/MultikeyActionsHandler.java | 2 +-
.../openstreetmap/josm/tools/OsmUrlToBounds.java | 23 +-
.../josm/tools/OverpassTurboQueryWizard.java | 44 +-
src/org/openstreetmap/josm/tools/Pair.java | 25 +-
.../openstreetmap/josm/tools/PlatformHookOsx.java | 2 +-
.../josm/tools/PlatformHookUnixoid.java | 4 +
.../josm/tools/RightAndLefthandTraffic.java | 3 +-
.../josm/tools/SubclassFilteredCollection.java | 4 +-
.../josm/tools/UncheckedParseException.java | 48 +
src/org/openstreetmap/josm/tools/Utils.java | 259 +-
.../openstreetmap/josm/tools/WindowGeometry.java | 4 +-
.../openstreetmap/josm/tools/XmlObjectParser.java | 2 +-
.../openstreetmap/josm/tools/date/DateUtils.java | 43 +-
.../josm/tools/date/FallbackDateParser.java | 113 -
.../josm/tools/date/PrimaryDateParser.java | 246 -
styles/standard/elemstyles.mapcss | 642 +-
styles/standard/potlatch2.mapcss | 3 +
styles_nodist/potlatch2/README | 2 +-
styles_nodist/potlatch2/patched/core_pois.css | 5 +-
styles_nodist/potlatch2/patched/potlatch.css | 6 +-
styles_nodist/potlatch2/prelude.css | 2 +-
styles_nodist/potlatch2/source/core_pois.css | 5 +-
test/data/customconfigurator/append.xml | 10 +
test/data/customconfigurator/replace.xml | 16 +
test/data/empty.gpx | 9 +
test/data/minimal.gpx | 49 +
.../2015-11-08_15-33-27-Xiaomi_YI-Y0030832.jpg | Bin 0 -> 3960473 bytes
test/data/regress/12255/bobrava2.gpx | 20067 ++++
test/data/regress/12312/single_trackpoint.gpx | 8 +
test/data/regress/12376/multipolygon_hang.osm.bz2 | Bin 0 -> 34803 bytes
test/data/regress/12436/example.osm | 6 +
test/data/regress/12464/example.osm | 4 +
test/data/regress/12531/notes.osn | 171 +
test/data/sessions/notes.joz | Bin 0 -> 17413 bytes
test/data/styles/filter.mapcss | 70 +
test/data/styles/label-from-tag.mapcss | 2 +-
.../josm/data/osm/TaginfoIntegrationTest.java | 85 -
.../openstreetmap/josm/data/osm/TaginfoTestIT.java | 91 +
.../conflict/pair/nodes/NodeListMergerTest.java | 77 -
.../conflict/pair/nodes/NodeListMergerTestFT.java | 74 +
.../pair/properties/PropertiesMergerTest.java | 52 -
.../pair/properties/PropertiesMergerTestFT.java | 50 +
.../pair/relation/RelationMemberMergerTest.java | 56 -
.../pair/relation/RelationMemberMergerTestFT.java | 54 +
.../josm/gui/conflict/pair/tags/TagMergerTest.java | 41 -
.../gui/conflict/pair/tags/TagMergerTestFT.java | 38 +
.../gui/dialogs/ConflictResolutionDialogTest.java | 52 -
.../dialogs/ConflictResolutionDialogTestFT.java | 50 +
.../changeset/ChangesetCacheManagerTest.java | 21 -
.../changeset/ChangesetCacheManagerTestFT.java | 18 +
.../changeset/query/ChangesetQueryDialogTest.java | 22 -
.../query/ChangesetQueryDialogTestFT.java | 19 +
.../josm/gui/history/HistoryBrowserTest.java | 65 -
.../josm/gui/history/HistoryBrowserTestFT.java | 63 +
.../josm/gui/mappaint/StyleCacheTest.java | 85 +
.../josm/io/MultiFetchServerObjectReaderTest.java | 10 +
.../josm/io/OsmServerBackreferenceReaderTest.java | 2 +
.../openstreetmap/josm/tools/HttpClientTest.java | 45 +-
test/generate-proj-data.pl | 33 -
.../openstreetmap/josm/PerformanceTestUtils.java | 36 +-
.../josm/data/osm/KeyValuePerformanceTest.java | 8 +
.../paint/StyledMapRendererPerformanceTest.java | 28 +-
.../gui/mappaint/MapRendererPerformanceTest.java | 331 +
.../mapcss/MapCSSStyleSourceFilterTest.java | 26 +-
.../josm/io/OsmReaderPerformanceTest.java | 92 +
test/unit/org/openstreetmap/josm/JOSMFixture.java | 5 +
test/unit/org/openstreetmap/josm/TestUtils.java | 70 +
.../josm/actions/AlignInLineActionTest.java | 6 +-
.../josm/actions/CombineWayActionTest.java | 139 +-
.../josm/actions/CreateCircleActionTest.java | 4 +-
.../josm/actions/ExtensionFileFilterTest.java | 42 +-
.../josm/actions/JoinAreasActionTest.java | 38 +-
.../josm/actions/PurgeActionTest.java | 127 +-
.../actions/SelectByInternalPointActionTest.java | 135 +
.../josm/actions/SplitWayActionTest.java | 2 +-
.../josm/actions/UnJoinNodeWayActionTest.java | 2 +-
.../actions/downloadtasks/DownloadGpsTaskTest.java | 120 +-
.../downloadtasks/DownloadNotesTaskTest.java | 116 +-
.../actions/downloadtasks/DownloadOsmTaskTest.java | 122 +-
.../josm/actions/mapmode/DrawActionTest.java | 201 +-
.../josm/actions/mapmode/MapViewMock.java | 138 +-
.../josm/actions/mapmode/SelectActionTest.java | 105 +-
.../josm/actions/search/SearchCompilerTest.java | 29 +
.../josm/actions/upload/FixDataHookTest.java | 129 +
.../actions/upload/ValidateUploadHookTest.java | 29 +
.../openstreetmap/josm/command/AddCommandTest.java | 41 +
.../josm/command/AddPrimitivesCommandTest.java | 37 +
.../josm/command/ChangeCommandTest.java | 41 +
.../josm/command/ChangeNodesCommandTest.java | 40 +
.../josm/command/ChangePropertyCommandTest.java | 37 +
.../josm/command/ChangePropertyKeyCommandTest.java | 37 +
.../ChangeRelationMemberRoleCommandTest.java | 40 +
.../openstreetmap/josm/command/CommandTest.java | 37 +
.../josm/command/DeleteCommandTest.java | 37 +
.../josm/command/MoveCommandTest.java | 37 +
.../josm/command/PurgeCommandTest.java | 44 +
.../josm/command/RemoveNodesCommandTest.java | 40 +
.../josm/command/RotateCommandTest.java | 37 +
.../josm/command/ScaleCommandTest.java | 37 +
.../josm/command/SelectCommandTest.java | 37 +
.../josm/command/SequenceCommandTest.java | 40 +
.../josm/command/TransformNodesCommandTest.java | 37 +
.../command/conflict/ConflictAddCommandTest.java | 159 +-
.../conflict/ConflictResolveCommandTest.java | 64 +-
.../CoordinateConflictResolveCommandTest.java | 189 +-
.../DeletedStateConflictResolveCommandTest.java | 84 +-
.../ModifiedConflictResolveCommandTest.java | 84 +-
.../RelationMemberConflictResolverCommandTest.java | 88 +-
.../conflict/TagConflictResolveCommandTest.java | 84 +-
.../VersionConflictResolveCommandTest.java | 84 +-
.../WayNodesConflictResolverCommandTest.java | 84 +-
.../corrector/ReverseWayNoTagCorrectorTest.java | 36 +
.../org/openstreetmap/josm/data/BoundsTest.java | 3 +
.../josm/data/CustomConfiguratorTest.java | 119 +
.../openstreetmap/josm/data/PreferencesTest.groovy | 13 +
.../openstreetmap/josm/data/coor/LatLonTest.java | 139 +-
.../josm/data/imagery/ImageryInfoTest.java | 47 +
.../data/imagery/TemplatedWMSTileSourceTest.java | 2 +-
.../josm/data/imagery/WMTSTileSourceTest.java | 69 +-
.../josm/data/oauth/OAuthParametersTest.java | 84 +-
.../josm/data/oauth/OAuthTokenTest.java | 72 +-
.../josm/data/oauth/OsmPrivilegesTest.java | 78 +-
.../josm/data/osm/MultipolygonBuilderTest.java | 47 +
.../org/openstreetmap/josm/data/osm/NodeTest.java | 88 +-
.../openstreetmap/josm/data/osm/NoteDataTest.java | 54 +-
.../josm/data/osm/OsmPrimitiveKeyHandlingTest.java | 88 +-
.../josm/data/osm/OsmPrimitiveTest.java | 3 +
.../openstreetmap/josm/data/osm/RelationTest.java | 25 +
.../josm/data/osm/WaySegmentTest.java | 8 +-
.../josm/data/osm/history/HistoryRelationTest.java | 194 +-
.../data/preferences/PreferencesWriterTest.java | 150 +
.../josm/data/projection/EllipsoidTest.java | 3 +
.../josm/data/projection/ProjectionRefTest.java | 367 +-
.../josm/data/projection/ProjectionTest.java | 115 +-
.../validation/routines/DomainValidatorTest.java | 510 +
.../validation/routines/DomainValidatorTestIT.java | 390 +
.../validation/routines/EmailValidatorTest.java | 576 +
.../routines/InetAddressValidatorTest.java | 617 +
.../validation/routines/RegexValidatorTest.java | 285 +
.../josm/data/validation/routines/ResultPair.java | 39 +
.../data/validation/routines/UrlValidatorTest.java | 654 +
.../data/validation/tests/InternetTagsTest.java | 28 +-
.../validation/tests/MapCSSTagCheckerTest.java | 4 +-
.../validation/tests/MultipolygonTestTest.java | 62 +-
.../josm/data/validation/tests/TagCheckerTest.java | 20 +-
.../data/validation/tests/UntaggedNodeTest.java | 65 +
.../validation/util/MultipleNameVisitorTest.java | 70 +-
.../josm/gui/DefaultNameFormatterTest.java | 24 +-
.../josm/gui/JosmUserIdentityManagerTest.groovy | 10 +-
.../gui/conflict/nodes/NodeListMergeModelTest.java | 728 -
.../pair/nodes/NodeListMergeModelTest.java | 727 +
.../conflict/pair/nodes/NodeListMergerTest.java | 30 +
.../pair/properties/PropertiesMergeModelTest.java | 144 +
.../pair/properties/PropertiesMergerTest.java | 30 +
.../pair/relation/RelationMemberMergerTest.java | 30 +
.../gui/conflict/pair/tags/TagMergeItemTest.java | 164 +
.../gui/conflict/pair/tags/TagMergeModelTest.java | 237 +
.../josm/gui/conflict/pair/tags/TagMergerTest.java | 30 +
.../properties/PropertiesMergeModelTest.java | 145 -
.../tags/CombinePrimitiveResolverDialogTest.java | 46 +
.../tags/PasteTagsConflictResolverDialogTest.java | 61 +
.../tags/RelationMemberConflictResolverTest.java | 30 +
.../josm/gui/conflict/tags/TagMergeItemTest.java | 165 -
.../josm/gui/conflict/tags/TagMergeModelTest.java | 239 -
.../datatransfer/PrimitiveTransferableTest.java | 74 +
.../RelationMemberTransferableTest.java | 77 +
.../josm/gui/dialogs/ConflictDialogTest.java | 70 +
.../josm/gui/dialogs/LatLonDialogTest.java | 2 +-
.../changeset/ChangesetContentPanelTest.java | 30 +
.../changeset/ChangesetDetailPanelTest.java | 30 +
.../changeset/ChangesetDiscussionPanelTest.java | 30 +
.../dialogs/changeset/ChangesetTagsPanelTest.java | 30 +
.../query/AdvancedChangesetQueryPanelTest.java | 30 +
.../query/BasicChangesetQueryPanelTest.java | 30 +
.../changeset/query/UrlBasedQueryPanelTest.java | 30 +
.../dialogs/properties/PropertiesDialogTest.java | 60 +
.../dialogs/relation/ChildRelationBrowserTest.java | 36 +
.../relation/GenericRelationEditorTest.java | 43 +
.../gui/dialogs/relation/MemberTableModelTest.java | 49 +
.../relation/ReferringRelationsBrowserTest.java | 34 +
.../actions/RelationEditorActionsTest.java | 111 +
.../dialogs/validator/ValidatorTreePanelTest.java | 66 +
.../josm/gui/download/BookmarkSelectionTest.java | 32 +
.../gui/download/BoundingBoxSelectionTest.java | 32 +
.../josm/gui/download/PlaceSelectionTest.java | 32 +
.../josm/gui/download/TileSelectionTest.java | 32 +
.../josm/gui/help/HelpBrowserTest.java | 125 +
.../josm/gui/history/CoordinateInfoViewerTest.java | 28 +
.../josm/gui/history/HistoryBrowserDialogTest.java | 37 +
.../josm/gui/history/NodeListViewerTest.java | 28 +
.../josm/gui/io/BasicUploadSettingsPanelTest.java | 30 +
.../josm/gui/io/ChangesetManagementPanelTest.java | 30 +
.../josm/gui/io/CredentialDialogTest.java | 51 +
.../josm/gui/io/SaveLayerInfoTest.java | 51 +
.../josm/gui/io/SaveLayersDialogTest.java | 55 +
.../josm/gui/io/TagSettingsPanelTest.java | 30 +
.../josm/gui/io/UploadDialogTest.java | 92 +
.../gui/io/UploadParameterSummaryPanelTest.java | 30 +
.../josm/gui/io/UploadPrimitivesTaskTest.java | 37 +
.../gui/io/UploadStrategySelectionPanelTest.java | 61 +
.../gui/io/UploadedObjectsSummaryPanelTest.java | 30 +
.../josm/gui/layer/NativeScaleLayerTest.java | 33 +
.../openstreetmap/josm/gui/layer/TMSLayerTest.java | 69 +
.../josm/gui/layer/ValidatorLayerTest.java | 48 +
.../openstreetmap/josm/gui/layer/WMSLayerTest.java | 40 +
.../josm/gui/layer/WMTSLayerTest.java | 33 +
.../layer/geoimage/CorrelateGpxWithImagesTest.java | 152 +
.../josm/gui/layer/geoimage/GeoImageLayerTest.java | 68 +
.../josm/gui/layer/geoimage/ImageEntryTest.java | 56 +-
.../layer/gpx/ChooseTrackVisibilityActionTest.java | 36 +
.../layer/gpx/DownloadAlongTrackActionTest.java | 61 +
.../layer/gpx/DownloadWmsAlongTrackActionTest.java | 65 +
.../josm/gui/layer/gpx/GpxDrawHelperTest.java | 137 +
.../gui/layer/markerlayer/AudioMarkerTest.java | 51 +
.../gui/layer/markerlayer/ImageMarkerTest.java | 45 +
.../gui/layer/markerlayer/PlayHeadMarkerTest.java | 38 +
.../josm/gui/layer/markerlayer/WebMarkerTest.java | 45 +
.../josm/gui/mappaint/AllMappaintTests.groovy | 2 +-
.../gui/mappaint/mapcss/MapCSSParserTest.groovy | 12 +
.../mappaint/mapcss/ParsingLinkSelectorTest.groovy | 12 +-
.../oauth/FullyAutomaticAuthorizationUITest.java | 31 +
.../josm/gui/oauth/ManualAuthorizationUITest.java | 31 +
.../gui/oauth/OsmOAuthAuthorizationClientTest.java | 92 +-
.../oauth/SemiAutomaticAuthorizationUITest.java | 31 +
.../josm/gui/preferences/PreferencesTestUtils.java | 42 +
.../advanced/AdvancedPreferenceTest.java | 39 +
.../advanced/ExportProfileActionTest.java | 30 +
.../gui/preferences/audio/AudioPreferenceTest.java | 39 +
.../preferences/display/ColorPreferenceTest.java | 39 +
.../preferences/display/DisplayPreferenceTest.java | 39 +
.../preferences/display/DrawingPreferenceTest.java | 39 +
.../gui/preferences/display/LafPreferenceTest.java | 39 +
.../display/LanguagePreferenceTest.java | 39 +
.../preferences/imagery/ImageryPreferenceTest.java | 39 +
.../gui/preferences/map/BackupPreferenceTest.java | 39 +
.../preferences/map/MapPaintPreferenceTest.java | 92 +-
.../preferences/map/MapPaintPreferenceTestIT.java | 100 +
.../gui/preferences/map/MapPreferenceTest.java | 39 +
.../map/TaggingPresetPreferenceTest.java | 127 +-
.../map/TaggingPresetPreferenceTestIT.java | 99 +
.../preferences/plugin/PluginPreferenceTest.java | 93 +
.../projection/ProjectionPreferenceTest.java | 40 +
.../remotecontrol/RemoteControlPreferenceTest.java | 39 +
.../server/AuthenticationPreferenceTest.java | 39 +
.../server/OverpassServerPreferenceTest.java | 39 +
.../preferences/server/ProxyPreferenceTest.java | 39 +
.../server/ServerAccessPreferenceTest.java | 39 +
.../shortcut/ShortcutPreferenceTest.java | 39 +
.../validator/ValidatorPreferenceTest.java | 39 +
.../ValidatorTagCheckerRulesPreferenceTest.java | 53 -
.../ValidatorTagCheckerRulesPreferenceTestIT.java | 59 +
.../validator/ValidatorTestsPreferenceTest.java | 39 +
.../josm/gui/tagging/TagEditorModelTest.java | 31 +
.../josm/gui/tagging/TagModelTest.java | 73 +
.../presets/items/ComboMultiSelectTest.java | 31 +
.../org/openstreetmap/josm/io/GpxReaderTest.java | 66 +
.../org/openstreetmap/josm/io/NmeaReaderTest.java | 81 +-
.../openstreetmap/josm/io/NoteImporterTest.java | 28 +
.../org/openstreetmap/josm/io/NoteReaderTest.java | 187 +-
.../org/openstreetmap/josm/io/OsmWriterTest.java | 8 +-
.../josm/io/remotecontrol/DNSNameTest.java | 44 +
.../remotecontrol/handler/AddNodeHandlerTest.java | 104 +
.../remotecontrol/handler/ImportHandlerTest.java | 84 +-
.../josm/io/session/SessionReaderTest.java | 16 +
.../josm/io/session/SessionWriterTest.java | 15 +
.../josm/plugins/PluginHandlerTest.java | 134 +-
.../josm/plugins/PluginHandlerTestIT.java | 85 +
.../openstreetmap/josm/tools/AudioPlayerTest.java | 124 +-
.../openstreetmap/josm/tools/AudioUtilTest.java | 78 +-
.../openstreetmap/josm/tools/ColorHelperTest.java | 56 +-
.../josm/tools/ExceptionUtilTest.java | 421 +
.../openstreetmap/josm/tools/ExifReaderTest.java | 30 +-
.../org/openstreetmap/josm/tools/GeometryTest.java | 38 +
.../org/openstreetmap/josm/tools/MultiMapTest.java | 60 +
.../josm/tools/OverpassTurboQueryWizardTest.java | 12 +-
.../org/openstreetmap/josm/tools/PairTest.java | 21 +
.../josm/tools/date/DateUtilsTest.java | 60 +
.../tools/template_engine/TemplateEngineTest.java | 335 -
.../tools/template_engine/TemplateParserTest.java | 335 +
tools/checkstyle/josm_filters.xml | 11 +-
1074 files changed, 276346 insertions(+), 62345 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