[josm] branch upstream updated (319352e -> dcdc43b)
Bas Couwenberg
sebastic at debian.org
Tue Jul 12 12:25:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository josm.
from 319352e Imported Upstream version 0.0.svn10327+dfsg
new dcdc43b Imported Upstream version 0.0.svn10526+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 | 2 +-
CONTRIBUTION | 1 +
README | 2 +-
REVISION | 6 +-
build.xml | 11 +-
data/defaultpresets.xml | 147 +-
data/validator/combinations.mapcss | 35 +-
data/validator/deprecated.mapcss | 25 +-
data/validator/geometry.mapcss | 17 +-
data/validator/ignoretags.cfg | 7 +-
eclipse/formatter.xml | 295 ++++
geticons.pl | 2 +-
i18n/build.xml | 8 +-
i18n/convpreset.pl | 59 +-
i18n/po/af.po | 303 +++-
i18n/po/am.po | 303 +++-
i18n/po/ar.po | 303 +++-
i18n/po/ast.po | 311 +++-
i18n/po/az.po | 303 +++-
i18n/po/be.po | 349 ++++-
i18n/po/bg.po | 307 +++-
i18n/po/bn.po | 303 +++-
i18n/po/br.po | 303 +++-
i18n/po/bs.po | 303 +++-
i18n/po/ca.po | 311 +++-
i18n/po/ca at valencia.po | 311 +++-
i18n/po/cs.po | 351 ++++-
i18n/po/cy.po | 303 +++-
i18n/po/da.po | 349 ++++-
i18n/po/de.po | 374 +++--
i18n/po/de_DE.po | 303 +++-
i18n/po/el.po | 307 +++-
i18n/po/en_AU.po | 305 +++-
i18n/po/en_CA.po | 303 +++-
i18n/po/en_GB.po | 345 ++++-
i18n/po/eo.po | 303 +++-
i18n/po/es.po | 455 ++++--
i18n/po/et.po | 307 +++-
i18n/po/eu.po | 303 +++-
i18n/po/fa.po | 303 +++-
i18n/po/fi.po | 305 +++-
i18n/po/fil.po | 303 +++-
i18n/po/fo.po | 303 +++-
i18n/po/fr.po | 335 ++++-
i18n/po/ga.po | 303 +++-
i18n/po/gl.po | 305 +++-
i18n/po/he.po | 303 +++-
i18n/po/hi.po | 303 +++-
i18n/po/hr.po | 303 +++-
i18n/po/ht.po | 303 +++-
i18n/po/hu.po | 325 ++++-
i18n/po/hy.po | 303 +++-
i18n/po/ia.po | 303 +++-
i18n/po/id.po | 311 +++-
i18n/po/is.po | 303 +++-
i18n/po/it.po | 311 +++-
i18n/po/ja.po | 331 ++++-
i18n/po/ka.po | 303 +++-
i18n/po/km.po | 307 +++-
i18n/po/ko.po | 303 +++-
i18n/po/ky.po | 303 +++-
i18n/po/lb.po | 303 +++-
i18n/po/lo.po | 303 +++-
i18n/po/lt.po | 313 +++-
i18n/po/lv.po | 303 +++-
i18n/po/mk.po | 303 +++-
i18n/po/mr.po | 303 +++-
i18n/po/ms.po | 303 +++-
i18n/po/nb.po | 303 +++-
i18n/po/nds.po | 303 +++-
i18n/po/nl.po | 382 +++--
i18n/po/nn.po | 303 +++-
i18n/po/oc.po | 303 +++-
i18n/po/pa.po | 303 +++-
i18n/po/pl.po | 405 ++++--
i18n/po/pt.po | 313 +++-
i18n/po/pt_BR.po | 362 +++--
i18n/po/rm.po | 303 +++-
i18n/po/ro.po | 303 +++-
i18n/po/ru.po | 370 +++--
i18n/po/sk.po | 326 ++++-
i18n/po/sl.po | 307 +++-
i18n/po/sq.po | 303 +++-
i18n/po/sr.po | 303 +++-
i18n/po/sv.po | 376 +++--
i18n/po/ta.po | 303 +++-
i18n/po/te.po | 303 +++-
i18n/po/th.po | 303 +++-
i18n/po/tr.po | 309 +++-
i18n/po/ug.po | 303 +++-
i18n/po/uk.po | 349 ++++-
i18n/po/ur.po | 303 +++-
i18n/po/vi.po | 311 +++-
i18n/po/wae.po | 303 +++-
i18n/po/zh_CN.po | 1502 +++++++++++---------
i18n/po/zh_TW.po | 311 +++-
images/presets/ferry.png | Bin 170 -> 0 bytes
images/presets/station16.png | Bin 0 -> 415 bytes
linux/latest/etc/default/josm-latest | 9 +
linux/latest/usr/bin/josm-latest | 4 +
linux/tested/etc/default/josm | 9 +
linux/tested/usr/bin/josm | 4 +
patches/javacc.patch | 13 +
scripts/SyncEditorImageryIndex.groovy | 40 +-
.../jcs/auxiliary/disk/block/BlockDisk.java | 22 +-
.../auxiliary/disk/indexed/IndexedDiskCache.java | 8 +-
.../remote/http/server/RemoteHttpCacheServlet.java | 2 +-
.../remote/util/RemoteCacheRequestFactory.java | 2 +-
.../memory/soft/SoftReferenceMemoryCache.java | 4 +-
.../apache/commons/jcs/utils/timing/SleepUtil.java | 50 -
src/org/openstreetmap/josm/Main.java | 321 +++--
.../openstreetmap/josm/actions/AboutAction.java | 4 +-
.../josm/actions/AbstractInfoAction.java | 11 +-
.../josm/actions/AbstractSelectAction.java | 4 +-
.../josm/actions/AddImageryLayerAction.java | 9 +-
.../openstreetmap/josm/actions/AddNodeAction.java | 14 +-
.../josm/actions/AlignInCircleAction.java | 9 +-
.../josm/actions/AlignInLineAction.java | 21 +-
.../josm/actions/AutoScaleAction.java | 24 +-
.../josm/actions/CombineWayAction.java | 17 +-
src/org/openstreetmap/josm/actions/CopyAction.java | 20 +-
.../josm/actions/CopyCoordinatesAction.java | 8 +-
.../josm/actions/CreateCircleAction.java | 13 +-
.../josm/actions/CreateMultipolygonAction.java | 35 +-
.../openstreetmap/josm/actions/DeleteAction.java | 6 +-
.../josm/actions/DeleteLayerAction.java | 4 +-
.../josm/actions/DistributeAction.java | 9 +-
.../josm/actions/DownloadPrimitiveAction.java | 2 +-
.../josm/actions/DownloadReferrersAction.java | 8 +-
.../josm/actions/DuplicateAction.java | 9 +-
.../josm/actions/ExtensionFileFilter.java | 78 +-
.../josm/actions/FollowLineAction.java | 11 +-
.../josm/actions/GpxExportAction.java | 2 +-
.../josm/actions/HistoryInfoAction.java | 4 +-
.../josm/actions/HistoryInfoWebAction.java | 2 +-
.../josm/actions/ImageryAdjustAction.java | 2 -
src/org/openstreetmap/josm/actions/InfoAction.java | 9 +-
.../josm/actions/JoinAreasAction.java | 23 +-
.../josm/actions/JoinNodeWayAction.java | 11 +-
src/org/openstreetmap/josm/actions/JosmAction.java | 190 ++-
.../josm/actions/MapRectifierWMSmenuAction.java | 4 +-
.../josm/actions/MergeLayerAction.java | 4 +-
.../josm/actions/MergeNodesAction.java | 15 +-
.../josm/actions/MergeSelectionAction.java | 24 +-
.../openstreetmap/josm/actions/MirrorAction.java | 9 +-
src/org/openstreetmap/josm/actions/MoveAction.java | 40 +-
.../openstreetmap/josm/actions/MoveNodeAction.java | 11 +-
src/org/openstreetmap/josm/actions/NewAction.java | 2 +-
.../openstreetmap/josm/actions/OpenFileAction.java | 4 +-
.../josm/actions/OrthogonalizeAction.java | 32 +-
.../openstreetmap/josm/actions/PasteAction.java | 6 +-
.../josm/actions/PasteTagsAction.java | 8 +-
.../openstreetmap/josm/actions/PurgeAction.java | 18 +-
.../josm/actions/ReverseWayAction.java | 18 +-
.../openstreetmap/josm/actions/SaveActionBase.java | 2 +-
.../josm/actions/SelectAllAction.java | 6 +-
.../josm/actions/SelectByInternalPointAction.java | 4 +-
.../SelectNonBranchingWaySequencesAction.java | 4 +-
.../josm/actions/SessionLoadAction.java | 8 +-
.../josm/actions/SessionSaveAsAction.java | 4 +-
.../josm/actions/ShowStatusReportAction.java | 6 +-
.../josm/actions/SimplifyWayAction.java | 11 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 21 +-
.../openstreetmap/josm/actions/UnGlueAction.java | 41 +-
.../josm/actions/UnJoinNodeWayAction.java | 9 +-
.../josm/actions/UnselectAllAction.java | 4 +-
.../josm/actions/UpdateDataAction.java | 20 +-
.../josm/actions/UpdateModifiedAction.java | 7 +-
.../josm/actions/UpdateSelectionAction.java | 18 +-
.../openstreetmap/josm/actions/UploadAction.java | 9 +-
.../josm/actions/UploadNotesAction.java | 2 +-
.../josm/actions/UploadSelectionAction.java | 16 +-
.../openstreetmap/josm/actions/ValidateAction.java | 14 +-
.../josm/actions/ViewportFollowToggleAction.java | 2 +-
.../josm/actions/WireframeToggleAction.java | 2 +-
.../openstreetmap/josm/actions/ZoomToAction.java | 23 +-
.../ChangesetContentDownloadTask.java | 1 +
.../actions/downloadtasks/ChangesetQueryTask.java | 3 +-
.../actions/downloadtasks/DownloadGpsTask.java | 8 +-
.../actions/downloadtasks/DownloadNotesTask.java | 6 +-
.../downloadtasks/DownloadOsmChangeTask.java | 4 +-
.../downloadtasks/DownloadOsmCompressedTask.java | 2 +-
.../actions/downloadtasks/DownloadOsmTask.java | 10 +-
.../downloadtasks/DownloadReferrersTask.java | 2 -
.../actions/downloadtasks/DownloadSessionTask.java | 2 +-
.../actions/downloadtasks/DownloadTaskList.java | 4 +-
.../josm/actions/mapmode/AddNoteAction.java | 3 +-
.../josm/actions/mapmode/DeleteAction.java | 48 +-
.../josm/actions/mapmode/DrawAction.java | 68 +-
.../josm/actions/mapmode/ExtrudeAction.java | 17 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 20 +-
.../josm/actions/mapmode/ModifiersSpec.java | 2 +
.../josm/actions/mapmode/ParallelWayAction.java | 17 +-
.../josm/actions/mapmode/SelectAction.java | 71 +-
.../actions/relation/AddSelectionToRelations.java | 2 +-
.../actions/relation/DeleteRelationsAction.java | 11 +-
.../actions/relation/DownloadMembersAction.java | 2 +-
.../DownloadSelectedIncompleteMembersAction.java | 2 +-
.../actions/relation/DuplicateRelationAction.java | 4 +-
.../josm/actions/relation/EditRelationAction.java | 8 +-
.../actions/relation/RecentRelationsAction.java | 29 +-
.../josm/actions/relation/SelectMembersAction.java | 4 +-
.../actions/relation/SelectRelationAction.java | 4 +-
.../josm/actions/search/SearchAction.java | 143 +-
.../josm/actions/search/SearchCompiler.java | 4 +-
.../actions/upload/ApiPreconditionCheckerHook.java | 5 +-
.../josm/actions/upload/FixDataHook.java | 2 +
.../josm/actions/upload/ValidateUploadHook.java | 5 +-
src/org/openstreetmap/josm/command/AddCommand.java | 4 +-
.../josm/command/AddPrimitivesCommand.java | 8 +-
src/org/openstreetmap/josm/command/Command.java | 26 +-
.../openstreetmap/josm/command/MoveCommand.java | 4 +-
.../openstreetmap/josm/command/PurgeCommand.java | 6 +-
.../openstreetmap/josm/command/RotateCommand.java | 2 +
.../openstreetmap/josm/command/ScaleCommand.java | 2 +-
.../openstreetmap/josm/command/SelectCommand.java | 6 +-
.../josm/command/SequenceCommand.java | 8 +
.../josm/command/conflict/ConflictAddCommand.java | 4 +-
.../command/conflict/ConflictResolveCommand.java | 4 +-
.../RelationMemberConflictResolverCommand.java | 6 +-
.../conflict/WayNodesConflictResolverCommand.java | 2 +-
src/org/openstreetmap/josm/data/AutosaveTask.java | 61 +-
.../josm/data/CustomConfigurator.java | 56 +-
src/org/openstreetmap/josm/data/DataSource.java | 9 +
src/org/openstreetmap/josm/data/Preferences.java | 13 +-
.../openstreetmap/josm/data/UndoRedoHandler.java | 84 +-
src/org/openstreetmap/josm/data/Version.java | 8 +-
.../josm/data/cache/CacheEntryAttributes.java | 10 +-
.../josm/data/cache/HostLimitQueue.java | 6 +-
.../josm/data/cache/JCSCacheManager.java | 20 +-
.../josm/data/cache/JCSCachedTileLoaderJob.java | 12 +-
.../josm/data/conflict/ConflictCollection.java | 2 +-
.../openstreetmap/josm/data/coor/CachedLatLon.java | 17 +-
.../openstreetmap/josm/data/coor/EastNorth.java | 20 +
src/org/openstreetmap/josm/data/coor/LatLon.java | 10 +-
src/org/openstreetmap/josm/data/gpx/GpxData.java | 2 +-
src/org/openstreetmap/josm/data/gpx/WayPoint.java | 2 +-
.../CachedAttributionBingAerialTileSource.java | 2 +-
.../josm/data/imagery/ImageryInfo.java | 2 +-
.../josm/data/imagery/ImageryLayerInfo.java | 2 +-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 8 +-
.../josm/data/imagery/TemplatedWMSTileSource.java | 28 +-
.../josm/data/imagery/WMTSTileSource.java | 6 +-
.../josm/data/osm/AbstractPrimitive.java | 4 +-
src/org/openstreetmap/josm/data/osm/BBox.java | 30 +-
src/org/openstreetmap/josm/data/osm/Changeset.java | 2 +-
.../josm/data/osm/ChangesetDataSet.java | 2 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 102 +-
.../josm/data/osm/DatasetConsistencyTest.java | 2 +-
src/org/openstreetmap/josm/data/osm/Filter.java | 2 +-
.../josm/data/osm/MultipolygonBuilder.java | 2 +
src/org/openstreetmap/josm/data/osm/Node.java | 2 +-
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 8 +-
.../josm/data/osm/event/DatasetEventManager.java | 25 +-
.../josm/data/osm/history/HistoryDataSet.java | 20 +-
.../josm/data/osm/history/HistoryOsmPrimitive.java | 2 +-
.../josm/data/osm/history/HistoryRelation.java | 2 +-
.../osm/visitor/paint/AbstractMapRenderer.java | 4 +-
.../data/osm/visitor/paint/MapRendererFactory.java | 8 +-
.../josm/data/osm/visitor/paint/PaintColors.java | 2 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 8 +-
.../osm/visitor/paint/WireframeMapRenderer.java | 2 +-
.../osm/visitor/paint/relations/Multipolygon.java | 2 +-
.../visitor/paint/relations/MultipolygonCache.java | 19 +-
.../data/preferences/ParametrizedEnumProperty.java | 1 +
.../josm/data/projection/CustomProjection.java | 5 +-
.../josm/data/projection/Projection.java | 3 +-
.../josm/data/projection/Projections.java | 3 +-
.../josm/data/projection/proj/AbstractProj.java | 4 +-
.../josm/data/projection/proj/AlbersEqualArea.java | 26 +-
.../projection/proj/LambertAzimuthalEqualArea.java | 58 +-
.../projection/proj/LambertConformalConic.java | 6 +-
.../josm/data/projection/proj/Mercator.java | 2 +-
.../josm/data/projection/proj/ObliqueMercator.java | 16 +-
.../data/projection/proj/PolarStereographic.java | 2 +-
.../josm/data/validation/OsmValidator.java | 34 +-
.../josm/data/validation/PaintVisitor.java | 4 +-
.../josm/data/validation/Severity.java | 2 +
.../openstreetmap/josm/data/validation/Test.java | 2 +-
.../josm/data/validation/TestError.java | 2 +-
.../data/validation/routines/DomainValidator.java | 60 +-
.../data/validation/routines/EmailValidator.java | 2 +-
.../validation/routines/InetAddressValidator.java | 4 +-
.../data/validation/routines/RegexValidator.java | 4 +-
.../data/validation/routines/UrlValidator.java | 7 +-
.../josm/data/validation/tests/Addresses.java | 2 +
.../josm/data/validation/tests/Coastlines.java | 7 +-
.../data/validation/tests/ConditionalKeys.java | 2 +
.../josm/data/validation/tests/DuplicateNode.java | 2 +-
.../josm/data/validation/tests/Highways.java | 2 +
.../josm/data/validation/tests/InternetTags.java | 34 +-
.../josm/data/validation/tests/LongSegment.java | 2 +-
.../data/validation/tests/MapCSSTagChecker.java | 8 +-
.../data/validation/tests/OverlappingWays.java | 2 +-
.../josm/data/validation/tests/PowerLines.java | 17 +-
.../data/validation/tests/RelationChecker.java | 18 +-
.../josm/data/validation/tests/TagChecker.java | 16 +-
.../josm/data/validation/tests/UnclosedWays.java | 6 +-
.../data/validation/tests/UnconnectedWays.java | 11 +-
.../josm/data/validation/tests/UntaggedWay.java | 18 +-
.../data/validation/tests/WronglyOrderedWays.java | 2 +
.../josm/data/validation/util/ValUtil.java | 8 +-
.../josm/gui/DefaultNameFormatter.java | 6 +-
src/org/openstreetmap/josm/gui/ExtendedDialog.java | 4 +-
.../josm/gui/HelpAwareOptionPane.java | 6 +-
.../openstreetmap/josm/gui/IconToggleButton.java | 2 +
src/org/openstreetmap/josm/gui/ImageryMenu.java | 34 +-
.../openstreetmap/josm/gui/MainApplication.java | 73 +-
src/org/openstreetmap/josm/gui/MainFrame.java | 246 ++++
src/org/openstreetmap/josm/gui/MainMenu.java | 36 +-
src/org/openstreetmap/josm/gui/MainPanel.java | 172 +++
src/org/openstreetmap/josm/gui/MapFrame.java | 48 +-
src/org/openstreetmap/josm/gui/MapMover.java | 99 +-
src/org/openstreetmap/josm/gui/MapScaler.java | 41 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 17 +-
src/org/openstreetmap/josm/gui/MapView.java | 217 ++-
src/org/openstreetmap/josm/gui/MapViewState.java | 454 ++++++
.../josm/gui/NavigatableComponent.java | 351 ++---
src/org/openstreetmap/josm/gui/ScrollViewport.java | 2 +-
.../openstreetmap/josm/gui/SelectionManager.java | 6 +-
src/org/openstreetmap/josm/gui/SideButton.java | 49 +-
src/org/openstreetmap/josm/gui/SplashScreen.java | 4 +-
.../josm/gui/bbox/SlippyMapBBoxChooser.java | 4 +-
.../josm/gui/bbox/TileSelectionBBoxChooser.java | 4 +-
.../josm/gui/conflict/pair/ComparePairType.java | 4 +-
.../josm/gui/conflict/pair/ConflictResolver.java | 22 +-
.../josm/gui/conflict/pair/ListMergeModel.java | 2 +-
.../josm/gui/conflict/pair/ListMerger.java | 27 +-
.../gui/conflict/pair/nodes/NodeListMerger.java | 6 +-
.../pair/properties/PropertiesMergeModel.java | 4 +-
.../pair/relation/RelationMemberMerger.java | 6 +-
.../relation/RelationMemberTableCellRenderer.java | 4 +-
.../josm/gui/conflict/pair/tags/TagMergeItem.java | 2 +-
.../josm/gui/conflict/pair/tags/TagMerger.java | 2 +-
.../tags/CombinePrimitiveResolverDialog.java | 4 +-
.../tags/PasteTagsConflictResolverDialog.java | 6 +-
.../tags/RelationMemberConflictDecision.java | 2 +-
.../tags/RelationMemberConflictResolver.java | 6 +-
.../josm/gui/dialogs/ChangesetDialog.java | 33 +-
.../josm/gui/dialogs/CommandStackDialog.java | 20 +-
.../josm/gui/dialogs/ConflictDialog.java | 23 +-
.../josm/gui/dialogs/ConflictResolutionDialog.java | 16 +-
.../DeleteFromRelationConfirmationDialog.java | 6 +-
.../josm/gui/dialogs/DialogsPanel.java | 7 +-
.../josm/gui/dialogs/FilterDialog.java | 14 +-
.../josm/gui/dialogs/FilterTableModel.java | 6 +-
.../josm/gui/dialogs/InspectPrimitiveDialog.java | 2 +-
.../josm/gui/dialogs/LayerListDialog.java | 49 +-
.../josm/gui/dialogs/MapPaintDialog.java | 10 +-
.../josm/gui/dialogs/NotesDialog.java | 74 +-
.../josm/gui/dialogs/RelationListDialog.java | 48 +-
.../josm/gui/dialogs/SelectionListDialog.java | 75 +-
.../josm/gui/dialogs/ToggleDialog.java | 25 +-
.../josm/gui/dialogs/UserListDialog.java | 38 +-
.../josm/gui/dialogs/ValidatorDialog.java | 63 +-
.../dialogs/changeset/ChangesetCacheManager.java | 32 +-
.../dialogs/changeset/ChangesetContentPanel.java | 52 +-
.../dialogs/changeset/ChangesetDetailPanel.java | 67 +-
.../changeset/ChangesetDiscussionPanel.java | 3 +-
.../changeset/ChangesetInSelectionListModel.java | 14 +-
.../ChangesetsInActiveDataLayerListModel.java | 14 +-
.../changeset/DownloadChangesetContentAction.java | 7 +-
.../changeset/SingleChangesetDownloadPanel.java | 9 +-
.../query/AdvancedChangesetQueryPanel.java | 16 +-
.../changeset/query/BasicChangesetQueryPanel.java | 2 +-
.../changeset/query/ChangesetQueryDialog.java | 17 +-
.../changeset/query/UrlBasedQueryPanel.java | 2 +-
.../gui/dialogs/layer/ActivateLayerAction.java | 29 +-
.../josm/gui/dialogs/layer/DeleteLayerAction.java | 4 +-
.../josm/gui/dialogs/layer/DuplicateAction.java | 5 +-
.../gui/dialogs/layer/LayerVisibilityAction.java | 2 +-
.../josm/gui/dialogs/layer/MergeAction.java | 4 +-
.../josm/gui/dialogs/layer/MoveDownAction.java | 2 +-
.../josm/gui/dialogs/layer/MoveUpAction.java | 4 +-
.../gui/dialogs/properties/PropertiesDialog.java | 37 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 12 +-
.../gui/dialogs/relation/ChildRelationBrowser.java | 6 +-
.../dialogs/relation/GenericRelationEditor.java | 13 +-
.../josm/gui/dialogs/relation/MemberTable.java | 40 +-
.../relation/MemberTableLinkedCellRenderer.java | 8 +-
.../gui/dialogs/relation/MemberTableModel.java | 2 +-
.../relation/ParentRelationLoadingTask.java | 2 +-
.../relation/ReferringRelationsBrowser.java | 12 +-
.../dialogs/relation/RelationDialogManager.java | 25 +-
.../josm/gui/dialogs/relation/RelationTree.java | 6 +-
.../relation/SelectionTableColumnModel.java | 2 +-
.../gui/dialogs/relation/SelectionTableModel.java | 38 +-
.../actions/AddSelectedAfterSelection.java | 6 +-
.../relation/actions/AddSelectedAtEndAction.java | 6 +-
.../relation/actions/AddSelectedAtStartAction.java | 6 +-
.../actions/AddSelectedBeforeSelection.java | 6 +-
.../gui/dialogs/relation/actions/CancelAction.java | 2 +-
.../gui/dialogs/relation/actions/OKAction.java | 2 +-
.../relation/actions/PasteMembersAction.java | 6 +-
.../relation/actions/RemoveSelectedAction.java | 2 +-
.../dialogs/relation/actions/SetRoleAction.java | 2 +-
.../gui/dialogs/validator/ValidatorTreePanel.java | 4 +-
.../josm/gui/download/BookmarkSelection.java | 2 +-
.../josm/gui/download/BoundingBoxSelection.java | 2 +-
.../josm/gui/download/DownloadDialog.java | 20 +-
.../josm/gui/download/DownloadObjectDialog.java | 2 +
.../josm/gui/download/DownloadSelection.java | 2 +-
.../josm/gui/help/ContextSensitiveHelpAction.java | 2 +-
.../josm/gui/history/HistoryBrowserDialog.java | 12 +-
.../gui/history/HistoryBrowserDialogManager.java | 26 +-
.../josm/gui/history/HistoryBrowserModel.java | 41 +-
.../josm/gui/history/NodeListViewer.java | 10 +-
.../josm/gui/history/VersionInfoPanel.java | 4 +-
.../josm/gui/io/AbstractUploadTask.java | 18 +-
.../josm/gui/io/ChangesetManagementPanel.java | 2 +-
.../io/DownloadPrimitivesWithReferrersTask.java | 6 +-
.../josm/gui/io/RecentlyOpenedFilesMenu.java | 2 +-
.../openstreetmap/josm/gui/io/SaveLayerTask.java | 2 +-
.../josm/gui/io/SaveLayersDialog.java | 15 +-
.../josm/gui/io/TagSettingsPanel.java | 2 +-
.../openstreetmap/josm/gui/io/UploadDialog.java | 7 +-
.../josm/gui/io/UploadPrimitivesTask.java | 2 +-
.../josm/gui/io/UploadSelectionDialog.java | 6 +-
.../josm/gui/io/UploadStrategySpecification.java | 2 +-
.../josm/gui/io/UploadedObjectsSummaryPanel.java | 2 +-
.../josm/gui/layer/AbstractMapViewPaintable.java | 55 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 100 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 2 +-
.../openstreetmap/josm/gui/layer/ImageryLayer.java | 14 +-
src/org/openstreetmap/josm/gui/layer/Layer.java | 60 +-
.../openstreetmap/josm/gui/layer/LayerManager.java | 113 +-
.../josm/gui/layer/MainLayerManager.java | 135 +-
.../josm/gui/layer/MapViewGraphics.java | 62 +
.../josm/gui/layer/MapViewPaintable.java | 69 +
.../josm/gui/layer/NativeScaleLayer.java | 2 +-
.../openstreetmap/josm/gui/layer/NoteLayer.java | 24 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 38 +-
.../josm/gui/layer/ValidatorLayer.java | 26 +-
src/org/openstreetmap/josm/gui/layer/WMSLayer.java | 6 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 8 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 32 +-
.../josm/gui/layer/geoimage/ImageEntry.java | 17 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 52 +-
.../gui/layer/gpx/ConvertToDataLayerAction.java | 4 +-
.../josm/gui/layer/gpx/DateFilterPanel.java | 4 +-
.../gui/layer/gpx/DownloadWmsAlongTrackAction.java | 2 +-
.../josm/gui/layer/gpx/ImportAudioAction.java | 2 +-
.../layer/gpx/MarkersFromNamedPointsAction.java | 2 +-
.../josm/gui/layer/markerlayer/MarkerLayer.java | 16 +-
.../josm/gui/mappaint/ElemStyles.java | 2 +-
.../josm/gui/mappaint/MapPaintMenu.java | 6 +-
.../josm/gui/mappaint/MapPaintStyles.java | 3 +-
.../gui/mappaint/styleelement/BoxTextElement.java | 110 +-
.../gui/mappaint/styleelement/LineElement.java | 406 +++---
.../josm/gui/mappaint/styleelement/MapImage.java | 2 +-
.../gui/mappaint/styleelement/NodeElement.java | 6 +-
.../josm/gui/oauth/AbstractAuthorizationUI.java | 2 +-
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 14 +-
.../josm/gui/oauth/ManualAuthorizationUI.java | 6 +-
.../josm/gui/oauth/OAuthAuthorizationWizard.java | 18 +-
.../gui/oauth/OsmOAuthAuthorizationClient.java | 2 +-
.../gui/oauth/SemiAutomaticAuthorizationUI.java | 26 +-
.../josm/gui/oauth/TestAccessTokenTask.java | 4 +-
.../josm/gui/preferences/PreferenceDialog.java | 12 +-
.../josm/gui/preferences/PreferenceTabbedPane.java | 11 +-
.../josm/gui/preferences/SourceEditor.java | 20 +-
.../josm/gui/preferences/ToolbarPreferences.java | 4 +-
.../gui/preferences/display/GPXSettingsPanel.java | 12 +-
.../gui/preferences/imagery/AddWMSLayerPanel.java | 12 +-
.../preferences/imagery/CacheContentsPanel.java | 2 +-
.../preferences/imagery/CommonSettingsPanel.java | 25 +
.../gui/preferences/map/MapPaintPreference.java | 4 +-
.../preferences/map/TaggingPresetPreference.java | 4 +-
.../gui/preferences/plugin/PluginPreference.java | 8 +-
.../projection/CodeProjectionChoice.java | 2 +-
.../preferences/server/OAuthAccessTokenHolder.java | 2 +-
.../OAuthAuthenticationPreferencesPanel.java | 17 +-
.../preferences/server/OsmApiUrlInputPanel.java | 10 +-
.../josm/gui/preferences/shortcut/PrefJPanel.java | 8 +-
.../ValidatorTagCheckerRulesPreference.java | 2 +
.../josm/gui/tagging/TagCellRenderer.java | 4 +-
.../openstreetmap/josm/gui/tagging/TagTable.java | 14 +-
.../gui/tagging/ac/AutoCompletionItemPriority.java | 2 +-
.../gui/tagging/ac/AutoCompletionListItem.java | 2 +-
.../josm/gui/tagging/presets/TaggingPreset.java | 55 +-
.../gui/tagging/presets/TaggingPresetItem.java | 2 +-
.../gui/tagging/presets/TaggingPresetReader.java | 2 +-
.../tagging/presets/TaggingPresetSearchAction.java | 2 +-
.../TaggingPresetSearchPrimitiveDialog.java | 8 +-
.../gui/tagging/presets/TaggingPresetSelector.java | 8 +-
.../tagging/presets/items/ComboMultiSelect.java | 1 +
.../josm/gui/tagging/presets/items/Text.java | 2 +-
.../josm/gui/util/AdjustmentSynchronizer.java | 2 +-
src/org/openstreetmap/josm/gui/util/GuiHelper.java | 29 +-
.../josm/gui/util/GuiSizesHelper.java | 115 ++
.../josm/gui/util/HighlightHelper.java | 4 +-
.../widgets/AbstractTextComponentValidator.java | 2 +-
.../gui/widgets/CompileSearchTextDecorator.java | 2 +
.../josm/gui/widgets/MultiSplitLayout.java | 4 +-
.../josm/gui/widgets/MultiSplitPane.java | 4 +-
.../josm/gui/widgets/OsmPrimitivesTable.java | 22 +-
.../josm/gui/widgets/TextContextualPopupMenu.java | 4 +-
.../openstreetmap/josm/io/AllFormatsImporter.java | 2 +-
src/org/openstreetmap/josm/io/Capabilities.java | 2 +-
src/org/openstreetmap/josm/io/ChangesetQuery.java | 6 +-
.../josm/io/DefaultProxySelector.java | 2 +-
.../openstreetmap/josm/io/DiffResultProcessor.java | 6 +-
src/org/openstreetmap/josm/io/FileExporter.java | 17 +-
src/org/openstreetmap/josm/io/FileImporter.java | 20 +-
src/org/openstreetmap/josm/io/GpxExporter.java | 2 +-
src/org/openstreetmap/josm/io/GpxImporter.java | 4 +-
src/org/openstreetmap/josm/io/GpxReader.java | 2 +-
.../josm/io/MultiFetchServerObjectReader.java | 4 +
src/org/openstreetmap/josm/io/NMEAImporter.java | 4 +-
src/org/openstreetmap/josm/io/NmeaReader.java | 3 +
src/org/openstreetmap/josm/io/NoteImporter.java | 12 +-
src/org/openstreetmap/josm/io/NoteReader.java | 2 +-
src/org/openstreetmap/josm/io/OsmApi.java | 12 +-
.../openstreetmap/josm/io/OsmChangeImporter.java | 4 +-
.../openstreetmap/josm/io/OsmHistoryReader.java | 3 +-
src/org/openstreetmap/josm/io/OsmImporter.java | 8 +-
.../josm/io/OsmServerBackreferenceReader.java | 4 +-
src/org/openstreetmap/josm/io/OsmServerReader.java | 20 +-
.../josm/io/OsmServerUserInfoReader.java | 6 +-
.../openstreetmap/josm/io/WMSLayerExporter.java | 6 +-
.../openstreetmap/josm/io/WMSLayerImporter.java | 2 +-
.../josm/io/auth/AbstractCredentialsAgent.java | 2 +-
.../openstreetmap/josm/io/imagery/WMSImagery.java | 44 +-
.../josm/io/remotecontrol/AddTagsDialog.java | 8 +-
.../io/remotecontrol/handler/AddNodeHandler.java | 4 +-
.../io/remotecontrol/handler/AddWayHandler.java | 4 +-
.../io/remotecontrol/handler/ImageryHandler.java | 4 +-
.../remotecontrol/handler/LoadAndZoomHandler.java | 14 +-
.../remotecontrol/handler/LoadObjectHandler.java | 2 +-
.../josm/io/session/GenericSessionExporter.java | 2 +-
.../josm/io/session/MarkerSessionExporter.java | 2 +-
.../josm/io/session/SessionReader.java | 9 +-
.../josm/io/session/SessionWriter.java | 8 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 5 +-
.../josm/plugins/PluginInformation.java | 21 +-
src/org/openstreetmap/josm/tools/ColorScale.java | 8 +-
src/org/openstreetmap/josm/tools/Diff.java | 29 +-
src/org/openstreetmap/josm/tools/ExifReader.java | 5 +-
src/org/openstreetmap/josm/tools/Geometry.java | 2 +-
src/org/openstreetmap/josm/tools/HttpClient.java | 1 +
.../openstreetmap/josm/tools/ImageProvider.java | 302 ++--
.../openstreetmap/josm/tools/ImageResource.java | 154 +-
.../josm/tools/MultikeyShortcutAction.java | 2 +-
.../openstreetmap/josm/tools/PlatformHookOsx.java | 138 +-
.../josm/tools/PlatformHookUnixoid.java | 7 +-
.../josm/tools/PlatformHookWindows.java | 7 +-
src/org/openstreetmap/josm/tools/Shortcut.java | 6 +-
.../openstreetmap/josm/tools/TextTagParser.java | 6 +-
src/org/openstreetmap/josm/tools/Utils.java | 41 +
.../openstreetmap/josm/tools/WindowGeometry.java | 8 +-
.../openstreetmap/josm/tools/XmlObjectParser.java | 4 +-
.../josm/tools/bugreport/BugReport.java | 6 +-
.../tools/bugreport/BugReportExceptionHandler.java | 4 +-
.../josm/tools/bugreport/BugReportSender.java | 6 +-
.../openstreetmap/josm/tools/date/DateUtils.java | 44 +-
.../josm/tools/template_engine/TemplateParser.java | 2 +-
styles/standard/elemstyles.mapcss | 185 ++-
.../gui/conflict/pair/tags/TagMergerTestFT.java | 2 +-
.../josm/io/OsmServerBackreferenceReaderTest.java | 2 +-
.../josm/io/UploadStrategySelectionPanelTest.java | 2 +-
test/unit/org/openstreetmap/josm/JOSMFixture.java | 43 +-
test/unit/org/openstreetmap/josm/MainTest.java | 5 +-
test/unit/org/openstreetmap/josm/TestUtils.java | 341 +----
.../josm/actions/AddImageryLayerActionTest.java | 31 +-
.../josm/actions/AlignInLineActionTest.java | 49 +-
.../josm/actions/CreateCircleActionTest.java | 8 +-
.../josm/actions/JoinAreasActionTest.java | 32 +-
.../josm/actions/OrthogonalizeActionTest.java | 2 +-
.../josm/actions/PurgeActionTest.java | 4 +-
.../actions/SelectByInternalPointActionTest.java | 80 +-
.../josm/actions/SimplifyWayActionTest.java | 12 +-
.../josm/actions/SplitWayActionTest.java | 4 +-
.../josm/actions/UnGlueActionTest.java | 16 +-
.../josm/actions/UnJoinNodeWayActionTest.java | 4 +-
.../josm/actions/mapmode/AddNoteActionTest.java | 4 +-
.../josm/actions/mapmode/DeleteActionTest.java | 4 +-
.../josm/actions/mapmode/DrawActionTest.java | 6 +-
.../josm/actions/mapmode/ExtrudeActionTest.java | 4 +-
.../mapmode/ImproveWayAccuracyActionTest.java | 4 +-
.../josm/actions/mapmode/MapViewMock.java | 26 +-
.../actions/mapmode/ParallelWayActionTest.java | 4 +-
.../josm/actions/mapmode/PlayHeadDragModeTest.java | 4 +-
.../josm/actions/mapmode/SelectActionTest.java | 6 +-
.../josm/actions/search/SearchCompilerTest.java | 15 +-
.../command/conflict/ConflictAddCommandTest.java | 8 +-
.../CoordinateConflictResolveCommandTest.java | 4 +-
.../openstreetmap/josm/data/AutosaveTaskTest.java | 219 ++-
.../openstreetmap/josm/data/PreferencesTest.groovy | 4 +-
.../data/cache/JCSCachedTileLoaderJobTest.java | 2 +-
.../josm/data/coor/CachedLatLonTest.java | 36 +
.../openstreetmap/josm/data/coor/LatLonTest.java | 93 +-
.../josm/data/imagery/ImageryInfoTest.java | 2 +-
.../data/imagery/TemplatedWMSTileSourceTest.java | 6 +-
.../josm/data/imagery/WMTSTileSourceTest.java | 7 +-
.../org/openstreetmap/josm/data/osm/BBoxTest.java | 33 +
.../josm/data/osm/DataSetMergerTest.java | 11 +-
.../josm/data/osm/history/HistoryRelationTest.java | 2 +
.../josm/data/osm/history/HistoryWayTest.java | 2 +
.../visitor/MergeSourceBuildingVisitorTest.java | 2 +-
.../josm/data/projection/SwissGridTest.java | 12 +-
.../validation/routines/DomainValidatorTest.java | 2 +-
.../validation/routines/EmailValidatorTest.java | 24 +-
.../routines/InetAddressValidatorTest.java | 40 +-
.../validation/routines/RegexValidatorTest.java | 26 +-
.../data/validation/routines/UrlValidatorTest.java | 4 +-
.../data/validation/tests/OpeningHourTestTest.java | 102 +-
.../josm/gui/DefaultNameFormatterTest.java | 2 +
.../openstreetmap/josm/gui/MapViewStateTest.java | 149 ++
.../josm/gui/NavigatableComponentTest.java | 36 +-
.../gui/dialogs/InspectPrimitiveDialogTest.java | 4 +-
.../dialogs/layer/LayerVisibilityActionTest.java | 109 +-
.../gui/dialogs/relation/SelectionTableTest.java | 4 +-
.../openstreetmap/josm/gui/layer/GpxLayerTest.java | 8 +-
.../josm/gui/layer/LayerManagerTest.java | 130 +-
.../josm/gui/layer/MainLayerManagerTest.java | 36 +-
.../josm/gui/layer/OsmDataLayerTest.java | 8 +-
.../openstreetmap/josm/gui/layer/TMSLayerTest.java | 4 +-
.../josm/gui/layer/ValidatorLayerTest.java | 4 +-
.../openstreetmap/josm/gui/layer/WMSLayerTest.java | 4 +-
.../layer/geoimage/CorrelateGpxWithImagesTest.java | 10 +-
.../josm/gui/layer/geoimage/GeoImageLayerTest.java | 51 +-
.../layer/gpx/DownloadAlongTrackActionTest.java | 4 +-
.../layer/gpx/DownloadWmsAlongTrackActionTest.java | 4 +-
.../gui/layer/markerlayer/MarkerLayerTest.java | 2 +-
.../advanced/AdvancedPreferenceTest.java | 2 +-
.../advanced/ExportProfileActionTest.java | 2 +-
.../gui/preferences/advanced/ListEditorTest.java | 2 +-
.../gui/preferences/advanced/PrefEntryTest.java | 2 +-
.../preferences/advanced/PreferencesTableTest.java | 4 +-
.../gui/preferences/audio/AudioPreferenceTest.java | 2 +-
.../preferences/display/ColorPreferenceTest.java | 2 +-
.../preferences/display/DisplayPreferenceTest.java | 2 +-
.../preferences/display/DrawingPreferenceTest.java | 2 +-
.../gui/preferences/display/LafPreferenceTest.java | 2 +-
.../display/LanguagePreferenceTest.java | 2 +-
.../preferences/imagery/ImageryPreferenceTest.java | 2 +-
.../gui/preferences/map/BackupPreferenceTest.java | 2 +-
.../preferences/map/MapPaintPreferenceTest.java | 2 +-
.../preferences/map/MapPaintPreferenceTestIT.java | 6 +-
.../gui/preferences/map/MapPreferenceTest.java | 2 +-
.../map/TaggingPresetPreferenceTest.java | 2 +-
.../map/TaggingPresetPreferenceTestIT.java | 8 +-
.../preferences/plugin/PluginPreferenceTest.java | 4 +-
.../projection/ProjectionPreferenceTest.java | 2 +-
.../remotecontrol/RemoteControlPreferenceTest.java | 2 +-
.../server/AuthenticationPreferenceTest.java | 2 +-
.../server/OverpassServerPreferenceTest.java | 2 +-
.../preferences/server/ProxyPreferenceTest.java | 2 +-
.../server/ServerAccessPreferenceTest.java | 2 +-
.../shortcut/ShortcutPreferenceTest.java | 2 +-
.../validator/ValidatorPreferenceTest.java | 2 +-
.../validator/ValidatorTestsPreferenceTest.java | 2 +-
.../tagging/presets/TaggingPresetReaderTest.java | 2 +-
.../org/openstreetmap/josm/io/NmeaReaderTest.java | 23 +-
.../openstreetmap/josm/io/NoteImporterTest.java | 16 +-
.../josm/io/remotecontrol/RemoteControlTest.java | 17 +-
.../remotecontrol/handler/AddNodeHandlerTest.java | 8 +-
.../remotecontrol/handler/AddWayHandlerTest.java | 8 +-
.../remotecontrol/handler/ImportHandlerTest.java | 4 +-
.../josm/io/session/SessionReaderTest.java | 4 +-
.../josm/testutils/ExpectedRootException.java | 117 ++
.../openstreetmap/josm/testutils/FakeGraphics.java | 340 +++++
.../openstreetmap/josm/testutils/FakeOsmApi.java | 121 ++
.../josm/testutils/JOSMTestRules.java | 258 ++++
.../josm/testutils/ThrowableRootCauseMatcher.java | 60 +
.../josm/tools/ExceptionUtilTest.java | 6 +
.../openstreetmap/josm/tools/ExifReaderTest.java | 24 +-
.../josm/tools/ImageProviderTest.java | 11 +
.../josm/tools/PlatformHookOsxTest.java | 145 ++
.../josm/tools/PlatformHookWindowsTest.java | 205 +++
.../openstreetmap/josm/tools/PredicatesTest.java | 1 -
.../josm/tools/TextTagParserTest.java | 12 +-
.../org/openstreetmap/josm/tools/UtilsTest.java | 7 +
.../josm/tools/date/DateUtilsTest.java | 26 +-
tools/checkstyle/josm_checks.xml | 3 +
675 files changed, 30205 insertions(+), 10363 deletions(-)
create mode 100644 eclipse/formatter.xml
delete mode 100644 images/presets/ferry.png
create mode 100644 images/presets/station16.png
create mode 100644 linux/latest/etc/default/josm-latest
create mode 100644 linux/tested/etc/default/josm
create mode 100644 patches/javacc.patch
delete mode 100644 src/org/apache/commons/jcs/utils/timing/SleepUtil.java
create mode 100644 src/org/openstreetmap/josm/gui/MainFrame.java
create mode 100644 src/org/openstreetmap/josm/gui/MainPanel.java
create mode 100644 src/org/openstreetmap/josm/gui/MapViewState.java
create mode 100644 src/org/openstreetmap/josm/gui/layer/MapViewGraphics.java
create mode 100644 src/org/openstreetmap/josm/gui/util/GuiSizesHelper.java
create mode 100644 test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java
create mode 100644 test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
create mode 100644 test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java
create mode 100644 test/unit/org/openstreetmap/josm/testutils/ExpectedRootException.java
create mode 100644 test/unit/org/openstreetmap/josm/testutils/FakeGraphics.java
create mode 100644 test/unit/org/openstreetmap/josm/testutils/FakeOsmApi.java
create mode 100644 test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
create mode 100644 test/unit/org/openstreetmap/josm/testutils/ThrowableRootCauseMatcher.java
create mode 100644 test/unit/org/openstreetmap/josm/tools/PlatformHookOsxTest.java
create mode 100644 test/unit/org/openstreetmap/josm/tools/PlatformHookWindowsTest.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