[josm] 02/07: Merge tag 'upstream/0.0.svn12271+dfsg'
Bas Couwenberg
sebastic at debian.org
Mon May 29 05:39:49 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 6ae050ab91a6a59c262c3aa19c4b44920da632af
Merge: 9914209 93af6ab
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon May 29 07:00:08 2017 +0200
Merge tag 'upstream/0.0.svn12271+dfsg'
Upstream version 0.0.svn12271+dfsg
.classpath | 4 +-
README | 3 +-
REVISION | 8 +-
build.xml | 24 +-
data/defaultpresets.xml | 58 +-
data/validator/geometry.mapcss | 6 +-
data/validator/highway.mapcss | 3 +-
data/validator/numeric.mapcss | 24 +
data_nodist/empty.xml | 3 -
eclipse/JOSM (Java 8).launch | 2 +-
i18n/po/af.po | 1034 +-
i18n/po/am.po | 1034 +-
i18n/po/ar.po | 1036 +-
i18n/po/ast.po | 843 +-
i18n/po/az.po | 1034 +-
i18n/po/be.po | 850 +-
i18n/po/bg.po | 856 +-
i18n/po/bn.po | 1034 +-
i18n/po/br.po | 1034 +-
i18n/po/bs.po | 1034 +-
i18n/po/ca.po | 848 +-
i18n/po/ca at valencia.po | 836 +-
i18n/po/cs.po | 904 +-
i18n/po/cy.po | 1034 +-
i18n/po/da.po | 1344 +-
i18n/po/de.po | 1072 +-
i18n/po/de_DE.po | 1034 +-
i18n/po/el.po | 1038 +-
i18n/po/en_AU.po | 826 +-
i18n/po/en_CA.po | 1034 +-
i18n/po/en_GB.po | 842 +-
i18n/po/eo.po | 1036 +-
i18n/po/es.po | 851 +-
i18n/po/et.po | 1036 +-
i18n/po/eu.po | 1042 +-
i18n/po/fa.po | 1034 +-
i18n/po/fi.po | 828 +-
i18n/po/fil.po | 1034 +-
i18n/po/fo.po | 1034 +-
i18n/po/fr.po | 1066 +-
i18n/po/ga.po | 1034 +-
i18n/po/gl.po | 1036 +-
i18n/po/he.po | 1040 +-
i18n/po/hi.po | 1034 +-
i18n/po/hr.po | 1034 +-
i18n/po/ht.po | 1034 +-
i18n/po/hu.po | 1451 +-
i18n/po/hy.po | 1034 +-
i18n/po/ia.po | 1034 +-
i18n/po/id.po | 830 +-
i18n/po/is.po | 1034 +-
i18n/po/it.po | 923 +-
i18n/po/ja.po | 931 +-
i18n/po/ka.po | 1034 +-
i18n/po/km.po | 838 +-
i18n/po/ko.po | 1151 +-
i18n/po/ku.po | 1034 +-
i18n/po/ky.po | 1034 +-
i18n/po/lb.po | 1034 +-
i18n/po/lo.po | 1034 +-
i18n/po/lt.po | 898 +-
i18n/po/lv.po | 1034 +-
i18n/po/mk.po | 1034 +-
i18n/po/mr.po | 1036 +-
i18n/po/ms.po | 1034 +-
i18n/po/nb.po | 1042 +-
i18n/po/nds.po | 1034 +-
i18n/po/nl.po | 1151 +-
i18n/po/nn.po | 1034 +-
i18n/po/oc.po | 1036 +-
i18n/po/pa.po | 1034 +-
i18n/po/pl.po | 915 +-
i18n/po/pt.po | 842 +-
i18n/po/pt_BR.po | 876 +-
i18n/po/rm.po | 1034 +-
i18n/po/ro.po | 1036 +-
i18n/po/ru.po | 1170 +-
i18n/po/sk.po | 877 +-
i18n/po/sl.po | 1036 +-
i18n/po/sq.po | 1034 +-
i18n/po/sr.po | 1034 +-
i18n/po/sv.po | 816 +-
i18n/po/ta.po | 1034 +-
i18n/po/te.po | 1034 +-
i18n/po/th.po | 1034 +-
i18n/po/tr.po | 1036 +-
i18n/po/ug.po | 1034 +-
i18n/po/uk.po | 1110 +-
i18n/po/ur.po | 1034 +-
i18n/po/vi.po | 839 +-
i18n/po/wae.po | 1034 +-
i18n/po/zh_CN.po | 826 +-
i18n/po/zh_TW.po | 828 +-
images/presets/shop/groceries/cheese.svg | 235 +
netbeans/nbproject/project.properties | 10 +-
scripts/SyncEditorLayerIndex.groovy | 124 +-
scripts/since_xxx.py | 33 +
src/org/openstreetmap/josm/Main.java | 42 +-
.../openstreetmap/josm/actions/AddNodeAction.java | 8 +-
.../josm/actions/AutoScaleAction.java | 12 +-
.../josm/actions/CopyCoordinatesAction.java | 4 +-
.../josm/actions/CreateMultipolygonAction.java | 3 +-
.../josm/actions/DialogsToggleAction.java | 11 +-
.../josm/actions/FollowLineAction.java | 2 +-
.../josm/actions/ImageryAdjustAction.java | 35 +-
src/org/openstreetmap/josm/actions/JosmAction.java | 5 +-
src/org/openstreetmap/josm/actions/MoveAction.java | 16 +-
.../josm/actions/OrthogonalizeAction.java | 5 +-
.../josm/actions/ReverseWayAction.java | 41 +-
.../actions/SelectNonBranchingWaySequences.java | 2 +-
.../josm/actions/ShowStatusReportAction.java | 8 +-
.../josm/actions/SimplifyWayAction.java | 7 +-
.../openstreetmap/josm/actions/ValidateAction.java | 4 +-
.../josm/actions/ViewportFollowToggleAction.java | 3 +-
.../actions/downloadtasks/DownloadOsmTask.java | 2 +-
.../josm/actions/mapmode/DrawAction.java | 38 +-
.../josm/actions/mapmode/DrawSnapHelper.java | 5 +-
.../josm/actions/mapmode/ParallelWayAction.java | 63 +-
.../josm/actions/mapmode/SelectAction.java | 126 +-
.../josm/actions/upload/ValidateUploadHook.java | 3 +-
.../josm/corrector/ReverseWayTagCorrector.java | 6 +-
src/org/openstreetmap/josm/data/Bounds.java | 21 +
src/org/openstreetmap/josm/data/Preferences.java | 17 +-
.../josm/data/SelectionChangedListener.java | 5 +
.../openstreetmap/josm/data/coor/CachedLatLon.java | 22 +-
.../openstreetmap/josm/data/coor/EastNorth.java | 2 +
src/org/openstreetmap/josm/data/coor/ILatLon.java | 66 +
src/org/openstreetmap/josm/data/coor/LatLon.java | 24 +-
.../openstreetmap/josm/data/gpx/GpxConstants.java | 60 +
src/org/openstreetmap/josm/data/gpx/GpxData.java | 342 +-
src/org/openstreetmap/josm/data/gpx/GpxRoute.java | 8 +
src/org/openstreetmap/josm/data/gpx/GpxTrack.java | 59 +-
.../josm/data/gpx/ImmutableGpxTrackSegment.java | 5 +-
src/org/openstreetmap/josm/data/gpx/WayPoint.java | 53 +-
.../data/imagery/GetCapabilitiesParseHelper.java | 7 +-
.../josm/data/imagery/ImageryInfo.java | 12 +-
.../josm/data/imagery/OffsetBookmark.java | 198 +-
.../josm/data/imagery/WMTSTileSource.java | 54 +-
.../openstreetmap/josm/data/oauth/OAuthToken.java | 3 +
.../josm/data/osm/AbstractPrimitive.java | 13 +
src/org/openstreetmap/josm/data/osm/BBox.java | 37 +-
.../josm/data/osm/ChangesetCacheEvent.java | 19 +
.../josm/data/osm/ChangesetCacheListener.java | 8 +
.../josm/data/osm/DataSelectionListener.java | 301 +
src/org/openstreetmap/josm/data/osm/DataSet.java | 514 +-
.../josm/data/osm/DefaultChangesetCacheEvent.java | 33 +-
.../openstreetmap/josm/data/osm/FilterMatcher.java | 3 +-
src/org/openstreetmap/josm/data/osm/INode.java | 9 +-
.../openstreetmap/josm/data/osm/NameFormatter.java | 12 +
src/org/openstreetmap/josm/data/osm/Node.java | 45 +-
src/org/openstreetmap/josm/data/osm/NodeData.java | 16 +-
.../josm/data/osm/NodePositionComparator.java | 4 +-
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 6 +-
src/org/openstreetmap/josm/data/osm/OsmUtils.java | 63 +-
.../josm/data/osm/QuadBucketPrimitiveStore.java | 200 +
.../openstreetmap/josm/data/osm/QuadBuckets.java | 4 +-
.../josm/data/osm/RelationMemberData.java | 3 +
.../josm/data/osm/RelationToChildReference.java | 37 +-
.../josm/data/osm/SimplePrimitiveId.java | 14 +
src/org/openstreetmap/josm/data/osm/Way.java | 4 +
src/org/openstreetmap/josm/data/osm/WayData.java | 11 +
.../osm/event/AbstractDatasetChangedEvent.java | 27 +
.../data/osm/event/ChangesetIdChangedEvent.java | 3 +
.../josm/data/osm/event/DataChangedEvent.java | 3 +
.../josm/data/osm/event/NodeMovedEvent.java | 3 +
.../josm/data/osm/event/PrimitivesAddedEvent.java | 3 +
.../data/osm/event/PrimitivesRemovedEvent.java | 3 +
.../osm/event/RelationMembersChangedEvent.java | 3 +
.../josm/data/osm/event/SelectionEventManager.java | 168 +-
.../josm/data/osm/event/TagsChangedEvent.java | 3 +
.../josm/data/osm/event/WayNodesChangedEvent.java | 3 +
.../josm/data/osm/history/HistoryDataSet.java | 12 +
.../data/osm/history/HistoryDataSetListener.java | 4 +
.../josm/data/osm/visitor/BoundingXYVisitor.java | 23 +-
.../data/osm/visitor/paint/ArrowPaintHelper.java | 9 +
.../data/osm/visitor/paint/MapRendererFactory.java | 41 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 151 +-
.../osm/visitor/paint/WireframeMapRenderer.java | 3 +-
.../osm/visitor/paint/relations/Multipolygon.java | 56 +
.../josm/data/preferences/AbstractProperty.java | 47 +-
.../data/preferences/AbstractToStringProperty.java | 6 -
.../josm/data/preferences/CachingProperty.java | 2 +-
.../josm/data/projection/AbstractProjection.java | 11 +-
.../josm/data/projection/CustomProjection.java | 5 +
.../josm/data/projection/Projecting.java | 28 +-
.../josm/data/projection/Projection.java | 11 +-
.../josm/data/projection/ShiftedProjecting.java | 3 +-
.../josm/data/validation/PaintVisitor.java | 17 +-
.../data/validation/routines/DomainValidator.java | 5 +-
.../josm/data/validation/tests/LongSegment.java | 22 +-
.../josm/data/validation/tests/TagChecker.java | 31 +-
src/org/openstreetmap/josm/gui/GettingStarted.java | 6 +
src/org/openstreetmap/josm/gui/ImageryMenu.java | 2 +-
.../openstreetmap/josm/gui/MainApplication.java | 19 +-
src/org/openstreetmap/josm/gui/MainFrame.java | 27 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 13 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 26 +-
src/org/openstreetmap/josm/gui/MapView.java | 35 +-
src/org/openstreetmap/josm/gui/MapViewState.java | 48 +-
src/org/openstreetmap/josm/gui/MenuScroller.java | 13 -
.../josm/gui/NavigatableComponent.java | 44 +-
src/org/openstreetmap/josm/gui/ScrollViewport.java | 140 +-
.../josm/gui/bbox/SlippyMapBBoxChooser.java | 5 +-
.../josm/gui/bbox/TileSelectionBBoxChooser.java | 3 +-
.../gui/conflict/pair/AbstractListMergeModel.java | 24 +-
.../josm/gui/conflict/pair/AbstractMergePanel.java | 205 +
.../josm/gui/conflict/pair/ConflictResolver.java | 15 +-
.../conflict/pair/properties/PropertiesMerger.java | 397 +-
.../josm/gui/conflict/pair/tags/TagMerger.java | 273 +-
.../josm/gui/datatransfer/OsmTransferHandler.java | 4 +-
.../josm/gui/dialogs/ConflictDialog.java | 1 -
.../josm/gui/dialogs/ConflictResolutionDialog.java | 2 +-
.../josm/gui/dialogs/FilterTableModel.java | 2 +-
.../josm/gui/dialogs/InspectPrimitiveDataText.java | 10 +-
.../josm/gui/dialogs/UserListDialog.java | 32 +-
.../josm/gui/dialogs/ValidatorDialog.java | 5 +-
.../dialogs/relation/GenericRelationEditor.java | 6 +-
.../gui/dialogs/relation/actions/SavingAction.java | 2 -
.../openstreetmap/josm/gui/draw/MapViewPath.java | 24 +-
.../josm/gui/history/VersionInfoPanel.java | 26 +-
.../josm/gui/io/TagSettingsPanel.java | 9 +
.../josm/gui/layer/AbstractMapViewPaintable.java | 10 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 21 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 145 +-
.../openstreetmap/josm/gui/layer/ImageryLayer.java | 24 +-
src/org/openstreetmap/josm/gui/layer/Layer.java | 57 +-
.../josm/gui/layer/MapViewPaintable.java | 17 +
.../openstreetmap/josm/gui/layer/NoteLayer.java | 1 +
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 82 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 31 +-
.../gui/layer/gpx/ChooseTrackVisibilityAction.java | 15 +-
.../gui/layer/gpx/ConvertToDataLayerAction.java | 2 +-
.../gui/layer/gpx/DownloadAlongTrackAction.java | 5 +-
.../josm/gui/layer/gpx/GpxDrawHelper.java | 121 +-
.../layer/gpx/MarkersFromNamedPointsAction.java | 15 +-
.../josm/gui/layer/imagery/ColorfulFilter.java | 2 +-
.../josm/gui/layer/imagery/ReprojectionTile.java | 2 +-
.../layer/imagery/TileSourceDisplaySettings.java | 50 +-
.../josm/gui/layer/markerlayer/MarkerLayer.java | 2 +-
.../josm/gui/layer/markerlayer/PlayHeadMarker.java | 2 +-
.../josm/gui/mappaint/MapPaintStyles.java | 12 +-
.../openstreetmap/josm/gui/mappaint/StyleKeys.java | 7 +
.../josm/gui/mappaint/mapcss/CSSColors.java | 5 +
.../josm/gui/mappaint/mapcss/ConditionFactory.java | 3 +-
.../gui/mappaint/mapcss/ExpressionFactory.java | 2 +-
.../josm/gui/mappaint/mapcss/Instruction.java | 11 +
.../gui/mappaint/styleelement/LineElement.java | 4 +-
.../mappaint/styleelement/RepeatImageElement.java | 3 +
.../gui/mappaint/styleelement/StyleElement.java | 17 +
.../josm/gui/mappaint/styleelement/TextLabel.java | 4 +-
.../placement/CompletelyInsideAreaStrategy.java | 3 +
.../placement/PartiallyInsideAreaStrategy.java | 5 +-
.../gui/oauth/OsmOAuthAuthorizationClient.java | 14 -
.../josm/gui/preferences/ToolbarPreferences.java | 11 +-
.../gui/preferences/imagery/ImageryPreference.java | 27 +-
.../projection/AbstractProjectionChoice.java | 11 +
.../projection/CustomProjectionChoice.java | 7 +
.../projection/GaussKruegerProjectionChoice.java | 5 +
.../LambertCC9ZonesProjectionChoice.java | 5 +
.../projection/LambertProjectionChoice.java | 5 +
.../projection/PuwgProjectionChoice.java | 6 +
.../projection/SwissGridProjectionChoice.java | 8 +-
.../projection/UTMFranceDOMProjectionChoice.java | 5 +
.../projection/UTMProjectionChoice.java | 5 +
.../gui/progress/PleaseWaitProgressMonitor.java | 5 +
.../josm/gui/progress/ProgressMonitor.java | 6 +-
.../josm/gui/tagging/ac/AutoCompletionManager.java | 50 +-
.../josm/gui/tagging/presets/TaggingPreset.java | 3 +-
.../josm/gui/tagging/presets/TaggingPresets.java | 78 +-
.../josm/gui/tagging/presets/items/Check.java | 4 +-
.../openstreetmap/josm/gui/util/RotationAngle.java | 12 +-
.../josm/gui/widgets/JosmImageView.java | 3 +-
src/org/openstreetmap/josm/io/AbstractReader.java | 2 +-
src/org/openstreetmap/josm/io/Capabilities.java | 7 +-
.../josm/io/CertificateAmendment.java | 21 +-
src/org/openstreetmap/josm/io/FileImporter.java | 4 +
src/org/openstreetmap/josm/io/GeoJSONWriter.java | 2 +-
src/org/openstreetmap/josm/io/GpxReader.java | 4 +-
src/org/openstreetmap/josm/io/GpxWriter.java | 6 +-
src/org/openstreetmap/josm/io/NmeaReader.java | 6 +-
src/org/openstreetmap/josm/io/OsmReader.java | 14 +-
.../josm/io/imagery/ImageryReader.java | 5 +
.../josm/io/remotecontrol/DNSName.java | 252 -
.../josm/io/remotecontrol/DNSNameFix.java | 105 +
.../io/remotecontrol/RemoteControlHttpsServer.java | 2 +-
.../josm/io/session/ImagerySessionExporter.java | 23 +-
.../josm/io/session/ImagerySessionImporter.java | 37 +-
.../josm/plugins/PluginInformation.java | 3 +-
.../openstreetmap/josm/plugins/PluginProxy.java | 7 +-
src/org/openstreetmap/josm/tools/Geometry.java | 19 +-
.../openstreetmap/josm/tools/ImageProvider.java | 4 +-
.../josm/tools/ListenableWeakReference.java | 70 +
.../josm/tools/ListeningCollection.java | 96 +
.../openstreetmap/josm/tools/OsmUrlToBounds.java | 6 +-
src/org/openstreetmap/josm/tools/PlatformHook.java | 102 +
.../openstreetmap/josm/tools/PlatformHookOsx.java | 70 +-
.../josm/tools/PlatformHookUnixoid.java | 146 +-
.../josm/tools/PlatformHookWindows.java | 79 +-
src/org/openstreetmap/josm/tools/Utils.java | 104 +
src/org/openstreetmap/josm/tools/WinRegistry.java | 199 +
.../openstreetmap/josm/tools/XmlObjectParser.java | 3 +-
styles/standard/elemstyles.mapcss | 5 +
test/data/empty.osm | 3 +
test/data/regress/14754/malformed_for_14754.osm | 7 +
test/data/regress/14788/remove_sign_test_4.osm | 11 +
test/data/sessions/bing.jos | 22 +-
test/data/wmts/WMTSCapabilities-GeoAdminCh.xml | 13458 +++++++++++++++++++
test/unit/org/openstreetmap/josm/JOSMFixture.java | 42 +-
test/unit/org/openstreetmap/josm/MainTest.java | 2 +-
test/unit/org/openstreetmap/josm/TestUtils.java | 44 +-
.../josm/actions/AlignInLineActionTest.java | 6 +-
.../josm/actions/CreateCircleActionTest.java | 29 +-
.../actions/downloadtasks/DownloadGpsTaskTest.java | 2 +-
.../downloadtasks/DownloadNotesTaskTest.java | 2 +-
.../actions/downloadtasks/DownloadOsmTaskTest.java | 2 +-
.../josm/actions/mapmode/DrawActionTest.java | 11 +
.../openstreetmap/josm/data/gpx/GpxDataTest.java | 423 +-
.../openstreetmap/josm/data/gpx/WayPointTest.java | 2 +-
.../imagery/GetCapabilitiesParseHelperTest.java | 12 +
.../josm/data/imagery/WMTSTileSourceTest.java | 21 +-
.../josm/data/oauth/SignpostAdaptersTest.java | 2 +-
.../openstreetmap/josm/data/osm/DataSetTest.java | 42 +
.../data/osm/event/SelectionEventManagerTest.java | 119 +
.../osm/visitor/paint/StyledMapRendererTest.java | 79 +
.../data/projection/ProjectionRegressionTest.java | 4 +-
.../data/projection/ShiftedProjectionTest.java | 5 +-
.../openstreetmap/josm/gui/MapViewStateTest.java | 8 -
.../pair/properties/PropertiesMergerTest.java | 9 +-
.../josm/gui/help/HelpBrowserTest.java | 2 +-
.../josm/gui/layer/OsmDataLayerTest.java | 6 +-
.../josm/gui/layer/gpx/GpxDrawHelperTest.java | 15 +-
.../map/TaggingPresetPreferenceTestIT.java | 9 +-
.../org/openstreetmap/josm/io/GpxReaderTest.java | 10 +-
.../org/openstreetmap/josm/io/OsmReaderTest.java | 278 +
.../josm/io/remotecontrol/DNSNameFixTest.java | 33 +
.../josm/io/remotecontrol/DNSNameTest.java | 44 -
.../josm/io/session/SessionReaderTest.java | 4 +-
.../josm/io/session/SessionWriterTest.java | 6 +-
.../josm/testutils/JOSMTestRules.java | 18 +-
.../josm/tools/ListenableWeakReferenceTest.java | 55 +
.../josm/tools/OsmUrlToBoundsTest.java | 4 +-
.../org/openstreetmap/josm/tools/UtilsTest.java | 75 +
tools/checkstyle/josm_checks.xml | 1 -
tools/checkstyle/josm_filters.xml | 2 +-
tools/pmd/josm-ruleset.xml | 1 +
345 files changed, 89633 insertions(+), 16126 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