[josm] 02/05: Merge tag 'upstream/0.0.svn9329+dfsg'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Thu Jan 7 20:44:12 UTC 2016


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

sebastic pushed a commit to branch master
in repository josm.

commit 1aa436f75c359f5701db32c40aa5c6bf35fc473f
Merge: 3e3a8af 30f3218
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 7 00:20:47 2016 +0100

    Merge tag 'upstream/0.0.svn9329+dfsg'
    
    Upstream version 0.0.svn9329+dfsg

 .settings/org.eclipse.jdt.core.prefs               |   8 +-
 REVISION                                           |   6 +-
 build.xml                                          |  11 +-
 data/defaultpresets.xml                            | 193 +++++++----
 data/validator/ignoretags.cfg                      |  16 +
 data_nodist/trans/ast.lang                         | Bin 8721 -> 8723 bytes
 data_nodist/trans/be.lang                          | Bin 15743 -> 15872 bytes
 data_nodist/trans/bg.lang                          | Bin 2395 -> 2397 bytes
 data_nodist/trans/ca-valencia.lang                 | Bin 7805 -> 7807 bytes
 data_nodist/trans/ca.lang                          | Bin 10236 -> 10326 bytes
 data_nodist/trans/cs.lang                          | Bin 9942 -> 10033 bytes
 data_nodist/trans/da.lang                          | Bin 9234 -> 9330 bytes
 data_nodist/trans/de.lang                          | Bin 10197 -> 10330 bytes
 data_nodist/trans/el.lang                          | Bin 1397 -> 1399 bytes
 data_nodist/trans/en.lang                          | Bin 8467 -> 8561 bytes
 data_nodist/trans/en_AU.lang                       | Bin 1482 -> 1484 bytes
 data_nodist/trans/en_GB.lang                       | Bin 1908 -> 1910 bytes
 data_nodist/trans/es.lang                          | Bin 11127 -> 11229 bytes
 data_nodist/trans/et.lang                          | Bin 1430 -> 1432 bytes
 data_nodist/trans/fi.lang                          | Bin 3068 -> 3070 bytes
 data_nodist/trans/fr.lang                          | Bin 10473 -> 10582 bytes
 data_nodist/trans/gl.lang                          | Bin 2945 -> 2947 bytes
 data_nodist/trans/hu.lang                          | Bin 9763 -> 9765 bytes
 data_nodist/trans/id.lang                          | Bin 6717 -> 6719 bytes
 data_nodist/trans/it.lang                          | Bin 9869 -> 9871 bytes
 data_nodist/trans/ja.lang                          | Bin 11385 -> 11387 bytes
 data_nodist/trans/km.lang                          | Bin 16172 -> 16174 bytes
 data_nodist/trans/lt.lang                          | Bin 1946 -> 1948 bytes
 data_nodist/trans/nb.lang                          | Bin 1673 -> 1675 bytes
 data_nodist/trans/nl.lang                          | Bin 10625 -> 10945 bytes
 data_nodist/trans/pl.lang                          | Bin 2927 -> 2929 bytes
 data_nodist/trans/pt.lang                          | Bin 12574 -> 12576 bytes
 data_nodist/trans/pt_BR.lang                       | Bin 8109 -> 8111 bytes
 data_nodist/trans/ru.lang                          | Bin 16144 -> 16277 bytes
 data_nodist/trans/sk.lang                          | Bin 9314 -> 9405 bytes
 data_nodist/trans/sv.lang                          | Bin 1334 -> 1336 bytes
 data_nodist/trans/uk.lang                          | Bin 16238 -> 16696 bytes
 data_nodist/trans/vi.lang                          | Bin 10524 -> 10526 bytes
 data_nodist/trans/zh_CN.lang                       | Bin 5848 -> 5850 bytes
 data_nodist/trans/zh_TW.lang                       | Bin 4641 -> 4643 bytes
 i18n/build.xml                                     |  12 +-
 i18n/convmaps.pl                                   |   2 +-
 i18n/convpreset.pl                                 |   2 +-
 i18n/convstyle.pl                                  |   2 +-
 i18n/convsurveyor.pl                               |   2 +-
 i18n/i18n.pl                                       |   2 +-
 i18n/po/af.po                                      | 187 +++++++++--
 i18n/po/am.po                                      | 187 +++++++++--
 i18n/po/ar.po                                      | 187 +++++++++--
 i18n/po/ast.po                                     | 196 +++++++++--
 i18n/po/az.po                                      | 187 +++++++++--
 i18n/po/be.po                                      | 192 +++++++++--
 i18n/po/bg.po                                      | 190 +++++++++--
 i18n/po/bn.po                                      | 187 +++++++++--
 i18n/po/br.po                                      | 187 +++++++++--
 i18n/po/bs.po                                      | 187 +++++++++--
 i18n/po/ca.po                                      | 239 ++++++++++---
 i18n/po/ca at valencia.po                             | 189 +++++++++--
 i18n/po/cs.po                                      | 194 +++++++++--
 i18n/po/cy.po                                      | 187 +++++++++--
 i18n/po/da.po                                      | 192 +++++++++--
 i18n/po/de.po                                      | 371 ++++++++++++++-------
 i18n/po/de_DE.po                                   | 187 +++++++++--
 i18n/po/el.po                                      | 189 +++++++++--
 i18n/po/en_AU.po                                   | 187 +++++++++--
 i18n/po/en_CA.po                                   | 187 +++++++++--
 i18n/po/en_GB.po                                   | 189 +++++++++--
 i18n/po/eo.po                                      | 187 +++++++++--
 i18n/po/es.po                                      | 234 ++++++++++---
 i18n/po/et.po                                      | 209 +++++++++---
 i18n/po/eu.po                                      | 187 +++++++++--
 i18n/po/fa.po                                      | 187 +++++++++--
 i18n/po/fi.po                                      | 187 +++++++++--
 i18n/po/fil.po                                     | 187 +++++++++--
 i18n/po/fo.po                                      | 187 +++++++++--
 i18n/po/fr.po                                      | 206 ++++++++++--
 i18n/po/ga.po                                      | 187 +++++++++--
 i18n/po/gl.po                                      | 197 +++++++++--
 i18n/po/he.po                                      | 187 +++++++++--
 i18n/po/hi.po                                      | 187 +++++++++--
 i18n/po/hr.po                                      | 191 +++++++++--
 i18n/po/ht.po                                      | 187 +++++++++--
 i18n/po/hu.po                                      | 192 +++++++++--
 i18n/po/hy.po                                      | 187 +++++++++--
 i18n/po/ia.po                                      | 187 +++++++++--
 i18n/po/id.po                                      | 192 +++++++++--
 i18n/po/is.po                                      | 189 +++++++++--
 i18n/po/it.po                                      | 192 +++++++++--
 i18n/po/ja.po                                      | 192 +++++++++--
 i18n/po/ka.po                                      | 187 +++++++++--
 i18n/po/km.po                                      | 187 +++++++++--
 i18n/po/ko.po                                      | 187 +++++++++--
 i18n/po/ky.po                                      | 187 +++++++++--
 i18n/po/lo.po                                      | 187 +++++++++--
 i18n/po/lt.po                                      | 190 +++++++++--
 i18n/po/lv.po                                      | 187 +++++++++--
 i18n/po/mk.po                                      | 187 +++++++++--
 i18n/po/mr.po                                      | 187 +++++++++--
 i18n/po/ms.po                                      | 187 +++++++++--
 i18n/po/nb.po                                      | 187 +++++++++--
 i18n/po/nds.po                                     | 187 +++++++++--
 i18n/po/nl.po                                      | 322 +++++++++++++-----
 i18n/po/nn.po                                      | 187 +++++++++--
 i18n/po/oc.po                                      | 187 +++++++++--
 i18n/po/pa.po                                      | 187 +++++++++--
 i18n/po/pl.po                                      | 192 +++++++++--
 i18n/po/pt.po                                      | 196 +++++++++--
 i18n/po/pt_BR.po                                   | 195 +++++++++--
 i18n/po/rm.po                                      | 187 +++++++++--
 i18n/po/ro.po                                      | 187 +++++++++--
 i18n/po/ru.po                                      | 197 +++++++++--
 i18n/po/sk.po                                      | 193 +++++++++--
 i18n/po/sl.po                                      | 187 +++++++++--
 i18n/po/sq.po                                      | 187 +++++++++--
 i18n/po/sr.po                                      | 187 +++++++++--
 i18n/po/sv.po                                      | 189 +++++++++--
 i18n/po/ta.po                                      | 187 +++++++++--
 i18n/po/te.po                                      | 187 +++++++++--
 i18n/po/th.po                                      | 187 +++++++++--
 i18n/po/tr.po                                      | 187 +++++++++--
 i18n/po/ug.po                                      | 187 +++++++++--
 i18n/po/uk.po                                      | 342 +++++++++++++------
 i18n/po/ur.po                                      | 187 +++++++++--
 i18n/po/vi.po                                      | 189 +++++++++--
 i18n/po/zh_CN.po                                   | 208 ++++++++++--
 i18n/po/zh_TW.po                                   | 189 +++++++++--
 images/presets/baby_hatch.png                      | Bin 848 -> 0 bytes
 linux/latest/DEBIAN/control                        |   2 +-
 linux/tested/DEBIAN/control                        |   2 +-
 scripts/BuildProjectionDefinitions.java            |   7 +-
 scripts/taginfoextract.groovy                      |  42 +--
 src/org/openstreetmap/josm/Main.java               |   8 +-
 .../josm/actions/DistributeAction.java             |   9 +-
 .../josm/actions/DownloadNotesInViewAction.java    |   4 +-
 src/org/openstreetmap/josm/actions/HelpAction.java |  24 +-
 .../josm/actions/JoinAreasAction.java              |  23 +-
 .../openstreetmap/josm/actions/OpenFileAction.java |  33 +-
 .../josm/actions/OrthogonalizeAction.java          |  12 +-
 .../josm/actions/OverpassDownloadAction.java       |  21 +-
 .../josm/actions/PasteTagsAction.java              |  23 +-
 .../openstreetmap/josm/actions/PurgeAction.java    |  14 +-
 .../josm/actions/RenameLayerAction.java            |   2 +
 .../openstreetmap/josm/actions/RestartAction.java  |   4 +-
 .../openstreetmap/josm/actions/SaveActionBase.java |   4 +-
 .../josm/actions/SessionLoadAction.java            |  11 +-
 .../josm/actions/SimplifyWayAction.java            |   6 +-
 .../openstreetmap/josm/actions/SplitWayAction.java |  15 +-
 .../openstreetmap/josm/actions/UnGlueAction.java   | 246 +++++++++++---
 .../josm/actions/UpdateSelectionAction.java        |   2 +-
 .../downloadtasks/DownloadReferrersTask.java       |   2 +-
 .../josm/actions/downloadtasks/DownloadTask.java   |   2 +-
 .../actions/downloadtasks/DownloadTaskList.java    |   6 +-
 .../josm/actions/mapmode/DeleteAction.java         |   3 +
 .../josm/actions/mapmode/DrawAction.java           |   5 +-
 .../josm/actions/mapmode/ExtrudeAction.java        |   9 +-
 .../josm/actions/mapmode/MapMode.java              |  16 +-
 .../josm/actions/mapmode/SelectAction.java         |   7 +-
 .../openstreetmap/josm/command/MoveCommand.java    |  11 +-
 .../openstreetmap/josm/command/PurgeCommand.java   |   4 +
 .../openstreetmap/josm/command/RotateCommand.java  |   3 +
 .../openstreetmap/josm/command/ScaleCommand.java   |   2 +
 .../josm/command/TransformNodesCommand.java        |   1 +
 src/org/openstreetmap/josm/data/AutosaveTask.java  |  31 +-
 src/org/openstreetmap/josm/data/Bounds.java        |   8 +
 .../josm/data/CustomConfigurator.java              |  17 +-
 src/org/openstreetmap/josm/data/Preferences.java   |  46 ++-
 .../openstreetmap/josm/data/ProjectionBounds.java  |  53 ++-
 .../josm/data/cache/JCSCacheManager.java           |   4 +
 .../josm/data/cache/JCSCachedTileLoaderJob.java    |  62 +---
 .../openstreetmap/josm/data/conflict/Conflict.java |   6 +-
 .../openstreetmap/josm/data/coor/EastNorth.java    |   4 +-
 src/org/openstreetmap/josm/data/coor/LatLon.java   |  17 +-
 .../josm/data/gpx/IWithAttributes.java             |   1 +
 .../josm/data/imagery/TMSCachedTileLoaderJob.java  |   4 +-
 .../josm/data/oauth/SignpostAdapters.java          |   5 +-
 .../josm/data/osm/AbstractPrimitive.java           |  92 +++--
 src/org/openstreetmap/josm/data/osm/BBox.java      |  15 +-
 src/org/openstreetmap/josm/data/osm/Hash.java      |   2 +
 .../josm/data/osm/MultipolygonBuilder.java         |   6 +-
 src/org/openstreetmap/josm/data/osm/Node.java      |   6 +
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |  70 ++--
 .../openstreetmap/josm/data/osm/QuadBuckets.java   |   4 +-
 src/org/openstreetmap/josm/data/osm/Relation.java  |   1 +
 src/org/openstreetmap/josm/data/osm/Storage.java   |  10 +-
 src/org/openstreetmap/josm/data/osm/User.java      |   6 +-
 src/org/openstreetmap/josm/data/osm/Way.java       |   2 +
 .../openstreetmap/josm/data/osm/WaySegment.java    |   4 +
 .../josm/data/osm/event/DataSetListener.java       |   1 +
 .../josm/data/osm/visitor/paint/LineClip.java      |  17 +-
 .../data/osm/visitor/paint/MapRendererFactory.java |   3 +
 .../data/osm/visitor/paint/StyledMapRenderer.java  |  66 ++--
 .../osm/visitor/paint/WireframeMapRenderer.java    |   1 +
 .../josm/data/projection/Ellipsoid.java            |  10 +-
 .../josm/data/projection/Projections.java          |   6 +
 .../josm/data/projection/datum/Datum.java          |   9 +-
 .../josm/data/projection/datum/NTV2GridShift.java  |   3 +-
 .../projection/proj/LambertConformalConic.java     |   4 +
 .../josm/data/validation/OsmValidator.java         |   1 +
 .../data/validation/routines/DomainValidator.java  |   5 +-
 .../data/validation/routines/RegexValidator.java   |   1 -
 .../data/validation/tests/MapCSSTagChecker.java    |  25 +-
 .../data/validation/tests/MultipolygonTest.java    |   8 +-
 .../josm/data/validation/tests/PowerLines.java     |   6 +-
 .../data/validation/tests/TurnrestrictionTest.java |   5 +
 src/org/openstreetmap/josm/gui/FileDrop.java       |   2 +-
 .../openstreetmap/josm/gui/IconToggleButton.java   |   3 +
 src/org/openstreetmap/josm/gui/ImageryMenu.java    |   1 +
 .../openstreetmap/josm/gui/MainApplication.java    |   8 +-
 src/org/openstreetmap/josm/gui/MainMenu.java       |  20 +-
 src/org/openstreetmap/josm/gui/MapFrame.java       |  15 +-
 src/org/openstreetmap/josm/gui/MapStatus.java      |  32 +-
 src/org/openstreetmap/josm/gui/MapView.java        |   2 +
 .../josm/gui/NavigatableComponent.java             |  51 +--
 src/org/openstreetmap/josm/gui/SideButton.java     |   2 +-
 src/org/openstreetmap/josm/gui/SplashScreen.java   |   1 +
 .../josm/gui/bbox/SlippyMapControler.java          |   2 +
 .../pair/nodes/NodeListTableCellRenderer.java      |   3 +-
 .../pair/properties/PropertiesMergeModel.java      |   2 +
 .../gui/conflict/tags/MultiValueCellRenderer.java  |   1 +
 .../josm/gui/dialogs/CommandStackDialog.java       |   3 +
 .../josm/gui/dialogs/InspectPrimitiveDialog.java   |   8 +-
 .../josm/gui/dialogs/LayerListDialog.java          |  13 +-
 .../josm/gui/dialogs/MapPaintDialog.java           |  17 +-
 .../josm/gui/dialogs/RelationListDialog.java       |  13 +-
 .../gui/dialogs/properties/PresetListPanel.java    |   6 +-
 .../dialogs/properties/SearchBasedRowFilter.java   |   2 +-
 .../josm/gui/dialogs/properties/TagEditHelper.java |  36 +-
 .../relation/DownloadRelationMemberTask.java       |   2 +-
 .../dialogs/relation/GenericRelationEditor.java    |   3 +-
 .../gui/dialogs/relation/MemberTableModel.java     |  10 +-
 .../dialogs/relation/RelationDialogManager.java    |   3 +-
 .../gui/dialogs/relation/sort/RelationNodeMap.java |  14 +-
 .../dialogs/relation/sort/RelationSortUtils.java   |   5 +-
 .../relation/sort/WayConnectionTypeCalculator.java |  15 +-
 .../gui/dialogs/validator/ValidatorTreePanel.java  |   1 +
 .../josm/gui/download/DownloadDialog.java          |   5 +
 .../josm/gui/download/DownloadSelection.java       |   1 +
 .../josm/gui/download/PlaceSelection.java          |   7 +-
 .../josm/gui/help/HelpContentReader.java           |   3 +
 src/org/openstreetmap/josm/gui/help/HelpUtil.java  |   2 +-
 .../josm/gui/history/TwoColumnDiff.java            |   4 +
 .../josm/gui/io/AbstractUploadTask.java            |   7 +-
 .../josm/gui/io/DownloadFileTask.java              |  26 +-
 .../josm/gui/io/DownloadPrimitivesTask.java        |   2 +-
 .../josm/gui/io/LayerNameAndFilePathTableCell.java |  22 +-
 .../josm/gui/io/TagSettingsPanel.java              |  14 +-
 .../josm/gui/io/UpdatePrimitivesTask.java          |  11 +-
 src/org/openstreetmap/josm/gui/layer/Layer.java    |   1 +
 .../josm/gui/layer/MapViewPaintable.java           |   3 +-
 .../gui/layer/geoimage/CorrelateGpxWithImages.java |  11 +-
 .../josm/gui/layer/geoimage/GeoImageLayer.java     | 169 +---------
 .../josm/gui/layer/geoimage/ImageEntry.java        | 303 ++++++++++++++++-
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |  21 +-
 .../josm/gui/layer/geoimage/ThumbsLoader.java      |  45 ++-
 .../gui/layer/gpx/ChooseTrackVisibilityAction.java |  11 +-
 .../josm/gui/layer/gpx/DateFilterPanel.java        |   5 +-
 .../josm/gui/layer/gpx/GpxDrawHelper.java          |  12 +-
 .../josm/gui/layer/gpx/ImportAudioAction.java      |   6 +-
 .../josm/gui/layer/gpx/ImportImagesAction.java     |   3 +
 .../josm/gui/layer/markerlayer/MarkerLayer.java    |   6 +-
 .../gui/layer/markerlayer/MarkerProducers.java     |   3 +
 .../josm/gui/layer/markerlayer/PlayHeadMarker.java |   7 +-
 .../{StyleCache.java => DividedScale.java}         | 188 ++++-------
 .../josm/gui/mappaint/ElemStyles.java              | 169 +++++-----
 .../josm/gui/mappaint/Environment.java             |   7 +
 .../josm/gui/mappaint/MapPaintStyles.java          |  13 +-
 .../josm/gui/mappaint/MultiCascade.java            |   6 +-
 src/org/openstreetmap/josm/gui/mappaint/Range.java |   3 +
 .../josm/gui/mappaint/StyleCache.java              | 246 ++------------
 .../josm/gui/mappaint/StyleElementList.java        |  71 ++++
 .../gui/mappaint/mapcss/ExpressionFactory.java     |   8 +
 .../josm/gui/mappaint/mapcss/MapCSSParser.jj       |  31 +-
 .../gui/mappaint/mapcss/MapCSSStyleSource.java     |   4 +-
 .../josm/gui/mappaint/mapcss/Selector.java         |   3 +-
 .../AreaElement.java}                              |  27 +-
 .../BoxTextElement.java}                           |  30 +-
 .../LabelCompositionStrategy.java                  |   2 +-
 .../LineElement.java}                              |  34 +-
 .../LineTextElement.java}                          |  19 +-
 .../gui/mappaint/{ => styleelement}/MapImage.java  |   8 +-
 .../NodeElement.java}                              |  32 +-
 .../RepeatImageElement.java}                       |  17 +-
 .../StyleElement.java}                             |  19 +-
 .../TextLabel.java}                                |  29 +-
 .../josm/gui/mappaint/xml/LinemodPrototype.java    |   6 +-
 .../josm/gui/mappaint/xml/XmlStyleSource.java      |   5 +
 .../josm/gui/oauth/OAuthAuthorizationWizard.java   |   2 +-
 .../gui/oauth/OsmOAuthAuthorizationClient.java     |  28 +-
 .../josm/gui/oauth/RetrieveAccessTokenTask.java    |  10 +-
 .../gui/oauth/SemiAutomaticAuthorizationUI.java    |   8 +-
 .../josm/gui/oauth/TestAccessTokenTask.java        |  16 +-
 .../josm/gui/preferences/PreferenceSetting.java    |   1 +
 .../josm/gui/preferences/PreferenceTabbedPane.java |   6 +-
 .../josm/gui/preferences/SourceEditor.java         |  34 +-
 .../josm/gui/preferences/SubPreferenceSetting.java |   1 +
 .../josm/gui/preferences/ToolbarPreferences.java   |  13 +
 .../preferences/advanced/ExportProfileAction.java  |   5 +-
 .../josm/gui/preferences/advanced/ListEditor.java  |   2 +
 .../gui/preferences/advanced/ListListEditor.java   |   2 +
 .../gui/preferences/advanced/StringEditor.java     |   2 +
 .../gui/preferences/imagery/ImageryPreference.java |   1 +
 .../gui/preferences/map/MapPaintPreference.java    |   8 +
 .../projection/ListProjectionChoice.java           |   6 +
 .../preferences/projection/ProjectionChoice.java   |   4 +
 .../gui/preferences/server/ApiUrlTestTask.java     |  11 +-
 .../server/OverpassServerPreference.java           | 103 ++++++
 .../gui/progress/PleaseWaitProgressMonitor.java    |   4 +
 .../josm/gui/tagging/TagEditorModel.java           |  10 +
 .../josm/gui/tagging/TagEditorPanel.java           |  14 +-
 .../openstreetmap/josm/gui/tagging/TagTable.java   |   9 +-
 .../gui/tagging/ac/AutoCompletionItemPriority.java |   1 +
 .../josm/gui/tagging/ac/AutoCompletionManager.java |   3 +-
 .../josm/gui/tagging/presets/TaggingPreset.java    |  34 +-
 .../gui/tagging/presets/TaggingPresetMenu.java     |   1 +
 .../gui/tagging/presets/TaggingPresetSelector.java |  14 +-
 .../josm/gui/tagging/presets/TaggingPresets.java   |  40 +++
 .../tagging/presets/items/ComboMultiSelect.java    |   1 +
 .../josm/gui/tagging/presets/items/Roles.java      |   3 +
 .../josm/gui/util/AdjustmentSynchronizer.java      |   3 +-
 src/org/openstreetmap/josm/gui/util/GuiHelper.java |   3 +
 .../josm/gui/util/KeyPressReleaseListener.java     |   5 +-
 .../josm/gui/util/StayOpenCheckBoxMenuItem.java    |  47 +--
 .../josm/gui/util/StayOpenMenuItem.java            |  85 -----
 .../josm/gui/util/StayOpenRadioButtonMenuItem.java |  99 ------
 .../openstreetmap/josm/gui/util/TableHelper.java   |   3 +
 .../widgets/AbstractTextComponentValidator.java    |   9 +
 .../josm/gui/widgets/MultiSplitLayout.java         |  42 ++-
 .../josm/gui/widgets/NativeFileChooser.java        |   4 +-
 .../josm/gui/widgets/TextContextualPopupMenu.java  |   1 +
 src/org/openstreetmap/josm/io/CachedFile.java      |  19 +-
 src/org/openstreetmap/josm/io/FileImporter.java    |  14 +-
 src/org/openstreetmap/josm/io/GpxExporter.java     |  12 +
 src/org/openstreetmap/josm/io/GpxReader.java       |   4 +-
 src/org/openstreetmap/josm/io/GpxWriter.java       |   5 +
 .../josm/io/MultiFetchOverpassObjectReader.java    |  40 +++
 .../josm/io/MultiFetchServerObjectReader.java      |  99 ++++--
 src/org/openstreetmap/josm/io/OsmApi.java          |  13 +-
 src/org/openstreetmap/josm/io/OsmConnection.java   |   2 +-
 src/org/openstreetmap/josm/io/OsmExporter.java     |   2 +-
 src/org/openstreetmap/josm/io/OsmReader.java       |  21 +-
 .../josm/io/OsmServerBackreferenceReader.java      |   1 +
 .../josm/io/OsmServerHistoryReader.java            |   1 +
 src/org/openstreetmap/josm/io/OsmServerReader.java |  29 +-
 src/org/openstreetmap/josm/io/OsmServerWriter.java |   1 +
 src/org/openstreetmap/josm/io/OsmWriter.java       |  24 +-
 .../josm/io/OverpassDownloadReader.java            |  17 +
 .../josm/io/StreamProgressUpdater.java             |   5 +-
 .../josm/io/UTFInputStreamReader.java              |   2 +
 src/org/openstreetmap/josm/io/XmlWriter.java       |  11 +
 .../josm/io/auth/DefaultAuthenticator.java         |   5 +-
 .../josm/io/remotecontrol/AddTagsDialog.java       |   6 +
 .../josm/io/remotecontrol/RequestProcessor.java    |   4 +
 .../io/remotecontrol/handler/AddWayHandler.java    |   3 +-
 .../josm/io/session/SessionReader.java             |   1 +
 .../josm/io/session/SessionWriter.java             |   3 +
 src/org/openstreetmap/josm/plugins/Plugin.java     |  17 +-
 .../josm/plugins/PluginDownloadTask.java           |  20 +-
 .../plugins/ReadRemotePluginInformationTask.java   |  11 +-
 .../josm/tools/CheckParameterUtil.java             |   1 +
 src/org/openstreetmap/josm/tools/CopyList.java     |   9 +-
 src/org/openstreetmap/josm/tools/Diff.java         | 182 +++++-----
 src/org/openstreetmap/josm/tools/GBC.java          |   8 +-
 src/org/openstreetmap/josm/tools/Geometry.java     |   6 +-
 src/org/openstreetmap/josm/tools/HttpClient.java   | 103 ++++--
 .../openstreetmap/josm/tools/ImageProvider.java    |  39 ++-
 .../openstreetmap/josm/tools/ImageResource.java    |  17 +-
 .../openstreetmap/josm/tools/OsmUrlToBounds.java   |  16 +-
 src/org/openstreetmap/josm/tools/Pair.java         |   2 +
 .../openstreetmap/josm/tools/PlatformHookOsx.java  |   5 +-
 .../josm/tools/PlatformHookWindows.java            |   2 +-
 src/org/openstreetmap/josm/tools/Predicates.java   |   4 +
 src/org/openstreetmap/josm/tools/Shortcut.java     |  16 +-
 src/org/openstreetmap/josm/tools/Utils.java        |  93 ++++--
 styles/standard/elemstyles.mapcss                  |  83 +++--
 test/data/regress/12255/G0016941.JPG               | Bin 0 -> 2073190 bytes
 .../josm/data/osm/TaginfoIntegrationTest.java      |  85 +++++
 .../openstreetmap/josm/tools/HttpClientTest.java   | 140 ++++++++
 test/unit/org/CustomMatchers.java                  |   1 +
 test/unit/org/openstreetmap/josm/TestUtils.java    |   1 +
 .../DeletedStateConflictResolveCommandTest.java    |  42 +++
 .../ModifiedConflictResolveCommandTest.java        |  42 +++
 .../RelationMemberConflictResolverCommandTest.java |  44 +++
 .../conflict/TagConflictResolveCommandTest.java    |  42 +++
 .../VersionConflictResolveCommandTest.java         |  42 +++
 .../WayNodesConflictResolverCommandTest.java       |  42 +++
 .../josm/data/validation/tests/TagCheckerTest.java |  24 +-
 .../RelationMemberConflictResolverModelTest.java   |   3 +
 .../josm/gui/layer/geoimage/ImageEntryTest.java    |  31 ++
 .../mappaint/LabelCompositionStrategyTest.groovy   |  42 +--
 .../MapCSSWithExtendedTextDirectivesTest.groovy    |  11 +-
 .../mappaint/mapcss/KeyValueConditionTest.groovy   |  16 +
 .../gui/preferences/ToolbarPreferencesTest.java    |   6 +-
 .../josm/gui/util/RotationAngleTest.java           |   9 +
 .../org/openstreetmap/josm/io/NmeaReaderTest.java  |  21 ++
 .../org/openstreetmap/josm/io/OsmWriterTest.java   |  38 +++
 .../josm/io/session/SessionWriterTest.java         |   3 +-
 .../openstreetmap/josm/tools/ColorScaleTest.java   |  36 ++
 .../josm/tools/ImageProviderTest.java              |   5 +-
 .../org/openstreetmap/josm/tools/UtilsTest.java    |  23 ++
 tools/checkstyle/josm_checks.xml                   |   2 +-
 tools/checkstyle/josm_filters.xml                  |  34 +-
 401 files changed, 17090 insertions(+), 4555 deletions(-)

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



More information about the Pkg-grass-devel mailing list