[josm] 03/07: Merge tag 'upstream/0.0.svn9224+dfsg'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Dec 31 14:59:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit c87a60a2b81058f0fd841ab81d3db5fad4a07d42
Merge: a51cb25 ad2a39a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Dec 31 14:14:10 2015 +0100
Merge tag 'upstream/0.0.svn9224+dfsg'
Upstream version 0.0.svn9224+dfsg
.classpath | 4 +-
.settings/org.eclipse.wst.validation.prefs | 9 +
REVISION | 8 +-
build.xml | 26 +-
data/defaultpresets.xml | 264 +-
data/maps.xsd | 4 +
data/validator/deprecated.mapcss | 77 +
data/validator/ignoretags.cfg | 11 +-
data_nodist/projection-regression-test-data.csv | 726 -
data_nodist/projection/epsg | 10228 +++
.../epsg => data_nodist/projection/josm-epsg | 2 +
.../{ => projection}/projection-reference-data.csv | 0
.../projection/projection-regression-test-data | 16810 +++++
.../projection-regression-test-data-java9} | 0
data_nodist/trans/ast.lang | Bin 8893 -> 8721 bytes
data_nodist/trans/be.lang | Bin 15437 -> 15743 bytes
data_nodist/trans/bg.lang | Bin 2804 -> 2395 bytes
data_nodist/trans/ca-valencia.lang | Bin 8068 -> 7805 bytes
data_nodist/trans/ca.lang | Bin 9810 -> 10236 bytes
data_nodist/trans/cs.lang | Bin 9583 -> 9942 bytes
data_nodist/trans/da.lang | Bin 8809 -> 9234 bytes
data_nodist/trans/de.lang | Bin 9665 -> 10197 bytes
data_nodist/trans/el.lang | Bin 1393 -> 1397 bytes
data_nodist/trans/en.lang | Bin 8111 -> 8467 bytes
data_nodist/trans/en_AU.lang | Bin 1669 -> 1482 bytes
data_nodist/trans/en_GB.lang | Bin 2091 -> 1908 bytes
data_nodist/trans/es.lang | Bin 10710 -> 11127 bytes
data_nodist/trans/et.lang | Bin 1426 -> 1430 bytes
data_nodist/trans/fi.lang | Bin 3126 -> 3068 bytes
data_nodist/trans/fr.lang | Bin 9774 -> 10473 bytes
data_nodist/trans/gl.lang | Bin 3170 -> 2945 bytes
data_nodist/trans/hu.lang | Bin 10003 -> 9763 bytes
data_nodist/trans/id.lang | Bin 6911 -> 6717 bytes
data_nodist/trans/it.lang | Bin 10313 -> 9869 bytes
data_nodist/trans/ja.lang | Bin 10784 -> 11385 bytes
data_nodist/trans/km.lang | Bin 16168 -> 16172 bytes
data_nodist/trans/lt.lang | Bin 1942 -> 1946 bytes
data_nodist/trans/nb.lang | Bin 0 -> 1673 bytes
data_nodist/trans/nl.lang | Bin 10415 -> 10625 bytes
data_nodist/trans/pl.lang | Bin 2923 -> 2927 bytes
data_nodist/trans/pt.lang | Bin 12597 -> 12574 bytes
data_nodist/trans/pt_BR.lang | Bin 8361 -> 8109 bytes
data_nodist/trans/ru.lang | Bin 15485 -> 16144 bytes
data_nodist/trans/sk.lang | Bin 8972 -> 9314 bytes
data_nodist/trans/sv.lang | Bin 1330 -> 1334 bytes
data_nodist/trans/uk.lang | Bin 15842 -> 16238 bytes
data_nodist/trans/vi.lang | Bin 10761 -> 10524 bytes
data_nodist/trans/zh_CN.lang | Bin 6060 -> 5848 bytes
data_nodist/trans/zh_TW.lang | Bin 4828 -> 4641 bytes
i18n/po/af.po | 319 +-
i18n/po/am.po | 319 +-
i18n/po/ar.po | 319 +-
i18n/po/ast.po | 343 +-
i18n/po/az.po | 319 +-
i18n/po/be.po | 535 +-
i18n/po/bg.po | 348 +-
i18n/po/bn.po | 319 +-
i18n/po/br.po | 319 +-
i18n/po/bs.po | 319 +-
i18n/po/ca.po | 486 +-
i18n/po/ca at valencia.po | 333 +-
i18n/po/cs.po | 447 +-
i18n/po/cy.po | 319 +-
i18n/po/da.po | 403 +-
i18n/po/de.po | 496 +-
i18n/po/de_DE.po | 319 +-
i18n/po/el.po | 321 +-
i18n/po/en_AU.po | 325 +-
i18n/po/en_CA.po | 319 +-
i18n/po/en_GB.po | 374 +-
i18n/po/eo.po | 319 +-
i18n/po/es.po | 652 +-
i18n/po/et.po | 321 +-
i18n/po/eu.po | 323 +-
i18n/po/fa.po | 319 +-
i18n/po/fi.po | 321 +-
i18n/po/fil.po | 319 +-
i18n/po/fo.po | 319 +-
i18n/po/fr.po | 750 +-
i18n/po/ga.po | 319 +-
i18n/po/gl.po | 324 +-
i18n/po/he.po | 319 +-
i18n/po/hi.po | 319 +-
i18n/po/hr.po | 319 +-
i18n/po/ht.po | 319 +-
i18n/po/hu.po | 345 +-
i18n/po/hy.po | 319 +-
i18n/po/ia.po | 319 +-
i18n/po/id.po | 331 +-
i18n/po/is.po | 319 +-
i18n/po/it.po | 351 +-
i18n/po/ja.po | 518 +-
i18n/po/ka.po | 319 +-
i18n/po/km.po | 331 +-
i18n/po/ko.po | 337 +-
i18n/po/ky.po | 319 +-
i18n/po/lo.po | 319 +-
i18n/po/lt.po | 371 +-
i18n/po/lv.po | 319 +-
i18n/po/mk.po | 319 +-
i18n/po/mr.po | 319 +-
i18n/po/ms.po | 319 +-
i18n/po/nb.po | 344 +-
i18n/po/nds.po | 319 +-
i18n/po/nl.po | 1007 +-
i18n/po/nn.po | 319 +-
i18n/po/oc.po | 319 +-
i18n/po/pa.po | 319 +-
i18n/po/pl.po | 387 +-
i18n/po/pt.po | 394 +-
i18n/po/pt_BR.po | 450 +-
i18n/po/rm.po | 319 +-
i18n/po/ro.po | 319 +-
i18n/po/ru.po | 382 +-
i18n/po/sk.po | 405 +-
i18n/po/sl.po | 319 +-
i18n/po/sq.po | 319 +-
i18n/po/sr.po | 319 +-
i18n/po/sv.po | 396 +-
i18n/po/ta.po | 319 +-
i18n/po/te.po | 319 +-
i18n/po/th.po | 319 +-
i18n/po/tr.po | 319 +-
i18n/po/ug.po | 319 +-
i18n/po/uk.po | 445 +-
i18n/po/ur.po | 319 +-
i18n/po/vi.po | 345 +-
i18n/po/zh_CN.po | 389 +-
i18n/po/zh_TW.po | 339 +-
images/icons/office_blue.png | Bin 569 -> 0 bytes
images/icons/office_pink.png | Bin 600 -> 0 bytes
images/presets/bay.png | Bin 273 -> 0 bytes
images/presets/beach.png | Bin 341 -> 0 bytes
images/presets/breakwater.png | Bin 386 -> 0 bytes
images/presets/bridge.png | Bin 780 -> 0 bytes
images/presets/bridge_movable.png | Bin 198 -> 0 bytes
images/presets/cliff.png | Bin 278 -> 0 bytes
images/presets/coastline.png | Bin 209 -> 0 bytes
images/presets/groyne.png | Bin 261 -> 0 bytes
images/presets/living_street.png | Bin 835 -> 0 bytes
images/presets/motorway.png | Bin 719 -> 0 bytes
images/presets/mud.png | Bin 192 -> 0 bytes
images/presets/pedestrian.png | Bin 1063 -> 0 bytes
images/presets/pier.png | Bin 366 -> 0 bytes
images/presets/railway.png | Bin 545 -> 0 bytes
images/presets/railway.svg | 98 +
images/presets/railway_switch.png | Bin 676 -> 0 bytes
images/presets/railway_switch.svg | 123 +
images/presets/residential.png | Bin 292 -> 0 bytes
images/presets/restrictions.png | Bin 691 -> 0 bytes
images/presets/roundabout.png | Bin 888 -> 0 bytes
images/presets/roundabout_left.png | Bin 1192 -> 0 bytes
images/presets/trunk.png | Bin 766 -> 0 bytes
images/presets/waterway.png | Bin 331 -> 0 bytes
images/presets/way_primary.png | Bin 585 -> 0 bytes
images/presets/way_secondary.png | Bin 708 -> 0 bytes
images/presets/way_tertiary.png | Bin 662 -> 0 bytes
images/presets/way_unclassified.png | Bin 433 -> 0 bytes
linux/latest/usr/bin/josm-latest | 13 +-
linux/tested/usr/bin/josm | 13 +-
scripts/BuildProjectionDefinitions.java | 163 +
scripts/taginfoextract.groovy | 2 +-
.../commons/jcs/access/AbstractCacheAccess.java | 6 +-
src/org/apache/commons/jcs/access/CacheAccess.java | 13 +-
.../AbstractAuxiliaryCacheAttributes.java | 16 +
.../auxiliary/AbstractAuxiliaryCacheMonitor.java | 206 +
.../jcs/auxiliary/AuxiliaryCacheAttributes.java | 10 +-
.../jcs/auxiliary/disk/AbstractDiskCache.java | 57 +-
.../disk/AbstractDiskCacheAttributes.java | 106 +-
.../jcs/auxiliary/disk/PurgatoryElement.java | 1 -
.../jcs/auxiliary/disk/block/BlockDiskCache.java | 71 +-
.../auxiliary/disk/block/BlockDiskKeyStore.java | 249 +-
.../auxiliary/disk/indexed/IndexedDiskCache.java | 812 +-
.../disk/indexed/IndexedDiskCacheAttributes.java | 22 -
.../jcs/auxiliary/disk/jdbc/JDBCDiskCache.java | 84 +-
.../auxiliary/disk/jdbc/JDBCDiskCacheFactory.java | 90 +-
.../disk/jdbc/dsfactory/JndiDataSourceFactory.java | 4 +-
.../dsfactory/SharedPoolDataSourceFactory.java | 4 +-
.../disk/jdbc/hsql/HSQLDiskCacheFactory.java | 40 +-
.../jcs/auxiliary/lateral/LateralCache.java | 39 +-
.../auxiliary/lateral/LateralCacheAttributes.java | 23 +-
.../jcs/auxiliary/lateral/LateralCacheMonitor.java | 199 +-
.../lateral/behavior/ILateralCacheAttributes.java | 4 +-
.../lateral/socket/tcp/LateralTCPCacheFactory.java | 117 +-
.../lateral/socket/tcp/LateralTCPListener.java | 72 +-
.../lateral/socket/tcp/LateralTCPService.java | 22 +-
.../socket/tcp/TCPLateralCacheAttributes.java | 22 +-
.../remote/AbstractRemoteAuxiliaryCache.java | 33 +-
.../remote/AbstractRemoteCacheListener.java | 11 +-
.../remote/CommonRemoteCacheAttributes.java | 70 +-
.../commons/jcs/auxiliary/remote/RemoteCache.java | 39 +-
.../auxiliary/remote/RemoteCacheAttributes.java | 6 +-
.../jcs/auxiliary/remote/RemoteCacheFactory.java | 247 +-
.../remote/RemoteCacheFailoverRunner.java | 345 +-
.../jcs/auxiliary/remote/RemoteCacheListener.java | 12 +-
.../jcs/auxiliary/remote/RemoteCacheManager.java | 442 +-
.../jcs/auxiliary/remote/RemoteCacheMonitor.java | 199 +-
.../jcs/auxiliary/remote/RemoteCacheNoWait.java | 25 +-
.../auxiliary/remote/RemoteCacheNoWaitFacade.java | 16 +-
.../jcs/auxiliary/remote/RemoteCacheRestore.java | 20 +-
.../jcs/auxiliary/remote/RemoteLocation.java | 144 +
.../commons/jcs/auxiliary/remote/RemoteUtils.java | 47 +-
.../behavior/ICommonRemoteCacheAttributes.java | 27 +-
.../remote/behavior/IRemoteCacheAttributes.java | 6 +-
.../http/client/RemoteHttpCacheDispatcher.java | 16 +-
.../remote/http/client/RemoteHttpCacheMonitor.java | 213 +-
.../http/server/RemoteCacheServiceAdaptor.java | 14 +-
.../server/RemoteHttpCacheServerAttributes.java | 20 -
.../remote/server/RegistryKeepAliveRunner.java | 9 +-
.../auxiliary/remote/server/RemoteCacheServer.java | 81 +-
.../remote/server/RemoteCacheServerFactory.java | 29 +-
src/org/apache/commons/jcs/engine/CacheInfo.java | 2 +-
.../apache/commons/jcs/engine/CacheListeners.java | 9 +-
.../jcs/engine/CompositeCacheAttributes.java | 38 +-
.../commons/jcs/engine/ElementAttributes.java | 53 +-
.../engine/behavior/ICompositeCacheAttributes.java | 14 +-
.../jcs/engine/behavior/IElementAttributes.java | 18 +-
.../commons/jcs/engine/control/CompositeCache.java | 535 +-
.../engine/control/CompositeCacheConfigurator.java | 14 +-
.../jcs/engine/control/CompositeCacheManager.java | 51 +-
.../AbstractDoubleLinkedListMemoryCache.java | 501 +-
.../jcs/engine/memory/AbstractMemoryCache.java | 30 +-
.../jcs/engine/memory/lru/LHMLRUMemoryCache.java | 61 +-
.../jcs/engine/memory/lru/LRUMemoryCache.java | 4 +-
.../jcs/engine/memory/mru/MRUMemoryCache.java | 7 +-
.../engine/memory/shrinking/ShrinkerThread.java | 7 +-
.../jcs/io/ObjectInputStreamClassLoaderAware.java | 67 +-
.../jcs/utils/access/AbstractJCSWorkerHelper.java | 7 +-
.../apache/commons/jcs/utils/access/JCSWorker.java | 68 +-
.../commons/jcs/utils/access/JCSWorkerHelper.java | 7 +-
.../commons/jcs/utils/config/OptionConverter.java | 37 +-
.../utils/discovery/UDPDiscoveryAttributes.java | 2 +-
.../jcs/utils/discovery/UDPDiscoveryManager.java | 7 +-
.../jcs/utils/discovery/UDPDiscoveryReceiver.java | 36 +-
.../jcs/utils/discovery/UDPDiscoveryService.java | 59 +-
.../commons/jcs/utils/struct/AbstractLRUMap.java | 17 +-
.../apache/commons/jcs/utils/struct/LRUMap.java | 26 +-
.../jcs/utils/threadpool/PoolConfiguration.java | 2 +-
.../jcs/utils/threadpool/ThreadPoolManager.java | 224 +-
src/org/openstreetmap/josm/Main.java | 13 +-
.../josm/actions/AbstractInfoAction.java | 27 +
.../josm/actions/AddImageryLayerAction.java | 2 +-
.../josm/actions/AlignInLineAction.java | 5 +
.../josm/actions/ChangesetManagerToggleAction.java | 2 +-
.../josm/actions/CombineWayAction.java | 6 +-
.../josm/actions/CreateCircleAction.java | 11 +-
.../josm/actions/CreateMultipolygonAction.java | 2 +-
.../josm/actions/DistributeAction.java | 19 +-
.../josm/actions/FullscreenToggleAction.java | 2 +-
.../josm/actions/HistoryInfoWebAction.java | 4 +
.../openstreetmap/josm/actions/InfoWebAction.java | 6 +-
.../josm/actions/JoinAreasAction.java | 12 +-
.../josm/actions/JoinNodeWayAction.java | 2 +-
.../openstreetmap/josm/actions/JumpToAction.java | 3 +-
.../josm/actions/MergeNodesAction.java | 14 +-
src/org/openstreetmap/josm/actions/MoveAction.java | 2 +-
.../josm/actions/OpenLocationAction.java | 4 +-
.../josm/actions/RenameLayerAction.java | 4 +-
.../josm/actions/ReverseWayAction.java | 6 +-
.../josm/actions/SelectByInternalPointAction.java | 3 +-
.../actions/SelectNonBranchingWaySequences.java | 12 +-
.../josm/actions/SessionLoadAction.java | 2 +-
.../josm/actions/SessionSaveAsAction.java | 14 +-
.../josm/actions/ShowStatusReportAction.java | 2 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 4 +-
.../ToggleUploadDiscouragedLayerAction.java | 2 +-
.../openstreetmap/josm/actions/UnGlueAction.java | 3 +
.../josm/actions/UploadSelectionAction.java | 9 +-
.../openstreetmap/josm/actions/ValidateAction.java | 4 +-
.../downloadtasks/AbstractDownloadTask.java | 2 +-
.../actions/downloadtasks/DownloadGpsTask.java | 2 +-
.../actions/downloadtasks/DownloadOsmTask.java | 2 +-
.../actions/downloadtasks/DownloadSessionTask.java | 4 +-
.../actions/downloadtasks/DownloadTaskList.java | 4 +-
.../actions/downloadtasks/PostDownloadHandler.java | 4 +-
.../josm/actions/mapmode/AddNoteAction.java | 4 +-
.../josm/actions/mapmode/DrawAction.java | 17 +-
.../josm/actions/mapmode/ExtrudeAction.java | 2 +-
.../josm/actions/mapmode/ParallelWayAction.java | 2 +-
.../josm/actions/mapmode/PlayHeadDragMode.java | 2 +-
.../josm/actions/mapmode/SelectAction.java | 12 +-
.../actions/relation/AbstractRelationAction.java | 1 +
.../josm/actions/search/SearchAction.java | 1 -
.../josm/actions/search/SearchCompiler.java | 8 +-
.../josm/actions/upload/FixDataHook.java | 14 +-
.../josm/actions/upload/UploadNotesTask.java | 4 +-
.../command/ChangeRelationMemberRoleCommand.java | 2 +-
.../openstreetmap/josm/command/DeleteCommand.java | 5 +-
.../openstreetmap/josm/command/MoveCommand.java | 2 +-
.../openstreetmap/josm/command/PurgeCommand.java | 4 +-
.../openstreetmap/josm/command/RotateCommand.java | 4 +-
.../openstreetmap/josm/command/ScaleCommand.java | 4 +-
.../josm/corrector/CorrectionTableModel.java | 4 +-
.../openstreetmap/josm/corrector/TagCorrector.java | 4 +-
src/org/openstreetmap/josm/data/APIDataSet.java | 2 +-
.../josm/data/CustomConfigurator.java | 2 +-
src/org/openstreetmap/josm/data/Preferences.java | 165 +-
.../josm/data/cache/CacheEntryAttributes.java | 2 +-
.../josm/data/cache/JCSCacheManager.java | 2 +-
.../josm/data/cache/JCSCachedTileLoaderJob.java | 8 +
.../josm/data/conflict/ConflictCollection.java | 2 +-
.../josm/data/coor/CoordinateFormat.java | 8 +-
src/org/openstreetmap/josm/data/gpx/GpxData.java | 2 +-
.../CachedAttributionBingAerialTileSource.java | 12 +-
.../josm/data/imagery/CachedTileLoaderFactory.java | 2 +-
.../josm/data/imagery/ImageryInfo.java | 32 +-
.../josm/data/imagery/OffsetBookmark.java | 2 +-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 2 +-
.../josm/data/imagery/TemplatedWMSTileSource.java | 74 +-
.../josm/data/imagery/WMTSTileSource.java | 454 +-
src/org/openstreetmap/josm/data/notes/Note.java | 2 +-
.../openstreetmap/josm/data/notes/NoteComment.java | 8 +-
.../josm/data/oauth/OAuthParameters.java | 119 +-
.../openstreetmap/josm/data/oauth/OAuthToken.java | 8 +-
.../josm/data/oauth/OsmPrivileges.java | 52 +
.../josm/data/oauth/SignpostAdapters.java | 138 +
.../josm/data/osm/ChangesetDataSet.java | 6 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 4 +-
src/org/openstreetmap/josm/data/osm/Filter.java | 3 +-
.../openstreetmap/josm/data/osm/FilterWorker.java | 17 +-
.../josm/data/osm/MultipolygonBuilder.java | 2 +-
.../openstreetmap/josm/data/osm/NameFormatter.java | 29 +
src/org/openstreetmap/josm/data/osm/NoteData.java | 10 +-
.../josm/data/osm/OsmPrimitiveType.java | 10 +-
.../josm/data/osm/RelationToChildReference.java | 8 +-
src/org/openstreetmap/josm/data/osm/Storage.java | 4 +-
.../josm/data/osm/history/History.java | 2 +-
.../josm/data/osm/history/HistoryDataSet.java | 6 +-
.../data/osm/history/HistoryNameFormatter.java | 27 +-
.../josm/data/osm/history/HistoryRelation.java | 2 +-
.../josm/data/osm/history/HistoryWay.java | 2 +-
.../josm/data/osm/visitor/BoundingXYVisitor.java | 8 +-
.../osm/visitor/MergeSourceBuildingVisitor.java | 6 +-
.../data/osm/visitor/paint/MapRendererFactory.java | 6 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 199 +-
.../osm/visitor/paint/WireframeMapRenderer.java | 2 +-
.../osm/visitor/paint/relations/Multipolygon.java | 29 +-
.../data/preferences/ParametrizedEnumProperty.java | 3 -
.../josm/data/projection/AbstractProjection.java | 40 +-
.../josm/data/projection/CustomProjection.java | 104 +-
.../josm/data/projection/Ellipsoid.java | 20 +
.../josm/data/projection/Projection.java | 13 +
.../josm/data/projection/Projections.java | 171 +-
.../projection/datum/NTV2GridShiftFileWrapper.java | 2 +-
.../josm/data/projection/datum/NTV2SubGrid.java | 32 +-
.../josm/data/projection/proj/AbstractProj.java | 136 +
.../data/projection/proj/ClassProjFactory.java | 2 +-
.../data/projection/proj/DoubleStereographic.java | 116 +
.../projection/proj/LambertConformalConic.java | 18 +-
.../josm/data/projection/proj/LonLat.java | 6 +
.../josm/data/projection/proj/Mercator.java | 6 +
.../josm/data/projection/proj/Proj.java | 18 +
.../data/projection/proj/SwissObliqueMercator.java | 7 +-
.../data/projection/proj/TransverseMercator.java | 403 +-
.../josm/data/validation/Severity.java | 2 -
.../josm/data/validation/tests/DuplicateNode.java | 3 +-
.../data/validation/tests/DuplicateRelation.java | 10 +-
.../data/validation/tests/MapCSSTagChecker.java | 4 +-
.../data/validation/tests/MultipolygonTest.java | 3 +-
.../data/validation/tests/SimilarNamedWays.java | 2 +-
.../josm/gui/DefaultNameFormatter.java | 67 +-
.../josm/gui/HelpAwareOptionPane.java | 8 +-
src/org/openstreetmap/josm/gui/ImageryMenu.java | 4 +-
.../openstreetmap/josm/gui/MainApplication.java | 3 +-
src/org/openstreetmap/josm/gui/MainMenu.java | 6 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 4 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 22 +-
src/org/openstreetmap/josm/gui/MapView.java | 10 +-
src/org/openstreetmap/josm/gui/MenuScroller.java | 2 +-
.../josm/gui/NavigatableComponent.java | 114 +-
.../openstreetmap/josm/gui/NoteInputDialog.java | 2 +-
src/org/openstreetmap/josm/gui/NoteSortDialog.java | 8 +-
src/org/openstreetmap/josm/gui/Notification.java | 4 +
.../josm/gui/NotificationManager.java | 7 +-
.../josm/gui/OsmPrimitivRenderer.java | 6 +-
src/org/openstreetmap/josm/gui/ScrollViewport.java | 8 +-
.../openstreetmap/josm/gui/SelectionManager.java | 7 +-
.../openstreetmap/josm/gui/bbox/SizeButton.java | 4 +-
.../josm/gui/bbox/SlippyMapBBoxChooser.java | 4 +-
.../josm/gui/bbox/SlippyMapControler.java | 4 +-
.../josm/gui/bbox/TileSelectionBBoxChooser.java | 2 +-
.../josm/gui/conflict/ConflictColors.java | 12 +-
.../josm/gui/conflict/pair/ComparePairType.java | 4 +-
.../relation/RelationMemberTableCellRenderer.java | 2 +-
.../josm/gui/conflict/pair/tags/TagMergeItem.java | 6 +-
.../tags/CombinePrimitiveResolverDialog.java | 25 +-
.../gui/conflict/tags/MultiValueCellEditor.java | 6 +-
.../gui/conflict/tags/MultiValueCellRenderer.java | 8 +-
.../tags/MultiValueResolutionDecision.java | 2 +-
.../tags/PasteTagsConflictResolverDialog.java | 4 +-
.../tags/RelationMemberConflictDecision.java | 6 +-
.../tags/RelationMemberConflictDecisionEditor.java | 18 +-
.../RelationMemberConflictDecisionRenderer.java | 2 +-
.../tags/RelationMemberConflictResolverModel.java | 14 +
.../gui/conflict/tags/TagConflictResolver.java | 2 +-
.../conflict/tags/TagConflictResolverModel.java | 2 +-
.../josm/gui/dialogs/CommandStackDialog.java | 30 +-
.../DeleteFromRelationConfirmationDialog.java | 2 +-
.../josm/gui/dialogs/DialogsPanel.java | 2 +-
.../josm/gui/dialogs/FilterDialog.java | 6 +-
.../josm/gui/dialogs/FilterTableModel.java | 2 +-
.../josm/gui/dialogs/InspectPrimitiveDialog.java | 2 +-
.../josm/gui/dialogs/LatLonDialog.java | 2 +-
.../josm/gui/dialogs/LayerListDialog.java | 22 +-
.../josm/gui/dialogs/MapPaintDialog.java | 4 +-
.../josm/gui/dialogs/NotesDialog.java | 6 +-
.../josm/gui/dialogs/RelationListDialog.java | 4 +-
.../josm/gui/dialogs/SelectionListDialog.java | 4 +-
.../josm/gui/dialogs/ToggleDialog.java | 4 +-
.../josm/gui/dialogs/UserListDialog.java | 49 +-
.../josm/gui/dialogs/ValidatorDialog.java | 10 +-
.../changeset/ChangesetCacheManagerModel.java | 2 +-
.../dialogs/changeset/ChangesetContentPanel.java | 2 +-
.../changeset/ChangesetContentTableModel.java | 2 +-
.../gui/dialogs/changeset/ChangesetListModel.java | 2 +-
.../changeset/query/UrlBasedQueryPanel.java | 1 -
.../dialogs/properties/PropertiesCellRenderer.java | 33 +
.../gui/dialogs/properties/PropertiesDialog.java | 89 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 34 +-
.../relation/DownloadRelationMemberTask.java | 4 +-
.../gui/dialogs/relation/DownloadRelationTask.java | 4 +-
.../dialogs/relation/GenericRelationEditor.java | 16 +-
.../gui/dialogs/relation/MemberRoleCellEditor.java | 4 +-
.../josm/gui/dialogs/relation/MemberTable.java | 2 +-
.../dialogs/relation/MemberTableCellRenderer.java | 15 +-
.../relation/MemberTableLinkedCellRenderer.java | 3 +-
.../relation/MemberTableMemberCellRenderer.java | 3 +-
.../gui/dialogs/relation/MemberTableModel.java | 4 +-
.../relation/MemberTableRoleCellRenderer.java | 3 +-
.../relation/ParentRelationLoadingTask.java | 8 +-
.../relation/ReferringRelationsBrowser.java | 4 +-
.../josm/gui/dialogs/relation/RelationEditor.java | 2 +-
.../josm/gui/dialogs/relation/RelationTree.java | 6 +-
.../dialogs/relation/RelationTreeCellRenderer.java | 2 +-
.../josm/gui/dialogs/relation/SelectionTable.java | 2 +-
.../relation/SelectionTableCellRenderer.java | 3 +-
.../gui/dialogs/relation/SelectionTableModel.java | 4 +-
.../relation/sort/WayConnectionTypeCalculator.java | 2 +-
.../josm/gui/download/BoundingBoxSelection.java | 10 +-
.../josm/gui/download/PlaceSelection.java | 23 +-
.../openstreetmap/josm/gui/help/HelpBrowser.java | 6 +-
.../josm/gui/help/HelpBrowserHistory.java | 2 +-
.../josm/gui/help/HelpContentReader.java | 22 +-
.../josm/gui/history/CoordinateInfoViewer.java | 27 +-
.../gui/history/HistoryBrowserDialogManager.java | 2 +-
.../josm/gui/history/HistoryBrowserModel.java | 2 +-
.../josm/gui/history/HistoryLoadTask.java | 2 +-
.../gui/history/NodeListTableCellRenderer.java | 5 +-
.../josm/gui/history/NodeListViewer.java | 4 +-
.../RelationMemberListTableCellRenderer.java | 7 +-
.../josm/gui/history/TagTableCellRenderer.java | 60 +-
.../josm/gui/history/TwoColumnDiff.java | 4 +-
.../josm/gui/history/VersionInfoPanel.java | 4 +-
.../josm/gui/history/VersionTable.java | 45 +-
.../josm/gui/io/ActionFlagsTableCell.java | 2 +-
.../josm/gui/io/BasicUploadSettingsPanel.java | 4 +-
.../josm/gui/io/ChangesetCellRenderer.java | 2 +-
.../josm/gui/io/ChangesetManagementPanel.java | 2 +-
.../josm/gui/io/CloseChangesetTask.java | 4 +-
.../josm/gui/io/CredentialDialog.java | 4 +-
.../josm/gui/io/DownloadFileTask.java | 17 +-
.../josm/gui/io/DownloadOpenChangesetsTask.java | 2 +-
.../josm/gui/io/OpenChangesetComboBoxModel.java | 2 +-
.../openstreetmap/josm/gui/io/SaveLayerInfo.java | 2 +-
.../openstreetmap/josm/gui/io/SaveLayerTask.java | 4 +-
.../josm/gui/io/SaveLayersDialog.java | 5 +
.../openstreetmap/josm/gui/io/SaveLayersModel.java | 2 +-
.../josm/gui/io/UpdatePrimitivesTask.java | 4 +-
.../openstreetmap/josm/gui/io/UploadLayerTask.java | 10 +-
.../josm/gui/io/UploadPrimitivesTask.java | 8 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 42 +-
.../josm/gui/layer/AlignImageryPanel.java | 34 +-
.../openstreetmap/josm/gui/layer/ImageryLayer.java | 10 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 2 +-
src/org/openstreetmap/josm/gui/layer/WMSLayer.java | 32 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 18 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 14 +-
.../josm/gui/layer/geoimage/ImageDisplay.java | 13 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 2 +-
.../josm/gui/layer/geoimage/ThumbsLoader.java | 6 +-
.../gui/layer/gpx/ChooseTrackVisibilityAction.java | 2 +-
.../gui/layer/gpx/ConvertToDataLayerAction.java | 1 +
.../josm/gui/layer/gpx/DateFilterPanel.java | 12 +-
.../gui/layer/gpx/DownloadAlongTrackAction.java | 4 +-
.../josm/gui/layer/gpx/GpxDrawHelper.java | 4 +-
.../josm/gui/layer/markerlayer/AudioMarker.java | 2 +-
.../josm/gui/layer/markerlayer/ButtonMarker.java | 2 +-
.../josm/gui/layer/markerlayer/Marker.java | 2 +-
.../josm/gui/layer/markerlayer/PlayHeadMarker.java | 4 +-
.../josm/gui/mappaint/AreaElemStyle.java | 21 +-
.../josm/gui/mappaint/BoxTextElemStyle.java | 6 +-
.../josm/gui/mappaint/ElemStyles.java | 43 +-
.../gui/mappaint/LabelCompositionStrategy.java | 4 +-
.../josm/gui/mappaint/LineTextElemStyle.java | 2 +-
.../josm/gui/mappaint/MapPaintMenu.java | 2 +-
.../josm/gui/mappaint/MapPaintStyles.java | 2 +-
.../josm/gui/mappaint/MultiCascade.java | 2 +-
.../josm/gui/mappaint/StyleCache.java | 2 +-
.../openstreetmap/josm/gui/mappaint/StyleKeys.java | 1 +
.../josm/gui/mappaint/StyleSource.java | 2 +-
.../josm/gui/mappaint/mapcss/Condition.java | 26 +-
.../gui/mappaint/mapcss/ExpressionFactory.java | 15 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 4 +-
.../josm/gui/mappaint/mapcss/Selector.java | 2 +-
.../gui/mappaint/xml/XmlStyleSourceHandler.java | 12 +-
.../gui/oauth/AdvancedOAuthPropertiesPanel.java | 15 +-
.../gui/oauth/OsmOAuthAuthorizationClient.java | 101 +-
.../josm/gui/oauth/RetrieveAccessTokenTask.java | 6 +-
.../josm/gui/oauth/RetrieveRequestTokenTask.java | 4 +-
.../josm/gui/oauth/TestAccessTokenTask.java | 32 +-
.../josm/gui/preferences/PreferenceTabbedPane.java | 2 +-
.../josm/gui/preferences/SourceEditor.java | 20 +-
.../josm/gui/preferences/ToolbarPreferences.java | 28 +-
.../preferences/advanced/AdvancedPreference.java | 6 +-
.../josm/gui/preferences/advanced/ListEditor.java | 2 +-
.../gui/preferences/advanced/ListListEditor.java | 4 +-
.../gui/preferences/advanced/MapListEditor.java | 6 +-
.../josm/gui/preferences/advanced/PrefEntry.java | 4 +-
.../gui/preferences/advanced/PreferencesTable.java | 20 +-
.../gui/preferences/advanced/StringEditor.java | 2 +-
.../gui/preferences/audio/AudioPreference.java | 26 +-
.../gui/preferences/display/ColorPreference.java | 8 +-
.../gui/preferences/display/DrawingPreference.java | 26 +-
.../gui/preferences/display/GPXSettingsPanel.java | 54 +-
.../gui/preferences/display/LafPreference.java | 14 +-
.../preferences/imagery/CacheContentsPanel.java | 2 +-
.../gui/preferences/imagery/ImageryPreference.java | 20 +-
.../preferences/map/TaggingPresetPreference.java | 2 +-
.../preferences/plugin/PluginPreferencesModel.java | 2 +-
.../plugin/PluginUpdatePolicyPanel.java | 2 +-
.../projection/CodeProjectionChoice.java | 6 +-
.../projection/ProjectionPreference.java | 15 +-
.../gui/preferences/server/ApiUrlTestTask.java | 12 +-
.../josm/gui/preferences/server/FeaturesPanel.java | 5 +-
.../josm/gui/preferences/shortcut/PrefJPanel.java | 37 +-
.../josm/gui/progress/AbstractProgressMonitor.java | 2 +-
.../josm/gui/progress/CancelHandler.java | 2 +-
.../gui/progress/PleaseWaitProgressMonitor.java | 6 +-
.../progress/SwingRenderingProgressMonitor.java | 2 +-
.../josm/gui/tagging/TagCellRenderer.java | 4 +-
.../josm/gui/tagging/TagEditorModel.java | 12 +-
.../openstreetmap/josm/gui/tagging/TagTable.java | 4 +-
.../josm/gui/tagging/ac/AutoCompletionList.java | 6 +-
.../tagging/presets/TaggingPresetSearchDialog.java | 2 +-
.../TaggingPresetSearchPrimitiveDialog.java | 2 +-
.../josm/gui/util/AdvancedKeyPressDetector.java | 16 +-
src/org/openstreetmap/josm/gui/util/GuiHelper.java | 15 +-
.../josm/gui/widgets/ComboBoxHistory.java | 4 +-
.../josm/gui/widgets/DateEditorWithSlider.java | 6 +-
.../josm/gui/widgets/HistoryComboBox.java | 2 +-
.../openstreetmap/josm/gui/widgets/ImageLabel.java | 4 +-
.../josm/gui/widgets/JosmEditorPane.java | 8 +-
.../josm/gui/widgets/ListPopupMenu.java | 2 +-
.../josm/gui/widgets/MultiSplitLayout.java | 2 +-
src/org/openstreetmap/josm/io/CachedFile.java | 124 +-
src/org/openstreetmap/josm/io/Compression.java | 20 +
.../josm/io/DefaultProxySelector.java | 2 +-
.../openstreetmap/josm/io/DiffResultProcessor.java | 6 +-
src/org/openstreetmap/josm/io/FileWatcher.java | 14 +-
src/org/openstreetmap/josm/io/GpxImporter.java | 6 +-
src/org/openstreetmap/josm/io/GpxReader.java | 2 +-
.../josm/io/InvalidXmlCharacterFilter.java | 2 +-
.../josm/io/MissingOAuthAccessTokenException.java | 20 +-
.../josm/io/MultiFetchServerObjectReader.java | 8 +-
src/org/openstreetmap/josm/io/NmeaReader.java | 2 +-
src/org/openstreetmap/josm/io/NoteReader.java | 8 +-
src/org/openstreetmap/josm/io/OsmApi.java | 90 +-
.../josm/io/OsmChangesetContentParser.java | 2 +-
src/org/openstreetmap/josm/io/OsmConnection.java | 35 +-
src/org/openstreetmap/josm/io/OsmReader.java | 3 +-
.../josm/io/OsmServerHistoryReader.java | 4 +-
.../josm/io/OsmServerLocationReader.java | 2 +-
src/org/openstreetmap/josm/io/OsmServerReader.java | 85 +-
src/org/openstreetmap/josm/io/OsmServerWriter.java | 2 +-
src/org/openstreetmap/josm/io/OsmWriter.java | 2 +-
.../openstreetmap/josm/io/ProgressInputStream.java | 82 +-
.../josm/io/ProgressOutputStream.java | 57 +
.../josm/io/StreamProgressUpdater.java | 54 +
.../josm/io/auth/CredentialsManager.java | 2 +-
.../josm/io/imagery/ImageryReader.java | 10 +-
.../openstreetmap/josm/io/imagery/WMSImagery.java | 28 +-
.../josm/io/remotecontrol/AddTagsDialog.java | 2 +-
.../io/remotecontrol/RemoteControlHttpServer.java | 4 +-
.../io/remotecontrol/RemoteControlHttpsServer.java | 2 +-
.../josm/io/remotecontrol/RequestProcessor.java | 2 +-
.../josm/io/session/GeoImageSessionExporter.java | 2 +-
.../josm/io/session/GpxTracksSessionExporter.java | 15 +-
.../josm/io/session/MarkerSessionExporter.java | 2 +-
.../josm/io/session/OsmDataSessionExporter.java | 18 +-
.../josm/io/session/SessionReader.java | 20 +-
.../josm/io/session/SessionWriter.java | 4 +-
.../josm/plugins/PluginDownloadTask.java | 11 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 32 +-
.../plugins/ReadLocalPluginInformationTask.java | 2 +-
.../plugins/ReadRemotePluginInformationTask.java | 53 +-
src/org/openstreetmap/josm/tools/AudioPlayer.java | 14 +-
src/org/openstreetmap/josm/tools/AudioUtil.java | 3 +
src/org/openstreetmap/josm/tools/ColorHelper.java | 13 +
.../openstreetmap/josm/tools/CompositeList.java | 2 +-
.../openstreetmap/josm/tools/GeoPropertyIndex.java | 2 +-
src/org/openstreetmap/josm/tools/Geometry.java | 57 +-
src/org/openstreetmap/josm/tools/HttpClient.java | 586 +
src/org/openstreetmap/josm/tools/I18n.java | 2 +-
src/org/openstreetmap/josm/tools/ImageOverlay.java | 12 +-
.../openstreetmap/josm/tools/ImageProvider.java | 10 +-
.../openstreetmap/josm/tools/ImageResource.java | 2 +-
src/org/openstreetmap/josm/tools/LanguageInfo.java | 2 +-
src/org/openstreetmap/josm/tools/MultiMap.java | 2 +-
.../josm/tools/MultikeyActionsHandler.java | 4 +-
.../openstreetmap/josm/tools/OsmUrlToBounds.java | 2 +-
.../josm/tools/PlatformHookWindows.java | 3 +-
.../josm/tools/RightAndLefthandTraffic.java | 2 +-
.../openstreetmap/josm/tools/TextTagParser.java | 10 +-
src/org/openstreetmap/josm/tools/Utils.java | 64 +-
src/org/openstreetmap/josm/tools/WikiReader.java | 7 +-
.../openstreetmap/josm/tools/WindowGeometry.java | 3 +-
.../openstreetmap/josm/tools/XmlObjectParser.java | 14 +-
.../josm/tools/date/FallbackDateParser.java | 2 +-
.../josm/tools/date/PrimaryDateParser.java | 10 +-
.../template_engine/CompoundTemplateEntry.java | 1 -
.../josm/tools/template_engine/Condition.java | 1 -
.../josm/tools/template_engine/Tokenizer.java | 2 +-
styles/standard/elemstyles.mapcss | 211 +-
test/data/regress/6851/20111003_121216-wp.gpx | 13 +
test/data/regress/6851/20111003_121226.wav | Bin 0 -> 106539 bytes
test/data/regress/6851/20111003_121557.wav | Bin 0 -> 108587 bytes
test/data/wmts/bug12168-WMTSCapabilities.xml | 307 +
test/data/wmts/getCapabilities-lots-of-layers.xml | 74224 +++++++++++++++++++
.../openstreetmap/josm/PerformanceTestUtils.java | 3 +
test/unit/org/openstreetmap/josm/TestUtils.java | 22 +-
.../josm/actions/mapmode/SelectActionTest.java | 2 +-
.../josm/actions/search/SearchCompilerTest.java | 2 +-
.../org/openstreetmap/josm/data/BoundsTest.java | 2 +-
.../data/imagery/TemplatedWMSTileSourceTest.java | 28 +-
.../josm/data/imagery/WMTSTileSourceTest.java | 29 +-
.../josm/data/oauth/OAuthParametersTest.java | 40 +
.../josm/data/oauth/OAuthTokenTest.java | 36 +
.../josm/data/oauth/OsmPrivilegesTest.java | 39 +
.../josm/data/osm/DataSetMergerTest.java | 60 +-
.../openstreetmap/josm/data/osm/FilterTest.java | 4 +-
.../openstreetmap/josm/data/osm/NoteDataTest.java | 27 +
.../josm/data/osm/OsmPrimitiveKeyHandlingTest.java | 8 +-
.../josm/data/osm/OsmPrimitiveTest.java | 18 +-
.../josm/data/osm/WaySegmentTest.java | 2 +-
.../josm/data/osm/history/HistoryNodeTest.java | 89 +-
.../josm/data/osm/history/HistoryRelationTest.java | 97 +
.../josm/data/osm/history/HistoryWayTest.java | 109 +-
.../visitor/MergeSourceBuildingVisitorTest.java | 2 +-
.../josm/data/projection/ProjectionRefTest.java | 4 +-
.../data/projection/ProjectionRegressionTest.java | 21 +-
.../josm/data/projection/ProjectionTest.java | 11 +-
.../josm/data/validation/tests/HighwaysTest.groovy | 2 +-
.../validation/tests/SimilarNamedWaysTest.groovy | 2 +-
.../mapcss/ChildOrParentSelectorTest.groovy | 9 +-
.../gui/mappaint/mapcss/KeyConditionTest.groovy | 2 +-
.../mappaint/mapcss/KeyValueConditionTest.groovy | 2 +-
.../preferences/map/MapPaintPreferenceTest.java | 2 +-
.../map/TaggingPresetPreferenceTest.java | 2 +-
.../josm/io/OsmChangeBuilderTest.groovy | 14 +-
.../josm/plugins/PluginHandlerTest.java | 2 +-
.../openstreetmap/josm/tools/AudioPlayerTest.java | 62 +
.../openstreetmap/josm/tools/AudioUtilTest.java | 39 +
.../josm/tools/ImageProviderTest.java | 16 +
.../org/openstreetmap/josm/tools/UtilsTest.java | 20 +-
664 files changed, 131772 insertions(+), 14299 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