[josm] 02/05: Merge tag 'upstream/0.0.svn7995+dfsg1'
Bas Couwenberg
sebastic at xs4all.nl
Sun Feb 1 19:23:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository josm.
commit 2cd159e4a0441f247ab7acf6c52ffaa501bb383e
Merge: 69b23a3 7113a8a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Feb 1 18:39:14 2015 +0100
Merge tag 'upstream/0.0.svn7995+dfsg1'
Upstream version 0.0.svn7995+dfsg1
.classpath | 2 +-
.settings/org.eclipse.jdt.core.prefs | 1 +
.settings/org.eclipse.jdt.groovy.core.prefs | 2 +-
CONTRIBUTION | 166 +-
README | 4 +-
REVISION | 8 +-
build.xml | 9 +-
data/defaultpresets.xml | 454 +--
data/maps.xsd | 24 +-
data/projection/epsg | 24 +
data/validator/addresses.mapcss | 12 +-
data/validator/combinations.mapcss | 18 +-
data/validator/deprecated.mapcss | 19 +-
data/validator/geometry.mapcss | 48 +-
data/validator/highway.mapcss | 9 +-
data/validator/multiple.mapcss | 88 +-
data/validator/numeric.mapcss | 308 +-
data_nodist/projection-regression-test-data.csv | 60 +
i18n/po/af.po | 376 ++-
i18n/po/am.po | 376 ++-
i18n/po/ar.po | 380 ++-
i18n/po/ast.po | 472 ++-
i18n/po/az.po | 376 ++-
i18n/po/be.po | 376 ++-
i18n/po/bg.po | 388 ++-
i18n/po/bn.po | 376 ++-
i18n/po/br.po | 376 ++-
i18n/po/bs.po | 376 ++-
i18n/po/ca.po | 1503 +++++----
i18n/po/ca at valencia.po | 410 ++-
i18n/po/cs.po | 537 ++-
i18n/po/cy.po | 376 ++-
i18n/po/da.po | 752 +++--
i18n/po/de.po | 476 ++-
i18n/po/de_DE.po | 376 ++-
i18n/po/el.po | 384 ++-
i18n/po/en_AU.po | 388 ++-
i18n/po/en_CA.po | 376 ++-
i18n/po/en_GB.po | 404 ++-
i18n/po/eo.po | 378 ++-
i18n/po/es.po | 876 +++--
i18n/po/et.po | 766 +++--
i18n/po/eu.po | 384 ++-
i18n/po/fa.po | 376 ++-
i18n/po/fi.po | 396 ++-
i18n/po/fil.po | 376 ++-
i18n/po/fr.po | 430 ++-
i18n/po/gl.po | 574 ++--
i18n/po/he.po | 380 ++-
i18n/po/hi.po | 376 ++-
i18n/po/hr.po | 378 ++-
i18n/po/ht.po | 376 ++-
i18n/po/hu.po | 858 +++--
i18n/po/hy.po | 376 ++-
i18n/po/ia.po | 376 ++-
i18n/po/id.po | 406 ++-
i18n/po/is.po | 384 ++-
i18n/po/it.po | 727 +++--
i18n/po/ja.po | 465 ++-
i18n/po/ka.po | 376 ++-
i18n/po/km.po | 3412 +++++++++++++-------
i18n/po/ko.po | 376 ++-
i18n/po/ky.po | 376 ++-
i18n/po/lo.po | 376 ++-
i18n/po/lt.po | 388 ++-
i18n/po/lv.po | 376 ++-
i18n/po/mk.po | 376 ++-
i18n/po/ms.po | 376 ++-
i18n/po/nb.po | 386 ++-
i18n/po/nds.po | 376 ++-
i18n/po/nl.po | 412 ++-
i18n/po/nn.po | 376 ++-
i18n/po/oc.po | 378 ++-
i18n/po/pa.po | 376 ++-
i18n/po/pl.po | 1253 ++++---
i18n/po/pt.po | 408 ++-
i18n/po/pt_BR.po | 430 ++-
i18n/po/rm.po | 376 ++-
i18n/po/ro.po | 380 ++-
i18n/po/ru.po | 440 ++-
i18n/po/sk.po | 522 ++-
i18n/po/sl.po | 384 ++-
i18n/po/sq.po | 376 ++-
i18n/po/sr.po | 376 ++-
i18n/po/sv.po | 477 ++-
i18n/po/ta.po | 376 ++-
i18n/po/te.po | 376 ++-
i18n/po/th.po | 376 ++-
i18n/po/tr.po | 386 ++-
i18n/po/ug.po | 376 ++-
i18n/po/uk.po | 444 ++-
i18n/po/ur.po | 376 ++-
i18n/po/vi.po | 376 ++-
i18n/po/zh_CN.po | 400 ++-
i18n/po/zh_TW.po | 396 ++-
images/dialogs/geoimage/togglegit.png | Bin 0 -> 550 bytes
images/icons/power_tower_high2.n.16.png | Bin 541 -> 0 bytes
images/icons/power_tower_low.n.16.png | Bin 343 -> 0 bytes
images/presets/State_Public.png | Bin 181 -> 0 bytes
images/presets/State_Tourist.png | Bin 213 -> 0 bytes
images/presets/aeroway_gate.png | Bin 496 -> 872 bytes
images/presets/bar.png | Bin 306 -> 0 bytes
images/presets/book.png | Bin 394 -> 0 bytes
images/presets/caravan2.png | Bin 165 -> 0 bytes
images/presets/cow.png | Bin 167 -> 0 bytes
images/presets/crossing.png | Bin 179 -> 0 bytes
images/presets/fishing.png | Bin 157 -> 0 bytes
images/presets/gasometer.png | Bin 347 -> 435 bytes
images/presets/gate.png | Bin 118 -> 0 bytes
images/presets/hostel.png | Bin 318 -> 0 bytes
images/presets/information.png | Bin 228 -> 0 bytes
images/presets/marina.png | Bin 394 -> 0 bytes
images/presets/picnic.png | Bin 324 -> 0 bytes
images/presets/places.png | Bin 127 -> 0 bytes
images/presets/power_tower.png | Bin 507 -> 0 bytes
images/presets/shelter.png | Bin 540 -> 0 bytes
images/presets/survey_point.png | Bin 355 -> 0 bytes
images/presets/swimming.png | Bin 144 -> 0 bytes
images/presets/tent.png | Bin 352 -> 0 bytes
images/presets/theater.png | Bin 591 -> 712 bytes
images/presets/tower.png | Bin 101 -> 0 bytes
images/presets/tree.png | Bin 1731 -> 0 bytes
images/presets/vending_machine.png | Bin 452 -> 0 bytes
images/presets/viewpoint.png | Bin 558 -> 0 bytes
images/presets/water_tower.png | Bin 130 -> 0 bytes
images/presets/windmill.png | Bin 303 -> 0 bytes
netbeans/nbproject/genfiles.properties | 16 +-
netbeans/nbproject/project.properties | 176 +-
netbeans/nbproject/project.xml | 32 +-
.../josm/actions/AbstractSelectAction.java | 24 +
.../josm/actions/CreateMultipolygonAction.java | 33 +-
.../josm/actions/DownloadAlongAction.java | 240 +-
.../josm/actions/JoinAreasAction.java | 7 +-
.../josm/actions/OsmPrimitiveAction.java | 42 +-
.../openstreetmap/josm/actions/PasteAction.java | 2 +-
.../josm/actions/ReportBugAction.java | 98 +-
.../josm/actions/SelectByInternalPointAction.java | 10 +-
.../openstreetmap/josm/actions/ToggleAction.java | 264 +-
.../ToggleUploadDiscouragedLayerAction.java | 50 +-
.../openstreetmap/josm/actions/ZoomToAction.java | 226 +-
.../DownloadOsmChangeCompressedTask.java | 108 +-
.../downloadtasks/DownloadOsmChangeTask.java | 414 +--
.../downloadtasks/DownloadOsmCompressedTask.java | 130 +-
.../actions/downloadtasks/DownloadOsmUrlTask.java | 66 +-
.../actions/downloadtasks/DownloadSessionTask.java | 172 +-
.../actions/relation/AbstractRelationAction.java | 80 +-
.../actions/relation/AddSelectionToRelations.java | 126 +-
.../actions/relation/DeleteRelationsAction.java | 94 +-
.../actions/relation/DownloadMembersAction.java | 110 +-
.../DownloadSelectedIncompleteMembersAction.java | 151 +-
.../actions/relation/DuplicateRelationAction.java | 112 +-
.../josm/actions/relation/EditRelationAction.java | 185 +-
.../relation/SelectInRelationListAction.java | 64 +-
.../josm/actions/relation/SelectMembersAction.java | 96 +-
.../josm/command/conflict/package-info.java | 12 +-
.../josm/corrector/ReverseWayNoTagCorrector.java | 242 +-
src/org/openstreetmap/josm/data/AutosaveTask.java | 9 +-
src/org/openstreetmap/josm/data/Data.java | 78 +-
src/org/openstreetmap/josm/data/Preferences.java | 7 -
.../josm/data/SystemOfMeasurement.java | 354 +-
src/org/openstreetmap/josm/data/ViewportData.java | 136 +-
src/org/openstreetmap/josm/data/osm/Changeset.java | 15 +-
.../josm/data/osm/ChangesetDiscussionComment.java | 130 +-
.../josm/data/osm/PrimitiveDeepCopy.java | 22 +-
.../visitor/paint/relations/MultipolygonCache.java | 688 ++--
.../josm/data/preferences/ColorProperty.java | 110 +-
.../josm/data/projection/Projections.java | 12 +-
.../data/projection/datum/NTV2GridShiftFile.java | 6 +-
.../josm/data/validation/PaintVisitor.java | 564 ++--
.../validation/routines/AbstractValidator.java | 102 +-
.../josm/data/validation/tests/Addresses.java | 24 +-
.../data/validation/tests/ApiCapabilitiesTest.java | 110 +-
.../data/validation/tests/BarriersEntrances.java | 76 +-
.../josm/data/validation/tests/Highways.java | 546 ++--
.../josm/data/validation/tests/InternetTags.java | 348 +-
.../josm/data/validation/tests/PowerLines.java | 440 +--
.../data/validation/tests/RelationChecker.java | 5 +-
.../josm/data/validation/tests/UntaggedWay.java | 13 +-
src/org/openstreetmap/josm/gui/ImageryMenu.java | 567 ++--
.../openstreetmap/josm/gui/MapFrameListener.java | 36 +-
.../openstreetmap/josm/gui/PleaseWaitRunnable.java | 12 +-
.../openstreetmap/josm/gui/PopupMenuHandler.java | 250 +-
.../openstreetmap/josm/gui/SelectionManager.java | 2 +-
.../josm/gui/actionsupport/LogShowDialog.java | 106 +-
.../josm/gui/conflict/pair/PairTable.java | 66 +-
.../gui/conflict/pair/nodes/NodeListTable.java | 44 +-
.../pair/relation/RelationMemberTable.java | 44 +-
.../josm/gui/dialogs/ConflictDialog.java | 8 +-
.../josm/gui/dialogs/NotesDialog.java | 14 +
.../josm/gui/dialogs/SelectionListDialog.java | 37 +-
.../josm/gui/dialogs/ValidatorDialog.java | 8 +-
.../dialogs/changeset/AbstractCellRenderer.java | 152 +-
.../dialogs/changeset/ChangesetCacheManager.java | 6 +-
.../changeset/ChangesetDiscussionPanel.java | 305 +-
.../ChangesetDiscussionTableCellRenderer.java | 84 +-
.../ChangesetDiscussionTableColumnModel.java | 96 +-
.../changeset/ChangesetDiscussionTableModel.java | 110 +-
.../dialogs/properties/PropertiesCellRenderer.java | 156 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 1594 ++++-----
.../josm/gui/download/DownloadObjectDialog.java | 230 +-
.../josm/gui/history/HistoryViewerPanel.java | 250 +-
.../josm/gui/history/VersionTable.java | 29 +-
.../josm/gui/io/AbstractUploadDialog.java | 414 +--
.../josm/gui/io/BasicUploadSettingsPanel.java | 19 +-
.../josm/gui/layer/AbstractModifiableLayer.java | 192 +-
src/org/openstreetmap/josm/gui/layer/TMSLayer.java | 16 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 2 +-
.../josm/gui/layer/geoimage/GeoImageLayer.java | 186 +-
.../josm/gui/layer/geoimage/ImageDisplay.java | 32 +-
.../josm/gui/layer/geoimage/ImageEntry.java | 2 +-
.../josm/gui/layer/geoimage/ImageViewerDialog.java | 2 +-
.../gui/layer/geoimage/ShowThumbnailAction.java | 69 +
.../josm/gui/layer/geoimage/ThumbsLoader.java | 26 +-
.../josm/gui/layer/gpx/DateFilterPanel.java | 274 +-
.../josm/gui/layer/gpx/DownloadAlongPanel.java | 390 +--
.../josm/gui/layer/gpx/GpxDrawHelper.java | 1094 +++----
.../openstreetmap/josm/gui/mappaint/StyleKeys.java | 68 +-
.../gui/preferences/DefaultPreferenceSetting.java | 40 +-
.../preferences/DefaultTabPreferenceSetting.java | 266 +-
.../josm/gui/preferences/SourceProvider.java | 18 +-
.../josm/gui/preferences/SourceType.java | 30 +-
.../josm/gui/preferences/SubPreferenceSetting.java | 32 +-
.../josm/gui/preferences/TabPreferenceSetting.java | 160 +-
.../preferences/advanced/ExportProfileAction.java | 170 +-
.../josm/gui/preferences/advanced/PrefEntry.java | 220 +-
.../gui/preferences/advanced/PreferencesTable.java | 724 ++---
.../gui/preferences/advanced/package-info.java | 12 +-
.../josm/gui/preferences/audio/package-info.java | 12 +-
.../gui/preferences/display/DisplayPreference.java | 86 +-
.../josm/gui/preferences/display/package-info.java | 12 +-
.../gui/preferences/imagery/AddImageryDialog.java | 86 +-
.../preferences/imagery/CommonSettingsPanel.java | 194 +-
.../gui/preferences/imagery/TMSSettingsPanel.java | 192 +-
.../gui/preferences/imagery/WMSSettingsPanel.java | 224 +-
.../josm/gui/preferences/imagery/package-info.java | 12 +-
.../josm/gui/preferences/map/MapPreference.java | 84 +-
.../josm/gui/preferences/map/package-info.java | 12 +-
.../josm/gui/preferences/package-info.java | 14 +-
.../josm/gui/preferences/plugin/package-info.java | 12 +-
.../projection/CustomProjectionChoice.java | 2 +-
.../gui/preferences/projection/package-info.java | 12 +-
.../preferences/remotecontrol/package-info.java | 12 +-
.../server/AuthenticationPreference.java | 116 +-
.../preferences/server/MessagesNotifierPanel.java | 196 +-
.../gui/preferences/server/ProxyPreference.java | 182 +-
.../server/ProxyPreferenceListener.java | 28 +-
.../josm/gui/preferences/server/package-info.java | 12 +-
.../gui/preferences/shortcut/package-info.java | 12 +-
.../ValidatorTagCheckerRulesPreference.java | 422 +--
.../validator/ValidatorTestsPreference.java | 278 +-
.../gui/preferences/validator/package-info.java | 12 +-
.../josm/gui/progress/ProgressMonitorExecutor.java | 6 +
.../josm/gui/tagging/TaggingPresetItems.java | 3085 +++++++++---------
.../josm/gui/tagging/TaggingPresetListener.java | 28 +-
.../josm/gui/tagging/TaggingPresetReader.java | 668 ++--
.../josm/gui/tagging/TaggingPresetSelector.java | 1120 +++----
.../josm/gui/tagging/TaggingPresets.java | 234 +-
.../josm/gui/util/AdvancedKeyPressDetector.java | 398 +--
.../josm/gui/util/HighlightHelper.java | 272 +-
.../josm/gui/util/KeyPressReleaseListener.java | 40 +-
.../josm/gui/util/ModifierListener.java | 20 +-
.../openstreetmap/josm/gui/util/TableHelper.java | 66 +-
.../josm/gui/widgets/AbstractFileChooser.java | 450 +--
.../josm/gui/widgets/AbstractIdTextField.java | 178 +-
.../josm/gui/widgets/ChangesetIdTextField.java | 178 +-
.../josm/gui/widgets/DateEditorWithSlider.java | 254 +-
.../DisableShortcutsOnFocusGainedTextField.java | 382 +--
.../josm/gui/widgets/FileChooserManager.java | 466 +--
.../openstreetmap/josm/gui/widgets/ImageLabel.java | 112 +-
.../josm/gui/widgets/JosmComboBox.java | 486 +--
.../josm/gui/widgets/JosmEditorPane.java | 282 +-
.../josm/gui/widgets/JosmHTMLEditorKit.java | 100 +-
.../josm/gui/widgets/JosmPasswordField.java | 332 +-
.../josm/gui/widgets/JosmTextArea.java | 210 +-
.../josm/gui/widgets/NativeFileChooser.java | 352 +-
.../josm/gui/widgets/OsmPrimitivesTable.java | 220 +-
.../josm/gui/widgets/OsmPrimitivesTableModel.java | 22 +-
.../josm/gui/widgets/SwingFileChooser.java | 216 +-
.../josm/gui/widgets/TextContextualPopupMenu.java | 370 +--
src/org/openstreetmap/josm/io/AbstractParser.java | 416 +--
src/org/openstreetmap/josm/io/AbstractReader.java | 410 +--
src/org/openstreetmap/josm/io/FileWatcher.java | 324 +-
.../josm/io/ImportCancelException.java | 20 +-
src/org/openstreetmap/josm/io/MessageNotifier.java | 304 +-
.../josm/io/OfflineAccessException.java | 34 +-
src/org/openstreetmap/josm/io/OnlineResource.java | 100 +-
src/org/openstreetmap/josm/io/OsmChangeReader.java | 222 +-
src/org/openstreetmap/josm/io/OsmZipImporter.java | 56 +-
.../josm/io/imagery/WMSException.java | 118 +-
.../josm/io/remotecontrol/DNSName.java | 496 +--
.../io/remotecontrol/RemoteControlHttpsServer.java | 876 ++---
.../josm/io/remotecontrol/RequestProcessor.java | 976 +++---
.../io/remotecontrol/handler/AddNodeHandler.java | 260 +-
.../io/remotecontrol/handler/FeaturesHandler.java | 176 +-
.../io/remotecontrol/handler/ImageryHandler.java | 344 +-
.../io/remotecontrol/handler/ImportHandler.java | 268 +-
.../remotecontrol/handler/LoadAndZoomHandler.java | 596 ++--
.../io/remotecontrol/handler/RequestHandler.java | 642 ++--
.../io/remotecontrol/handler/VersionHandler.java | 126 +-
.../josm/io/session/SessionImporter.java | 80 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 1 -
src/org/openstreetmap/josm/tools/ColorScale.java | 352 +-
.../openstreetmap/josm/tools/CompositeList.java | 70 +-
src/org/openstreetmap/josm/tools/ExifReader.java | 63 +
.../openstreetmap/josm/tools/TextTagParser.java | 640 ++--
.../josm/tools/XmlParsingException.java | 164 +-
.../josm/tools/date/package-info.java | 12 +-
styles/standard/elemstyles.mapcss | 337 +-
taginfoextract.groovy | 10 +-
.../conflict/pair/nodes/NodeListMergerTest.java | 154 +-
.../pair/properties/PropertiesMergerTest.java | 104 +-
.../pair/relation/RelationMemberMergerTest.java | 112 +-
.../josm/gui/conflict/pair/tags/TagMergerTest.java | 80 +-
.../gui/dialogs/ConflictResolutionDialogTest.java | 104 +-
.../changeset/ChangesetCacheManagerTest.java | 42 +-
.../changeset/query/ChangesetQueryDialogTest.java | 44 +-
.../josm/gui/history/HistoryBrowserTest.java | 130 +-
.../josm/io/MultiFetchServerObjectReaderTest.java | 556 ++--
.../josm/io/OsmServerBackreferenceReaderTest.java | 1138 +++----
.../josm/io/OsmServerHistoryReaderTest.java | 126 +-
.../josm/io/UploadStrategySelectionPanelTest.java | 134 +-
.../josm/data/osm/RoundingPerformanceTest.java | 96 +-
test/unit/org/openstreetmap/josm/JOSMFixture.java | 226 +-
.../josm/actions/AlignInLineActionTest.java | 382 +--
.../josm/actions/JoinAreasActionTest.java | 90 +-
.../josm/corrector/ReverseWayTagCorrectorTest.java | 196 +-
.../org/openstreetmap/josm/data/BoundsTest.java | 86 +-
.../openstreetmap/josm/data/coor/LatLonTest.java | 246 +-
.../josm/data/osm/APIDataSetTest.java | 522 +--
.../josm/data/osm/ChangesetCacheTest.groovy | 332 +-
.../josm/data/osm/DataSetMergerTest.java | 1998 ++++++------
.../josm/data/osm/OsmPrimitiveKeyHandlingTest.java | 290 +-
.../openstreetmap/josm/data/osm/RelationTest.java | 212 +-
.../josm/data/osm/history/HistoryNodeTest.java | 104 +-
.../josm/data/osm/history/HistoryWayTest.java | 208 +-
.../visitor/MergeSourceBuildingVisitorTest.java | 818 ++---
.../data/projection/ProjectionRegressionTest.java | 9 +-
.../data/validation/tests/DuplicateNodeTest.java | 92 +-
.../data/validation/tests/InternetTagsTest.java | 158 +-
.../josm/gui/DefaultNameFormatterTest.java | 234 +-
.../josm/gui/JosmUserIdentityManagerTest.groovy | 628 ++--
.../josm/gui/SystemOfMeasurementTest.java | 256 +-
.../gui/conflict/nodes/NodeListMergeModelTest.java | 1446 ++++-----
.../properties/PropertiesMergeModelTest.java | 284 +-
.../josm/gui/conflict/tags/TagMergeItemTest.java | 302 +-
.../josm/gui/conflict/tags/TagMergeModelTest.java | 464 +--
.../josm/io/ChangesetQueryUrlParserTest.groovy | 438 +--
.../josm/io/DiffResultProcessorTest.groovy | 390 +--
.../josm/io/OsmChangeBuilderTest.groovy | 412 +--
.../josm/io/OsmChangesetContentParserTest.groovy | 432 +--
.../josm/io/ParseWithChangesetReaderTest.groovy | 420 +--
.../josm/io/remotecontrol/RemoteControlTest.java | 302 +-
.../josm/io/session/SessionReaderTest.java | 224 +-
.../josm/io/session/SessionWriterTest.java | 374 +--
.../josm/tools/BugReportExceptionHandlerTest.java | 114 +-
.../openstreetmap/josm/tools/ExifReaderTest.java | 149 +-
.../josm/tools/ImageProviderTest.java | 82 +-
.../org/openstreetmap/josm/tools/UtilsTest.java | 256 +-
358 files changed, 53859 insertions(+), 38050 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