[josm] 02/07: Merge tag 'upstream/0.0.svn13265+dfsg'
Bas Couwenberg
sebastic at debian.org
Sun Dec 31 20:02:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit e4876ebad896b0d7f19c354bef1828a7c4953ba1
Merge: 6aeb687 ffef1af
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Dec 31 20:21:23 2017 +0100
Merge tag 'upstream/0.0.svn13265+dfsg'
Upstream version 0.0.svn13265+dfsg
.travis.yml | 25 +
CONTRIBUTION | 4 +-
REVISION | 6 +-
appveyor.yml | 29 +
build.xml | 55 +-
data/defaultpresets.xml | 64 +-
data/validator/deprecated.mapcss | 8 +
data/validator/geometry.mapcss | 3 +-
i18n/convmaps.pl | 2 +
i18n/po/af.po | 470 ++++--
i18n/po/am.po | 470 ++++--
i18n/po/ar.po | 470 ++++--
i18n/po/ast.po | 526 ++++--
i18n/po/az.po | 470 ++++--
i18n/po/be.po | 581 +++++--
i18n/po/bg.po | 528 ++++--
i18n/po/bn.po | 470 ++++--
i18n/po/br.po | 470 ++++--
i18n/po/bs.po | 470 ++++--
i18n/po/ca.po | 574 +++++--
i18n/po/ca at valencia.po | 492 ++++--
i18n/po/cs.po | 631 +++++--
i18n/po/cy.po | 470 ++++--
i18n/po/da.po | 700 +++++---
i18n/po/de.po | 636 +++++--
i18n/po/de_DE.po | 470 ++++--
i18n/po/el.po | 490 ++++--
i18n/po/en_AU.po | 492 ++++--
i18n/po/en_CA.po | 470 ++++--
i18n/po/en_GB.po | 1167 ++++++++-----
i18n/po/eo.po | 470 ++++--
i18n/po/es.po | 685 +++++---
i18n/po/et.po | 470 ++++--
i18n/po/eu.po | 470 ++++--
i18n/po/fa.po | 470 ++++--
i18n/po/fi.po | 492 ++++--
i18n/po/fil.po | 470 ++++--
i18n/po/fo.po | 470 ++++--
i18n/po/fr.po | 626 +++++--
i18n/po/ga.po | 470 ++++--
i18n/po/gl.po | 492 ++++--
i18n/po/he.po | 478 ++++--
i18n/po/hi.po | 470 ++++--
i18n/po/hr.po | 470 ++++--
i18n/po/ht.po | 470 ++++--
i18n/po/hu.po | 703 +++++---
i18n/po/hy.po | 470 ++++--
i18n/po/ia.po | 470 ++++--
i18n/po/id.po | 1267 ++++++++------
i18n/po/is.po | 486 ++++--
i18n/po/it.po | 574 +++++--
i18n/po/ja.po | 732 +++++---
i18n/po/ka.po | 470 ++++--
i18n/po/km.po | 489 ++++--
i18n/po/ko.po | 513 ++++--
i18n/po/ku.po | 470 ++++--
i18n/po/ky.po | 470 ++++--
i18n/po/lb.po | 470 ++++--
i18n/po/lo.po | 470 ++++--
i18n/po/lt.po | 577 +++++--
i18n/po/lv.po | 470 ++++--
i18n/po/mk.po | 470 ++++--
i18n/po/mr.po | 482 ++++--
i18n/po/ms.po | 470 ++++--
i18n/po/nb.po | 486 ++++--
i18n/po/nds.po | 470 ++++--
i18n/po/nl.po | 668 +++++---
i18n/po/nn.po | 470 ++++--
i18n/po/oc.po | 476 ++++--
i18n/po/pa.po | 470 ++++--
i18n/po/pl.po | 1703 ++++++++++++-------
i18n/po/pt.po | 678 +++++---
i18n/po/pt_BR.po | 1747 ++++++++++++--------
i18n/po/rm.po | 470 ++++--
i18n/po/ro.po | 470 ++++--
i18n/po/ru.po | 647 ++++++--
i18n/po/sk.po | 601 +++++--
i18n/po/sl.po | 474 ++++--
i18n/po/sq.po | 470 ++++--
i18n/po/sr.po | 470 ++++--
i18n/po/sv.po | 496 ++++--
i18n/po/ta.po | 470 ++++--
i18n/po/te.po | 470 ++++--
i18n/po/th.po | 470 ++++--
i18n/po/tr.po | 482 ++++--
i18n/po/ug.po | 470 ++++--
i18n/po/uk.po | 636 +++++--
i18n/po/ur.po | 470 ++++--
i18n/po/vi.po | 523 ++++--
i18n/po/wae.po | 470 ++++--
i18n/po/zh_CN.po | 601 +++++--
i18n/po/zh_TW.po | 495 ++++--
images/presets/misc/angles.svg | 48 +
src/javax/json/EmptyArray.java | 136 ++
src/javax/json/EmptyObject.java | 126 ++
src/javax/json/Json.java | 829 ++++++----
src/javax/json/JsonArray.java | 563 ++++---
src/javax/json/JsonArrayBuilder.java | 862 +++++++---
src/javax/json/JsonBuilderFactory.java | 262 +--
src/javax/json/JsonException.java | 160 +-
src/javax/json/JsonMergePatch.java | 87 +
src/javax/json/JsonNumber.java | 411 ++---
src/javax/json/JsonObject.java | 548 +++---
src/javax/json/JsonObjectBuilder.java | 587 +++----
src/javax/json/JsonPatch.java | 163 ++
src/javax/json/JsonPatchBuilder.java | 210 +++
src/javax/json/JsonPointer.java | 140 ++
src/javax/json/JsonReader.java | 297 ++--
src/javax/json/JsonReaderFactory.java | 232 ++-
src/javax/json/JsonString.java | 176 +-
src/javax/json/JsonStructure.java | 112 +-
src/javax/json/JsonValue.java | 426 ++---
.../json/{JsonString.java => JsonValueImpl.java} | 196 ++-
src/javax/json/JsonWriter.java | 278 ++--
src/javax/json/JsonWriterFactory.java | 238 ++-
src/javax/json/package-info.java | 134 +-
src/javax/json/spi/JsonProvider.java | 778 ++++++---
src/javax/json/spi/package-info.java | 113 +-
src/javax/json/stream/JsonCollectors.java | 184 +++
src/javax/json/stream/JsonGenerationException.java | 164 +-
src/javax/json/stream/JsonGenerator.java | 1101 ++++++------
src/javax/json/stream/JsonGeneratorFactory.java | 225 +--
src/javax/json/stream/JsonLocation.java | 172 +-
src/javax/json/stream/JsonParser.java | 858 ++++++----
src/javax/json/stream/JsonParserFactory.java | 261 +--
src/javax/json/stream/JsonParsingException.java | 194 ++-
src/javax/json/stream/package-info.java | 143 +-
src/org/glassfish/json/BufferPoolImpl.java | 196 +--
src/org/glassfish/json/JsonArrayBuilderImpl.java | 778 ++++++---
src/org/glassfish/json/JsonBuilderFactoryImpl.java | 177 +-
.../glassfish/json/JsonGeneratorFactoryImpl.java | 188 +--
src/org/glassfish/json/JsonGeneratorImpl.java | 1440 ++++++++--------
src/org/glassfish/json/JsonLocationImpl.java | 161 +-
src/org/glassfish/json/JsonMergePatchImpl.java | 142 ++
src/org/glassfish/json/JsonMessages.java | 524 +++---
src/org/glassfish/json/JsonNumberImpl.java | 548 +++---
src/org/glassfish/json/JsonObjectBuilderImpl.java | 624 ++++---
src/org/glassfish/json/JsonParserFactoryImpl.java | 190 +--
src/org/glassfish/json/JsonParserImpl.java | 895 ++++++----
src/org/glassfish/json/JsonPatchBuilderImpl.java | 362 ++++
src/org/glassfish/json/JsonPatchImpl.java | 321 ++++
src/org/glassfish/json/JsonPointerImpl.java | 316 ++++
.../glassfish/json/JsonPrettyGeneratorImpl.java | 250 +--
src/org/glassfish/json/JsonProviderImpl.java | 502 +++---
src/org/glassfish/json/JsonReaderFactoryImpl.java | 166 +-
src/org/glassfish/json/JsonReaderImpl.java | 377 ++---
src/org/glassfish/json/JsonStringImpl.java | 261 +--
src/org/glassfish/json/JsonStructureParser.java | 606 ++++---
src/org/glassfish/json/JsonTokenizer.java | 1152 +++++++------
src/org/glassfish/json/JsonUtil.java | 99 ++
src/org/glassfish/json/JsonWriterFactoryImpl.java | 172 +-
src/org/glassfish/json/JsonWriterImpl.java | 360 ++--
src/org/glassfish/json/MapUtil.java | 115 ++
src/org/glassfish/json/NodeReference.java | 307 ++++
.../json/UnicodeDetectingInputStream.java | 377 +++--
src/org/glassfish/json/api/BufferPool.java | 134 +-
src/org/glassfish/json/messages.properties | 112 ++
src/org/openstreetmap/josm/Main.java | 485 ------
.../josm/actions/AbstractMergeAction.java | 2 +-
.../josm/actions/AddImageryLayerAction.java | 4 +-
.../josm/actions/GpxExportAction.java | 18 +
.../josm/actions/ImageryAdjustAction.java | 7 +-
.../josm/actions/JoinAreasAction.java | 2 +-
.../josm/actions/MergeNodesAction.java | 21 +-
.../josm/actions/OpenLocationAction.java | 37 +-
.../openstreetmap/josm/actions/PurgeAction.java | 2 +-
.../openstreetmap/josm/actions/RestartAction.java | 4 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 281 +---
.../downloadtasks/AbstractDownloadTask.java | 6 +-
.../josm/actions/downloadtasks/DownloadTask.java | 7 +
.../josm/actions/mapmode/DrawAction.java | 22 +-
.../josm/actions/mapmode/MapMode.java | 45 +-
.../josm/actions/mapmode/SelectAction.java | 4 +-
.../relation/ExportRelationToGpxAction.java | 249 +++
.../josm/actions/search/SearchAction.java | 2 +-
src/org/openstreetmap/josm/command/AddCommand.java | 23 -
.../josm/command/AddPrimitivesCommand.java | 36 -
.../openstreetmap/josm/command/ChangeCommand.java | 16 -
src/org/openstreetmap/josm/command/Command.java | 77 +-
.../openstreetmap/josm/command/DeleteCommand.java | 143 --
.../openstreetmap/josm/command/PurgeCommand.java | 32 -
.../openstreetmap/josm/command/SelectCommand.java | 14 -
.../josm/command/SequenceCommand.java | 17 +-
.../josm/command/SplitWayCommand.java | 2 +-
.../josm/command/conflict/ConflictAddCommand.java | 13 -
.../command/conflict/ConflictResolveCommand.java | 20 -
src/org/openstreetmap/josm/data/Bounds.java | 31 -
src/org/openstreetmap/josm/data/Preferences.java | 543 +-----
src/org/openstreetmap/josm/data/StructUtils.java | 7 +-
.../josm/data/cache/JCSCacheManager.java | 5 +-
.../josm/data/cache/JCSCachedTileLoaderJob.java | 25 +-
.../openstreetmap/josm/data/coor/Coordinate.java | 16 -
.../josm/data/coor/CoordinateFormat.java | 94 --
src/org/openstreetmap/josm/data/coor/ILatLon.java | 14 -
src/org/openstreetmap/josm/data/coor/LatLon.java | 125 --
src/org/openstreetmap/josm/data/gpx/GpxData.java | 121 ++
.../josm/data/gpx/ImmutableGpxTrack.java | 16 +
src/org/openstreetmap/josm/data/gpx/WayPoint.java | 9 +
.../josm/data/imagery/OffsetBookmark.java | 96 +-
.../josm/data/oauth/OAuthAccessTokenHolder.java | 57 -
.../josm/data/oauth/OAuthParameters.java | 40 -
src/org/openstreetmap/josm/data/osm/Changeset.java | 10 -
src/org/openstreetmap/josm/data/osm/DataSet.java | 67 +-
src/org/openstreetmap/josm/data/osm/Filter.java | 2 +-
.../openstreetmap/josm/data/osm/FilterModel.java | 3 +
src/org/openstreetmap/josm/data/osm/Node.java | 13 -
src/org/openstreetmap/josm/data/osm/NodeData.java | 11 -
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 20 -
.../josm/data/osm/OsmPrimitiveComparator.java | 2 +-
src/org/openstreetmap/josm/data/osm/Relation.java | 11 +-
src/org/openstreetmap/josm/data/osm/Way.java | 10 +-
.../josm/data/osm/event/SelectionEventManager.java | 20 +-
.../josm/data/osm/visitor/AbstractVisitor.java | 21 -
.../josm/data/osm/visitor/Visitor.java | 20 -
.../data/osm/visitor/paint/MapRendererFactory.java | 4 -
.../data/osm/visitor/paint/StyledMapRenderer.java | 40 +-
.../osm/visitor/paint/relations/Multipolygon.java | 6 +-
.../josm/data/preferences/CollectionProperty.java | 35 -
.../josm/data/projection/CustomProjection.java | 29 -
.../josm/data/projection/Projection.java | 8 -
.../josm/data/projection/ProjectionCLI.java | 2 +-
.../josm/data/projection/Projections.java | 43 -
.../datum/NTV2Proj4DirGridShiftFileSource.java | 13 +-
.../josm/data/tagging/ac/AutoCompletionItem.java | 14 -
.../validation/routines/InetAddressValidator.java | 2 +-
.../data/validation/tests/MapCSSTagChecker.java | 3 +-
.../josm/gui/JosmUserIdentityManager.java | 197 ---
.../openstreetmap/josm/gui/MainApplication.java | 26 +-
src/org/openstreetmap/josm/gui/MainPanel.java | 5 -
src/org/openstreetmap/josm/gui/MapFrame.java | 6 +
src/org/openstreetmap/josm/gui/MapSlider.java | 13 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 68 +-
src/org/openstreetmap/josm/gui/MapView.java | 15 -
src/org/openstreetmap/josm/gui/MapViewState.java | 17 +-
.../josm/gui/NavigatableComponent.java | 18 +-
src/org/openstreetmap/josm/gui/SideButton.java | 40 +-
.../gui/datatransfer/PrimitiveTransferable.java | 2 +-
.../josm/gui/dialogs/DialogsPanel.java | 3 +
.../josm/gui/dialogs/InspectPrimitiveDataText.java | 2 +-
.../josm/gui/dialogs/RelationListDialog.java | 52 +-
.../josm/gui/dialogs/ToggleDialog.java | 6 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 12 +-
.../gui/dialogs/relation/ChildRelationBrowser.java | 23 +-
.../josm/gui/dialogs/relation/MemberTable.java | 2 +
.../relation/ReferringRelationsBrowser.java | 22 +-
.../josm/gui/history/HistoryBrowserModel.java | 4 +-
.../josm/gui/io/CustomConfigurator.java | 63 +-
.../josm/gui/io/DownloadFileTask.java | 6 +-
.../josm/gui/io/SaveLayersDialog.java | 2 +-
.../josm/gui/io/TagSettingsPanel.java | 3 +-
.../josm/gui/io/importexport/NoteExporter.java | 4 +-
.../io/importexport/ValidatorErrorExporter.java | 4 +-
.../josm/gui/io/importexport/WMSLayerExporter.java | 6 +-
.../josm/gui/io/importexport/WMSLayerImporter.java | 4 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 88 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 161 +-
.../openstreetmap/josm/gui/layer/ImageryLayer.java | 91 +-
src/org/openstreetmap/josm/gui/layer/Layer.java | 12 -
.../josm/gui/layer/MainLayerManager.java | 28 +-
.../openstreetmap/josm/gui/layer/NoteLayer.java | 2 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 23 +-
src/org/openstreetmap/josm/gui/layer/WMSLayer.java | 2 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 23 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 67 +-
.../josm/gui/layer/geoimage/ImageDisplay.java | 370 +++--
.../josm/gui/layer/geoimage/ImageEntry.java | 60 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 293 ++--
.../gui/layer/gpx/DownloadWmsAlongTrackAction.java | 2 +-
.../josm/gui/layer/gpx/GpxDrawHelper.java | 2 +-
.../layer/imagery/TileSourceDisplaySettings.java | 8 +-
.../josm/gui/layer/markerlayer/Marker.java | 33 +-
.../josm/gui/layer/markerlayer/MarkerLayer.java | 2 +-
.../josm/gui/mappaint/RenderingCLI.java | 27 +-
.../gui/mappaint/styleelement/AreaElement.java | 4 +-
.../josm/gui/mappaint/styleelement/MapImage.java | 2 +-
.../josm/gui/oauth/AbstractAuthorizationUI.java | 14 -
.../gui/oauth/AdvancedOAuthPropertiesPanel.java | 40 -
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 27 -
.../gui/oauth/OsmOAuthAuthorizationClient.java | 5 +-
.../gui/preferences/imagery/AddWMSLayerPanel.java | 2 +-
.../projection/AbstractProjectionChoice.java | 36 +-
.../projection/CodeProjectionChoice.java | 2 +-
.../projection/ProjectionPreference.java | 25 +-
.../projection/SingleProjectionChoice.java | 7 +-
.../projection/UTMProjectionChoice.java | 6 +-
.../server/OverpassServerPreference.java | 20 -
.../gui/tagging/ac/AutoCompletingComboBox.java | 17 -
.../gui/tagging/ac/AutoCompletingTextField.java | 3 +-
.../gui/tagging/ac/AutoCompletionItemPriority.java | 149 --
.../josm/gui/tagging/ac/AutoCompletionList.java | 73 +-
.../gui/tagging/ac/AutoCompletionListItem.java | 128 --
.../josm/gui/tagging/ac/AutoCompletionManager.java | 34 +-
.../josm/gui/tagging/presets/TaggingPreset.java | 2 +-
.../josm/gui/tagging/presets/items/Check.java | 2 +-
.../tagging/presets/items/ComboMultiSelect.java | 2 +-
.../josm/gui/tagging/presets/items/KeyedItem.java | 2 +-
.../josm/gui/tagging/presets/items/Text.java | 2 +-
.../josm/gui/util/AdvancedKeyPressDetector.java | 39 -
src/org/openstreetmap/josm/gui/util/GuiHelper.java | 19 -
.../josm/gui/util/ModifierListener.java | 18 -
.../josm/gui/widgets/MultiSplitLayout.java | 2 +
.../josm/gui/widgets/NativeFileChooser.java | 2 +-
src/org/openstreetmap/josm/io/AbstractReader.java | 17 +-
.../openstreetmap/josm/io/CacheCustomContent.java | 12 +-
src/org/openstreetmap/josm/io/CachedFile.java | 3 +-
.../josm/io/ChangesetClosedException.java | 18 +-
src/org/openstreetmap/josm/io/Compression.java | 7 +-
src/org/openstreetmap/josm/io/FileWatcher.java | 28 -
src/org/openstreetmap/josm/io/GeoJSONWriter.java | 12 -
src/org/openstreetmap/josm/io/GpxReader.java | 33 +-
src/org/openstreetmap/josm/io/OsmApi.java | 2 +-
src/org/openstreetmap/josm/io/OsmReader.java | 10 +-
src/org/openstreetmap/josm/io/OsmWriter.java | 11 -
.../openstreetmap/josm/io/ProgressInputStream.java | 30 -
.../openstreetmap/josm/io/imagery/WMSImagery.java | 83 +-
.../josm/io/remotecontrol/AddTagsDialog.java | 9 +-
.../remotecontrol/handler/LoadAndZoomHandler.java | 15 +-
.../io/remotecontrol/handler/RequestHandler.java | 41 +-
.../josm/io/session/SessionReader.java | 8 +-
.../josm/io/session/SessionWriter.java | 7 +-
src/org/openstreetmap/josm/plugins/Plugin.java | 2 +
.../openstreetmap/josm/plugins/PluginHandler.java | 13 -
.../josm/plugins/PluginInformation.java | 7 +-
.../plugins/ReadLocalPluginInformationTask.java | 8 +-
.../josm/tools/CheckParameterUtil.java | 83 -
src/org/openstreetmap/josm/tools/HiDPISupport.java | 2 +-
src/org/openstreetmap/josm/tools/HttpClient.java | 3 +-
src/org/openstreetmap/josm/tools/I18n.java | 10 +-
.../openstreetmap/josm/tools/ImageProvider.java | 44 +-
src/org/openstreetmap/josm/tools/ListenerList.java | 2 +-
src/org/openstreetmap/josm/tools/Logging.java | 2 +
.../josm/tools/PlatformHookUnixoid.java | 4 +-
.../josm/tools/PlatformHookWindows.java | 7 +-
.../josm/tools/RightAndLefthandTraffic.java | 13 +-
src/org/openstreetmap/josm/tools/Utils.java | 43 -
.../josm/tools/template_engine/Condition.java | 10 -
.../josm/tools/template_engine/TemplateParser.java | 2 +-
styles/standard/elemstyles.mapcss | 8 +-
test/data/regress/15634/drumlish.gpx | 882 ++++++++++
.../josm/data/imagery/ImageryCompareTestIT.java | 2 +-
.../josm/data/osm/KeyValuePerformanceTest.java | 10 +-
.../gui/mappaint/MapRendererPerformanceTest.java | 18 +-
test/unit/org/openstreetmap/josm/JOSMFixture.java | 13 +-
test/unit/org/openstreetmap/josm/MainTest.java | 36 -
.../downloadtasks/PostDownloadHandlerTest.java | 5 +
.../josm/data/cache/JCSCacheManagerTest.java | 2 +-
.../data/cache/JCSCachedTileLoaderJobTest.java | 25 +
.../openstreetmap/josm/data/gpx/GpxDataTest.java | 3 +-
.../josm/data/oauth/OAuthParametersTest.java | 11 -
.../validation/tests/MapCSSTagCheckerTest.java | 12 +
.../josm/gui/MainApplicationTest.java | 10 -
.../josm/gui/dialogs/MinimapDialogTest.java | 248 ++-
.../josm/gui/help/HelpContentReaderTest.java | 2 +-
.../io/AsynchronousUploadPrimitivesTaskTest.java | 15 +-
.../openstreetmap/josm/gui/layer/GpxLayerTest.java | 22 +-
.../josm/gui/layer/OsmDataLayerTest.java | 98 +-
.../josm/gui/layer/ValidatorLayerTest.java | 37 +-
.../layer/geoimage/CorrelateGpxWithImagesTest.java | 29 +-
.../gui/oauth/OsmOAuthAuthorizationClientTest.java | 2 +-
.../openstreetmap/josm/io/GeoJSONWriterTest.java | 38 +-
.../org/openstreetmap/josm/io/GpxReaderTest.java | 13 +
.../josm/io/session/SessionReaderTest.java | 6 +-
.../josm/testutils/ImagePatternMatching.java | 317 ++++
tools/checkstyle/META-INF/MANIFEST.MF | 2 +-
tools/checkstyle/josm_checks.xml | 15 +-
tools/checkstyle/josm_filters.xml | 1 -
tools/pmd/designer.bat | 4 +-
tools/pmd/josm-ruleset.xml | 231 ++-
tools/spotbugs/josm-filter.xml | 119 +-
369 files changed, 51836 insertions(+), 26601 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