[josm] branch master updated (aabbe13 -> de94ac1)
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Oct 30 14:40:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch master
in repository josm.
from aabbe13 Move from experimental to unstable.
new 976fbf5 Update +dfsg revision for new upstream release.
new d94ba46 Move generated tarball to parent directory.
new 986eb5e Imported Upstream version 0.0.svn8964+dfsg
new b906112 Merge tag 'upstream/0.0.svn8964+dfsg'
new ed8b39e New tested snapshot.
new 05d3d21 Drop patch applied upstream, refresh remaining patches.
new b2e053e Imported Upstream version 0.0.svn8969+dfsg
new da144fa Merge tag 'upstream/0.0.svn8969+dfsg'
new afb024e New tested snapshot.
new 0e26d83 Fix LinkedList import in 02-elemstyles.patch.
new 9fc3c75 Install icons from tested package.
new 4e2c767 Update josm executable to support OpenJDK 8 & 9 too.
new 1e90010 Fix JOSM capitalization.
new de94ac1 Set distribution to unstable.
The 14 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:
.project | 6 +
.settings/org.eclipse.jdt.core.prefs | 4 +-
.settings/org.sonar.ide.eclipse.core.prefs | 2 +-
README | 4 +-
REVISION | 10 +-
build.xml | 8 +-
data/defaultpresets.xml | 329 ++--
data/tagging-preset.xsd | 2 +
data/validator/combinations.mapcss | 10 +-
data_nodist/trans/es.lang | Bin 10613 -> 10710 bytes
data_nodist/trans/fi.lang | Bin 2449 -> 3126 bytes
debian/README.source | 2 +-
debian/changelog | 8 +
debian/josm.sh | 39 -
debian/patches/00-build.patch | 22 +-
debian/patches/02-elemstyles.patch | 47 +-
debian/patches/03-default_look_and_feel.patch | 2 +-
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 6 +-
debian/patches/08-josm-alternatives.patch | 86 ++
debian/patches/08-josm-desktop-fixes.patch | 39 -
debian/patches/series | 2 +-
debian/rules | 14 +-
i18n/convpreset.pl | 1 +
i18n/po/af.po | 486 ++++--
i18n/po/am.po | 486 ++++--
i18n/po/ar.po | 496 +++---
i18n/po/ast.po | 545 ++++---
i18n/po/az.po | 486 ++++--
i18n/po/be.po | 580 ++++---
i18n/po/bg.po | 500 +++---
i18n/po/bn.po | 486 ++++--
i18n/po/br.po | 486 ++++--
i18n/po/bs.po | 486 ++++--
i18n/po/ca.po | 560 ++++---
i18n/po/ca at valencia.po | 542 ++++---
i18n/po/cs.po | 585 ++++---
i18n/po/cy.po | 486 ++++--
i18n/po/da.po | 1257 ++++++++-------
i18n/po/de.po | 591 +++++---
i18n/po/de_DE.po | 486 ++++--
i18n/po/el.po | 551 ++++---
i18n/po/en_AU.po | 495 +++---
i18n/po/en_CA.po | 486 ++++--
i18n/po/en_GB.po | 641 +++++---
i18n/po/eo.po | 486 ++++--
i18n/po/es.po | 573 ++++---
i18n/po/et.po | 500 +++---
i18n/po/eu.po | 486 ++++--
i18n/po/fa.po | 486 ++++--
i18n/po/fi.po | 647 +++++---
i18n/po/fil.po | 486 ++++--
i18n/po/fo.po | 486 ++++--
i18n/po/fr.po | 1027 ++++++++-----
i18n/po/ga.po | 486 ++++--
i18n/po/gl.po | 510 ++++---
i18n/po/he.po | 494 +++---
i18n/po/hi.po | 486 ++++--
i18n/po/hr.po | 486 ++++--
i18n/po/ht.po | 486 ++++--
i18n/po/hu.po | 579 ++++---
i18n/po/hy.po | 486 ++++--
i18n/po/ia.po | 486 ++++--
i18n/po/id.po | 532 ++++---
i18n/po/is.po | 494 +++---
i18n/po/it.po | 551 ++++---
i18n/po/ja.po | 561 ++++---
i18n/po/ka.po | 486 ++++--
i18n/po/km.po | 530 ++++---
i18n/po/ko.po | 486 ++++--
i18n/po/ky.po | 486 ++++--
i18n/po/lo.po | 486 ++++--
i18n/po/lt.po | 541 ++++---
i18n/po/lv.po | 486 ++++--
i18n/po/mk.po | 486 ++++--
i18n/po/mr.po | 486 ++++--
i18n/po/ms.po | 486 ++++--
i18n/po/nb.po | 494 +++---
i18n/po/nds.po | 486 ++++--
i18n/po/nl.po | 834 ++++++----
i18n/po/nn.po | 486 ++++--
i18n/po/oc.po | 486 ++++--
i18n/po/pa.po | 486 ++++--
i18n/po/pl.po | 594 +++++---
i18n/po/pt.po | 640 +++++---
i18n/po/pt_BR.po | 545 ++++---
i18n/po/rm.po | 486 ++++--
i18n/po/ro.po | 486 ++++--
i18n/po/ru.po | 603 +++++---
i18n/po/sk.po | 564 ++++---
i18n/po/sl.po | 486 ++++--
i18n/po/sq.po | 486 ++++--
i18n/po/sr.po | 486 ++++--
i18n/po/sv.po | 568 ++++---
i18n/po/ta.po | 538 ++++---
i18n/po/te.po | 486 ++++--
i18n/po/th.po | 486 ++++--
i18n/po/tr.po | 490 ++++--
i18n/po/ug.po | 486 ++++--
i18n/po/uk.po | 585 ++++---
i18n/po/ur.po | 486 ++++--
i18n/po/vi.po | 547 ++++---
i18n/po/zh_CN.po | 563 ++++---
i18n/po/zh_TW.po | 530 ++++---
images/dialogs/relation/reverse.png | Bin 0 -> 602 bytes
images/dialogs/relation/reverse.svg | 198 ---
images/dialogs/sort.png | Bin 236 -> 858 bytes
images/dialogs/sort_below.png | Bin 249 -> 888 bytes
linux/latest/DEBIAN/control | 2 +-
.../usr/share/applications/josm-latest.desktop | 7 +-
.../share/icons/hicolor/16x16/apps/josm-latest.png | Bin
.../share/icons/hicolor/32x32/apps/josm-latest.png | Bin
.../share/icons/hicolor/48x48/apps/josm-latest.png | Bin
.../icons/hicolor/scalable/apps/josm-latest.svg | 0
linux/latest/usr/share/menu/josm-latest | 2 -
linux/latest/usr/share/pixmaps/josm-latest-16.xpm | 213 ---
linux/latest/usr/share/pixmaps/josm-latest-32.xpm | 714 ---------
linux/tested/DEBIAN/control | 2 +-
linux/tested/usr/share/applications/josm.desktop | 7 +-
.../usr/share/icons/hicolor/16x16/apps/josm.png | Bin
.../usr/share/icons/hicolor/32x32/apps/josm.png | Bin
.../usr/share/icons/hicolor/48x48/apps/josm.png | Bin
.../usr/share/icons/hicolor/scalable/apps/josm.svg | 0
linux/tested/usr/share/menu/josm | 2 -
linux/tested/usr/share/pixmaps/josm-16.xpm | 213 ---
linux/tested/usr/share/pixmaps/josm-32.xpm | 714 ---------
scripts/taginfoextract.groovy | 19 +-
src/org/openstreetmap/josm/Main.java | 205 +--
.../openstreetmap/josm/actions/AboutAction.java | 2 +-
.../josm/actions/AddImageryLayerAction.java | 16 +-
.../josm/actions/AlignInCircleAction.java | 8 +-
.../josm/actions/AlignInLineAction.java | 20 +-
.../josm/actions/AutoScaleAction.java | 23 +-
.../josm/actions/CombineWayAction.java | 26 +-
src/org/openstreetmap/josm/actions/CopyAction.java | 2 +-
.../josm/actions/CreateCircleAction.java | 4 +-
.../josm/actions/CreateMultipolygonAction.java | 2 +-
.../josm/actions/DistributeAction.java | 8 +-
.../josm/actions/DownloadAlongAction.java | 7 +
.../josm/actions/ExtensionFileFilter.java | 90 +-
.../josm/actions/HistoryInfoWebAction.java | 2 +-
.../josm/actions/ImageryAdjustAction.java | 4 +-
.../openstreetmap/josm/actions/InfoWebAction.java | 2 +-
.../josm/actions/JoinAreasAction.java | 28 +-
src/org/openstreetmap/josm/actions/JosmAction.java | 4 +-
.../josm/actions/MapRectifierWMSmenuAction.java | 11 +-
.../josm/actions/MergeLayerAction.java | 17 +-
.../josm/actions/MergeNodesAction.java | 2 +-
.../openstreetmap/josm/actions/OpenFileAction.java | 2 +-
.../josm/actions/OrthogonalizeAction.java | 39 +-
.../josm/actions/OverpassDownloadAction.java | 54 +-
.../josm/actions/PasteTagsAction.java | 31 +-
.../openstreetmap/josm/actions/PurgeAction.java | 7 +-
.../openstreetmap/josm/actions/RestartAction.java | 2 +-
.../josm/actions/ReverseWayAction.java | 13 +-
.../openstreetmap/josm/actions/SaveActionBase.java | 10 +-
.../josm/actions/SearchNotesDownloadAction.java | 2 +-
.../josm/actions/SessionLoadAction.java | 2 +-
.../josm/actions/SessionSaveAsAction.java | 33 +-
.../josm/actions/ShowStatusReportAction.java | 2 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 277 +++-
.../openstreetmap/josm/actions/UnGlueAction.java | 25 +-
.../openstreetmap/josm/actions/UploadAction.java | 5 +-
.../josm/actions/UploadSelectionAction.java | 4 +-
.../openstreetmap/josm/actions/ValidateAction.java | 7 +-
.../downloadtasks/AbstractDownloadTask.java | 24 +-
.../actions/downloadtasks/DownloadGpsTask.java | 18 +-
.../actions/downloadtasks/DownloadNotesTask.java | 20 +-
.../downloadtasks/DownloadNotesUrlIdTask.java | 2 +-
.../actions/downloadtasks/DownloadOsmTask.java | 76 +-
.../actions/downloadtasks/DownloadSessionTask.java | 2 +-
.../actions/downloadtasks/DownloadTaskList.java | 2 +-
.../josm/actions/mapmode/DeleteAction.java | 6 +-
.../josm/actions/mapmode/DrawAction.java | 18 +-
.../josm/actions/mapmode/ExtrudeAction.java | 27 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 21 +-
.../josm/actions/mapmode/MapMode.java | 16 +-
.../josm/actions/mapmode/ModifiersSpec.java | 4 +-
.../josm/actions/mapmode/ParallelWayAction.java | 18 +-
.../josm/actions/mapmode/PlayHeadDragMode.java | 8 +-
.../josm/actions/mapmode/SelectAction.java | 41 +-
.../josm/actions/search/PushbackTokenizer.java | 2 +-
.../josm/actions/search/SearchAction.java | 345 +++--
.../josm/actions/search/SearchCompiler.java | 217 ++-
.../actions/upload/ApiPreconditionCheckerHook.java | 2 +-
.../josm/actions/upload/UploadHook.java | 2 +
.../josm/actions/upload/UploadNotesTask.java | 8 +-
.../josm/actions/upload/ValidateUploadHook.java | 2 +-
.../josm/command/AddPrimitivesCommand.java | 4 +-
.../josm/command/ChangePropertyCommand.java | 40 +-
.../josm/command/ChangePropertyKeyCommand.java | 6 +-
src/org/openstreetmap/josm/command/Command.java | 6 +-
.../openstreetmap/josm/command/DeleteCommand.java | 5 +-
.../openstreetmap/josm/command/PurgeCommand.java | 1 +
.../openstreetmap/josm/command/RotateCommand.java | 7 +-
.../openstreetmap/josm/command/ScaleCommand.java | 2 +-
.../josm/command/SequenceCommand.java | 2 +-
.../josm/command/TransformNodesCommand.java | 2 +
.../josm/command/conflict/ConflictAddCommand.java | 4 +-
.../command/conflict/ConflictResolveCommand.java | 20 +-
.../conflict/CoordinateConflictResolveCommand.java | 2 +-
.../DeletedStateConflictResolveCommand.java | 2 +-
.../conflict/ModifiedConflictResolveCommand.java | 2 +-
.../conflict/TagConflictResolveCommand.java | 2 +-
.../conflict/VersionConflictResolveCommand.java | 2 +-
.../conflict/WayNodesConflictResolverCommand.java | 2 +-
.../josm/corrector/CorrectionTable.java | 2 +-
.../josm/corrector/ReverseWayNoTagCorrector.java | 1 +
.../josm/corrector/ReverseWayTagCorrector.java | 5 +-
.../openstreetmap/josm/corrector/TagCorrector.java | 3 +-
.../josm/corrector/UserCancelException.java | 6 -
src/org/openstreetmap/josm/data/APIDataSet.java | 2 +-
src/org/openstreetmap/josm/data/AutosaveTask.java | 4 +-
src/org/openstreetmap/josm/data/Bounds.java | 10 +-
.../josm/data/CustomConfigurator.java | 10 +-
src/org/openstreetmap/josm/data/DataSource.java | 2 +-
src/org/openstreetmap/josm/data/Preferences.java | 65 +-
.../openstreetmap/josm/data/ProjectionBounds.java | 6 +-
.../josm/data/SystemOfMeasurement.java | 8 +-
src/org/openstreetmap/josm/data/Version.java | 6 +-
.../josm/data/cache/BufferedImageCacheEntry.java | 6 +-
.../josm/data/cache/JCSCacheManager.java | 4 +-
.../josm/data/cache/JCSCachedTileLoaderJob.java | 6 +-
.../openstreetmap/josm/data/conflict/Conflict.java | 2 +-
.../josm/data/conflict/ConflictCollection.java | 2 +-
.../openstreetmap/josm/data/coor/CachedLatLon.java | 2 +-
.../openstreetmap/josm/data/coor/EastNorth.java | 18 +-
src/org/openstreetmap/josm/data/coor/LatLon.java | 11 +-
src/org/openstreetmap/josm/data/gpx/WayPoint.java | 2 +-
.../CachedAttributionBingAerialTileSource.java | 2 +-
.../josm/data/imagery/ImageryInfo.java | 26 +-
.../josm/data/imagery/ImageryLayerInfo.java | 6 +-
.../josm/data/imagery/OffsetBookmark.java | 8 +-
.../josm/data/imagery/TMSCachedTileLoader.java | 2 +-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 31 +-
.../josm/data/imagery/TemplatedWMSTileSource.java | 2 +-
.../josm/data/imagery/WMTSTileSource.java | 11 +-
.../josm/data/osm/AbstractPrimitive.java | 6 +-
src/org/openstreetmap/josm/data/osm/Changeset.java | 4 +-
.../josm/data/osm/ChangesetDataSet.java | 6 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 8 +-
.../openstreetmap/josm/data/osm/DataSetMerger.java | 2 +-
.../josm/data/osm/DatasetConsistencyTest.java | 4 +-
src/org/openstreetmap/josm/data/osm/Filter.java | 28 +-
.../openstreetmap/josm/data/osm/FilterMatcher.java | 16 +-
.../josm/data/osm/MultipolygonBuilder.java | 4 +-
src/org/openstreetmap/josm/data/osm/Node.java | 2 +-
src/org/openstreetmap/josm/data/osm/NoteData.java | 4 +-
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 23 +-
src/org/openstreetmap/josm/data/osm/OsmUtils.java | 2 +-
.../openstreetmap/josm/data/osm/QuadBuckets.java | 10 +-
.../josm/data/osm/RelationMemberData.java | 2 +-
src/org/openstreetmap/josm/data/osm/Storage.java | 21 +-
src/org/openstreetmap/josm/data/osm/Tag.java | 4 +-
.../openstreetmap/josm/data/osm/TigerUtils.java | 9 +-
src/org/openstreetmap/josm/data/osm/User.java | 4 +-
src/org/openstreetmap/josm/data/osm/Way.java | 4 +-
.../openstreetmap/josm/data/osm/WaySegment.java | 2 +-
.../josm/data/osm/event/DatasetEventManager.java | 2 +-
.../josm/data/osm/event/SelectionEventManager.java | 2 +-
.../josm/data/osm/history/HistoryOsmPrimitive.java | 4 +-
.../josm/data/osm/visitor/BoundingXYVisitor.java | 35 +-
.../josm/data/osm/visitor/paint/LineClip.java | 2 +-
.../data/osm/visitor/paint/MapPaintSettings.java | 135 +-
.../data/osm/visitor/paint/MapRendererFactory.java | 3 +-
.../josm/data/osm/visitor/paint/PaintColors.java | 2 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 18 +-
.../osm/visitor/paint/WireframeMapRenderer.java | 21 +-
.../osm/visitor/paint/relations/Multipolygon.java | 2 +-
.../visitor/paint/relations/MultipolygonCache.java | 4 +-
.../josm/data/projection/AbstractProjection.java | 8 +-
.../josm/data/projection/CustomProjection.java | 4 +-
.../josm/data/projection/Ellipsoid.java | 2 +-
.../josm/data/projection/datum/CentricDatum.java | 2 +-
.../data/projection/datum/NTV2GridShiftFile.java | 4 +-
.../projection/datum/NTV2GridShiftFileWrapper.java | 2 +-
.../josm/data/projection/datum/NTV2SubGrid.java | 4 +-
.../josm/data/validation/OsmValidator.java | 10 +-
.../openstreetmap/josm/data/validation/Test.java | 3 +
.../josm/data/validation/TestError.java | 11 +-
.../data/validation/routines/DomainValidator.java | 2 +-
.../josm/data/validation/tests/Coastlines.java | 2 +-
.../josm/data/validation/tests/DuplicateNode.java | 13 +-
.../data/validation/tests/DuplicateRelation.java | 19 +-
.../josm/data/validation/tests/DuplicateWay.java | 19 +-
.../josm/data/validation/tests/Highways.java | 31 +-
.../josm/data/validation/tests/InternetTags.java | 2 +-
.../josm/data/validation/tests/Lanes.java | 2 +-
.../data/validation/tests/MapCSSTagChecker.java | 63 +-
.../data/validation/tests/MultipolygonTest.java | 6 +-
.../data/validation/tests/OpeningHourTest.java | 5 +-
.../josm/data/validation/tests/PowerLines.java | 8 +-
.../data/validation/tests/RelationChecker.java | 18 +-
.../data/validation/tests/SimilarNamedWays.java | 4 +-
.../josm/data/validation/tests/TagChecker.java | 54 +-
.../josm/data/validation/tests/UnclosedWays.java | 8 +-
.../data/validation/tests/UnconnectedWays.java | 2 +-
.../josm/data/validation/tests/UntaggedNode.java | 16 -
.../josm/data/validation/tests/UntaggedWay.java | 4 +-
.../data/validation/tests/WayConnectedToArea.java | 2 +-
.../josm/data/validation/util/Entities.java | 24 +-
.../data/validation/util/MultipleNameVisitor.java | 8 +-
.../josm/gui/ConditionalOptionPaneUtil.java | 7 +-
.../josm/gui/DefaultNameFormatter.java | 22 +-
src/org/openstreetmap/josm/gui/ExtendedDialog.java | 14 +-
src/org/openstreetmap/josm/gui/FileDrop.java | 10 +-
src/org/openstreetmap/josm/gui/GettingStarted.java | 6 +-
.../josm/gui/HelpAwareOptionPane.java | 2 +-
.../openstreetmap/josm/gui/IconToggleButton.java | 2 +-
.../josm/gui/JosmUserIdentityManager.java | 8 +-
.../openstreetmap/josm/gui/MainApplication.java | 30 +-
src/org/openstreetmap/josm/gui/MainMenu.java | 46 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 7 +-
src/org/openstreetmap/josm/gui/MapMover.java | 4 +-
src/org/openstreetmap/josm/gui/MapSlider.java | 4 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 87 +-
src/org/openstreetmap/josm/gui/MapView.java | 25 +-
src/org/openstreetmap/josm/gui/MenuScroller.java | 8 +-
.../josm/gui/NavigatableComponent.java | 69 +-
.../josm/gui/NotificationManager.java | 10 +-
.../josm/gui/OsmPrimitivRenderer.java | 17 +-
.../openstreetmap/josm/gui/PleaseWaitRunnable.java | 2 +-
src/org/openstreetmap/josm/gui/ScrollViewport.java | 10 +-
.../openstreetmap/josm/gui/SelectionManager.java | 4 +-
src/org/openstreetmap/josm/gui/SideButton.java | 6 +-
src/org/openstreetmap/josm/gui/SplashScreen.java | 6 +-
.../openstreetmap/josm/gui/bbox/SizeButton.java | 6 +-
.../josm/gui/bbox/SlippyMapBBoxChooser.java | 4 -
.../josm/gui/bbox/SlippyMapControler.java | 22 +-
.../openstreetmap/josm/gui/bbox/SourceButton.java | 2 +-
.../josm/gui/bbox/TileSelectionBBoxChooser.java | 12 +-
.../josm/gui/conflict/pair/ConflictResolver.java | 2 +-
.../josm/gui/conflict/pair/ListMergeModel.java | 2 +-
.../josm/gui/conflict/pair/ListMerger.java | 26 +-
.../pair/nodes/NodeListTableCellRenderer.java | 9 +-
.../conflict/pair/properties/PropertiesMerger.java | 12 +-
.../relation/RelationMemberTableCellRenderer.java | 2 +-
.../josm/gui/conflict/pair/tags/TagMergeItem.java | 6 +-
.../josm/gui/conflict/pair/tags/TagMergeModel.java | 2 +-
.../josm/gui/conflict/pair/tags/TagMerger.java | 8 +-
.../tags/CombinePrimitiveResolverDialog.java | 97 +-
.../gui/conflict/tags/MultiValueCellEditor.java | 2 +-
.../tags/PasteTagsConflictResolverDialog.java | 10 +-
.../tags/RelationMemberConflictDecision.java | 6 +
.../tags/RelationMemberConflictResolver.java | 2 +-
.../tags/RelationMemberConflictResolverModel.java | 94 +-
.../conflict/tags/TagConflictResolutionUtil.java | 2 +-
.../conflict/tags/TagConflictResolverModel.java | 4 +-
.../josm/gui/dialogs/ChangesetDialog.java | 12 +-
.../josm/gui/dialogs/CommandStackDialog.java | 8 +-
.../josm/gui/dialogs/ConflictDialog.java | 8 +-
.../josm/gui/dialogs/ConflictResolutionDialog.java | 10 +-
.../DeleteFromRelationConfirmationDialog.java | 6 +-
.../josm/gui/dialogs/DialogsPanel.java | 2 +-
.../josm/gui/dialogs/FilterDialog.java | 5 +-
.../josm/gui/dialogs/FilterTableModel.java | 2 +-
.../josm/gui/dialogs/InspectPrimitiveDialog.java | 6 +-
.../josm/gui/dialogs/LatLonDialog.java | 37 +-
.../josm/gui/dialogs/LayerListDialog.java | 53 +-
.../josm/gui/dialogs/LayerListPopup.java | 2 +-
.../josm/gui/dialogs/MapPaintDialog.java | 8 +-
.../josm/gui/dialogs/NotesDialog.java | 12 +-
.../josm/gui/dialogs/RelationListDialog.java | 8 +-
.../josm/gui/dialogs/SelectionListDialog.java | 14 +-
.../josm/gui/dialogs/ToggleDialog.java | 21 +-
.../josm/gui/dialogs/UserListDialog.java | 14 +-
.../josm/gui/dialogs/ValidatorDialog.java | 6 +-
.../dialogs/changeset/ChangesetCacheManager.java | 19 +-
.../dialogs/changeset/ChangesetContentPanel.java | 14 +-
.../changeset/ChangesetContentTableModel.java | 4 +-
.../dialogs/changeset/ChangesetDetailPanel.java | 17 +-
.../changeset/ChangesetDiscussionPanel.java | 4 +-
.../gui/dialogs/changeset/ChangesetTagsPanel.java | 8 -
.../changeset/SingleChangesetDownloadPanel.java | 2 +-
.../query/AdvancedChangesetQueryPanel.java | 16 +-
.../changeset/query/BasicChangesetQueryPanel.java | 2 +-
.../changeset/query/ChangesetQueryDialog.java | 4 +-
.../gui/dialogs/properties/PresetListPanel.java | 24 +-
.../gui/dialogs/properties/PropertiesDialog.java | 39 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 18 +-
.../gui/dialogs/relation/ChildRelationBrowser.java | 12 +-
.../dialogs/relation/GenericRelationEditor.java | 71 +-
.../gui/dialogs/relation/MemberRoleCellEditor.java | 9 +-
.../josm/gui/dialogs/relation/MemberTable.java | 6 +-
.../relation/MemberTableLinkedCellRenderer.java | 4 +-
.../relation/MemberTableMemberCellRenderer.java | 16 +-
.../gui/dialogs/relation/MemberTableModel.java | 24 +-
.../relation/ReferringRelationsBrowser.java | 4 +-
.../dialogs/relation/RelationDialogManager.java | 4 +-
.../josm/gui/dialogs/relation/RelationTree.java | 2 +-
.../relation/SelectionTableCellRenderer.java | 13 +-
.../gui/dialogs/relation/sort/RelationNodeMap.java | 8 +-
.../dialogs/relation/sort/WayConnectionType.java | 10 +-
.../gui/dialogs/validator/ValidatorTreePanel.java | 4 +-
.../josm/gui/download/BookmarkList.java | 2 +-
.../josm/gui/download/BookmarkSelection.java | 6 +-
.../josm/gui/download/BoundingBoxSelection.java | 8 +-
.../josm/gui/download/DownloadDialog.java | 11 +-
.../josm/gui/download/PlaceSelection.java | 30 +-
.../josm/gui/download/SlippyMapChooser.java | 16 +-
.../openstreetmap/josm/gui/help/HelpBrowser.java | 14 +-
.../josm/gui/help/HelpBrowserHistory.java | 2 +-
src/org/openstreetmap/josm/gui/help/HelpUtil.java | 4 +-
.../josm/gui/history/CoordinateInfoViewer.java | 4 +-
.../josm/gui/history/DiffTableModel.java | 2 +-
.../josm/gui/history/HistoryBrowserDialog.java | 4 +-
.../josm/gui/history/HistoryBrowserModel.java | 9 +-
.../josm/gui/history/HistoryLoadTask.java | 6 +-
.../josm/gui/history/NodeListViewer.java | 15 +-
.../RelationMemberListTableCellRenderer.java | 12 +-
.../josm/gui/history/TagTableCellRenderer.java | 12 +-
.../josm/gui/history/TwoColumnDiff.java | 6 +-
.../josm/gui/history/VersionInfoPanel.java | 4 +-
.../josm/gui/history/VersionTable.java | 13 +-
.../josm/gui/io/AbstractUploadDialog.java | 2 +-
.../josm/gui/io/ActionFlagsTableCell.java | 2 +-
.../josm/gui/io/ChangesetManagementPanel.java | 4 +-
.../josm/gui/io/CloseChangesetDialog.java | 4 +-
.../josm/gui/io/CredentialDialog.java | 14 +-
.../josm/gui/io/DownloadFileTask.java | 2 +-
.../io/DownloadPrimitivesWithReferrersTask.java | 4 +-
.../josm/gui/io/LayerNameAndFilePathTableCell.java | 6 +-
.../josm/gui/io/OpenChangesetComboBoxModel.java | 2 +-
.../josm/gui/io/RecentlyOpenedFilesMenu.java | 2 +-
.../openstreetmap/josm/gui/io/SaveLayerInfo.java | 2 +-
.../josm/gui/io/SaveLayersDialog.java | 47 +-
.../openstreetmap/josm/gui/io/SaveLayersTable.java | 2 +-
.../josm/gui/io/SaveLayersTableColumnModel.java | 40 +-
.../josm/gui/io/TagSettingsPanel.java | 2 +-
.../josm/gui/io/UploadAndSaveProgressRenderer.java | 2 +-
.../openstreetmap/josm/gui/io/UploadDialog.java | 6 +-
.../josm/gui/io/UploadPrimitivesTask.java | 4 +-
.../josm/gui/io/UploadSelectionDialog.java | 8 +-
.../josm/gui/io/UploadStrategySelectionPanel.java | 2 +-
.../josm/gui/io/UploadedObjectsSummaryPanel.java | 6 +-
.../gui/layer/AbstractCachedTileSourceLayer.java | 2 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 82 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 5 +-
.../openstreetmap/josm/gui/layer/ImageryLayer.java | 49 +-
.../josm/gui/layer/JumpToMarkerActions.java | 2 +-
src/org/openstreetmap/josm/gui/layer/Layer.java | 39 +-
.../openstreetmap/josm/gui/layer/NoteLayer.java | 2 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 47 +-
src/org/openstreetmap/josm/gui/layer/WMSLayer.java | 13 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 24 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 24 +-
.../josm/gui/layer/geoimage/ImageDisplay.java | 26 +-
.../josm/gui/layer/geoimage/ImageEntry.java | 4 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 10 +-
.../josm/gui/layer/geoimage/ThumbsLoader.java | 10 +-
.../gui/layer/gpx/ChooseTrackVisibilityAction.java | 2 +-
.../gui/layer/gpx/ConvertToDataLayerAction.java | 107 +-
.../josm/gui/layer/gpx/DateFilterPanel.java | 2 +-
.../gui/layer/gpx/DownloadAlongTrackAction.java | 6 +-
.../josm/gui/layer/gpx/GpxDrawHelper.java | 2 +-
.../josm/gui/layer/gpx/ImportAudioAction.java | 22 +-
.../josm/gui/layer/gpx/ImportImagesAction.java | 4 +-
.../josm/gui/layer/markerlayer/AudioMarker.java | 7 +-
.../josm/gui/layer/markerlayer/Marker.java | 67 +-
.../josm/gui/layer/markerlayer/MarkerLayer.java | 28 +-
.../gui/layer/markerlayer/MarkerProducers.java | 7 +-
.../josm/gui/layer/markerlayer/PlayHeadMarker.java | 12 +-
.../josm/gui/layer/markerlayer/WebMarker.java | 2 +-
.../josm/gui/mappaint/BoxTextElemStyle.java | 15 +-
.../openstreetmap/josm/gui/mappaint/Cascade.java | 2 +-
.../openstreetmap/josm/gui/mappaint/ElemStyle.java | 11 +-
.../josm/gui/mappaint/ElemStyles.java | 3 +-
.../josm/gui/mappaint/Environment.java | 4 +-
.../gui/mappaint/LabelCompositionStrategy.java | 21 +-
.../josm/gui/mappaint/LineElemStyle.java | 2 +-
.../josm/gui/mappaint/LineTextElemStyle.java | 2 +-
.../openstreetmap/josm/gui/mappaint/MapImage.java | 9 +-
.../josm/gui/mappaint/MapPaintMenu.java | 4 +-
.../josm/gui/mappaint/MapPaintStyles.java | 23 +-
.../josm/gui/mappaint/MultiCascade.java | 2 +-
.../josm/gui/mappaint/NodeElemStyle.java | 6 +-
src/org/openstreetmap/josm/gui/mappaint/Range.java | 5 +-
.../josm/gui/mappaint/RepeatImageElemStyle.java | 2 +-
.../josm/gui/mappaint/mapcss/Condition.java | 81 +-
.../gui/mappaint/mapcss/ExpressionFactory.java | 2 +-
.../josm/gui/mappaint/mapcss/Instruction.java | 2 +-
.../gui/mappaint/mapcss/LiteralExpression.java | 2 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 34 +-
.../josm/gui/mappaint/mapcss/MapCSSRule.java | 2 +-
.../gui/mappaint/mapcss/MapCSSStyleSource.java | 8 +-
.../josm/gui/mappaint/mapcss/Selector.java | 13 +-
.../josm/gui/mappaint/xml/Prototype.java | 2 +-
.../josm/gui/mappaint/xml/XmlCondition.java | 8 +-
.../josm/gui/mappaint/xml/XmlStyleSource.java | 14 +-
.../gui/mappaint/xml/XmlStyleSourceHandler.java | 6 +-
.../gui/oauth/AuthorizationProcedureComboBox.java | 2 +-
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 12 +-
.../gui/oauth/FullyAutomaticPropertiesPanel.java | 2 +-
.../josm/gui/oauth/ManualAuthorizationUI.java | 6 +-
.../josm/gui/oauth/OAuthAuthorizationWizard.java | 4 +-
.../gui/oauth/SemiAutomaticAuthorizationUI.java | 16 +-
.../josm/gui/preferences/PreferenceDialog.java | 4 +-
.../josm/gui/preferences/PreferenceSetting.java | 1 +
.../josm/gui/preferences/PreferenceTabbedPane.java | 7 +-
.../josm/gui/preferences/SourceEditor.java | 57 +-
.../josm/gui/preferences/SubPreferenceSetting.java | 1 +
.../josm/gui/preferences/ToolbarPreferences.java | 6 +-
.../preferences/advanced/AdvancedPreference.java | 4 +-
.../preferences/advanced/ExportProfileAction.java | 2 +-
.../gui/preferences/advanced/ListListEditor.java | 4 +-
.../gui/preferences/advanced/MapListEditor.java | 4 +-
.../gui/preferences/advanced/PreferencesTable.java | 4 +-
.../gui/preferences/display/ColorPreference.java | 6 +-
.../preferences/display/LanguagePreference.java | 4 +-
.../gui/preferences/imagery/AddImageryPanel.java | 2 +-
.../preferences/imagery/CacheContentsPanel.java | 4 +-
.../preferences/imagery/CommonSettingsPanel.java | 13 -
.../gui/preferences/imagery/ImageryPreference.java | 18 +-
.../josm/gui/preferences/imagery/WMSLayerTree.java | 4 +-
.../gui/preferences/map/MapPaintPreference.java | 26 +-
.../preferences/map/TaggingPresetPreference.java | 4 +-
.../gui/preferences/plugin/PluginListPanel.java | 4 +-
.../gui/preferences/plugin/PluginPreference.java | 13 +-
.../preferences/plugin/PluginPreferencesModel.java | 11 +-
.../projection/CodeProjectionChoice.java | 2 +-
.../projection/CustomProjectionChoice.java | 4 +-
.../LambertCC9ZonesProjectionChoice.java | 2 +-
.../projection/LambertProjectionChoice.java | 2 +-
.../projection/ProjectionPreference.java | 2 +-
.../projection/UTMProjectionChoice.java | 2 +-
.../OAuthAuthenticationPreferencesPanel.java | 10 +-
.../preferences/server/OsmApiUrlInputPanel.java | 6 +-
.../josm/gui/preferences/shortcut/PrefJPanel.java | 6 +-
.../ValidatorTagCheckerRulesPreference.java | 23 +-
.../josm/gui/progress/AbstractProgressMonitor.java | 2 +-
.../gui/progress/PleaseWaitProgressMonitor.java | 7 +-
.../josm/gui/progress/ProgressMonitor.java | 1 +
.../josm/gui/progress/ProgressTaskId.java | 4 +-
.../progress/SwingRenderingProgressMonitor.java | 2 +-
.../josm/gui/tagging/TagCellEditor.java | 8 +-
.../josm/gui/tagging/TagCellRenderer.java | 8 +-
.../josm/gui/tagging/TagEditorModel.java | 4 +-
.../josm/gui/tagging/TagEditorPanel.java | 8 +-
.../openstreetmap/josm/gui/tagging/TagModel.java | 4 +-
.../openstreetmap/josm/gui/tagging/TagTable.java | 18 +-
.../josm/gui/tagging/TaggingPresetItem.java | 70 -
.../josm/gui/tagging/TaggingPresetItems.java | 1593 --------------------
.../gui/tagging/ac/AutoCompletingComboBox.java | 4 +-
.../gui/tagging/ac/AutoCompletingTextField.java | 4 +-
.../gui/tagging/ac/AutoCompletionItemPriority.java | 1 +
.../josm/gui/tagging/ac/AutoCompletionList.java | 7 +-
.../josm/gui/tagging/ac/AutoCompletionManager.java | 24 +-
.../josm/gui/tagging/package-info.java | 4 +-
.../gui/tagging/{ => presets}/TaggingPreset.java | 80 +-
.../TaggingPresetHandler.java} | 4 +-
.../gui/tagging/presets/TaggingPresetItem.java | 134 ++
.../TaggingPresetLabel.java} | 6 +-
.../{ => presets}/TaggingPresetListener.java | 2 +-
.../tagging/{ => presets}/TaggingPresetMenu.java | 6 +-
.../TaggingPresetNameTemplateList.java | 6 +-
.../tagging/{ => presets}/TaggingPresetReader.java | 140 +-
.../{ => presets}/TaggingPresetSearchAction.java | 2 +-
.../{ => presets}/TaggingPresetSearchDialog.java | 6 +-
.../TaggingPresetSearchPrimitiveDialog.java | 55 +-
.../{ => presets}/TaggingPresetSelector.java | 21 +-
.../{ => presets}/TaggingPresetSeparator.java | 2 +-
.../tagging/{ => presets}/TaggingPresetType.java | 2 +-
.../gui/tagging/{ => presets}/TaggingPresets.java | 2 +-
.../josm/gui/tagging/presets/items/Check.java | 122 ++
.../josm/gui/tagging/presets/items/CheckGroup.java | 68 +
.../josm/gui/tagging/presets/items/Combo.java | 104 ++
.../tagging/presets/items/ComboMultiSelect.java | 498 ++++++
.../gui/tagging/presets/items/ItemSeparator.java | 35 +
.../josm/gui/tagging/presets/items/Key.java | 47 +
.../josm/gui/tagging/presets/items/KeyedItem.java | 162 ++
.../josm/gui/tagging/presets/items/Label.java | 50 +
.../josm/gui/tagging/presets/items/Link.java | 44 +
.../gui/tagging/presets/items/MultiSelect.java | 69 +
.../josm/gui/tagging/presets/items/Optional.java | 25 +
.../josm/gui/tagging/presets/items/PresetLink.java | 50 +
.../josm/gui/tagging/presets/items/Roles.java | 132 ++
.../josm/gui/tagging/presets/items/Space.java | 34 +
.../josm/gui/tagging/presets/items/Text.java | 228 +++
.../josm/gui/tagging/presets/items/TextItem.java | 44 +
.../gui/tagging/presets/items/package-info.java | 6 +
.../josm/gui/tagging/presets/package-info.java | 6 +
.../josm/gui/util/AdvancedKeyPressDetector.java | 6 +-
src/org/openstreetmap/josm/gui/util/GuiHelper.java | 3 +-
.../josm/gui/util/HighlightHelper.java | 5 +
.../openstreetmap/josm/gui/util/RotationAngle.java | 8 +
.../widgets/AbstractTextComponentValidator.java | 2 +-
.../gui/widgets/BoundingBoxSelectionPanel.java | 6 +-
.../josm/gui/widgets/ChangesetIdTextField.java | 2 +-
.../DisableShortcutsOnFocusGainedTextField.java | 2 +
.../openstreetmap/josm/gui/widgets/HtmlPanel.java | 4 +-
.../josm/gui/widgets/JMultilineLabel.java | 4 +-
.../josm/gui/widgets/JosmEditorPane.java | 6 +-
.../josm/gui/widgets/JosmHTMLEditorKit.java | 12 +-
.../josm/gui/widgets/JosmHTMLFactory.java | 37 +
.../josm/gui/widgets/JosmImageView.java | 171 +++
.../josm/gui/widgets/MultiSplitLayout.java | 14 +-
.../josm/gui/widgets/MultiSplitPane.java | 12 +-
.../josm/gui/widgets/QuadStateCheckBox.java | 1 +
.../josm/gui/widgets/TextContextualPopupMenu.java | 2 +-
.../josm/io/BoundingBoxDownloader.java | 16 +-
.../openstreetmap/josm/io/CacheCustomContent.java | 4 +-
src/org/openstreetmap/josm/io/CachedFile.java | 11 +-
.../josm/io/ChangesetClosedException.java | 2 +-
src/org/openstreetmap/josm/io/ChangesetQuery.java | 16 +-
src/org/openstreetmap/josm/io/Compression.java | 11 +-
.../josm/io/DefaultProxySelector.java | 2 +-
src/org/openstreetmap/josm/io/FileImporter.java | 1 +
src/org/openstreetmap/josm/io/GeoJSONExporter.java | 27 +-
src/org/openstreetmap/josm/io/GeoJSONWriter.java | 43 +-
src/org/openstreetmap/josm/io/GpxExporter.java | 53 +-
src/org/openstreetmap/josm/io/GpxImporter.java | 4 +-
src/org/openstreetmap/josm/io/GpxReader.java | 10 +-
src/org/openstreetmap/josm/io/GpxWriter.java | 20 +-
.../josm/io/InvalidXmlCharacterFilter.java | 6 +-
src/org/openstreetmap/josm/io/JpgImporter.java | 4 +-
src/org/openstreetmap/josm/io/MessageNotifier.java | 8 +-
.../josm/io/MultiFetchServerObjectReader.java | 28 +-
src/org/openstreetmap/josm/io/NMEAImporter.java | 7 +-
src/org/openstreetmap/josm/io/NmeaReader.java | 24 +-
src/org/openstreetmap/josm/io/NoteImporter.java | 6 +-
src/org/openstreetmap/josm/io/NoteReader.java | 2 +-
src/org/openstreetmap/josm/io/OsmApi.java | 21 +-
.../openstreetmap/josm/io/OsmChangeBuilder.java | 2 +-
.../openstreetmap/josm/io/OsmChangeImporter.java | 9 +-
.../openstreetmap/josm/io/OsmChangesetParser.java | 10 +-
src/org/openstreetmap/josm/io/OsmConnection.java | 10 +-
src/org/openstreetmap/josm/io/OsmExporter.java | 2 +-
.../openstreetmap/josm/io/OsmHistoryReader.java | 2 +-
src/org/openstreetmap/josm/io/OsmImporter.java | 13 +-
src/org/openstreetmap/josm/io/OsmReader.java | 10 +-
.../josm/io/OsmServerLocationReader.java | 2 +-
src/org/openstreetmap/josm/io/OsmServerReader.java | 6 +-
src/org/openstreetmap/josm/io/OsmServerWriter.java | 8 +-
src/org/openstreetmap/josm/io/OsmWriter.java | 46 +-
.../josm/io/OverpassDownloadReader.java | 8 +-
.../openstreetmap/josm/io/ProgressInputStream.java | 4 +-
.../josm/io/UTFInputStreamReader.java | 2 +
src/org/openstreetmap/josm/io/XmlWriter.java | 1 +
.../josm/io/auth/AbstractCredentialsAgent.java | 1 +
.../josm/io/auth/CredentialsAgent.java | 7 +-
.../josm/io/auth/DefaultAuthenticator.java | 2 +-
.../josm/io/imagery/ImageryReader.java | 10 +-
.../openstreetmap/josm/io/imagery/WMSImagery.java | 6 +-
.../josm/io/remotecontrol/AddTagsDialog.java | 8 +-
.../io/remotecontrol/RemoteControlHttpServer.java | 14 +-
.../io/remotecontrol/RemoteControlHttpsServer.java | 11 +-
.../josm/io/remotecontrol/RequestProcessor.java | 6 +-
.../io/remotecontrol/handler/AddNodeHandler.java | 4 +-
.../io/remotecontrol/handler/AddWayHandler.java | 6 +-
.../io/remotecontrol/handler/FeaturesHandler.java | 4 +-
.../remotecontrol/handler/LoadAndZoomHandler.java | 4 +-
.../io/remotecontrol/handler/LoadDataHandler.java | 12 +-
.../io/remotecontrol/handler/RequestHandler.java | 5 +-
.../io/remotecontrol/handler/VersionHandler.java | 2 +-
.../josm/io/session/GeoImageSessionExporter.java | 8 +-
.../josm/io/session/GeoImageSessionImporter.java | 2 +-
.../josm/io/session/ImagerySessionExporter.java | 2 +
.../josm/io/session/ImagerySessionImporter.java | 9 +-
.../josm/io/session/MarkerSessionImporter.java | 2 +-
.../josm/io/session/OsmDataSessionExporter.java | 2 +-
.../josm/io/session/SessionLayerExporter.java | 21 +-
.../josm/io/session/SessionLayerImporter.java | 10 +-
.../josm/io/session/SessionReader.java | 19 +-
.../josm/io/session/SessionWriter.java | 13 +-
src/org/openstreetmap/josm/plugins/Plugin.java | 4 +-
.../josm/plugins/PluginDownloadTask.java | 5 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 64 +-
.../josm/plugins/PluginInformation.java | 36 +-
.../josm/plugins/PluginListParser.java | 2 +-
.../openstreetmap/josm/plugins/PluginProxy.java | 28 +-
.../josm/tools/AlphanumComparator.java | 10 +-
src/org/openstreetmap/josm/tools/AudioPlayer.java | 31 +-
.../josm/tools/BugReportExceptionHandler.java | 10 +-
src/org/openstreetmap/josm/tools/ColorHelper.java | 2 +-
src/org/openstreetmap/josm/tools/CopyList.java | 2 +-
src/org/openstreetmap/josm/tools/Diff.java | 62 +-
.../openstreetmap/josm/tools/ExceptionUtil.java | 6 +-
src/org/openstreetmap/josm/tools/FontsManager.java | 2 +-
src/org/openstreetmap/josm/tools/GBC.java | 51 +-
src/org/openstreetmap/josm/tools/Geometry.java | 9 +-
src/org/openstreetmap/josm/tools/I18n.java | 12 +-
.../openstreetmap/josm/tools/ImageProvider.java | 83 +-
.../openstreetmap/josm/tools/ImageResource.java | 4 +-
src/org/openstreetmap/josm/tools/LanguageInfo.java | 28 +-
src/org/openstreetmap/josm/tools/MultiMap.java | 4 +-
.../josm/tools/MultikeyActionsHandler.java | 6 +-
.../openstreetmap/josm/tools/OsmUrlToBounds.java | 4 +-
.../josm/tools/OverpassTurboQueryWizard.java | 1 -
src/org/openstreetmap/josm/tools/Pair.java | 2 +-
.../openstreetmap/josm/tools/PlatformHookOsx.java | 25 +-
.../josm/tools/PlatformHookUnixoid.java | 59 +-
.../josm/tools/PlatformHookWindows.java | 11 +-
src/org/openstreetmap/josm/tools/Predicates.java | 18 +
src/org/openstreetmap/josm/tools/Shortcut.java | 27 +-
.../josm/tools/SubclassFilteredCollection.java | 2 +-
.../openstreetmap/josm/tools/TextTagParser.java | 10 +-
.../josm/tools/UserCancelException.java | 47 +
src/org/openstreetmap/josm/tools/Utils.java | 30 +-
src/org/openstreetmap/josm/tools/WikiReader.java | 20 +-
.../openstreetmap/josm/tools/WindowGeometry.java | 4 +-
.../openstreetmap/josm/tools/XmlObjectParser.java | 10 +-
.../josm/tools/XmlParsingException.java | 2 +-
.../josm/tools/date/FallbackDateParser.java | 2 +-
.../josm/tools/date/PrimaryDateParser.java | 4 +-
.../template_engine/SearchExpressionCondition.java | 2 +-
.../josm/tools/template_engine/TemplateParser.java | 23 +-
.../josm/tools/template_engine/Tokenizer.java | 7 +-
.../josm/tools/template_engine/Variable.java | 2 +-
styles/standard/elemstyles.mapcss | 11 +
test/data/planet-notes-extract.osn | 43 +
test/data/regress/11957/data.osm | 30 +
test/data/regress/11992/shapes.osm | 173 +++
test/data/sessions/bing.jos | 21 +
.../josm/io/MultiFetchServerObjectReaderTest.java | 6 +-
.../josm/io/OsmServerBackreferenceReaderTest.java | 14 +-
.../josm/data/osm/OsmDataGenerator.java | 1 +
.../mapcss/MapCSSStyleSourceFilterTest.java | 2 +-
test/unit/org/CustomMatchers.java | 33 +-
test/unit/org/openstreetmap/josm/MainTest.java | 68 +-
.../josm/actions/AlignInLineActionTest.java | 2 +-
.../josm/actions/CombineWayActionTest.java | 57 +
.../openstreetmap/josm/actions/CopyActionTest.java | 25 +-
.../josm/actions/CreateCircleActionTest.java | 9 +-
.../actions/CreateMultipolygonActionTest.groovy | 18 +-
.../josm/actions/JoinAreasActionTest.java | 25 +
.../josm/actions/SplitWayActionTest.java | 90 +-
.../josm/actions/UnJoinNodeWayActionTest.java | 2 +-
.../actions/downloadtasks/DownloadGpsTaskTest.java | 60 +
.../downloadtasks/DownloadNotesTaskTest.java | 58 +
.../actions/downloadtasks/DownloadOsmTaskTest.java | 61 +
.../josm/actions/mapmode/DrawActionTest.java | 98 ++
.../josm/actions/mapmode/MapViewMock.java | 69 +
.../josm/actions/mapmode/SelectActionTest.java | 82 +-
.../josm/actions/search/SearchCompilerTest.java | 365 ++++-
.../command/conflict/ConflictAddCommandTest.java | 56 +
.../CoordinateConflictResolveCommandTest.java | 71 +
.../data/cache/JCSCachedTileLoaderJobTest.java | 16 +-
.../openstreetmap/josm/data/coor/LatLonTest.java | 3 +
.../data/imagery/TemplatedWMSTileSourceTest.java | 9 +-
.../josm/data/imagery/WMTSTileSourceTest.java | 24 +-
.../josm/data/osm/APIDataSetTest.java | 6 +
.../josm/data/osm/DataSetMergerTest.java | 6 +
.../openstreetmap/josm/data/osm/FilterTest.java | 7 +-
.../josm/data/osm/OsmPrimitiveKeyHandlingTest.java | 4 +-
.../josm/data/osm/OsmPrimitiveTest.java | 3 +
.../openstreetmap/josm/data/osm/OsmUtilsTest.java | 16 +-
.../josm/data/osm/QuadBucketsTest.java | 3 +
.../josm/data/osm/history/HistoryNodeTest.java | 3 +
.../josm/data/osm/history/HistoryWayTest.java | 3 +
.../visitor/MergeSourceBuildingVisitorTest.java | 3 +
.../josm/data/projection/SwissGridTest.java | 2 +-
.../validation/tests/ConditionalKeysTest.groovy | 2 +-
.../josm/data/validation/tests/HighwaysTest.groovy | 26 +-
.../validation/tests/MapCSSTagCheckerTest.java | 64 +-
.../data/validation/tests/OpeningHourTestTest.java | 92 +-
.../validation/tests/RelationCheckerTest.groovy | 2 +-
.../josm/data/validation/tests/TagCheckerTest.java | 34 +-
.../data/validation/tests/UnconnectedWaysTest.java | 17 +-
.../validation/util/MultipleNameVisitorTest.java | 35 +
.../josm/gui/DefaultNameFormatterTest.java | 40 +-
.../josm/gui/NavigatableComponentTest.java | 13 +-
.../gui/conflict/nodes/NodeListMergeModelTest.java | 3 +
.../properties/PropertiesMergeModelTest.java | 3 +
.../RelationMemberConflictResolverModelTest.java | 122 ++
.../josm/gui/conflict/tags/TagMergeItemTest.java | 6 +
.../josm/gui/conflict/tags/TagMergeModelTest.java | 6 +
.../josm/gui/dialogs/LatLonDialogTest.java | 118 +-
.../dialogs/relation/sort/RelationSorterTest.java | 6 +-
.../sort/WayConnectionTypeCalculatorTest.java | 7 +-
.../mapcss/ChildOrParentSelectorTest.groovy | 14 +-
.../mappaint/mapcss/KeyValueConditionTest.groovy | 19 +-
.../gui/preferences/ToolbarPreferencesTest.java | 5 +-
.../preferences/map/MapPaintPreferenceTest.java | 53 +
.../map/TaggingPresetPreferenceTest.java | 88 ++
.../ValidatorTagCheckerRulesPreferenceTest.java | 53 +
.../{ => presets}/PresetClassificationsTest.java | 25 +-
.../{ => presets}/TaggingPresetReaderTest.java | 23 +-
.../josm/gui/util/RotationAngleTest.java | 20 +-
.../org/openstreetmap/josm/io/NoteReaderTest.java | 85 ++
.../josm/io/remotecontrol/RemoteControlTest.java | 45 +-
.../remotecontrol/handler/ImportHandlerTest.java | 14 +-
.../remotecontrol/handler/RequestHandlerTest.java | 40 +-
.../josm/io/session/SessionReaderTest.java | 17 +
.../josm/io/session/SessionWriterTest.java | 58 +-
.../josm/plugins/PluginHandlerTest.java | 74 +
.../org/openstreetmap/josm/tools/GeometryTest.java | 3 +
.../josm/tools/ImageProviderTest.java | 16 +-
.../josm/tools/OsmUrlToBoundsTest.java | 3 +-
.../josm/tools/OverpassTurboQueryWizardTest.java | 20 +-
.../josm/tools/TextTagParserTest.java | 27 +-
.../org/openstreetmap/josm/tools/UtilsTest.java | 45 +-
.../josm/tools/date/DateUtilsTest.java | 22 +-
.../tools/template_engine/TemplateEngineTest.java | 68 +-
794 files changed, 37321 insertions(+), 22986 deletions(-)
delete mode 100644 debian/josm.sh
create mode 100644 debian/patches/08-josm-alternatives.patch
delete mode 100644 debian/patches/08-josm-desktop-fixes.patch
create mode 100644 images/dialogs/relation/reverse.png
delete mode 100644 images/dialogs/relation/reverse.svg
copy images/logo_16x16x32.png => linux/latest/usr/share/icons/hicolor/16x16/apps/josm-latest.png (100%)
copy images/logo_32x32x32.png => linux/latest/usr/share/icons/hicolor/32x32/apps/josm-latest.png (100%)
copy images/logo_48x48x32.png => linux/latest/usr/share/icons/hicolor/48x48/apps/josm-latest.png (100%)
copy images/logo.svg => linux/latest/usr/share/icons/hicolor/scalable/apps/josm-latest.svg (100%)
delete mode 100644 linux/latest/usr/share/menu/josm-latest
delete mode 100644 linux/latest/usr/share/pixmaps/josm-latest-16.xpm
delete mode 100644 linux/latest/usr/share/pixmaps/josm-latest-32.xpm
copy images/logo_16x16x32.png => linux/tested/usr/share/icons/hicolor/16x16/apps/josm.png (100%)
copy images/logo_32x32x32.png => linux/tested/usr/share/icons/hicolor/32x32/apps/josm.png (100%)
copy images/logo_48x48x32.png => linux/tested/usr/share/icons/hicolor/48x48/apps/josm.png (100%)
copy images/logo.svg => linux/tested/usr/share/icons/hicolor/scalable/apps/josm.svg (100%)
delete mode 100644 linux/tested/usr/share/menu/josm
delete mode 100644 linux/tested/usr/share/pixmaps/josm-16.xpm
delete mode 100644 linux/tested/usr/share/pixmaps/josm-32.xpm
delete mode 100644 src/org/openstreetmap/josm/corrector/UserCancelException.java
delete mode 100644 src/org/openstreetmap/josm/gui/tagging/TaggingPresetItem.java
delete mode 100644 src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPreset.java (86%)
rename src/org/openstreetmap/josm/gui/tagging/{PresetHandler.java => presets/TaggingPresetHandler.java} (75%)
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
rename src/org/openstreetmap/josm/gui/tagging/{PresetLabel.java => presets/TaggingPresetLabel.java} (92%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetListener.java (84%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetMenu.java (96%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetNameTemplateList.java (98%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetReader.java (81%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetSearchAction.java (95%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetSearchDialog.java (97%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetSearchPrimitiveDialog.java (96%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetSelector.java (96%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetSeparator.java (83%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetType.java (97%)
rename src/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresets.java (98%)
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/Check.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/CheckGroup.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/ItemSeparator.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/Key.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/KeyedItem.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/Label.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/Link.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/Optional.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/Space.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/TextItem.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/items/package-info.java
create mode 100644 src/org/openstreetmap/josm/gui/tagging/presets/package-info.java
create mode 100644 src/org/openstreetmap/josm/gui/widgets/JosmHTMLFactory.java
create mode 100644 src/org/openstreetmap/josm/gui/widgets/JosmImageView.java
create mode 100644 src/org/openstreetmap/josm/tools/UserCancelException.java
create mode 100644 test/data/planet-notes-extract.osn
create mode 100644 test/data/regress/11957/data.osm
create mode 100644 test/data/regress/11992/shapes.osm
create mode 100644 test/data/sessions/bing.jos
create mode 100644 test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
create mode 100644 test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTaskTest.java
create mode 100644 test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTaskTest.java
create mode 100644 test/unit/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskTest.java
create mode 100644 test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
create mode 100644 test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java
create mode 100644 test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java
create mode 100644 test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java
create mode 100644 test/unit/org/openstreetmap/josm/data/validation/util/MultipleNameVisitorTest.java
create mode 100644 test/unit/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModelTest.java
create mode 100644 test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java
create mode 100644 test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java
create mode 100644 test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreferenceTest.java
rename test/unit/org/openstreetmap/josm/gui/tagging/{ => presets}/PresetClassificationsTest.java (74%)
rename test/unit/org/openstreetmap/josm/gui/tagging/{ => presets}/TaggingPresetReaderTest.java (74%)
create mode 100644 test/unit/org/openstreetmap/josm/io/NoteReaderTest.java
create mode 100644 test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.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