[josm] branch master updated (5e5097a -> 94d0182)
Bas Couwenberg
sebastic at debian.org
Mon Apr 3 06:47:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch master
in repository josm.
from 5e5097a Add josm-plugins to Conflicts, as it Breaks newer josm revisions.
new d109609 Imported Upstream version 0.0.svn11826+dfsg
new da84fd3 Merge tag 'upstream/0.0.svn11826+dfsg'
new 57110c4 New tested snapshot.
new 0e7260c Add proj-data to dependencies for grid shift files.
new a96b414 Update copyright for japicc.
new 5ccfc01 Refresh patches.
new 94d0182 Set distribution to experimental.
The 7 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:
CONTRIBUTION | 9 +
README | 5 +-
REVISION | 10 +-
build.xml | 38 +-
data/defaultpresets.xml | 2374 +++--
data/maps.xsd | 1388 +--
data/projection/ntf_r93_b.gsb | Bin 277424 -> 0 bytes
data/tagging-preset.xsd | 642 +-
data/validator/combinations.mapcss | 9 +-
data/validator/geometry.mapcss | 19 +-
data/validator/numeric.mapcss | 18 +-
data/validator/wikipedia.mapcss | 137 +-
{data => data_nodist}/projection/BETA2007.gsb | Bin
data_nodist/projection/CHENYX06_etrs.gsb | Bin 0 -> 3310656 bytes
data_nodist/projection/CHENyx06-Distribution.pdf | Bin 0 -> 19312 bytes
data_nodist/projection/josm-epsg | 10 +-
data_nodist/projection/ntf_r93.gsb | Bin 0 -> 277424 bytes
data_nodist/projection/projection-reference-data | 26 +-
.../projection/projection-regression-test-data | 4 +-
data_nodist/trans/ast.lang | Bin 8866 -> 8801 bytes
data_nodist/trans/be.lang | Bin 18529 -> 18388 bytes
data_nodist/trans/bg.lang | Bin 2429 -> 2433 bytes
data_nodist/trans/ca-valencia.lang | Bin 7809 -> 7813 bytes
data_nodist/trans/ca.lang | Bin 10528 -> 10474 bytes
data_nodist/trans/cs.lang | Bin 11298 -> 11585 bytes
data_nodist/trans/da.lang | Bin 10603 -> 10536 bytes
data_nodist/trans/de.lang | Bin 11937 -> 12238 bytes
data_nodist/trans/el.lang | Bin 1431 -> 1435 bytes
data_nodist/trans/en.lang | Bin 9743 -> 9957 bytes
data_nodist/trans/en_AU.lang | Bin 1516 -> 1520 bytes
data_nodist/trans/en_GB.lang | Bin 2108 -> 2112 bytes
data_nodist/trans/es.lang | Bin 12551 -> 12618 bytes
data_nodist/trans/et.lang | Bin 1408 -> 1412 bytes
data_nodist/trans/fi.lang | Bin 3029 -> 3033 bytes
data_nodist/trans/fr.lang | Bin 12280 -> 12219 bytes
data_nodist/trans/gl.lang | Bin 2979 -> 2983 bytes
data_nodist/trans/hu.lang | Bin 12590 -> 12512 bytes
data_nodist/trans/id.lang | Bin 6719 -> 6723 bytes
data_nodist/trans/it.lang | Bin 10418 -> 10357 bytes
data_nodist/trans/ja.lang | Bin 11734 -> 11661 bytes
data_nodist/trans/km.lang | Bin 16889 -> 16686 bytes
data_nodist/trans/lt.lang | Bin 2037 -> 2041 bytes
data_nodist/trans/nb.lang | Bin 1707 -> 1711 bytes
data_nodist/trans/nl.lang | Bin 12447 -> 12362 bytes
data_nodist/trans/pl.lang | Bin 2856 -> 2860 bytes
data_nodist/trans/pt.lang | Bin 13690 -> 13644 bytes
data_nodist/trans/pt_BR.lang | Bin 10175 -> 10116 bytes
data_nodist/trans/ru.lang | Bin 18583 -> 18731 bytes
data_nodist/trans/sk.lang | Bin 10557 -> 10489 bytes
data_nodist/trans/sv.lang | Bin 1330 -> 1334 bytes
data_nodist/trans/uk.lang | Bin 18940 -> 18807 bytes
data_nodist/trans/vi.lang | Bin 10755 -> 10676 bytes
data_nodist/trans/zh_CN.lang | Bin 7588 -> 7531 bytes
data_nodist/trans/zh_TW.lang | Bin 4839 -> 4921 bytes
debian/changelog | 8 +-
debian/control | 1 +
debian/copyright | 4 +-
debian/patches/00-build.patch | 39 +-
debian/patches/01-bts.patch | 4 +-
debian/patches/03-default_look_and_feel.patch | 2 +-
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 2 +-
debian/patches/08-use_noto_font.patch | 11 -
i18n/po/af.po | 433 +-
i18n/po/am.po | 433 +-
i18n/po/ar.po | 433 +-
i18n/po/ast.po | 463 +-
i18n/po/az.po | 433 +-
i18n/po/be.po | 484 +-
i18n/po/bg.po | 433 +-
i18n/po/bn.po | 433 +-
i18n/po/br.po | 433 +-
i18n/po/bs.po | 433 +-
i18n/po/ca.po | 485 +-
i18n/po/ca at valencia.po | 439 +-
i18n/po/cs.po | 1760 ++--
i18n/po/cy.po | 433 +-
i18n/po/da.po | 481 +-
i18n/po/de.po | 646 +-
i18n/po/de_DE.po | 433 +-
i18n/po/el.po | 435 +-
i18n/po/en_AU.po | 435 +-
i18n/po/en_CA.po | 433 +-
i18n/po/en_GB.po | 478 +-
i18n/po/eo.po | 433 +-
i18n/po/es.po | 698 +-
i18n/po/et.po | 433 +-
i18n/po/eu.po | 433 +-
i18n/po/fa.po | 433 +-
i18n/po/fi.po | 435 +-
i18n/po/fil.po | 433 +-
i18n/po/fo.po | 433 +-
i18n/po/fr.po | 473 +-
i18n/po/ga.po | 433 +-
i18n/po/gl.po | 433 +-
i18n/po/he.po | 433 +-
i18n/po/hi.po | 433 +-
i18n/po/hr.po | 433 +-
i18n/po/ht.po | 433 +-
i18n/po/hu.po | 484 +-
i18n/po/hy.po | 433 +-
i18n/po/ia.po | 433 +-
i18n/po/id.po | 437 +-
i18n/po/is.po | 433 +-
i18n/po/it.po | 513 +-
i18n/po/ja.po | 535 +-
i18n/po/ka.po | 433 +-
i18n/po/km.po | 436 +-
i18n/po/ko.po | 2696 +++---
i18n/po/ku.po | 433 +-
i18n/po/ky.po | 433 +-
i18n/po/lb.po | 433 +-
i18n/po/lo.po | 433 +-
i18n/po/lt.po | 501 +-
i18n/po/lv.po | 433 +-
i18n/po/mk.po | 433 +-
i18n/po/mr.po | 433 +-
i18n/po/ms.po | 433 +-
i18n/po/nb.po | 433 +-
i18n/po/nds.po | 433 +-
i18n/po/nl.po | 483 +-
i18n/po/nn.po | 433 +-
i18n/po/oc.po | 433 +-
i18n/po/pa.po | 433 +-
i18n/po/pl.po | 984 +-
i18n/po/pt.po | 481 +-
i18n/po/pt_BR.po | 574 +-
i18n/po/rm.po | 433 +-
i18n/po/ro.po | 433 +-
i18n/po/ru.po | 512 +-
i18n/po/sk.po | 481 +-
i18n/po/sl.po | 433 +-
i18n/po/sq.po | 433 +-
i18n/po/sr.po | 433 +-
i18n/po/sv.po | 435 +-
i18n/po/ta.po | 433 +-
i18n/po/te.po | 433 +-
i18n/po/th.po | 433 +-
i18n/po/tr.po | 433 +-
i18n/po/ug.po | 433 +-
i18n/po/uk.po | 614 +-
i18n/po/ur.po | 433 +-
i18n/po/vi.po | 461 +-
i18n/po/wae.po | 433 +-
i18n/po/zh_CN.po | 443 +-
i18n/po/zh_TW.po | 529 +-
i18n/specialmessages.java | 5 +
images/presets/shop/lottery.svg | 451 +-
netbeans/nbproject/project.properties | 2 +-
scripts/SyncEditorLayerIndex.groovy | 18 +-
presets_lang.pl => scripts/presets_lang.pl | 15 +-
snapcraft.yaml | 46 +
src/org/openstreetmap/josm/Main.java | 43 +-
.../josm/actions/AbstractInfoAction.java | 3 +-
.../josm/actions/AddImageryLayerAction.java | 10 +-
.../josm/actions/AutoScaleAction.java | 18 +-
.../josm/actions/DialogsToggleAction.java | 2 +-
.../openstreetmap/josm/actions/DownloadAction.java | 48 +-
.../josm/actions/DownloadNotesInViewAction.java | 9 +
.../josm/actions/DownloadOsmInViewAction.java | 1 +
.../josm/actions/ImageryAdjustAction.java | 18 +-
.../josm/actions/LassoModeAction.java | 1 -
.../josm/actions/MergeLayerAction.java | 11 +-
.../josm/actions/OverpassDownloadAction.java | 1 +
.../openstreetmap/josm/actions/RestartAction.java | 3 +-
.../josm/actions/SessionLoadAction.java | 17 +-
.../josm/actions/ShowStatusReportAction.java | 29 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 16 +-
.../ToggleUploadDiscouragedLayerAction.java | 22 +-
.../josm/actions/UpdateSelectionAction.java | 2 +-
.../openstreetmap/josm/actions/UploadAction.java | 3 +-
.../josm/actions/audio/AudioBackAction.java | 3 +-
.../josm/actions/audio/AudioFastSlowAction.java | 3 +-
.../josm/actions/audio/AudioFwdAction.java | 3 +-
.../josm/actions/audio/AudioPlayPauseAction.java | 3 +-
.../downloadtasks/AbstractDownloadTask.java | 20 +
.../actions/downloadtasks/DownloadGpsTask.java | 17 +-
.../actions/downloadtasks/DownloadNotesTask.java | 14 +-
.../downloadtasks/DownloadOsmChangeTask.java | 3 +-
.../actions/downloadtasks/DownloadOsmTask.java | 61 +-
.../josm/actions/mapmode/AddNoteAction.java | 10 +-
.../josm/actions/mapmode/DeleteAction.java | 9 +-
.../josm/actions/mapmode/DrawAction.java | 7 +-
.../josm/actions/mapmode/DrawSnapHelper.java | 2 +-
.../josm/actions/mapmode/ExtrudeAction.java | 6 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 7 +-
.../josm/actions/mapmode/MapMode.java | 41 +-
.../josm/actions/mapmode/ParallelWayAction.java | 2 +-
.../josm/actions/mapmode/PlayHeadDragMode.java | 5 +-
.../josm/actions/mapmode/SelectAction.java | 1 -
.../josm/actions/mapmode/ZoomAction.java | 2 +-
.../josm/command/SequenceCommand.java | 12 +-
src/org/openstreetmap/josm/data/AutosaveTask.java | 2 +-
src/org/openstreetmap/josm/data/Bounds.java | 2 +-
src/org/openstreetmap/josm/data/Preferences.java | 3 +-
.../openstreetmap/josm/data/ProjectionBounds.java | 20 +
.../josm/data/cache/JCSCacheManager.java | 2 +-
src/org/openstreetmap/josm/data/gpx/GpxData.java | 4 +-
.../data/imagery/GetCapabilitiesParseHelper.java | 3 +-
.../josm/data/imagery/ImageryInfo.java | 18 +-
.../josm/data/imagery/ImageryLayerInfo.java | 47 +-
.../josm/data/imagery/OffsetBookmark.java | 52 +-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 16 +-
.../josm/data/imagery/WMTSTileSource.java | 95 +-
src/org/openstreetmap/josm/data/notes/Note.java | 66 +-
.../openstreetmap/josm/data/notes/NoteComment.java | 8 +-
.../josm/data/osm/AbstractPrimitive.java | 2 +-
src/org/openstreetmap/josm/data/osm/DataSet.java | 73 +-
.../josm/data/osm/DatasetConsistencyTest.java | 3 +-
src/org/openstreetmap/josm/data/osm/Node.java | 2 +-
src/org/openstreetmap/josm/data/osm/NoteData.java | 45 +-
.../josm/data/osm/OsmPrimitiveComparator.java | 21 +
.../josm/data/osm/RelationMember.java | 2 +-
src/org/openstreetmap/josm/data/osm/TagMap.java | 6 +-
.../josm/data/osm/event/DatasetEventManager.java | 4 +-
.../data/osm/visitor/paint/OffsetIterator.java | 168 +
.../visitor/paint/RenderBenchmarkCollector.java | 2 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 798 +-
.../visitor/paint/relations/MultipolygonCache.java | 51 +-
.../josm/data/preferences/PreferencesWriter.java | 8 +-
.../josm/data/projection/CustomProjection.java | 3 +-
.../josm/data/projection/Ellipsoid.java | 2 +-
.../josm/data/projection/Projections.java | 50 +-
.../josm/data/projection/datum/NTV2Datum.java | 28 +-
.../data/projection/datum/NTV2GridShiftFile.java | 2 +-
.../projection/datum/NTV2GridShiftFileWrapper.java | 60 +-
.../josm/data/projection/datum/NTV2SubGrid.java | 2 +-
.../data/projection/proj/SwissObliqueMercator.java | 2 +-
.../josm/data/validation/OsmValidator.java | 2 +-
.../data/validation/routines/DomainValidator.java | 2 +-
.../data/validation/routines/RegexValidator.java | 2 +-
.../data/validation/routines/UrlValidator.java | 2 +-
.../josm/data/validation/routines/package.html | 12 +-
.../data/validation/tests/ConditionalKeys.java | 6 +-
.../data/validation/tests/DuplicateRelation.java | 2 +-
.../josm/data/validation/tests/Highways.java | 6 +-
.../data/validation/tests/MultipolygonTest.java | 26 +-
.../josm/data/validation/tests/PowerLines.java | 4 +-
.../data/validation/tests/RelationChecker.java | 3 +-
.../data/validation/tests/SimilarNamedWays.java | 2 +-
.../josm/data/validation/tests/TagChecker.java | 20 +-
src/org/openstreetmap/josm/gui/ExtendedDialog.java | 8 +-
src/org/openstreetmap/josm/gui/ImageryMenu.java | 10 +-
.../josm/gui/JosmUserIdentityManager.java | 5 +-
.../openstreetmap/josm/gui/MainApplication.java | 28 +-
src/org/openstreetmap/josm/gui/MainFrame.java | 6 +-
src/org/openstreetmap/josm/gui/MainMenu.java | 2 +-
src/org/openstreetmap/josm/gui/MainPanel.java | 2 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 14 +-
src/org/openstreetmap/josm/gui/MapMover.java | 9 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 2 +-
src/org/openstreetmap/josm/gui/MapView.java | 52 +-
src/org/openstreetmap/josm/gui/MapViewState.java | 5 +-
src/org/openstreetmap/josm/gui/NoteSortDialog.java | 17 +-
.../openstreetmap/josm/gui/PleaseWaitDialog.java | 49 +-
.../openstreetmap/josm/gui/PleaseWaitRunnable.java | 4 +-
.../openstreetmap/josm/gui/ProgramArguments.java | 6 +-
.../gui/conflict/pair/AbstractListMergeModel.java | 18 +-
.../josm/gui/conflict/pair/ComparePairType.java | 2 +-
.../josm/gui/conflict/pair/tags/TagMerger.java | 2 +-
.../conflict/tags/CombinePrimitiveResolver.java | 78 +
.../tags/CombinePrimitiveResolverDialog.java | 274 +-
.../tags/PasteTagsConflictResolverDialog.java | 31 +-
.../gui/conflict/tags/TagConflictResolver.java | 6 +-
.../datatransfer/AbstractStackTransferHandler.java | 3 +-
.../josm/gui/datatransfer/ClipboardUtils.java | 2 +-
.../josm/gui/datatransfer/OsmTransferHandler.java | 2 +-
.../gui/datatransfer/importers/OsmLinkPaster.java | 4 +-
.../importers/PrimitiveDataPaster.java | 3 +-
.../josm/gui/dialogs/ChangesetDialog.java | 2 +-
.../josm/gui/dialogs/DialogsPanel.java | 3 +-
.../josm/gui/dialogs/LatLonDialog.java | 11 +-
.../josm/gui/dialogs/NotesDialog.java | 2 +-
.../josm/gui/dialogs/OsmIdSelectionDialog.java | 2 +-
.../josm/gui/dialogs/SelectionListDialog.java | 6 +-
.../josm/gui/dialogs/UserListDialog.java | 4 +-
.../josm/gui/dialogs/ValidatorDialog.java | 2 -
.../dialogs/changeset/ChangesetCacheManager.java | 4 +-
.../dialogs/changeset/ChangesetContentPanel.java | 3 +-
.../dialogs/layer/LayerListTransferHandler.java | 26 +-
.../gui/dialogs/properties/PropertiesDialog.java | 5 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 28 +-
.../gui/dialogs/relation/MemberTableModel.java | 19 +-
.../relation/actions/PasteMembersAction.java | 4 +-
.../gui/dialogs/relation/actions/SavingAction.java | 6 +-
.../relation/sort/WayConnectionTypeCalculator.java | 3 +-
.../josm/gui/download/DownloadDialog.java | 22 +
.../openstreetmap/josm/gui/draw/MapViewPath.java | 182 +-
.../josm/gui/draw/MapViewPositionAndRotation.java | 49 +
.../josm/gui/history/HistoryBrowserDialog.java | 11 +-
.../gui/history/HistoryBrowserDialogManager.java | 3 +-
.../josm/gui/history/HistoryBrowserModel.java | 363 +-
.../josm/gui/history/TagInfoTransferHandler.java | 1 -
.../josm/gui/history/TagTableCellRenderer.java | 9 +-
.../josm/gui/history/TagTableModel.java | 146 +
.../josm/gui/history/TwoColumnDiff.java | 2 +-
.../josm/gui/history/VersionTable.java | 19 +-
.../josm/gui/history/VersionTableModel.java | 105 +
.../openstreetmap/josm/gui/io/SaveLayerTask.java | 3 +-
.../josm/gui/io/UploadPrimitivesTask.java | 6 +
.../josm/gui/io/UploadSelectionDialog.java | 2 +-
.../josm/gui/layer/AbstractTileSourceLayer.java | 5 -
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 2 +-
.../openstreetmap/josm/gui/layer/ImageryLayer.java | 19 +-
.../openstreetmap/josm/gui/layer/LayerManager.java | 47 +-
.../josm/gui/layer/MainLayerManager.java | 4 +-
.../josm/gui/layer/MapViewPaintable.java | 2 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 37 +-
.../openstreetmap/josm/gui/layer/WMTSLayer.java | 3 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 5 +-
.../josm/gui/layer/geoimage/ImageEntry.java | 60 +-
.../josm/gui/layer/gpx/GpxDrawHelper.java | 22 +-
.../josm/gui/layer/gpx/ImportImagesAction.java | 2 +-
.../layer/imagery/TileSourceDisplaySettings.java | 3 +-
.../josm/gui/layer/markerlayer/AudioMarker.java | 3 +-
.../josm/gui/layer/markerlayer/PlayHeadMarker.java | 5 +-
.../josm/gui/mappaint/ElemStyles.java | 37 +-
.../josm/gui/mappaint/MapPaintStyles.java | 3 +
.../josm/gui/mappaint/StyleCache.java | 14 +
.../openstreetmap/josm/gui/mappaint/StyleKeys.java | 4 +
.../josm/gui/mappaint/mapcss/Condition.java | 2 +-
.../josm/gui/mappaint/mapcss/ConditionFactory.java | 5 +-
.../gui/mappaint/mapcss/ExpressionFactory.java | 52 +-
.../josm/gui/mappaint/mapcss/MapCSSParser.jj | 2 +-
.../josm/gui/mappaint/mapcss/Selector.java | 2 +-
.../gui/mappaint/styleelement/AreaElement.java | 58 +-
.../gui/mappaint/styleelement/AreaIconElement.java | 103 +
.../gui/mappaint/styleelement/BoxTextElement.java | 59 +-
.../gui/mappaint/styleelement/LineElement.java | 34 +-
.../gui/mappaint/styleelement/LineTextElement.java | 9 +-
.../gui/mappaint/styleelement/NodeElement.java | 80 +-
.../mappaint/styleelement/RepeatImageElement.java | 6 +-
.../gui/mappaint/styleelement/TextElement.java | 88 +
.../josm/gui/mappaint/styleelement/TextLabel.java | 102 +-
.../placement/CompletelyInsideAreaStrategy.java | 97 +
.../styleelement/placement/OnLineStrategy.java | 334 +
.../placement/PartiallyInsideAreaStrategy.java | 43 +
.../placement/PositionForAreaStrategy.java | 81 +
.../styleelement/placement/package-info.java | 6 +
.../josm/gui/preferences/PreferenceTabbedPane.java | 4 +-
.../josm/gui/preferences/ToolbarPreferences.java | 42 +-
.../gui/preferences/display/ColorPreference.java | 2 -
.../gui/preferences/display/LafPreference.java | 11 +-
.../gui/preferences/imagery/AddWMSLayerPanel.java | 8 +-
.../preferences/imagery/CommonSettingsPanel.java | 42 +-
.../gui/preferences/imagery/ImageryPreference.java | 19 +-
.../gui/preferences/map/MapPaintPreference.java | 2 +-
.../gui/progress/PleaseWaitProgressMonitor.java | 11 +-
.../josm/gui/progress/ProgressMonitor.java | 2 +-
.../josm/gui/tagging/TagEditorModel.java | 6 +-
.../gui/tagging/TagTableColumnModelBuilder.java | 10 +-
.../josm/gui/tagging/ac/AutoCompletionManager.java | 7 +-
.../gui/tagging/presets/TaggingPresetSelector.java | 8 +-
.../tagging/presets/items/ComboMultiSelect.java | 2 +-
src/org/openstreetmap/josm/gui/util/GuiHelper.java | 2 +-
.../openstreetmap/josm/gui/util/RotationAngle.java | 142 +-
.../josm/gui/widgets/AutoAdjustingSplitPane.java | 47 +
.../josm/gui/widgets/JosmPasswordField.java | 2 +-
.../josm/gui/widgets/JosmTextField.java | 5 +-
.../josm/gui/widgets/ListPopupMenu.java | 2 +-
.../josm/gui/widgets/MultiSplitPane.java | 2 +-
.../josm/gui/widgets/QuadStateCheckBox.java | 4 +-
.../josm/io/BoundingBoxDownloader.java | 3 +-
src/org/openstreetmap/josm/io/GpxReader.java | 2 +-
.../josm/io/MultiFetchServerObjectReader.java | 15 +-
src/org/openstreetmap/josm/io/NameFinder.java | 2 +-
src/org/openstreetmap/josm/io/NmeaReader.java | 2 +-
src/org/openstreetmap/josm/io/OsmExporter.java | 10 +-
src/org/openstreetmap/josm/io/OsmReader.java | 8 +-
src/org/openstreetmap/josm/io/OsmWriter.java | 11 +-
.../josm/io/XmlStreamParsingException.java | 7 +-
.../openstreetmap/josm/io/imagery/WMSImagery.java | 2 +-
.../josm/io/remotecontrol/DNSName.java | 3 +
.../io/remotecontrol/handler/ImportHandler.java | 2 +-
.../remotecontrol/handler/LoadAndZoomHandler.java | 2 +-
.../josm/io/session/SessionReader.java | 2 +-
.../josm/io/session/SessionWriter.java | 12 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 8 +-
src/org/openstreetmap/josm/tools/AudioPlayer.java | 32 +-
.../openstreetmap/josm/tools/ExceptionUtil.java | 2 +
src/org/openstreetmap/josm/tools/ExifReader.java | 153 +-
src/org/openstreetmap/josm/tools/Geometry.java | 6 +-
.../openstreetmap/josm/tools/ImageProvider.java | 6 +-
.../openstreetmap/josm/tools/OsmUrlToBounds.java | 2 +-
src/org/openstreetmap/josm/tools/PlatformHook.java | 8 +
.../openstreetmap/josm/tools/PlatformHookOsx.java | 6 +
.../josm/tools/PlatformHookUnixoid.java | 7 +-
.../josm/tools/PlatformHookWindows.java | 6 +
.../josm/tools/RightAndLefthandTraffic.java | 2 +-
src/org/openstreetmap/josm/tools/Utils.java | 25 +-
.../openstreetmap/josm/tools/WindowGeometry.java | 2 +-
.../josm/tools/bugreport/BugReport.java | 2 +-
.../josm/tools/bugreport/BugReportDialog.java | 2 +-
.../josm/tools/bugreport/ReportedException.java | 14 +-
.../template_engine/ContextSwitchTemplate.java | 26 +-
test/data/regress/14209/7VWFOryj--.1.jpg | Bin 1633543 -> 670 bytes
test/data/renderer/area-fill-color/data.osm | 245 +
test/data/renderer/area-fill-color/reference.png | Bin 0 -> 1725 bytes
test/data/renderer/area-fill-color/style.mapcss | 34 +
test/data/renderer/area-fill-image/data.osm | 245 +
test/data/renderer/area-fill-image/reference.png | Bin 0 -> 6343 bytes
test/data/renderer/area-fill-image/style.mapcss | 34 +
test/data/renderer/area-icon/data.osm | 251 +
test/data/renderer/area-icon/reference.png | Bin 0 -> 11000 bytes
test/data/renderer/area-icon/style.mapcss | 18 +
test/data/renderer/area-text/data.osm | 252 +
test/data/renderer/area-text/reference.png | Bin 0 -> 4984 bytes
test/data/renderer/area-text/style.mapcss | 17 +
test/data/renderer/node-shapes/reference.png | Bin 3765 -> 3867 bytes
test/data/renderer/node-text/data.osm | 82 +
test/data/renderer/node-text/reference.png | Bin 0 -> 6743 bytes
test/data/renderer/node-text/style.mapcss | 142 +
test/data/renderer/order/data.osm | 606 ++
test/data/renderer/order/reference.png | Bin 0 -> 13111 bytes
test/data/renderer/order/style.mapcss | 83 +
test/data/renderer/way-color/data.osm | 88 +
test/data/renderer/way-color/reference.png | Bin 0 -> 4549 bytes
test/data/renderer/way-color/style.mapcss | 30 +
test/data/renderer/way-dashes/data.osm | 88 +
test/data/renderer/way-dashes/reference.png | Bin 0 -> 4526 bytes
test/data/renderer/way-dashes/style.mapcss | 36 +
test/data/renderer/way-width/reference.png | Bin 2714 -> 3557 bytes
.../josm/gui/mappaint/MapCSSRendererTest.java | 308 +
.../josm/gui/mappaint/StyleCacheTest.java | 69 +-
.../josm/actions/JoinAreasActionTest.java | 123 +-
.../josm/actions/mapmode/AddNoteActionTest.java | 2 +-
.../josm/actions/mapmode/DeleteActionTest.java | 2 +-
.../josm/actions/mapmode/ExtrudeActionTest.java | 2 +-
.../mapmode/ImproveWayAccuracyActionTest.java | 2 +-
.../josm/actions/mapmode/MapViewMock.java | 2 +-
.../josm/command/SequenceCommandTest.java | 61 +
.../josm/data/projection/ProjectionRefTest.java | 58 +-
.../josm/data/projection/SwissGridTest.java | 48 +-
.../data/validation/tests/DuplicateNodeTest.java | 2 +-
.../data/validation/tests/ValidatorTestUtils.java | 2 +-
.../gui/dialogs/InspectPrimitiveDialogTest.java | 5 +-
.../josm/gui/history/HistoryBrowserModelTest.java | 2 -
.../josm/gui/layer/gpx/GpxDrawHelperTest.java | 4 +-
.../josm/gui/mappaint/MapCSSRendererTest.java | 199 -
.../preferences/map/MapPaintPreferenceTestIT.java | 5 +-
.../AutoAdjustingSplitPaneTest.java} | 11 +-
.../josm/testutils/JOSMTestRules.java | 18 +
.../openstreetmap/josm/tools/ExifReaderTest.java | 16 +
tools/japicc/japi-compliance-checker.pl | 9890 ++++++--------------
tools/japicc/modules/Internals/APIDump.pm | 1043 +++
tools/japicc/modules/Internals/Basic.pm | 282 +
tools/japicc/modules/Internals/Css/Report.css | 227 +
tools/japicc/modules/Internals/Css/Tabs.css | 34 +
tools/japicc/modules/Internals/Descriptor.pm | 94 +
tools/japicc/modules/Internals/Filter.pm | 309 +
tools/japicc/modules/Internals/Input.pm | 32 +
tools/japicc/modules/Internals/Js/Sections.js | 16 +
tools/japicc/modules/Internals/Js/Tabs.js | 64 +
tools/japicc/modules/Internals/Logging.pm | 90 +
tools/japicc/modules/Internals/Mangling.pm | 100 +
tools/japicc/modules/Internals/Path.pm | 81 +
tools/japicc/modules/Internals/RegTests.pm | 1591 ++++
tools/japicc/modules/Internals/SysFiles.pm | 225 +
tools/japicc/modules/Internals/TypeAttr.pm | 97 +
tools/japicc/modules/Internals/Utils.pm | 235 +
tools/japicc/modules/RulesBin.xml | 1233 +++
tools/japicc/modules/RulesSrc.xml | 1109 +++
tools/pmd/designer.bat | 6 +
tools/pmd/josm-ruleset.xml | 58 +
465 files changed, 52930 insertions(+), 20366 deletions(-)
delete mode 100644 data/projection/ntf_r93_b.gsb
rename {data => data_nodist}/projection/BETA2007.gsb (100%)
create mode 100644 data_nodist/projection/CHENYX06_etrs.gsb
create mode 100644 data_nodist/projection/CHENyx06-Distribution.pdf
create mode 100644 data_nodist/projection/ntf_r93.gsb
rename presets_lang.pl => scripts/presets_lang.pl (82%)
create mode 100644 snapcraft.yaml
create mode 100644 src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java
create mode 100644 src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolver.java
create mode 100644 src/org/openstreetmap/josm/gui/draw/MapViewPositionAndRotation.java
create mode 100644 src/org/openstreetmap/josm/gui/history/TagTableModel.java
create mode 100644 src/org/openstreetmap/josm/gui/history/VersionTableModel.java
create mode 100644 src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaIconElement.java
create mode 100644 src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java
create mode 100644 src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java
create mode 100644 src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java
create mode 100644 src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java
create mode 100644 src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PositionForAreaStrategy.java
create mode 100644 src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/package-info.java
create mode 100644 src/org/openstreetmap/josm/gui/widgets/AutoAdjustingSplitPane.java
create mode 100644 test/data/renderer/area-fill-color/data.osm
create mode 100644 test/data/renderer/area-fill-color/reference.png
create mode 100644 test/data/renderer/area-fill-color/style.mapcss
create mode 100644 test/data/renderer/area-fill-image/data.osm
create mode 100644 test/data/renderer/area-fill-image/reference.png
create mode 100644 test/data/renderer/area-fill-image/style.mapcss
create mode 100644 test/data/renderer/area-icon/data.osm
create mode 100644 test/data/renderer/area-icon/reference.png
create mode 100644 test/data/renderer/area-icon/style.mapcss
create mode 100644 test/data/renderer/area-text/data.osm
create mode 100644 test/data/renderer/area-text/reference.png
create mode 100644 test/data/renderer/area-text/style.mapcss
create mode 100644 test/data/renderer/node-text/data.osm
create mode 100644 test/data/renderer/node-text/reference.png
create mode 100644 test/data/renderer/node-text/style.mapcss
create mode 100644 test/data/renderer/order/data.osm
create mode 100644 test/data/renderer/order/reference.png
create mode 100644 test/data/renderer/order/style.mapcss
create mode 100644 test/data/renderer/way-color/data.osm
create mode 100644 test/data/renderer/way-color/reference.png
create mode 100644 test/data/renderer/way-color/style.mapcss
create mode 100644 test/data/renderer/way-dashes/data.osm
create mode 100644 test/data/renderer/way-dashes/reference.png
create mode 100644 test/data/renderer/way-dashes/style.mapcss
create mode 100644 test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
delete mode 100644 test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
rename test/unit/org/openstreetmap/josm/gui/{conflict/tags/CombinePrimitiveResolverDialogTest.java => widgets/AutoAdjustingSplitPaneTest.java} (71%)
create mode 100644 tools/japicc/modules/Internals/APIDump.pm
create mode 100644 tools/japicc/modules/Internals/Basic.pm
create mode 100644 tools/japicc/modules/Internals/Css/Report.css
create mode 100644 tools/japicc/modules/Internals/Css/Tabs.css
create mode 100644 tools/japicc/modules/Internals/Descriptor.pm
create mode 100644 tools/japicc/modules/Internals/Filter.pm
create mode 100644 tools/japicc/modules/Internals/Input.pm
create mode 100644 tools/japicc/modules/Internals/Js/Sections.js
create mode 100644 tools/japicc/modules/Internals/Js/Tabs.js
create mode 100644 tools/japicc/modules/Internals/Logging.pm
create mode 100644 tools/japicc/modules/Internals/Mangling.pm
create mode 100644 tools/japicc/modules/Internals/Path.pm
create mode 100644 tools/japicc/modules/Internals/RegTests.pm
create mode 100644 tools/japicc/modules/Internals/SysFiles.pm
create mode 100644 tools/japicc/modules/Internals/TypeAttr.pm
create mode 100644 tools/japicc/modules/Internals/Utils.pm
create mode 100644 tools/japicc/modules/RulesBin.xml
create mode 100644 tools/japicc/modules/RulesSrc.xml
create mode 100644 tools/pmd/designer.bat
create mode 100644 tools/pmd/josm-ruleset.xml
--
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