[josm] branch upstream updated (8354f25 -> aa8882a)
Bas Couwenberg
sebastic at debian.org
Tue Jan 31 07:11:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository josm.
from 8354f25 Imported Upstream version 0.0.svn11427+dfsg
new aa8882a Imported Upstream version 0.0.svn11514+dfsg
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.classpath | 12 +-
Dockerfile | 13 +
README | 4 +-
REVISION | 8 +-
build.xml | 9 +-
data/boundaries.osm | 566 +++----
data/defaultpresets.xml | 2 +
data/gpx/brown2green.txt | 15 +
data/gpx/inferno.txt | 267 ++++
data/gpx/red2blue.txt | 18 +
data/gpx/viridis.txt | 267 ++++
data/validator/combinations.mapcss | 14 +-
data/validator/deprecated.mapcss | 6 +
data/validator/geometry.mapcss | 12 +-
data/validator/highway.mapcss | 7 -
data/validator/ignoretags.cfg | 9 +
data/validator/territories.mapcss | 10 +
data/validator/unnecessary.mapcss | 8 +
data_nodist/trans/ast.lang | Bin 8864 -> 8866 bytes
data_nodist/trans/be.lang | Bin 18451 -> 18529 bytes
data_nodist/trans/bg.lang | Bin 2427 -> 2429 bytes
data_nodist/trans/ca-valencia.lang | Bin 7807 -> 7809 bytes
data_nodist/trans/ca.lang | Bin 10526 -> 10528 bytes
data_nodist/trans/cs.lang | Bin 11260 -> 11298 bytes
data_nodist/trans/da.lang | Bin 10550 -> 10603 bytes
data_nodist/trans/de.lang | Bin 11879 -> 11937 bytes
data_nodist/trans/el.lang | Bin 1429 -> 1431 bytes
data_nodist/trans/en.lang | Bin 9694 -> 9743 bytes
data_nodist/trans/en_AU.lang | Bin 1514 -> 1516 bytes
data_nodist/trans/en_GB.lang | Bin 2106 -> 2108 bytes
data_nodist/trans/es.lang | Bin 12549 -> 12551 bytes
data_nodist/trans/et.lang | Bin 1406 -> 1408 bytes
data_nodist/trans/fi.lang | Bin 3027 -> 3029 bytes
data_nodist/trans/fr.lang | Bin 11393 -> 11395 bytes
data_nodist/trans/gl.lang | Bin 2977 -> 2979 bytes
data_nodist/trans/hu.lang | Bin 12588 -> 12590 bytes
data_nodist/trans/id.lang | Bin 6717 -> 6719 bytes
data_nodist/trans/it.lang | Bin 10416 -> 10418 bytes
data_nodist/trans/ja.lang | Bin 11732 -> 11734 bytes
data_nodist/trans/km.lang | Bin 16887 -> 16889 bytes
data_nodist/trans/lt.lang | Bin 2035 -> 2037 bytes
data_nodist/trans/nb.lang | Bin 1705 -> 1707 bytes
data_nodist/trans/nl.lang | Bin 12338 -> 12447 bytes
data_nodist/trans/pl.lang | Bin 2861 -> 2856 bytes
data_nodist/trans/pt.lang | Bin 13586 -> 13588 bytes
data_nodist/trans/pt_BR.lang | Bin 10176 -> 10175 bytes
data_nodist/trans/ru.lang | Bin 18495 -> 18583 bytes
data_nodist/trans/sk.lang | Bin 10522 -> 10557 bytes
data_nodist/trans/sv.lang | Bin 1328 -> 1330 bytes
data_nodist/trans/uk.lang | Bin 18831 -> 18940 bytes
data_nodist/trans/vi.lang | Bin 10753 -> 10755 bytes
data_nodist/trans/zh_CN.lang | Bin 7586 -> 7588 bytes
data_nodist/trans/zh_TW.lang | Bin 4822 -> 4839 bytes
docker-test.bat | 6 +
docker-test.sh | 5 +
i18n/po/af.po | 76 +-
i18n/po/am.po | 76 +-
i18n/po/ar.po | 78 +-
i18n/po/ast.po | 92 +-
i18n/po/az.po | 76 +-
i18n/po/be.po | 187 ++-
i18n/po/bg.po | 82 +-
i18n/po/bn.po | 76 +-
i18n/po/br.po | 76 +-
i18n/po/bs.po | 76 +-
i18n/po/ca.po | 93 +-
i18n/po/ca at valencia.po | 84 +-
i18n/po/cs.po | 144 +-
i18n/po/cy.po | 76 +-
i18n/po/da.po | 130 +-
i18n/po/de.po | 189 ++-
i18n/po/de_DE.po | 76 +-
i18n/po/el.po | 78 +-
i18n/po/en_AU.po | 91 +-
i18n/po/en_CA.po | 76 +-
i18n/po/en_GB.po | 93 +-
i18n/po/eo.po | 76 +-
i18n/po/es.po | 161 +-
i18n/po/et.po | 86 +-
i18n/po/eu.po | 78 +-
i18n/po/fa.po | 76 +-
i18n/po/fi.po | 88 +-
i18n/po/fil.po | 76 +-
i18n/po/fo.po | 76 +-
i18n/po/fr.po | 126 +-
i18n/po/ga.po | 76 +-
i18n/po/gl.po | 80 +-
i18n/po/he.po | 78 +-
i18n/po/hi.po | 76 +-
i18n/po/hr.po | 76 +-
i18n/po/ht.po | 76 +-
i18n/po/hu.po | 90 +-
i18n/po/hy.po | 76 +-
i18n/po/ia.po | 76 +-
i18n/po/id.po | 84 +-
i18n/po/is.po | 78 +-
i18n/po/it.po | 145 +-
i18n/po/ja.po | 100 +-
i18n/po/ka.po | 76 +-
i18n/po/km.po | 90 +-
i18n/po/ko.po | 76 +-
i18n/po/ky.po | 76 +-
i18n/po/lb.po | 76 +-
i18n/po/lo.po | 76 +-
i18n/po/lt.po | 92 +-
i18n/po/lv.po | 76 +-
i18n/po/mk.po | 76 +-
i18n/po/mr.po | 76 +-
i18n/po/ms.po | 76 +-
i18n/po/nb.po | 80 +-
i18n/po/nds.po | 78 +-
i18n/po/nl.po | 183 ++-
i18n/po/nn.po | 76 +-
i18n/po/oc.po | 76 +-
i18n/po/pa.po | 76 +-
i18n/po/pl.po | 267 ++--
i18n/po/pt.po | 94 +-
i18n/po/pt_BR.po | 118 +-
i18n/po/rm.po | 76 +-
i18n/po/ro.po | 76 +-
i18n/po/ru.po | 128 +-
i18n/po/sk.po | 137 +-
i18n/po/sl.po | 76 +-
i18n/po/sq.po | 76 +-
i18n/po/sr.po | 76 +-
i18n/po/sv.po | 80 +-
i18n/po/ta.po | 76 +-
i18n/po/te.po | 76 +-
i18n/po/th.po | 76 +-
i18n/po/tr.po | 78 +-
i18n/po/ug.po | 76 +-
i18n/po/uk.po | 99 +-
i18n/po/ur.po | 76 +-
i18n/po/vi.po | 94 +-
i18n/po/wae.po | 76 +-
i18n/po/zh_CN.po | 94 +-
i18n/po/zh_TW.po | 84 +-
netbeans/nbproject/project.properties | 20 +-
.../remote/AbstractRemoteAuxiliaryCache.java | 16 +-
.../jcs/engine/AbstractCacheEventQueue.java | 81 +-
.../apache/commons/jcs/engine/CacheEventQueue.java | 232 +--
.../commons/jcs/engine/ElementAttributes.java | 4 +-
.../commons/jcs/engine/PooledCacheEventQueue.java | 45 +-
.../commons/jcs/engine/control/CompositeCache.java | 2 +-
.../engine/control/event/ElementEventQueue.java | 18 +-
.../AbstractDoubleLinkedListMemoryCache.java | 222 +--
.../jcs/engine/memory/AbstractMemoryCache.java | 254 ++-
.../jcs/engine/memory/lru/LHMLRUMemoryCache.java | 127 +-
.../memory/soft/SoftReferenceMemoryCache.java | 157 +-
.../util/DefaultMemoryElementDescriptor.java | 16 +-
.../memory/util/MemoryElementDescriptor.java | 12 +-
.../util/SoftReferenceElementDescriptor.java | 2 +-
.../jcs/utils/discovery/UDPDiscoveryReceiver.java | 16 +-
.../jcs/utils/threadpool/PoolConfiguration.java | 41 +-
.../jcs/utils/threadpool/ThreadPoolManager.java | 299 ++--
src/org/openstreetmap/josm/Main.java | 4 +-
.../josm/actions/JoinAreasAction.java | 2 +-
.../josm/actions/MergeNodesAction.java | 10 +-
.../josm/actions/ShowStatusReportAction.java | 3 +
.../josm/actions/SimplifyWayAction.java | 15 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 2 +-
.../josm/actions/audio/AudioPlayPauseAction.java | 2 +-
.../josm/actions/mapmode/DrawAction.java | 505 +-----
.../josm/actions/mapmode/DrawSnapHelper.java | 563 +++++++
.../josm/actions/mapmode/ExtrudeAction.java | 4 +-
.../josm/actions/mapmode/SelectAction.java | 6 +-
.../josm/actions/search/SearchAction.java | 9 +-
.../josm/actions/search/SearchCompiler.java | 119 +-
.../conflict/CoordinateConflictResolveCommand.java | 3 +-
.../DeletedStateConflictResolveCommand.java | 3 +-
src/org/openstreetmap/josm/data/Preferences.java | 17 +-
.../josm/data/SystemOfMeasurement.java | 2 +-
.../josm/data/cache/HostLimitQueue.java | 70 +-
.../josm/data/coor/CoordinateFormat.java | 5 +-
.../CachedAttributionBingAerialTileSource.java | 12 +
.../data/imagery/GetCapabilitiesParseHelper.java | 4 +-
.../josm/data/imagery/TMSCachedTileLoader.java | 15 +-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 2 +-
.../josm/data/imagery/WMSCachedTileLoader.java | 10 +-
.../josm/data/imagery/WMTSTileSource.java | 15 -
.../josm/data/oauth/SignpostAdapters.java | 6 +-
.../josm/data/osm/AbstractPrimitive.java | 6 +-
src/org/openstreetmap/josm/data/osm/BBox.java | 2 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 2 +-
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 27 +-
.../openstreetmap/josm/data/osm/QuadBuckets.java | 2 +-
.../josm/data/osm/RelationMemberData.java | 4 +-
.../osm/visitor/MergeSourceBuildingVisitor.java | 2 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 2 +-
.../osm/visitor/paint/WireframeMapRenderer.java | 2 +-
.../josm/data/preferences/AbstractProperty.java | 10 +-
.../josm/data/preferences/MapListSetting.java | 4 +-
.../josm/data/preferences/PreferencesReader.java | 7 +-
.../data/validation/routines/UrlValidator.java | 2 +-
.../data/validation/tests/DuplicateRelation.java | 2 +-
.../data/validation/tests/MapCSSTagChecker.java | 12 +-
.../josm/data/validation/tests/PowerLines.java | 31 +-
.../data/validation/tests/RelationChecker.java | 21 +-
.../data/validation/tests/SelfIntersectingWay.java | 30 +-
.../data/validation/tests/UnconnectedWays.java | 2 +-
.../data/validation/tests/WayConnectedToArea.java | 5 +-
.../openstreetmap/josm/gui/MainApplication.java | 17 +-
src/org/openstreetmap/josm/gui/MapViewState.java | 16 +
src/org/openstreetmap/josm/gui/MenuScroller.java | 36 +-
.../josm/gui/NavigatableComponent.java | 4 +-
.../josm/gui/bbox/SlippyMapControler.java | 4 +-
.../josm/gui/conflict/pair/ComparePairType.java | 2 +-
.../tags/RelationMemberConflictDecision.java | 8 +-
.../tags/RelationMemberConflictResolverModel.java | 7 +-
.../josm/gui/datatransfer/ClipboardUtils.java | 4 +-
.../josm/gui/dialogs/DialogsPanel.java | 4 +-
.../josm/gui/dialogs/FilterTableModel.java | 2 +-
.../josm/gui/dialogs/InspectPrimitiveDialog.java | 2 +-
.../josm/gui/dialogs/MenuItemSearchDialog.java | 3 -
.../josm/gui/dialogs/MinimapDialog.java | 2 +-
.../josm/gui/dialogs/layer/DuplicateAction.java | 2 +-
.../dialogs/layer/LayerListTransferHandler.java | 2 +-
.../gui/dialogs/layer/LayerVisibilityAction.java | 3 +-
.../gui/dialogs/properties/PropertiesDialog.java | 2 +-
.../dialogs/relation/GenericRelationEditor.java | 28 +-
.../dialogs/relation/RelationDialogManager.java | 3 +-
.../relation/sort/WayConnectionTypeCalculator.java | 4 +-
.../gui/history/HistoryBrowserDialogManager.java | 4 +-
.../josm/gui/history/VersionInfoPanel.java | 2 +-
.../josm/gui/io/SaveLayersDialog.java | 2 +-
.../openstreetmap/josm/gui/io/UploadDialog.java | 4 +-
.../openstreetmap/josm/gui/io/UploadStrategy.java | 2 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 2 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 6 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 269 ++--
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 2 +-
.../gui/layer/geoimage/ShowThumbnailAction.java | 4 +-
.../gui/layer/gpx/ChooseTrackVisibilityAction.java | 2 +-
.../gui/layer/gpx/ConvertToDataLayerAction.java | 24 +-
.../josm/gui/layer/gpx/GpxDrawHelper.java | 681 ++++++++-
.../josm/gui/layer/gpx/ImportAudioAction.java | 8 +-
.../josm/gui/mappaint/ElemStyles.java | 9 +
.../josm/gui/mappaint/MapPaintStyles.java | 21 +-
.../josm/gui/mappaint/mapcss/ConditionFactory.java | 2 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 2 +-
.../gui/mappaint/styleelement/BoxTextElement.java | 10 +-
.../gui/mappaint/styleelement/LineElement.java | 14 +-
.../mappaint/styleelement/RepeatImageElement.java | 10 +-
.../gui/mappaint/styleelement/StyleElement.java | 8 +-
.../josm/gui/preferences/SourceEditor.java | 2 +-
.../gui/preferences/display/GPXSettingsPanel.java | 69 +-
.../gui/preferences/imagery/WMSSettingsPanel.java | 8 +-
.../gui/preferences/map/MapPaintPreference.java | 2 +-
.../plugin/PluginUpdatePolicyPanel.java | 3 +-
.../preferences/server/ProxyPreferencesPanel.java | 3 +-
.../josm/gui/tagging/ac/AutoCompletionManager.java | 6 +-
.../josm/gui/tagging/presets/items/Check.java | 2 +-
.../josm/gui/tagging/presets/items/Combo.java | 2 +-
.../tagging/presets/items/ComboMultiSelect.java | 2 +-
.../josm/gui/tagging/presets/items/Text.java | 2 +-
.../josm/gui/widgets/JMultilineLabel.java | 10 +-
.../gui/widgets/VerticallyScrollablePanel.java | 2 +-
.../openstreetmap/josm/io/CacheCustomContent.java | 8 +-
src/org/openstreetmap/josm/io/CachedFile.java | 4 +-
src/org/openstreetmap/josm/io/Capabilities.java | 4 +-
src/org/openstreetmap/josm/io/NameFinder.java | 8 +-
src/org/openstreetmap/josm/io/NoteExporter.java | 9 +-
src/org/openstreetmap/josm/io/NoteReader.java | 6 +-
src/org/openstreetmap/josm/io/OsmReader.java | 6 +
src/org/openstreetmap/josm/io/OsmServerWriter.java | 6 +-
.../josm/io/imagery/ImageryReader.java | 2 +-
.../josm/io/remotecontrol/AddTagsDialog.java | 2 +-
src/org/openstreetmap/josm/tools/AudioPlayer.java | 16 +-
src/org/openstreetmap/josm/tools/ExifReader.java | 17 +-
.../josm/tools/RightAndLefthandTraffic.java | 2 +-
src/org/openstreetmap/josm/tools/Shortcut.java | 2 +-
src/org/openstreetmap/josm/tools/Utils.java | 30 +-
test/data/regress/12627/overlapping.osm | 27 +
test/data/regress/14199/emptytag.osm | 16 +
test/data/regress/14209/0MbEfj1S--.1.jpg | Bin 0 -> 36113 bytes
test/data/regress/14209/7VWFOryj--.1.jpg | Bin 0 -> 1633543 bytes
test/data/regress/14217/filter.txt | 1 +
test/data/regress/14275/1485101437.8189685.gpx | 1615 ++++++++++++++++++++
test/data/regress/14287/example.osm | 33 +
test/data/regress/14289/example2.osm | 42 +
test/data/regress/4539/josm_error_#4539.osm.zip | Bin 0 -> 140329 bytes
test/data/renderer/README | 1 +
test/data/renderer/node-shapes/data.osm | 82 +
test/data/renderer/node-shapes/reference.png | Bin 0 -> 3765 bytes
test/data/renderer/node-shapes/style.mapcss | 99 ++
test/data/renderer/way-width/data.osm | 88 ++
test/data/renderer/way-width/reference.png | Bin 0 -> 2714 bytes
test/data/renderer/way-width/style.mapcss | 28 +
.../josm/actions/search/SearchCompilerTest.java | 18 +-
.../corrector/ReverseWayNoTagCorrectorTest.java | 2 +-
.../josm/data/cache/HostLimitQueueTest.java | 164 ++
.../data/cache/JCSCachedTileLoaderJobTest.java | 35 +-
.../openstreetmap/josm/data/osm/DataSetTest.java | 36 +-
.../validation/tests/MapCSSTagCheckerTest.java | 88 +-
.../data/validation/tests/RelationCheckerTest.java | 19 +-
.../validation/tests/SelfIntersectingWayTest.java | 136 +-
.../gui/dialogs/layer/DuplicateActionTest.java | 58 +
.../layer/gpx/ConvertToDataLayerActionTest.java | 14 +
.../josm/gui/mappaint/MapCSSRendererTest.java | 199 +++
.../org/openstreetmap/josm/io/OsmReaderTest.java | 33 +
.../openstreetmap/josm/tools/ExifReaderTest.java | 29 +-
.../org/openstreetmap/josm/tools/UtilsTest.java | 74 +-
.../josm/tools/date/DateUtilsTest.java | 2 +-
303 files changed, 11690 insertions(+), 4655 deletions(-)
create mode 100644 Dockerfile
create mode 100644 data/gpx/brown2green.txt
create mode 100644 data/gpx/inferno.txt
create mode 100644 data/gpx/red2blue.txt
create mode 100644 data/gpx/viridis.txt
create mode 100644 docker-test.bat
create mode 100644 docker-test.sh
create mode 100644 src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java
create mode 100644 test/data/regress/12627/overlapping.osm
create mode 100644 test/data/regress/14199/emptytag.osm
create mode 100644 test/data/regress/14209/0MbEfj1S--.1.jpg
create mode 100644 test/data/regress/14209/7VWFOryj--.1.jpg
create mode 100644 test/data/regress/14217/filter.txt
create mode 100644 test/data/regress/14275/1485101437.8189685.gpx
create mode 100644 test/data/regress/14287/example.osm
create mode 100644 test/data/regress/14289/example2.osm
create mode 100644 test/data/regress/4539/josm_error_#4539.osm.zip
create mode 100644 test/data/renderer/README
create mode 100644 test/data/renderer/node-shapes/data.osm
create mode 100644 test/data/renderer/node-shapes/reference.png
create mode 100644 test/data/renderer/node-shapes/style.mapcss
create mode 100644 test/data/renderer/way-width/data.osm
create mode 100644 test/data/renderer/way-width/reference.png
create mode 100644 test/data/renderer/way-width/style.mapcss
create mode 100644 test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java
create mode 100644 test/unit/org/openstreetmap/josm/gui/dialogs/layer/DuplicateActionTest.java
create mode 100644 test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
create mode 100644 test/unit/org/openstreetmap/josm/io/OsmReaderTest.java
--
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