[josm] 01/02: Merge tag 'debian/0.0.svn11427+dfsg-1' into jessie-backports
Bas Couwenberg
sebastic at debian.org
Wed Jan 18 06:56:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository josm.
commit e2724ba9d1396f9d8dde8c0ef36ddf1b30bb96ef
Merge: bbc5daf 294a74b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Jan 18 07:49:16 2017 +0100
Merge tag 'debian/0.0.svn11427+dfsg-1' into jessie-backports
Conflicts:
debian/changelog
.classpath | 4 +-
README | 7 +-
REVISION | 8 +-
build.xml | 19 +-
data/boundaries.osm | 43887 +++++++++++++++++++
data/defaultpresets.xml | 58 +-
data/left-right-hand-traffic.osm | 1090 -
data/validator/combinations.mapcss | 117 +-
data/validator/deprecated.mapcss | 83 +-
data/validator/geometry.mapcss | 9 +
data/validator/highway.mapcss | 36 +-
data/validator/ignoretags.cfg | 1 +
data/validator/numeric.mapcss | 20 +
data/validator/religion.mapcss | 2 +-
data/validator/speed_limits.json | 234 -
data/validator/territories.mapcss | 7 +
data_nodist/trans/ast.lang | Bin 8864 -> 8864 bytes
data_nodist/trans/be.lang | Bin 18102 -> 18451 bytes
data_nodist/trans/bg.lang | Bin 2427 -> 2427 bytes
data_nodist/trans/ca-valencia.lang | Bin 7807 -> 7807 bytes
data_nodist/trans/ca.lang | Bin 10526 -> 10526 bytes
data_nodist/trans/cs.lang | Bin 11233 -> 11260 bytes
data_nodist/trans/da.lang | Bin 10543 -> 10550 bytes
data_nodist/trans/de.lang | Bin 11857 -> 11879 bytes
data_nodist/trans/el.lang | Bin 1429 -> 1429 bytes
data_nodist/trans/en.lang | Bin 9671 -> 9694 bytes
data_nodist/trans/en_AU.lang | Bin 1514 -> 1514 bytes
data_nodist/trans/en_GB.lang | Bin 2146 -> 2106 bytes
data_nodist/trans/es.lang | Bin 12604 -> 12549 bytes
data_nodist/trans/et.lang | Bin 1406 -> 1406 bytes
data_nodist/trans/fi.lang | Bin 3027 -> 3027 bytes
data_nodist/trans/fr.lang | Bin 11444 -> 11393 bytes
data_nodist/trans/gl.lang | Bin 2977 -> 2977 bytes
data_nodist/trans/hu.lang | Bin 12634 -> 12588 bytes
data_nodist/trans/id.lang | Bin 6717 -> 6717 bytes
data_nodist/trans/it.lang | Bin 10471 -> 10416 bytes
data_nodist/trans/ja.lang | Bin 11732 -> 11732 bytes
data_nodist/trans/km.lang | Bin 16887 -> 16887 bytes
data_nodist/trans/lt.lang | Bin 2028 -> 2035 bytes
data_nodist/trans/nb.lang | Bin 1705 -> 1705 bytes
data_nodist/trans/nl.lang | Bin 12376 -> 12338 bytes
data_nodist/trans/pl.lang | Bin 2861 -> 2861 bytes
data_nodist/trans/pt.lang | Bin 13637 -> 13586 bytes
data_nodist/trans/pt_BR.lang | Bin 10176 -> 10176 bytes
data_nodist/trans/ru.lang | Bin 18464 -> 18495 bytes
data_nodist/trans/sk.lang | Bin 10510 -> 10522 bytes
data_nodist/trans/sv.lang | Bin 1328 -> 1328 bytes
data_nodist/trans/uk.lang | Bin 18832 -> 18831 bytes
data_nodist/trans/vi.lang | Bin 10753 -> 10753 bytes
data_nodist/trans/zh_CN.lang | Bin 7616 -> 7586 bytes
data_nodist/trans/zh_TW.lang | Bin 4666 -> 4822 bytes
debian/changelog | 10 +
debian/control | 1 -
debian/copyright | 5 +
debian/patches/00-build.patch | 20 +-
debian/patches/02-elemstyles.patch | 110 -
debian/patches/06-move_data_out_of_jar.patch | 2 +-
debian/patches/08-use_noto_font.patch | 2 +-
debian/patches/series | 1 -
debian/rules | 2 -
i18n/build.xml | 2 +-
i18n/po/af.po | 963 +-
i18n/po/am.po | 963 +-
i18n/po/ar.po | 971 +-
i18n/po/ast.po | 1054 +-
i18n/po/az.po | 969 +-
i18n/po/be.po | 1501 +-
i18n/po/bg.po | 1025 +-
i18n/po/bn.po | 963 +-
i18n/po/br.po | 963 +-
i18n/po/bs.po | 963 +-
i18n/po/ca.po | 1092 +-
i18n/po/ca at valencia.po | 1059 +-
i18n/po/cs.po | 1095 +-
i18n/po/cy.po | 963 +-
i18n/po/da.po | 1156 +-
i18n/po/de.po | 1108 +-
i18n/po/de_DE.po | 967 +-
i18n/po/el.po | 1041 +-
i18n/po/en_AU.po | 1051 +-
i18n/po/en_CA.po | 967 +-
i18n/po/en_GB.po | 1081 +-
i18n/po/eo.po | 967 +-
i18n/po/es.po | 1627 +-
i18n/po/et.po | 1035 +-
i18n/po/eu.po | 1040 +-
i18n/po/fa.po | 967 +-
i18n/po/fi.po | 1051 +-
i18n/po/fil.po | 963 +-
i18n/po/fo.po | 963 +-
i18n/po/fr.po | 1429 +-
i18n/po/ga.po | 963 +-
i18n/po/gl.po | 1055 +-
i18n/po/he.po | 969 +-
i18n/po/hi.po | 963 +-
i18n/po/hr.po | 1045 +-
i18n/po/ht.po | 963 +-
i18n/po/hu.po | 1079 +-
i18n/po/hy.po | 963 +-
i18n/po/ia.po | 963 +-
i18n/po/id.po | 1057 +-
i18n/po/is.po | 1031 +-
i18n/po/it.po | 1197 +-
i18n/po/ja.po | 1101 +-
i18n/po/ka.po | 967 +-
i18n/po/km.po | 1087 +-
i18n/po/ko.po | 967 +-
i18n/po/ky.po | 963 +-
i18n/po/lb.po | 963 +-
i18n/po/lo.po | 963 +-
i18n/po/lt.po | 1287 +-
i18n/po/lv.po | 967 +-
i18n/po/mk.po | 963 +-
i18n/po/mr.po | 1045 +-
i18n/po/ms.po | 963 +-
i18n/po/nb.po | 1038 +-
i18n/po/nds.po | 963 +-
i18n/po/nl.po | 1112 +-
i18n/po/nn.po | 963 +-
i18n/po/oc.po | 1025 +-
i18n/po/pa.po | 963 +-
i18n/po/pl.po | 2464 +-
i18n/po/pt.po | 1083 +-
i18n/po/pt_BR.po | 1158 +-
i18n/po/rm.po | 963 +-
i18n/po/ro.po | 967 +-
i18n/po/ru.po | 1117 +-
i18n/po/sk.po | 1114 +-
i18n/po/sl.po | 969 +-
i18n/po/sq.po | 963 +-
i18n/po/sr.po | 967 +-
i18n/po/sv.po | 1043 +-
i18n/po/ta.po | 1043 +-
i18n/po/te.po | 963 +-
i18n/po/th.po | 963 +-
i18n/po/tr.po | 969 +-
i18n/po/ug.po | 963 +-
i18n/po/uk.po | 1141 +-
i18n/po/ur.po | 963 +-
i18n/po/vi.po | 1066 +-
i18n/po/wae.po | 963 +-
i18n/po/zh_CN.po | 1051 +-
i18n/po/zh_TW.po | 1169 +-
images/presets/accommodation/apartment.svg | 131 +
images/presets/accommodation/chalet.svg | 158 +-
images/presets/accommodation/guest_house.svg | 79 +-
images/presets/misc/watering_place.svg | 47 +
images/presets/shop/groceries/dairy.svg | 101 +
linux/latest/usr/share/man/man1/josm-latest.1 | 19 +-
linux/tested/usr/share/man/man1/josm.1 | 19 +-
netbeans/nbproject/project.properties | 4 +-
scripts/BuildProjectionDefinitions.java | 7 +-
scripts/SyncEditorImageryIndex.groovy | 300 +-
scripts/TagInfoExtract.groovy | 12 +-
src/org/apache/commons/jcs/JCS.java | 51 +-
.../jcs/auxiliary/disk/AbstractDiskCache.java | 69 +-
.../commons/jcs/auxiliary/disk/LRUMapJCS.java | 75 -
.../auxiliary/disk/indexed/IndexedDiskCache.java | 11 -
.../jcs/engine/AbstractCacheEventQueue.java | 119 +-
.../apache/commons/jcs/engine/CacheEventQueue.java | 255 +-
.../commons/jcs/engine/CacheWatchRepairable.java | 92 +-
.../commons/jcs/engine/PooledCacheEventQueue.java | 47 +-
.../jcs/engine/behavior/ICacheEventQueue.java | 17 +-
.../jcs/engine/control/CompositeCacheManager.java | 41 +-
.../AbstractDoubleLinkedListMemoryCache.java | 68 +-
.../jcs/engine/memory/AbstractMemoryCache.java | 80 +-
.../jcs/engine/memory/lru/LHMLRUMemoryCache.java | 87 +-
.../memory/soft/SoftReferenceMemoryCache.java | 54 +-
.../commons/jcs/utils/struct/AbstractLRUMap.java | 172 +-
.../apache/commons/jcs/utils/struct/LRUMap.java | 13 +-
src/org/openstreetmap/josm/Main.java | 93 +-
.../josm/actions/AbstractInfoAction.java | 9 +-
.../josm/actions/AddImageryLayerAction.java | 30 +-
.../josm/actions/AutoScaleAction.java | 10 +-
.../josm/actions/CombineWayAction.java | 2 +-
.../josm/actions/CopyCoordinatesAction.java | 2 +-
.../josm/actions/ExpertToggleAction.java | 99 +-
.../josm/actions/FullscreenToggleAction.java | 26 +-
.../josm/actions/JoinAreasAction.java | 128 +-
.../openstreetmap/josm/actions/JumpToAction.java | 94 +-
.../josm/actions/MergeLayerAction.java | 11 +-
.../josm/actions/OpenLocationAction.java | 114 +-
.../josm/actions/OrthogonalizeAction.java | 14 +-
.../openstreetmap/josm/actions/PurgeAction.java | 107 +-
.../josm/actions/RenameLayerAction.java | 20 +-
.../josm/actions/SearchNotesDownloadAction.java | 2 +-
.../josm/actions/SelectByInternalPointAction.java | 26 +-
.../josm/actions/SimplifyWayAction.java | 18 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 34 +-
.../josm/actions/UnJoinNodeWayAction.java | 19 +-
.../openstreetmap/josm/actions/UploadAction.java | 6 +-
.../josm/actions/UploadSelectionAction.java | 6 +-
.../openstreetmap/josm/actions/ZoomToAction.java | 2 +-
.../actions/downloadtasks/DownloadGeoUrlTask.java | 30 -
.../actions/downloadtasks/DownloadOsmUrlTask.java | 5 +-
.../josm/actions/mapmode/ExtrudeAction.java | 26 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 2 +-
.../josm/actions/mapmode/MapMode.java | 2 +-
.../josm/actions/mapmode/ParallelWays.java | 12 +-
.../josm/actions/mapmode/PlayHeadDragMode.java | 3 +-
.../josm/actions/mapmode/SelectAction.java | 16 +-
.../actions/relation/RecentRelationsAction.java | 14 +-
.../josm/actions/search/PushbackTokenizer.java | 19 +-
.../josm/actions/search/SearchAction.java | 3 +-
.../josm/actions/search/SearchCompiler.java | 16 +-
src/org/openstreetmap/josm/command/AddCommand.java | 12 +
.../josm/command/AddPrimitivesCommand.java | 13 +-
.../openstreetmap/josm/command/ChangeCommand.java | 15 +
.../josm/command/ChangePropertyCommand.java | 44 +-
.../josm/command/ChangePropertyKeyCommand.java | 48 +-
src/org/openstreetmap/josm/command/Command.java | 25 +-
.../openstreetmap/josm/command/DeleteCommand.java | 30 +-
.../openstreetmap/josm/command/PurgeCommand.java | 59 +-
.../DeletedStateConflictResolveCommand.java | 2 +-
.../RelationMemberConflictResolverCommand.java | 41 +-
src/org/openstreetmap/josm/data/AutosaveTask.java | 5 +-
src/org/openstreetmap/josm/data/Bounds.java | 8 +
.../josm/data/CustomConfigurator.java | 31 +-
src/org/openstreetmap/josm/data/Preferences.java | 61 +-
.../openstreetmap/josm/data/UndoRedoHandler.java | 15 +-
.../josm/data/cache/BufferedImageCacheEntry.java | 2 +-
.../josm/data/cache/HostLimitQueue.java | 11 +-
.../josm/data/cache/JCSCacheManager.java | 3 -
.../josm/data/cache/JCSCachedTileLoaderJob.java | 26 +-
.../openstreetmap/josm/data/coor/QuadTiling.java | 4 +-
src/org/openstreetmap/josm/data/gpx/GpxData.java | 52 +-
.../CachedAttributionBingAerialTileSource.java | 3 +-
.../josm/data/imagery/CachedTileLoaderFactory.java | 5 +-
.../josm/data/imagery/DefaultLayer.java | 32 +
.../josm/data/imagery/ImageryInfo.java | 14 +-
.../josm/data/imagery/ImageryLayerInfo.java | 20 +-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 11 +-
.../josm/data/imagery/WMTSDefaultLayer.java | 28 +
.../josm/data/imagery/WMTSTileSource.java | 56 +-
.../josm/data/osm/AbstractPrimitive.java | 80 +-
src/org/openstreetmap/josm/data/osm/BBox.java | 199 +-
src/org/openstreetmap/josm/data/osm/Changeset.java | 121 +-
.../josm/data/osm/ChangesetCache.java | 76 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 21 +-
.../openstreetmap/josm/data/osm/DataSetMerger.java | 5 +-
.../openstreetmap/josm/data/osm/FilterMatcher.java | 8 +-
src/org/openstreetmap/josm/data/osm/Node.java | 52 +-
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 124 +-
.../josm/data/osm/OsmPrimitiveType.java | 10 +-
.../openstreetmap/josm/data/osm/QuadBuckets.java | 213 +-
src/org/openstreetmap/josm/data/osm/Relation.java | 71 +-
src/org/openstreetmap/josm/data/osm/Storage.java | 104 +-
.../openstreetmap/josm/data/osm/TagCollection.java | 7 +-
src/org/openstreetmap/josm/data/osm/UserInfo.java | 60 +
src/org/openstreetmap/josm/data/osm/Way.java | 15 +-
.../openstreetmap/josm/data/osm/WaySegment.java | 15 +-
.../osm/visitor/paint/AbstractMapRenderer.java | 6 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 45 +-
.../osm/visitor/paint/relations/Multipolygon.java | 21 +-
.../josm/data/preferences/ListListSetting.java | 27 -
.../josm/data/preferences/ListSetting.java | 14 -
.../josm/data/preferences/MapListSetting.java | 41 -
.../josm/data/preferences/Setting.java | 4 +-
.../josm/data/preferences/StringSetting.java | 14 -
.../josm/data/projection/Projections.java | 3 +-
.../projection/datum/NTV2GridShiftFileWrapper.java | 3 +-
.../data/projection/proj/ClassProjFactory.java | 4 +-
.../data/projection/proj/SwissObliqueMercator.java | 3 +-
.../josm/data/validation/TestError.java | 225 +-
.../data/validation/routines/DomainValidator.java | 28 +-
.../data/validation/routines/UrlValidator.java | 8 +-
.../josm/data/validation/tests/Addresses.java | 8 +-
.../josm/data/validation/tests/DuplicateNode.java | 28 +-
.../data/validation/tests/MapCSSTagChecker.java | 5 +-
.../data/validation/tests/MultipolygonTest.java | 647 +-
.../josm/data/validation/tests/PowerLines.java | 22 +-
.../josm/data/validation/tests/TagChecker.java | 110 +-
.../josm/data/validation/tests/UntaggedNode.java | 10 +-
.../josm/data/validation/tests/UntaggedWay.java | 4 +-
.../openstreetmap/josm/gui/IconToggleButton.java | 7 +-
src/org/openstreetmap/josm/gui/ImageryMenu.java | 32 +-
.../openstreetmap/josm/gui/MainApplication.java | 23 +-
src/org/openstreetmap/josm/gui/MainFrame.java | 14 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 30 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 38 +-
src/org/openstreetmap/josm/gui/MapView.java | 20 +-
.../josm/gui/NavigatableComponent.java | 83 +-
.../josm/gui/NotificationManager.java | 20 +-
.../openstreetmap/josm/gui/PopupMenuHandler.java | 8 +-
.../josm/gui/bbox/SlippyMapControler.java | 13 +-
...MergeModel.java => AbstractListMergeModel.java} | 64 +-
.../{ListMerger.java => AbstractListMerger.java} | 40 +-
.../josm/gui/conflict/pair/ConflictResolver.java | 17 +-
.../josm/gui/conflict/pair/ListRole.java | 2 +-
.../josm/gui/conflict/pair/PairTable.java | 5 +-
.../conflict/pair/nodes/NodeListMergeModel.java | 16 +-
.../gui/conflict/pair/nodes/NodeListMerger.java | 5 +-
.../gui/conflict/pair/nodes/NodeListTable.java | 10 +-
.../pair/nodes/NodeListTableCellRenderer.java | 12 +-
.../relation/RelationMemberListMergeModel.java | 30 +-
.../pair/relation/RelationMemberMerger.java | 5 +-
.../pair/relation/RelationMemberTable.java | 10 +-
.../relation/RelationMemberTableCellRenderer.java | 16 +-
.../josm/gui/conflict/pair/tags/TagMerger.java | 6 +-
.../tags/RelationMemberConflictResolver.java | 10 +-
.../RelationMemberConflictResolverColumnModel.java | 58 +-
.../gui/datatransfer/importers/OsmLinkPaster.java | 51 +-
.../gui/datatransfer/importers/TextTagPaster.java | 5 +-
.../josm/gui/dialogs/ConflictDialog.java | 54 +-
.../DeleteFromRelationConfirmationDialog.java | 30 +-
.../josm/gui/dialogs/DialogsPanel.java | 19 +-
.../josm/gui/dialogs/FilterDialog.java | 41 +-
.../josm/gui/dialogs/LayerListDialog.java | 7 +-
.../josm/gui/dialogs/MapPaintDialog.java | 6 +
.../josm/gui/dialogs/MenuItemSearchDialog.java | 12 +-
.../josm/gui/dialogs/NotesDialog.java | 6 +-
.../josm/gui/dialogs/RelationListDialog.java | 48 +-
.../josm/gui/dialogs/SelectionListDialog.java | 19 +-
.../josm/gui/dialogs/ToggleDialog.java | 19 +-
.../josm/gui/dialogs/UserListDialog.java | 4 +-
.../josm/gui/dialogs/ValidatorDialog.java | 11 +-
.../changeset/ChangesetCacheManagerModel.java | 16 +-
.../gui/dialogs/changeset/ChangesetListModel.java | 14 +-
.../query/AdvancedChangesetQueryPanel.java | 905 +-
.../changeset/query/BBoxRestrictionPanel.java | 70 +
.../changeset/query/BasicChangesetQueryPanel.java | 18 +-
.../changeset/query/ChangesetQueryDialog.java | 14 +
.../gui/dialogs/changeset/query/DateValidator.java | 103 +
.../query/OpenAndCloseStateRestrictionPanel.java | 138 +
.../dialogs/changeset/query/RestrictionPanel.java | 28 +
.../changeset/query/TimeRestrictionPanel.java | 346 +
.../gui/dialogs/changeset/query/TimeValidator.java | 108 +
.../changeset/query/UidInputFieldValidator.java | 74 +
.../changeset/query/UrlBasedQueryPanel.java | 7 +
.../changeset/query/UserRestrictionPanel.java | 309 +
.../gui/dialogs/properties/PresetListPanel.java | 36 +-
.../gui/dialogs/properties/PropertiesDialog.java | 169 +-
.../dialogs/properties/RecentTagCollection.java | 32 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 68 +-
.../gui/dialogs/relation/MemberTableModel.java | 9 +-
.../gui/dialogs/validator/ValidatorTreePanel.java | 69 +-
.../josm/gui/download/DownloadDialog.java | 42 +-
.../openstreetmap/josm/gui/draw/MapViewPath.java | 5 +-
src/org/openstreetmap/josm/gui/help/HelpUtil.java | 18 +-
.../gui/history/HistoryBrowserDialogManager.java | 51 +-
.../josm/gui/history/HistoryBrowserModel.java | 25 +-
.../josm/gui/history/NodeListViewer.java | 57 +-
.../josm/gui/history/VersionInfoPanel.java | 6 +-
.../josm/gui/history/VersionTable.java | 1 +
.../josm/gui/history/VersionTableColumnModel.java | 7 +
.../josm/gui/io/BasicUploadSettingsPanel.java | 31 +-
.../josm/gui/io/RecentlyOpenedFilesMenu.java | 33 +-
.../josm/gui/io/SaveLayersDialog.java | 40 +-
.../openstreetmap/josm/gui/io/UploadDialog.java | 22 +-
.../openstreetmap/josm/gui/io/UploadLayerTask.java | 6 +-
.../josm/gui/io/UploadSelectionDialog.java | 27 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 2 +-
.../josm/gui/layer/AlignImageryPanel.java | 10 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 2 +
.../openstreetmap/josm/gui/layer/LayerManager.java | 2 +-
.../josm/gui/layer/NativeScaleLayer.java | 12 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 26 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 33 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 36 +-
.../gui/layer/gpx/ChooseTrackVisibilityAction.java | 2 +
.../gui/layer/gpx/ConvertToDataLayerAction.java | 8 +-
.../josm/gui/layer/gpx/ImportAudioAction.java | 25 +-
.../josm/gui/layer/markerlayer/MarkerLayer.java | 18 +-
.../josm/gui/layer/markerlayer/PlayHeadMarker.java | 5 +-
.../openstreetmap/josm/gui/mappaint/Cascade.java | 32 +-
.../josm/gui/mappaint/ElemStyles.java | 45 +-
.../josm/gui/mappaint/MapPaintStyles.java | 68 +-
.../josm/gui/mappaint/MultiCascade.java | 2 +-
src/org/openstreetmap/josm/gui/mappaint/Range.java | 2 +-
.../josm/gui/mappaint/mapcss/ConditionFactory.java | 3 +-
.../gui/mappaint/mapcss/ExpressionFactory.java | 51 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 17 +-
.../gui/mappaint/mapcss/MapCSSStyleSource.java | 16 +-
.../josm/gui/mappaint/mapcss/Selector.java | 34 +-
.../gui/mappaint/styleelement/AreaElement.java | 30 +
.../gui/oauth/OsmOAuthAuthorizationClient.java | 4 +-
.../gui/preferences/PreferenceSettingFactory.java | 8 +
.../josm/gui/preferences/PreferenceTabbedPane.java | 40 +-
.../josm/gui/preferences/SourceEditor.java | 157 +-
.../josm/gui/preferences/ToolbarPreferences.java | 70 +
.../gui/preferences/display/ColorPreference.java | 6 +-
.../gui/preferences/display/LafPreference.java | 19 +-
.../gui/preferences/imagery/AddImageryPanel.java | 2 +-
.../gui/preferences/imagery/AddTMSLayerPanel.java | 7 +-
.../gui/preferences/imagery/AddWMSLayerPanel.java | 4 +-
.../gui/preferences/imagery/AddWMTSLayerPanel.java | 1 +
.../gui/preferences/imagery/WMSSettingsPanel.java | 12 +-
.../gui/preferences/plugin/PluginListPanel.java | 20 +-
.../gui/preferences/plugin/PluginPreference.java | 9 +-
.../projection/ProjectionPreference.java | 3 +-
.../preferences/server/ProxyPreferencesPanel.java | 25 +-
.../ValidatorTagCheckerRulesPreference.java | 1 +
.../gui/progress/PleaseWaitProgressMonitor.java | 22 +-
.../josm/gui/tagging/TagCellRenderer.java | 18 +-
.../gui/tagging/ac/AutoCompletingComboBox.java | 62 +-
.../josm/gui/tagging/ac/AutoCompletionManager.java | 6 +-
.../gui/tagging/presets/TaggingPresetReader.java | 6 +-
.../gui/tagging/presets/TaggingPresetSelector.java | 11 +-
.../josm/gui/tagging/presets/TaggingPresets.java | 8 +-
.../tagging/presets/items/ComboMultiSelect.java | 4 +-
.../josm/gui/tagging/presets/items/KeyedItem.java | 2 +-
.../josm/gui/tagging/presets/items/PresetLink.java | 20 +-
.../josm/gui/util/AdvancedKeyPressDetector.java | 24 +-
src/org/openstreetmap/josm/gui/util/GuiHelper.java | 6 +-
.../widgets/AbstractTextComponentValidator.java | 7 +-
.../josm/gui/widgets/JosmTextArea.java | 13 +
.../openstreetmap/josm/gui/widgets/UrlLabel.java | 16 +-
.../josm/io/BoundingBoxDownloader.java | 3 +-
.../openstreetmap/josm/io/CacheCustomContent.java | 13 +-
src/org/openstreetmap/josm/io/CachedFile.java | 20 +-
src/org/openstreetmap/josm/io/ChangesetQuery.java | 2 +-
src/org/openstreetmap/josm/io/GpxReader.java | 5 +-
src/org/openstreetmap/josm/io/GpxWriter.java | 3 +-
src/org/openstreetmap/josm/io/MessageNotifier.java | 2 +-
.../josm/io/MultiFetchServerObjectReader.java | 10 +-
src/org/openstreetmap/josm/io/NmeaReader.java | 3 +-
src/org/openstreetmap/josm/io/OsmApi.java | 14 +-
src/org/openstreetmap/josm/io/OsmExporter.java | 14 +-
.../josm/io/OsmServerHistoryReader.java | 6 +-
src/org/openstreetmap/josm/io/OsmServerWriter.java | 9 +-
.../josm/io/OverpassDownloadReader.java | 31 +-
.../josm/io/imagery/ImageryReader.java | 11 +-
.../openstreetmap/josm/io/imagery/WMSImagery.java | 2 +-
.../josm/io/remotecontrol/AddTagsDialog.java | 22 +-
.../io/remotecontrol/RemoteControlHttpsServer.java | 23 +-
.../josm/io/session/SessionReader.java | 12 +-
.../josm/io/session/SessionWriter.java | 7 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 25 +-
.../josm/plugins/PluginListParser.java | 10 +-
.../josm/plugins/PluginPreferenceFactory.java | 8 +
src/org/openstreetmap/josm/tools/AudioPlayer.java | 31 +-
.../josm/tools/DefaultGeoProperty.java | 62 +
src/org/openstreetmap/josm/tools/Diff.java | 2 +-
.../openstreetmap/josm/tools/ExceptionUtil.java | 3 +-
src/org/openstreetmap/josm/tools/ExifReader.java | 3 +-
src/org/openstreetmap/josm/tools/FontsManager.java | 2 +-
src/org/openstreetmap/josm/tools/GeoProperty.java | 30 +
.../openstreetmap/josm/tools/GeoPropertyIndex.java | 32 +-
.../openstreetmap/josm/tools/GeoUrlToBounds.java | 2 +
src/org/openstreetmap/josm/tools/Geometry.java | 43 +-
src/org/openstreetmap/josm/tools/HttpClient.java | 72 +-
.../openstreetmap/josm/tools/ImageProvider.java | 17 +-
.../josm/tools/JosmRuntimeException.java | 54 +
src/org/openstreetmap/josm/tools/ListenerList.java | 47 +-
src/org/openstreetmap/josm/tools/Logging.java | 6 +-
.../josm/tools/MultiLineFlowLayout.java | 2 +-
.../josm/tools/MultikeyActionsHandler.java | 42 +-
.../openstreetmap/josm/tools/OsmUrlToBounds.java | 87 +-
.../josm/tools/RightAndLefthandTraffic.java | 180 +-
src/org/openstreetmap/josm/tools/Shortcut.java | 7 +-
src/org/openstreetmap/josm/tools/Territories.java | 109 +
src/org/openstreetmap/josm/tools/Utils.java | 43 +-
.../openstreetmap/josm/tools/WindowGeometry.java | 2 +-
.../openstreetmap/josm/tools/XmlObjectParser.java | 3 +-
.../openstreetmap/josm/tools/date/DateUtils.java | 3 +-
styles/standard/elemstyles.mapcss | 35 +-
...iple-tile-matrices-for-one-layer-projection.xml | 377 +
.../openstreetmap/josm/data/BoundariesTestIT.java | 66 +
.../josm/data/imagery/ImageryCompareTestIT.java | 56 +
.../josm/gui/mappaint/StyleCacheTest.java | 2 +-
.../josm/io/MultiFetchServerObjectReaderTest.java | 18 +-
.../josm/io/OsmServerBackreferenceReaderTest.java | 3 +
.../openstreetmap/josm/tools/HttpClientTest.java | 85 +
.../openstreetmap/josm/PerformanceTestUtils.java | 1 +
.../josm/data/osm/KeyValuePerformanceTest.java | 3 +-
.../josm/data/osm/OsmDataGenerator.java | 10 +-
.../gui/mappaint/MapRendererPerformanceTest.java | 2 -
test/unit/org/openstreetmap/josm/TestUtils.java | 9 +-
.../josm/actions/CreateCircleActionTest.java | 49 +-
.../josm/actions/ExpertToggleActionTest.java | 87 +
.../josm/actions/FullscreenToggleActionTest.java | 31 +
.../actions/SelectByInternalPointActionTest.java | 3 +
.../josm/actions/search/SearchCompilerTest.java | 3 +
.../openstreetmap/josm/data/AutosaveTaskTest.java | 18 +-
.../josm/data/cache/JCSCacheManagerTest.java | 4 +-
.../josm/data/imagery/WMTSTileSourceTest.java | 21 +-
.../org/openstreetmap/josm/data/osm/BBoxTest.java | 37 +
.../openstreetmap/josm/data/osm/ChangesetTest.java | 1 +
.../openstreetmap/josm/data/osm/NodeDataTest.java | 3 +
.../org/openstreetmap/josm/data/osm/NodeTest.java | 61 +
.../josm/data/osm/QuadBucketsTest.java | 75 +
.../openstreetmap/josm/data/osm/RelationTest.java | 25 +
.../data/osm/{BBoxTest.java => StorageTest.java} | 10 +-
.../openstreetmap/josm/data/osm/WayDataTest.java | 4 +
.../org/openstreetmap/josm/data/osm/WayTest.java | 73 +
.../ListListSettingTest.java} | 18 +-
.../ListSettingTest.java} | 18 +-
.../MapListSettingTest.java} | 18 +-
.../StringSettingTest.java} | 18 +-
.../josm/data/projection/EllipsoidTest.java | 3 +-
.../josm/data/projection/ProjectionRefTest.java | 17 +-
.../data/projection/ProjectionRegressionTest.java | 3 +-
.../josm/data/projection/ProjectionTest.java | 3 +-
.../validation/tests/ConditionalKeysTest.groovy | 43 -
.../data/validation/tests/ConditionalKeysTest.java | 63 +
.../josm/data/validation/tests/HighwaysTest.groovy | 77 -
.../josm/data/validation/tests/HighwaysTest.java | 98 +
.../josm/data/validation/tests/LanesTest.groovy | 69 -
.../josm/data/validation/tests/LanesTest.java | 96 +
.../validation/tests/MultipolygonTestTest.java | 5 +-
.../validation/tests/RelationCheckerTest.groovy | 142 -
.../data/validation/tests/RelationCheckerTest.java | 166 +
.../validation/tests/SimilarNamedWaysTest.groovy | 107 -
.../validation/tests/SimilarNamedWaysTest.java | 121 +
.../josm/gui/MainApplicationTest.java | 18 +-
.../josm/gui/NavigatableComponentTest.java | 2 +-
.../datatransfer/importers/OsmLinkPasterTest.java | 31 +-
.../openstreetmap/josm/gui/layer/GpxLayerTest.java | 9 +
.../josm/gui/layer/MainLayerManagerTest.java | 2 +-
.../josm/gui/layer/OsmDataLayerTest.java | 28 +-
.../josm/gui/layer/geoimage/GeoImageLayerTest.java | 10 +
.../josm/io/remotecontrol/RemoteControlTest.java | 13 +-
.../josm/io/session/SessionReaderTest.java | 2 +-
.../josm/testutils/JOSMTestRules.java | 9 +-
.../josm/tools/AlphanumComparatorTest.groovy | 18 -
.../josm/tools/AlphanumComparatorTest.java | 36 +
.../org/openstreetmap/josm/tools/I18nTest.groovy | 10 -
.../org/openstreetmap/josm/tools/I18nTest.java | 22 +
.../org/openstreetmap/josm/tools/LoggingTest.java | 5 +
.../josm/tools/OsmUrlToBoundsTest.java | 35 +
.../josm/tools/RightAndLefthandTrafficTest.java | 126 +
.../openstreetmap/josm/tools/TerritoriesTest.java | 37 +
.../org/openstreetmap/josm/tools/UtilsTest.java | 15 +
tools/findbugs/josm-filter.xml | 22 +
524 files changed, 112805 insertions(+), 34554 deletions(-)
diff --cc debian/changelog
index 09cebab,f0c9e18..b58fa88
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+ josm (0.0.svn11427+dfsg-1) unstable; urgency=medium
+
+ * New tested snapshot.
+ * Don't remove icons from JOSM source, icons from OSM SVN no longer used.
+ * Drop openstreetmap-map-icons dependency, icons included in JOSM now.
+ * Add license & copyright for preset icons.
+ * Drop 02-elemstyles.patch, openstreetmap-map-icons package no longer used.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 07 Jan 2017 23:52:18 +0100
+
+josm (0.0.svn11223+dfsg-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 11 Nov 2016 21:18:04 +0100
+
josm (0.0.svn11223+dfsg-1) unstable; urgency=medium
* New tested snapshot.
--
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