This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit 16384de73cda4ee5055de01fc3964bccfe6fa3a1
Merge: 0c6bb2d 7c8bf9a
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Tue May 12 09:06:21 2015 +0200

    Merge tag 'upstream/0.0.svn8339+dfsg1'
    
    Upstream version 0.0.svn8339+dfsg1

 .classpath                                         |    6 +-
 REVISION                                           |   11 +-
 data/defaultpresets.xml                            |  244 ++++-
 data/tagging-preset.xsd                            |    1 +
 data/validator/combinations.mapcss                 |    2 +-
 {data/validator => data_nodist}/tagchecker.cfg     |    0
 data_nodist/trans/ast.lang                         |  Bin 0 -> 9399 bytes
 data_nodist/trans/bg.lang                          |  Bin 0 -> 2806 bytes
 data_nodist/trans/ca-valencia.lang                 |  Bin 0 -> 8323 bytes
 data_nodist/trans/ca.lang                          |  Bin 0 -> 9737 bytes
 data_nodist/trans/cs.lang                          |  Bin 0 -> 9742 bytes
 data_nodist/trans/da.lang                          |  Bin 0 -> 5205 bytes
 data_nodist/trans/de.lang                          |  Bin 0 -> 9781 bytes
 data_nodist/trans/el.lang                          |  Bin 0 -> 1395 bytes
 data_nodist/trans/en.lang                          |  Bin 0 -> 8247 bytes
 data_nodist/trans/en_AU.lang                       |  Bin 0 -> 1671 bytes
 data_nodist/trans/en_GB.lang                       |  Bin 0 -> 2259 bytes
 data_nodist/trans/es.lang                          |  Bin 0 -> 10692 bytes
 data_nodist/trans/et.lang                          |  Bin 0 -> 1428 bytes
 data_nodist/trans/fi.lang                          |  Bin 0 -> 2605 bytes
 data_nodist/trans/fr.lang                          |  Bin 0 -> 9453 bytes
 data_nodist/trans/gl.lang                          |  Bin 0 -> 3230 bytes
 data_nodist/trans/hu.lang                          |  Bin 0 -> 10662 bytes
 data_nodist/trans/id.lang                          |  Bin 0 -> 7149 bytes
 data_nodist/trans/it.lang                          |  Bin 0 -> 10263 bytes
 data_nodist/trans/ja.lang                          |  Bin 0 -> 11523 bytes
 data_nodist/trans/km.lang                          |  Bin 0 -> 17419 bytes
 data_nodist/trans/lt.lang                          |  Bin 0 -> 708 bytes
 data_nodist/trans/nl.lang                          |  Bin 0 -> 9085 bytes
 data_nodist/trans/pl.lang                          |  Bin 0 -> 2855 bytes
 data_nodist/trans/pt.lang                          |  Bin 0 -> 12660 bytes
 data_nodist/trans/pt_BR.lang                       |  Bin 0 -> 8869 bytes
 data_nodist/trans/ru.lang                          |  Bin 0 -> 15654 bytes
 data_nodist/trans/sk.lang                          |  Bin 0 -> 9163 bytes
 data_nodist/trans/sv.lang                          |  Bin 0 -> 1332 bytes
 data_nodist/trans/uk.lang                          |  Bin 0 -> 16154 bytes
 data_nodist/trans/zh_CN.lang                       |  Bin 0 -> 5411 bytes
 data_nodist/trans/zh_TW.lang                       |  Bin 0 -> 4866 bytes
 eclipse/JOSM (Java 7).launch                       |   21 +
 eclipse/JOSM (Java 8).launch                       |   21 +
 i18n/.tx/config                                    |    6 +-
 i18n/build.xml                                     |   97 +-
 i18n/convcss.pl                                    |   14 +
 i18n/convmaps.pl                                   |    2 +-
 i18n/convpreset.pl                                 |    7 +-
 i18n/convstyle.pl                                  |    1 +
 i18n/convvalidator.pl                              |   40 -
 i18n/convwiki.pl                                   |   53 +
 i18n/i18n.pl                                       |  116 ++-
 i18n/po/af.po                                      |  145 ++-
 i18n/po/am.po                                      |  145 ++-
 i18n/po/ar.po                                      |  145 ++-
 i18n/po/ast.po                                     |  156 ++-
 i18n/po/az.po                                      |  145 ++-
 i18n/po/be.po                                      |  145 ++-
 i18n/po/bg.po                                      |  167 ++-
 i18n/po/bn.po                                      |  145 ++-
 i18n/po/br.po                                      |  145 ++-
 i18n/po/bs.po                                      |  145 ++-
 i18n/po/ca.po                                      |  162 ++-
 i18n/po/c...@valencia.po                             |  151 ++-
 i18n/po/cs.po                                      |  176 +++-
 i18n/po/cy.po                                      |  145 ++-
 i18n/po/da.po                                      |  490 ++++++---
 i18n/po/de.po                                      |  188 +++-
 i18n/po/de_DE.po                                   |  145 ++-
 i18n/po/el.po                                      |  145 ++-
 i18n/po/en_AU.po                                   |  147 ++-
 i18n/po/en_CA.po                                   |  145 ++-
 i18n/po/en_GB.po                                   |  328 ++++--
 i18n/po/eo.po                                      |  145 ++-
 i18n/po/es.po                                      |  174 +++-
 i18n/po/et.po                                      |  145 ++-
 i18n/po/eu.po                                      |  145 ++-
 i18n/po/fa.po                                      |  145 ++-
 i18n/po/fi.po                                      |  153 ++-
 i18n/po/fil.po                                     |  145 ++-
 i18n/po/fo.po                                      |  145 ++-
 i18n/po/fr.po                                      |  376 ++++---
 i18n/po/gl.po                                      |  147 ++-
 i18n/po/he.po                                      |  145 ++-
 i18n/po/hi.po                                      |  145 ++-
 i18n/po/hr.po                                      |  145 ++-
 i18n/po/ht.po                                      |  145 ++-
 i18n/po/hu.po                                      |  311 ++++--
 i18n/po/hy.po                                      |  145 ++-
 i18n/po/ia.po                                      |  145 ++-
 i18n/po/id.po                                      |  149 ++-
 i18n/po/is.po                                      |  145 ++-
 i18n/po/it.po                                      |  159 ++-
 i18n/po/ja.po                                      |  174 +++-
 i18n/po/ka.po                                      |  145 ++-
 i18n/po/km.po                                      |  159 ++-
 i18n/po/ko.po                                      |  145 ++-
 i18n/po/ky.po                                      |  145 ++-
 i18n/po/lo.po                                      |  145 ++-
 i18n/po/lt.po                                      | 1088 +++++++++++++-------
 i18n/po/lv.po                                      |  145 ++-
 i18n/po/mk.po                                      |  145 ++-
 i18n/po/ms.po                                      |  145 ++-
 i18n/po/nb.po                                      |  145 ++-
 i18n/po/nds.po                                     |  145 ++-
 i18n/po/nl.po                                      |  279 +++--
 i18n/po/nn.po                                      |  145 ++-
 i18n/po/oc.po                                      |  145 ++-
 i18n/po/pa.po                                      |  145 ++-
 i18n/po/pl.po                                      |  153 ++-
 i18n/po/pt.po                                      |  160 ++-
 i18n/po/pt_BR.po                                   |  160 ++-
 i18n/po/rm.po                                      |  145 ++-
 i18n/po/ro.po                                      |  145 ++-
 i18n/po/ru.po                                      |  187 +++-
 i18n/po/sk.po                                      |  196 +++-
 i18n/po/sl.po                                      |  145 ++-
 i18n/po/sq.po                                      |  145 ++-
 i18n/po/sr.po                                      |  145 ++-
 i18n/po/sv.po                                      |  145 ++-
 i18n/po/ta.po                                      |  145 ++-
 i18n/po/te.po                                      |  145 ++-
 i18n/po/th.po                                      |  145 ++-
 i18n/po/tr.po                                      |  145 ++-
 i18n/po/ug.po                                      |  145 ++-
 i18n/po/uk.po                                      |  184 +++-
 i18n/po/ur.po                                      |  145 ++-
 i18n/po/vi.po                                      |  145 ++-
 i18n/po/zh_CN.po                                   |  145 ++-
 i18n/po/zh_TW.po                                   |  185 +++-
 images/presets/storage_tank.png                    |  Bin 0 -> 705 bytes
 linux/latest/DEBIAN/control                        |    2 +-
 linux/latest/usr/bin/josm-latest                   |   22 +-
 linux/latest/usr/share/doc/josm-latest/copyright   |    2 +-
 linux/tested/DEBIAN/control                        |    2 +-
 linux/tested/usr/bin/josm                          |   22 +-
 linux/tested/usr/share/doc/josm/copyright          |    2 +-
 .../taginfoextract.groovy                          |    8 +-
 src/org/openstreetmap/josm/Main.java               |    2 +-
 .../josm/actions/AddImageryLayerAction.java        |    3 +-
 .../josm/actions/AlignInCircleAction.java          |   21 +-
 .../josm/actions/AlignInLineAction.java            |    2 +-
 .../josm/actions/AutoScaleAction.java              |    6 +-
 .../josm/actions/ChangesetManagerToggleAction.java |    2 +-
 .../josm/actions/CloseChangesetAction.java         |    2 +-
 .../josm/actions/CombineWayAction.java             |    9 +-
 .../josm/actions/CreateCircleAction.java           |   96 +-
 .../josm/actions/DownloadReferrersAction.java      |   25 +-
 .../josm/actions/ExtensionFileFilter.java          |    4 +-
 .../josm/actions/FullscreenToggleAction.java       |    2 +-
 .../josm/actions/GpxExportAction.java              |    4 +-
 .../josm/actions/ImageryAdjustAction.java          |    2 +-
 .../josm/actions/JoinAreasAction.java              |    6 +-
 .../josm/actions/JoinNodeWayAction.java            |    6 +-
 src/org/openstreetmap/josm/actions/JosmAction.java |   43 +-
 .../josm/actions/MapRectifierWMSmenuAction.java    |    2 +-
 .../josm/actions/MergeNodesAction.java             |    6 +-
 .../openstreetmap/josm/actions/OpenFileAction.java |    2 +-
 .../josm/actions/OpenLocationAction.java           |    2 +-
 .../josm/actions/OrthogonalizeAction.java          |   14 +-
 .../josm/actions/PasteTagsAction.java              |    4 +-
 .../openstreetmap/josm/actions/PurgeAction.java    |   14 +-
 .../josm/actions/RenameLayerAction.java            |    6 +-
 .../josm/actions/SearchNotesDownloadAction.java    |   10 +-
 .../josm/actions/SelectByInternalPointAction.java  |    3 +-
 .../actions/SelectNonBranchingWaySequences.java    |    6 +-
 .../josm/actions/SessionSaveAsAction.java          |    6 +-
 .../josm/actions/SimplifyWayAction.java            |    3 +-
 .../openstreetmap/josm/actions/ToggleAction.java   |    2 +-
 .../ToggleUploadDiscouragedLayerAction.java        |    4 +-
 .../openstreetmap/josm/actions/UnGlueAction.java   |   28 +-
 .../josm/actions/UnJoinNodeWayAction.java          |  107 +-
 .../josm/actions/UpdateSelectionAction.java        |   10 +-
 .../openstreetmap/josm/actions/UploadAction.java   |    3 +-
 .../josm/actions/UploadNotesAction.java            |    2 +-
 .../josm/actions/UploadSelectionAction.java        |   17 +-
 .../openstreetmap/josm/actions/ValidateAction.java |    2 +-
 .../actions/downloadtasks/DownloadNotesTask.java   |    2 +-
 .../downloadtasks/DownloadNotesUrlIdTask.java      |    8 +-
 .../downloadtasks/DownloadOsmChangeTask.java       |   10 +-
 .../downloadtasks/DownloadOsmCompressedTask.java   |   10 +-
 .../downloadtasks/DownloadReferrersTask.java       |   29 +-
 .../actions/downloadtasks/DownloadTaskList.java    |    6 +-
 .../actions/downloadtasks/PostDownloadHandler.java |    3 +-
 .../josm/actions/mapmode/AddNoteAction.java        |    2 +-
 .../josm/actions/mapmode/DeleteAction.java         |   12 +-
 .../josm/actions/mapmode/DrawAction.java           |   61 +-
 .../josm/actions/mapmode/ExtrudeAction.java        |   31 +-
 .../actions/mapmode/ImproveWayAccuracyAction.java  |   26 +-
 .../josm/actions/mapmode/ParallelWayAction.java    |   34 +-
 .../josm/actions/mapmode/ParallelWays.java         |    9 +-
 .../josm/actions/mapmode/PlayHeadDragMode.java     |    2 +-
 .../josm/actions/mapmode/SelectAction.java         |   16 +-
 .../josm/actions/mapmode/ZoomAction.java           |    5 +-
 .../actions/relation/AbstractRelationAction.java   |    8 +-
 .../DownloadSelectedIncompleteMembersAction.java   |    2 +-
 .../josm/actions/relation/SelectMembersAction.java |    7 +-
 .../josm/actions/search/SearchAction.java          |    9 +-
 .../josm/actions/upload/DiscardTagsHook.java       |    4 +-
 .../josm/actions/upload/FixDataHook.java           |   14 +-
 .../josm/actions/upload/UploadNotesTask.java       |    4 +-
 .../josm/command/ChangePropertyCommand.java        |    5 +-
 src/org/openstreetmap/josm/command/Command.java    |   37 +-
 .../openstreetmap/josm/command/DeleteCommand.java  |   26 +-
 .../openstreetmap/josm/command/MoveCommand.java    |    8 +-
 .../openstreetmap/josm/command/PurgeCommand.java   |    2 +-
 .../openstreetmap/josm/command/RotateCommand.java  |    2 +-
 .../openstreetmap/josm/command/ScaleCommand.java   |    5 +-
 .../josm/command/TransformNodesCommand.java        |    4 +-
 .../josm/corrector/CorrectionTableModel.java       |    2 +-
 src/org/openstreetmap/josm/data/APIDataSet.java    |    8 +-
 src/org/openstreetmap/josm/data/AutosaveTask.java  |   15 +-
 src/org/openstreetmap/josm/data/Bounds.java        |   12 +-
 .../josm/data/CustomConfigurator.java              |   19 +-
 src/org/openstreetmap/josm/data/Preferences.java   |   27 +-
 .../josm/data/cache/CacheEntryAttributes.java      |   17 +-
 .../josm/data/cache/JCSCacheManager.java           |    9 +-
 .../josm/data/cache/JCSCachedTileLoaderJob.java    |   85 +-
 .../josm/data/conflict/ConflictCollection.java     |   17 +-
 .../openstreetmap/josm/data/coor/CachedLatLon.java |    2 +-
 .../openstreetmap/josm/data/coor/EastNorth.java    |    2 +
 src/org/openstreetmap/josm/data/coor/LatLon.java   |    2 +
 .../openstreetmap/josm/data/gpx/Extensions.java    |    2 +
 .../josm/data/imagery/OffsetBookmark.java          |    2 +-
 src/org/openstreetmap/josm/data/imagery/Shape.java |    4 +-
 .../josm/data/imagery/TMSCachedTileLoader.java     |    4 +-
 .../josm/data/imagery/TMSCachedTileLoaderJob.java  |  176 +++-
 .../openstreetmap/josm/data/imagery/WmsCache.java  |   38 +-
 .../josm/data/oauth/OAuthParameters.java           |    6 +-
 .../openstreetmap/josm/data/oauth/OAuthToken.java  |    4 +-
 .../josm/data/osm/AbstractPrimitive.java           |   54 +-
 .../josm/data/osm/ChangesetCache.java              |    3 +-
 .../josm/data/osm/ChangesetDataSet.java            |   14 +-
 src/org/openstreetmap/josm/data/osm/DataSet.java   |    6 +-
 .../openstreetmap/josm/data/osm/DataSetMerger.java |   20 +-
 .../openstreetmap/josm/data/osm/FilterMatcher.java |    6 +-
 src/org/openstreetmap/josm/data/osm/Node.java      |   10 +-
 .../josm/data/osm/NodePositionComparator.java      |    6 +-
 src/org/openstreetmap/josm/data/osm/NoteData.java  |    3 +-
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |   36 +-
 .../josm/data/osm/OsmPrimitiveComparator.java      |    6 +-
 src/org/openstreetmap/josm/data/osm/OsmUtils.java  |    6 +-
 .../josm/data/osm/PrimitiveDeepCopy.java           |    2 +-
 .../openstreetmap/josm/data/osm/QuadBuckets.java   |   41 +-
 src/org/openstreetmap/josm/data/osm/Relation.java  |    6 +-
 .../josm/data/osm/RelationMember.java              |    2 +-
 .../josm/data/osm/SimplePrimitiveId.java           |    5 +-
 src/org/openstreetmap/josm/data/osm/Storage.java   |   12 +-
 .../openstreetmap/josm/data/osm/TagCollection.java |   26 +-
 .../openstreetmap/josm/data/osm/TigerUtils.java    |    2 +-
 src/org/openstreetmap/josm/data/osm/Way.java       |   42 +-
 .../josm/data/osm/event/DatasetEventManager.java   |    4 +-
 .../josm/data/osm/event/SelectionEventManager.java |    2 +-
 .../josm/data/osm/history/History.java             |    3 +-
 .../josm/data/osm/history/HistoryDataSet.java      |   13 +-
 .../josm/data/osm/history/HistoryNode.java         |    4 +-
 .../josm/data/osm/history/HistoryOsmPrimitive.java |    4 +-
 .../josm/data/osm/history/HistoryRelation.java     |   12 +-
 .../josm/data/osm/history/HistoryWay.java          |    8 +-
 .../osm/visitor/MergeSourceBuildingVisitor.java    |    5 +-
 .../osm/visitor/paint/AbstractMapRenderer.java     |    6 +-
 .../data/osm/visitor/paint/MapPaintSettings.java   |    2 +-
 .../data/osm/visitor/paint/MapRendererFactory.java |   24 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |   16 +-
 .../osm/visitor/paint/WireframeMapRenderer.java    |    6 +-
 .../josm/data/projection/datum/NTV2GridShift.java  |    6 +-
 .../data/projection/datum/NTV2GridShiftFile.java   |   60 +-
 .../josm/data/projection/datum/NTV2SubGrid.java    |  103 +-
 .../josm/data/validation/OsmValidator.java         |    2 +
 .../josm/data/validation/PaintVisitor.java         |   18 +-
 .../data/validation/routines/DomainValidator.java  |    2 +-
 .../data/validation/tests/ConditionalKeys.java     |    8 +-
 .../josm/data/validation/tests/DuplicateNode.java  |    2 +-
 .../data/validation/tests/DuplicateRelation.java   |    4 +-
 .../josm/data/validation/tests/DuplicateWay.java   |    4 +-
 .../josm/data/validation/tests/Highways.java       |   15 +-
 .../josm/data/validation/tests/Lanes.java          |    2 +-
 .../josm/data/validation/tests/LongSegment.java    |   53 +
 .../data/validation/tests/MapCSSTagChecker.java    |   15 +-
 .../data/validation/tests/MultipolygonTest.java    |    2 +-
 .../josm/data/validation/tests/NameMismatch.java   |    3 +-
 .../data/validation/tests/OpeningHourTest.java     |    7 +-
 .../data/validation/tests/RelationChecker.java     |    7 +-
 .../data/validation/tests/SelfIntersectingWay.java |    6 +-
 .../data/validation/tests/SimilarNamedWays.java    |    2 +-
 .../josm/data/validation/tests/TagChecker.java     |   10 +-
 .../data/validation/tests/UnconnectedWays.java     |    6 +-
 .../util/AggregatePrimitivesVisitor.java           |    2 +-
 .../josm/data/validation/util/ValUtil.java         |    4 +-
 src/org/openstreetmap/josm/gui/ExtendedDialog.java |   12 +-
 src/org/openstreetmap/josm/gui/FileDrop.java       |    4 +-
 .../openstreetmap/josm/gui/IconToggleButton.java   |    2 +-
 src/org/openstreetmap/josm/gui/ImageryMenu.java    |    8 +-
 .../josm/gui/JosmUserIdentityManager.java          |   14 +-
 .../openstreetmap/josm/gui/MainApplication.java    |   78 +-
 src/org/openstreetmap/josm/gui/MainMenu.java       |    4 +-
 src/org/openstreetmap/josm/gui/MapFrame.java       |   20 +-
 src/org/openstreetmap/josm/gui/MapSlider.java      |    2 +-
 src/org/openstreetmap/josm/gui/MapStatus.java      |   52 +-
 src/org/openstreetmap/josm/gui/MapView.java        |   40 +-
 src/org/openstreetmap/josm/gui/MenuScroller.java   |    6 +-
 .../josm/gui/NavigatableComponent.java             |   16 +-
 .../openstreetmap/josm/gui/PleaseWaitDialog.java   |    2 +-
 .../openstreetmap/josm/gui/PleaseWaitRunnable.java |    4 +-
 src/org/openstreetmap/josm/gui/ScrollViewport.java |    2 +-
 src/org/openstreetmap/josm/gui/SideButton.java     |    2 +-
 src/org/openstreetmap/josm/gui/SplashScreen.java   |    2 +-
 .../DeleteFromRelationConfirmationDialog.java      |    6 +-
 .../openstreetmap/josm/gui/bbox/SizeButton.java    |    2 +-
 .../josm/gui/bbox/SlippyMapBBoxChooser.java        |   12 +-
 .../josm/gui/bbox/SlippyMapControler.java          |    5 +-
 .../openstreetmap/josm/gui/bbox/SourceButton.java  |    4 +-
 .../josm/gui/bbox/TileSelectionBBoxChooser.java    |   18 +-
 .../josm/gui/conflict/pair/ComparePairType.java    |    2 +-
 .../josm/gui/conflict/pair/ConflictResolver.java   |    8 +-
 .../josm/gui/conflict/pair/ListMergeModel.java     |   30 +-
 .../josm/gui/conflict/pair/ListMerger.java         |    4 +-
 .../josm/gui/conflict/pair/PairTable.java          |    4 +-
 .../conflict/pair/nodes/NodeListMergeModel.java    |    6 +-
 .../pair/nodes/NodeListTableCellRenderer.java      |    2 +-
 .../pair/properties/PropertiesMergeModel.java      |    6 +-
 .../conflict/pair/properties/PropertiesMerger.java |    2 +-
 .../relation/RelationMemberListMergeModel.java     |    6 +-
 .../relation/RelationMemberTableCellRenderer.java  |    2 +-
 .../josm/gui/conflict/pair/tags/TagMergeItem.java  |   17 +-
 .../josm/gui/conflict/pair/tags/TagMergeModel.java |    7 +-
 .../josm/gui/conflict/pair/tags/TagMerger.java     |    2 +-
 .../tags/CombinePrimitiveResolverDialog.java       |    4 +-
 .../tags/MultiValueResolutionDecision.java         |   32 +-
 .../tags/PasteTagsConflictResolverDialog.java      |   26 +-
 .../tags/RelationMemberConflictDecision.java       |    2 +-
 .../tags/RelationMemberConflictDecisionEditor.java |    2 +-
 .../RelationMemberConflictResolverColumnModel.java |    4 +-
 .../tags/RelationMemberConflictResolverModel.java  |    4 +-
 .../conflict/tags/TagConflictResolverModel.java    |   10 +-
 .../gui/dialogs/CommandListMutableTreeNode.java    |    2 +-
 .../josm/gui/dialogs/CommandStackDialog.java       |    6 +-
 .../josm/gui/dialogs/ConflictDialog.java           |    6 +-
 .../josm/gui/dialogs/DialogsPanel.java             |    4 +-
 .../josm/gui/dialogs/FilterDialog.java             |    2 +-
 .../josm/gui/dialogs/FilterTableModel.java         |    4 +-
 .../josm/gui/dialogs/InspectPrimitiveDialog.java   |   10 +-
 .../josm/gui/dialogs/LatLonDialog.java             |    3 +-
 .../josm/gui/dialogs/LayerListDialog.java          |  119 ++-
 .../josm/gui/dialogs/LayerListPopup.java           |    2 +-
 .../josm/gui/dialogs/MapPaintDialog.java           |   17 +-
 .../josm/gui/dialogs/NotesDialog.java              |    9 +-
 .../josm/gui/dialogs/OsmIdSelectionDialog.java     |    2 +-
 .../josm/gui/dialogs/RelationListDialog.java       |   12 +-
 .../josm/gui/dialogs/SelectionListDialog.java      |   10 +-
 .../josm/gui/dialogs/ToggleDialog.java             |    4 +-
 .../josm/gui/dialogs/UserListDialog.java           |   28 +-
 .../josm/gui/dialogs/ValidatorDialog.java          |    9 +-
 .../changeset/ChangesetCacheManagerModel.java      |    4 +-
 .../changeset/ChangesetContentDownloadTask.java    |   16 +-
 .../dialogs/changeset/ChangesetContentPanel.java   |    4 +-
 .../changeset/ChangesetContentTableModel.java      |    2 +-
 .../dialogs/changeset/ChangesetDetailPanel.java    |    2 +-
 .../changeset/ChangesetDiscussionPanel.java        |    2 +-
 .../changeset/ChangesetDiscussionTableModel.java   |    2 +-
 .../changeset/ChangesetHeaderDownloadTask.java     |   13 +-
 .../gui/dialogs/changeset/ChangesetListModel.java  |    4 +-
 .../query/AdvancedChangesetQueryPanel.java         |   25 +-
 .../changeset/query/BasicChangesetQueryPanel.java  |    4 +-
 .../changeset/query/ChangesetQueryTask.java        |   12 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |   38 +-
 .../josm/gui/dialogs/properties/TagEditHelper.java |   32 +-
 .../gui/dialogs/relation/ChildRelationBrowser.java |   14 +-
 .../gui/dialogs/relation/DownloadRelationTask.java |    6 +-
 .../dialogs/relation/GenericRelationEditor.java    |    3 +-
 .../gui/dialogs/relation/MemberRoleCellEditor.java |    4 +-
 .../josm/gui/dialogs/relation/MemberTable.java     |   10 +-
 .../relation/MemberTableLinkedCellRenderer.java    |   12 +-
 .../gui/dialogs/relation/MemberTableModel.java     |   20 +-
 .../relation/ParentRelationLoadingTask.java        |    6 +-
 .../relation/ReferringRelationsBrowser.java        |    2 +-
 .../relation/ReferringRelationsBrowserModel.java   |    4 +-
 .../dialogs/relation/RelationDialogManager.java    |   20 +-
 .../josm/gui/dialogs/relation/RelationEditor.java  |   11 +-
 .../gui/dialogs/relation/SelectionTableModel.java  |    8 +-
 .../gui/dialogs/relation/sort/RelationNodeMap.java |    8 +-
 .../gui/dialogs/relation/sort/RelationSorter.java  |    2 +-
 .../relation/sort/WayConnectionTypeCalculator.java |    7 +-
 .../gui/dialogs/validator/ValidatorTreePanel.java  |    4 +-
 .../josm/gui/download/BookmarkList.java            |    8 +-
 .../josm/gui/download/DownloadDialog.java          |    4 +-
 .../josm/gui/download/PlaceSelection.java          |   13 +-
 .../openstreetmap/josm/gui/help/HelpBrowser.java   |    8 +-
 .../josm/gui/help/HelpBrowserHistory.java          |    2 +-
 .../josm/gui/help/HelpContentReader.java           |   10 +-
 .../josm/gui/history/CoordinateInfoViewer.java     |    8 +-
 .../josm/gui/history/DiffTableModel.java           |    4 +-
 .../josm/gui/history/HistoryBrowser.java           |    2 +-
 .../gui/history/HistoryBrowserDialogManager.java   |   23 +-
 .../josm/gui/history/HistoryBrowserModel.java      |   31 +-
 .../josm/gui/history/HistoryLoadTask.java          |   16 +-
 .../josm/gui/history/HistoryViewerPanel.java       |   22 +-
 .../josm/gui/history/NodeListViewer.java           |   20 +-
 .../RelationMemberListTableCellRenderer.java       |    2 +-
 .../josm/gui/history/TwoColumnDiff.java            |    6 +-
 .../josm/gui/history/VersionInfoPanel.java         |   33 +-
 .../josm/gui/history/VersionTable.java             |   12 +-
 .../josm/gui/io/ActionFlagsTableCell.java          |    4 +-
 .../josm/gui/io/BasicUploadSettingsPanel.java      |   12 +-
 .../josm/gui/io/ChangesetManagementPanel.java      |    4 +-
 .../josm/gui/io/CredentialDialog.java              |    4 +-
 .../josm/gui/io/DownloadPrimitivesTask.java        |    8 +-
 .../io/DownloadPrimitivesWithReferrersTask.java    |    2 +-
 .../josm/gui/io/LayerNameAndFilePathTableCell.java |    2 +-
 .../josm/gui/io/OpenChangesetComboBoxModel.java    |    4 +-
 .../josm/gui/io/RecentlyOpenedFilesMenu.java       |    2 +-
 .../openstreetmap/josm/gui/io/SaveLayerInfo.java   |    2 +-
 .../openstreetmap/josm/gui/io/SaveLayerTask.java   |    2 +-
 .../josm/gui/io/SaveLayersDialog.java              |   12 +-
 .../openstreetmap/josm/gui/io/SaveLayersModel.java |    2 +-
 .../josm/gui/io/TagSettingsPanel.java              |   10 +-
 .../josm/gui/io/UpdatePrimitivesTask.java          |    4 +-
 .../openstreetmap/josm/gui/io/UploadDialog.java    |   18 +-
 .../openstreetmap/josm/gui/io/UploadLayerTask.java |    6 +-
 .../josm/gui/io/UploadParameterSummaryPanel.java   |    6 +-
 .../josm/gui/io/UploadPrimitivesTask.java          |   10 +-
 .../josm/gui/io/UploadSelectionDialog.java         |    2 +-
 .../josm/gui/io/UploadStrategySelectionPanel.java  |   13 +-
 .../josm/gui/io/UploadedObjectsSummaryPanel.java   |    2 +-
 .../josm/gui/layer/CustomizeColor.java             |    2 +-
 .../openstreetmap/josm/gui/layer/ImageryLayer.java |    2 +-
 .../josm/gui/layer/JumpToMarkerActions.java        |    6 +-
 src/org/openstreetmap/josm/gui/layer/Layer.java    |    6 +-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |   42 +-
 src/org/openstreetmap/josm/gui/layer/TMSLayer.java |   37 +-
 src/org/openstreetmap/josm/gui/layer/WMSLayer.java |   18 +-
 .../gui/layer/geoimage/CorrelateGpxWithImages.java |   72 +-
 .../josm/gui/layer/geoimage/GeoImageLayer.java     |   18 +-
 .../josm/gui/layer/geoimage/ImageDisplay.java      |    8 +-
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |    4 +-
 .../gui/layer/geoimage/ShowThumbnailAction.java    |    3 +-
 .../josm/gui/layer/geoimage/ThumbsLoader.java      |   10 +-
 .../gui/layer/gpx/ChooseTrackVisibilityAction.java |   13 +-
 .../gui/layer/gpx/ConvertToDataLayerAction.java    |    2 +-
 .../josm/gui/layer/gpx/CustomizeDrawingAction.java |    2 +-
 .../josm/gui/layer/gpx/DateFilterPanel.java        |   52 +-
 .../gui/layer/gpx/DownloadAlongTrackAction.java    |    8 +-
 .../gui/layer/gpx/DownloadWmsAlongTrackAction.java |    2 +-
 .../josm/gui/layer/gpx/GpxDrawHelper.java          |    8 +-
 .../josm/gui/layer/gpx/ImportAudioAction.java      |    2 +-
 .../josm/gui/layer/gpx/ImportImagesAction.java     |    4 +-
 .../layer/gpx/MarkersFromNamedPointsAction.java    |    2 +-
 .../josm/gui/layer/markerlayer/MarkerLayer.java    |    2 +-
 .../josm/gui/mappaint/AreaElemStyle.java           |    2 +-
 .../openstreetmap/josm/gui/mappaint/Cascade.java   |    9 +-
 .../josm/gui/mappaint/Environment.java             |    2 +-
 .../gui/mappaint/LabelCompositionStrategy.java     |    2 +-
 .../openstreetmap/josm/gui/mappaint/MapImage.java  |   12 +-
 .../josm/gui/mappaint/MapPaintMenu.java            |    4 +-
 .../josm/gui/mappaint/StyleCache.java              |    4 +-
 .../josm/gui/mappaint/StyleSource.java             |   10 +
 .../josm/gui/mappaint/TextElement.java             |    4 +-
 .../josm/gui/mappaint/mapcss/Condition.java        |    7 +-
 .../gui/mappaint/mapcss/ExpressionFactory.java     |   20 +-
 .../gui/mappaint/mapcss/LiteralExpression.java     |    3 +-
 .../josm/gui/mappaint/mapcss/MapCSSParser.jj       |   14 +
 .../gui/mappaint/mapcss/MapCSSStyleSource.java     |  242 ++++-
 .../josm/gui/mappaint/mapcss/Selector.java         |    4 +-
 .../josm/gui/mappaint/xml/XmlStyleSource.java      |    2 +-
 .../gui/mappaint/xml/XmlStyleSourceHandler.java    |   18 +-
 .../josm/gui/oauth/AbstractAuthorizationUI.java    |   10 +-
 .../gui/oauth/AdvancedOAuthPropertiesPanel.java    |   14 +-
 .../gui/oauth/FullyAutomaticAuthorizationUI.java   |    4 +-
 .../josm/gui/oauth/ManualAuthorizationUI.java      |   10 +-
 .../josm/gui/oauth/OAuthAuthorizationWizard.java   |    8 +-
 .../gui/oauth/OsmOAuthAuthorizationClient.java     |   36 +-
 .../josm/gui/oauth/RetrieveAccessTokenTask.java    |    4 +-
 .../josm/gui/oauth/RetrieveRequestTokenTask.java   |    2 +-
 .../gui/oauth/SemiAutomaticAuthorizationUI.java    |    4 +-
 .../josm/gui/preferences/PreferenceTabbedPane.java |   14 +-
 .../josm/gui/preferences/SourceEditor.java         |   22 +-
 .../josm/gui/preferences/ToolbarPreferences.java   |   16 +-
 .../preferences/advanced/AdvancedPreference.java   |   56 +-
 .../preferences/advanced/ExportProfileAction.java  |    2 +-
 .../josm/gui/preferences/advanced/ListEditor.java  |    4 +-
 .../gui/preferences/advanced/ListListEditor.java   |   14 +-
 .../gui/preferences/advanced/MapListEditor.java    |   16 +-
 .../gui/preferences/advanced/PreferencesTable.java |    2 +-
 .../gui/preferences/advanced/StringEditor.java     |    4 +-
 .../gui/preferences/display/GPXSettingsPanel.java  |    2 +-
 .../gui/preferences/display/LafPreference.java     |    2 +-
 .../preferences/display/LanguagePreference.java    |    2 +-
 .../gui/preferences/imagery/AddImageryPanel.java   |    2 +-
 .../gui/preferences/imagery/AddTMSLayerPanel.java  |    2 +-
 .../gui/preferences/imagery/AddWMSLayerPanel.java  |    4 +-
 .../gui/preferences/imagery/ImageryPreference.java |   13 +-
 .../gui/preferences/imagery/TMSSettingsPanel.java  |   15 +-
 .../gui/preferences/map/MapPaintPreference.java    |   53 -
 .../gui/preferences/plugin/PluginListPanel.java    |    4 +-
 .../gui/preferences/plugin/PluginPreference.java   |    2 +-
 .../plugin/PluginUpdatePolicyPanel.java            |    6 +-
 .../projection/CodeProjectionChoice.java           |   18 +-
 .../projection/ListProjectionChoice.java           |    2 +-
 .../gui/preferences/server/ApiUrlTestTask.java     |    4 +-
 .../server/AuthenticationPreference.java           |    2 +-
 .../preferences/server/OAuthAccessTokenHolder.java |   10 +-
 .../preferences/server/OsmApiUrlInputPanel.java    |    6 +-
 .../preferences/server/ProxyPreferencesPanel.java  |    2 +-
 .../josm/gui/preferences/shortcut/PrefJPanel.java  |    4 +-
 .../josm/gui/progress/AbstractProgressMonitor.java |   20 +-
 .../progress/SwingRenderingProgressMonitor.java    |    3 +-
 .../josm/gui/tagging/TagCellEditor.java            |    5 +-
 .../josm/gui/tagging/TagEditorModel.java           |   16 +-
 .../josm/gui/tagging/TagEditorPanel.java           |    8 +-
 .../openstreetmap/josm/gui/tagging/TagTable.java   |    4 +-
 .../josm/gui/tagging/TaggingPreset.java            |   17 +-
 .../josm/gui/tagging/TaggingPresetItems.java       |   27 +-
 .../josm/gui/tagging/TaggingPresetReader.java      |    2 +-
 .../TaggingPresetSearchPrimitiveDialog.java        |    3 +-
 .../josm/gui/tagging/TaggingPresetSelector.java    |   23 +-
 .../josm/gui/tagging/TaggingPresets.java           |    3 +-
 .../gui/tagging/ac/AutoCompletingTextField.java    |    2 +-
 .../josm/gui/tagging/ac/AutoCompletionList.java    |   14 +-
 .../gui/tagging/ac/AutoCompletionListItem.java     |    2 +-
 .../josm/gui/util/AdjustmentSynchronizer.java      |    8 +-
 .../josm/gui/util/AdvancedKeyPressDetector.java    |    5 +-
 src/org/openstreetmap/josm/gui/util/GuiHelper.java |   15 +-
 .../josm/gui/util/HighlightHelper.java             |    2 +-
 .../openstreetmap/josm/gui/util/RotationAngle.java |    4 +-
 .../josm/gui/widgets/AbstractFileChooser.java      |    9 +-
 .../josm/gui/widgets/AbstractIdTextField.java      |    6 +-
 .../widgets/AbstractTextComponentValidator.java    |    8 +-
 .../josm/gui/widgets/ComboBoxHistory.java          |    2 +-
 .../josm/gui/widgets/DateEditorWithSlider.java     |    2 +-
 .../DisableShortcutsOnFocusGainedTextField.java    |    6 +-
 .../josm/gui/widgets/JosmEditorPane.java           |   10 +-
 .../josm/gui/widgets/JosmTextArea.java             |    6 +-
 .../josm/gui/widgets/JosmTextField.java            |    4 +-
 .../josm/gui/widgets/MultiSplitLayout.java         |    2 +-
 .../josm/gui/widgets/MultiSplitPane.java           |   10 +-
 .../josm/gui/widgets/OsmPrimitivesTable.java       |   12 +-
 .../josm/gui/widgets/QuadStateCheckBox.java        |    2 +-
 .../josm/gui/widgets/TextContextualPopupMenu.java  |    4 +-
 src/org/openstreetmap/josm/io/AbstractParser.java  |   20 +-
 src/org/openstreetmap/josm/io/AbstractReader.java  |   22 +-
 .../josm/io/BoundingBoxDownloader.java             |    4 +-
 .../openstreetmap/josm/io/CacheCustomContent.java  |   42 +-
 src/org/openstreetmap/josm/io/CacheFiles.java      |   43 +-
 src/org/openstreetmap/josm/io/Capabilities.java    |   14 +-
 src/org/openstreetmap/josm/io/ChangesetQuery.java  |   42 +-
 .../openstreetmap/josm/io/DiffResultProcessor.java |    4 +-
 src/org/openstreetmap/josm/io/GpxReader.java       |    6 +-
 .../josm/io/MultiFetchServerObjectReader.java      |    4 +-
 src/org/openstreetmap/josm/io/NoteReader.java      |    8 +-
 src/org/openstreetmap/josm/io/OsmApi.java          |   41 +-
 .../openstreetmap/josm/io/OsmChangeBuilder.java    |   15 +-
 src/org/openstreetmap/josm/io/OsmChangeReader.java |    4 +-
 .../josm/io/OsmChangesetContentParser.java         |   13 +-
 .../openstreetmap/josm/io/OsmChangesetParser.java  |    6 +-
 src/org/openstreetmap/josm/io/OsmConnection.java   |    6 +-
 src/org/openstreetmap/josm/io/OsmExporter.java     |    4 +-
 .../openstreetmap/josm/io/OsmHistoryReader.java    |    9 +-
 src/org/openstreetmap/josm/io/OsmReader.java       |    4 +-
 .../josm/io/OsmServerBackreferenceReader.java      |   24 +-
 .../josm/io/OsmServerChangesetReader.java          |   14 +-
 .../josm/io/OsmServerHistoryReader.java            |    6 +-
 .../josm/io/OsmServerObjectReader.java             |   22 +-
 src/org/openstreetmap/josm/io/OsmServerReader.java |   10 +-
 src/org/openstreetmap/josm/io/OsmServerWriter.java |   16 +-
 .../josm/io/auth/CredentialsAgent.java             |   10 +-
 .../io/auth/JosmPreferencesCredentialAgent.java    |    4 +-
 .../josm/io/imagery/ImageryReader.java             |   23 +-
 .../josm/io/imagery/WMSException.java              |    2 +-
 .../openstreetmap/josm/io/imagery/WMSImagery.java  |    2 +-
 .../josm/io/remotecontrol/AddTagsDialog.java       |   29 +-
 .../josm/io/remotecontrol/DNSName.java             |    2 +-
 .../josm/io/remotecontrol/RemoteControl.java       |   32 +-
 .../io/remotecontrol/RemoteControlHttpServer.java  |   59 +-
 .../io/remotecontrol/RemoteControlHttpsServer.java |  143 +--
 .../io/remotecontrol/handler/AddWayHandler.java    |   12 +-
 .../remotecontrol/handler/LoadAndZoomHandler.java  |    2 +-
 .../io/remotecontrol/handler/LoadDataHandler.java  |   12 +-
 .../remotecontrol/handler/LoadObjectHandler.java   |   14 +-
 .../io/remotecontrol/handler/RequestHandler.java   |   44 +-
 .../josm/io/session/SessionReader.java             |    6 +-
 .../josm/plugins/PluginDownloadTask.java           |   10 +-
 .../josm/plugins/PluginException.java              |    2 +-
 .../openstreetmap/josm/plugins/PluginHandler.java  |   11 +-
 .../josm/plugins/PluginInformation.java            |    4 +-
 .../josm/plugins/PluginListParser.java             |    2 +-
 .../plugins/ReadRemotePluginInformationTask.java   |    5 +-
 .../josm/tools/AlphanumComparator.java             |    5 +-
 .../josm/tools/BugReportExceptionHandler.java      |    2 +-
 .../josm/tools/CheckParameterUtil.java             |    4 +-
 .../openstreetmap/josm/tools/CompositeList.java    |    2 +-
 src/org/openstreetmap/josm/tools/CopyList.java     |    6 +-
 src/org/openstreetmap/josm/tools/Diff.java         |   10 +-
 src/org/openstreetmap/josm/tools/FontsManager.java |    6 +-
 src/org/openstreetmap/josm/tools/Geometry.java     |   22 +-
 src/org/openstreetmap/josm/tools/I18n.java         |   33 +-
 src/org/openstreetmap/josm/tools/ImageOverlay.java |    6 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |  152 +--
 src/org/openstreetmap/josm/tools/LanguageInfo.java |   77 +-
 src/org/openstreetmap/josm/tools/MultiMap.java     |    4 +-
 .../josm/tools/MultikeyActionsHandler.java         |    4 +-
 src/org/openstreetmap/josm/tools/OpenBrowser.java  |    4 +-
 .../openstreetmap/josm/tools/OsmUrlToBounds.java   |   12 +-
 src/org/openstreetmap/josm/tools/Pair.java         |   11 +-
 .../josm/tools/PlatformHookWindows.java            |    5 +-
 src/org/openstreetmap/josm/tools/Shortcut.java     |    2 +-
 .../josm/tools/SubclassFilteredCollection.java     |    2 +-
 .../openstreetmap/josm/tools/TextTagParser.java    |   12 +-
 src/org/openstreetmap/josm/tools/Utils.java        |  103 +-
 .../openstreetmap/josm/tools/WindowGeometry.java   |    2 +-
 .../openstreetmap/josm/tools/XmlObjectParser.java  |   17 +-
 .../openstreetmap/josm/tools/date/DateUtils.java   |    1 +
 .../template_engine/ContextSwitchTemplate.java     |    2 +-
 .../josm/tools/template_engine/ParseError.java     |    2 +-
 styles/standard/elemstyles.mapcss                  |   13 +-
 .../josm/actions/CreateCircleActionTest.java       |  185 ++++
 .../josm/actions/UnJoinNodeWayActionTest.java      |   87 ++
 .../validation/tests/MapCSSTagCheckerTest.java     |    9 +
 .../josm/io/session/SessionWriterTest.java         |    2 +-
 .../josm/tools/date/DateUtilsTest.java             |   20 +
 616 files changed, 14771 insertions(+), 6197 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/josm.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to