#
# ChangeLog for trunk/src in josm
#
# Generated by Trac 1.6
# 2024-11-29T18:24:48+01:00

Sun, 20 Sep 2009 11:01:42 GMT Gubaer [2170]
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)

	fixed #3546: Grey out preset buttons in toolbar on startup


Sun, 20 Sep 2009 10:25:17 GMT Gubaer [2169]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)

	Removed old code


Sun, 20 Sep 2009 09:46:08 GMT Gubaer [2168]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/upload (added)
	* trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (moved)
	* trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (added)
	* trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (added)
	* trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java (added)
	* trunk/src/org/openstreetmap/josm/actions/upload/UploadParameterHook.java (added)
	* trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (added)

	fixed #3304: Upload failed - Placeholder Relation not found
	fixed ...


Sun, 20 Sep 2009 09:07:46 GMT stoecker [2166]
	* trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified)

	see #3475 - patch by Petr Dlouhý - improve speed


Sun, 20 Sep 2009 09:05:58 GMT stoecker [2165]
	* trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)

	applied #3532 - path by Dave Hansen - infrastructure for faster data ...


Sun, 20 Sep 2009 08:46:41 GMT stoecker [2164]
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (modified)

	fixed typo


Sun, 20 Sep 2009 08:23:22 GMT stoecker [2163]
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxExporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (modified)

	fixed typos


Sun, 20 Sep 2009 07:52:57 GMT stoecker [2162]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified)

	see #3550 - patch by bastik - resize dialogs on right side


Sat, 19 Sep 2009 14:37:52 GMT xeen [2161]
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)

	fix #3502 (the ESC listener on ExtendedDialog stopped working)


Sat, 19 Sep 2009 08:55:26 GMT Gubaer [2159]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified)

	fixed #3539: NullPointerException when deleting the only data layer ...


Sat, 19 Sep 2009 08:37:43 GMT Gubaer [2158]
	* trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified)

	fixed #3541: Upload-Dialog: Pressing 'enter' in comment-field should ...


Thu, 17 Sep 2009 20:38:08 GMT Gubaer [2157]
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified)

	fixed #3534: Merge dialog "remembers" old relations


Thu, 17 Sep 2009 19:52:20 GMT Gubaer [2156]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (modified)

	fixed #3533: auto-completion in relation editor broken


Thu, 17 Sep 2009 16:40:48 GMT Gubaer [2155]
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)

	see #3449: action='modified' lost on file reopening


Wed, 16 Sep 2009 21:20:13 GMT xeen [2154]
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java (modified)

	Rewrite JMultilineLabel to support HTML markup.
	this closes #3500


Wed, 16 Sep 2009 19:59:47 GMT Gubaer [2153]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)

	applied #3489: patch by singularita@gmail.com: Confusing conflict
	message


Wed, 16 Sep 2009 19:47:44 GMT Gubaer [2152]
	* trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	applied #3524: patch by avar: Make plugin search (much) faster


Wed, 16 Sep 2009 19:40:57 GMT Gubaer [2151]
	* trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified)

	applied #3526: patch by glebius@...: be more verbose about available ...


Wed, 16 Sep 2009 19:28:20 GMT Gubaer [2148]
	* trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified)

	fixed #3530: Unable to satisfy "Please enter a comment....(min 3 ...


Wed, 16 Sep 2009 15:55:01 GMT stoecker [2147]
	* trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	applied #3061 - patch by avar - search in plugin list


Wed, 16 Sep 2009 15:50:07 GMT stoecker [2146]
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)

	applied #3425 - patch by dmuecke - Import Audio gives excessive
	warnings


Wed, 16 Sep 2009 15:45:50 GMT stoecker [2145]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Filter.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Filters.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)

	see #3475 - patch by Petr Dlouhý - cleanups


Tue, 15 Sep 2009 22:13:54 GMT xeen [2143]
	* trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified)

	close #3516: clarify-middle-click-message.java, patch by avar


Tue, 15 Sep 2009 19:16:43 GMT Gubaer [2142]
	* trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (modified)

	fixed #3514: NullPointerException when double-clicking on a download ...


Tue, 15 Sep 2009 14:32:01 GMT Gubaer [2141]
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java (modified)

	applied #3513: patch by Claudius Henrichs : Typos and unifying ...


Tue, 15 Sep 2009 07:21:02 GMT stoecker [2140]
	* trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java (modified)

	fixed preset submenus


Tue, 15 Sep 2009 05:52:33 GMT Gubaer [2139]
	* trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (modified)

	added missing JScrollPane + doc


Mon, 14 Sep 2009 21:02:59 GMT xeen [2138]
	* trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)

	Add remember window geometry feature to extended dialog (see #3478)


Mon, 14 Sep 2009 19:57:36 GMT xeen [2137]
	* trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified)

	* close #3490 (Add editor username to middleclick menu)
	* improve ...


Mon, 14 Sep 2009 19:39:03 GMT Gubaer [2136]
	* trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified)

	fixed #3328: show note= again at relations


Mon, 14 Sep 2009 19:24:54 GMT Gubaer [2135]
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)

	fixed #3488: "No open changeset" appears in changeset list every ...


Mon, 14 Sep 2009 19:13:06 GMT Gubaer [2134]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)

	fixed #3489: Confusing conflict message


Mon, 14 Sep 2009 19:07:37 GMT ce [2133]
	* trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified)

	Default Toolbar Preset Icons -  fixes #3366


Mon, 14 Sep 2009 19:00:54 GMT Gubaer [2132]
	* trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified)

	fixed #3478: Remember size of download dialog


Mon, 14 Sep 2009 18:32:12 GMT Gubaer [2131]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)

	see #3407: NPE in ConflictDialog when using OpenStreetBug plugin


Mon, 14 Sep 2009 12:39:07 GMT framm [2130]
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)

	fix <bound> exception (again)


Mon, 14 Sep 2009 09:37:34 GMT stoecker [2129]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Filter.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Filters.java (modified)

	see #3475 - minor cleanup


Mon, 14 Sep 2009 08:35:38 GMT stoecker [2128]
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)

	fixed tagging presets typo


Mon, 14 Sep 2009 00:56:05 GMT xeen [2127]
	* trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified)

	close #3480


Sun, 13 Sep 2009 21:48:03 GMT Gubaer [2126]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)

	fixed #3474: sort relation list for type and alphabetically again


Sun, 13 Sep 2009 21:12:49 GMT stoecker [2125]
	* trunk/src/org/openstreetmap/josm/data/osm/Filter.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/Filters.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (added)

	added files


Sun, 13 Sep 2009 20:46:45 GMT Gubaer [2124]
	* trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (modified)

	See #3483: "Load list of changesets from the server" is broken for ...


Sun, 13 Sep 2009 20:42:43 GMT stoecker [2123]
	* trunk/images/dialogs/filter.png (added)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified)

	see #3475 - patch by Petr Dlouhý - display filtering - disabled by ...


Sun, 13 Sep 2009 20:41:38 GMT ce [2122]
	* trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified)

	see #3366 - preparation for inclusion of default presets in the menu
	bar.


Sun, 13 Sep 2009 20:23:19 GMT stoecker [2120]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)

	see #3475 - patch by Petr Dlouhý - code rework for display filtering


Sun, 13 Sep 2009 17:30:36 GMT Gubaer [2115]
	* trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (moved)
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Tagged.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/UserInfo.java (added)
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (added)
	* trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (added)
	* trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (added)
	* trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmDataParsingException.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified)

	new: reading open changesets from the server
	new: reading user info ...


Sun, 13 Sep 2009 11:12:14 GMT stoecker [2114]
	* trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/LambertEST.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/Mercator.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/Projection.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/UTM.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapSlider.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)

	see #3016 - patch by xeen - fixes some zooming issues


Sun, 13 Sep 2009 10:33:18 GMT Gubaer [2113]
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)

	fixed #3469: Merge nodes produce bad results


Sun, 13 Sep 2009 09:49:12 GMT Gubaer [2112]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified)

	fixed #3472: Ctrl+drop node merging broken


Sun, 13 Sep 2009 09:17:48 GMT Gubaer [2111]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified)

	applied #3473: patch by bastiK: fix some bugs of ToggleDialog


Sat, 12 Sep 2009 21:21:13 GMT stoecker [2110]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)

	applied #2317 - patch by xeen - fix wrong calculation for angle
	display


Sat, 12 Sep 2009 21:13:00 GMT stoecker [2109]
	* trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified)

	applied #3441 - patch by xeen - improve middle click to allow better ...


Sat, 12 Sep 2009 21:09:38 GMT stoecker [2108]
	* trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified)

	applied #3470 - patch by xeen - better scroll handling


Sat, 12 Sep 2009 16:53:18 GMT stoecker [2107]
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)

	close #3313 - patch by xeen - fix display problems with OpenJDK ...


Sat, 12 Sep 2009 16:22:41 GMT Gubaer [2105]
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (modified)

	applied #3222: patch by sbrunner: better HDOP visualisation


Sat, 12 Sep 2009 16:08:26 GMT Gubaer [2104]
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified)

	fixed #3402: Conflict in created_by when merging nodes or ways ...


Sat, 12 Sep 2009 15:37:30 GMT Gubaer [2103]
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified)

	fixing bug member conflict handling


Sat, 12 Sep 2009 15:09:59 GMT Gubaer [2102]
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)

	see #3466: Merge nodes produce bad results


Sat, 12 Sep 2009 14:56:37 GMT Gubaer [2101]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)

	see #3463: Combine ways action breaks relations


Sat, 12 Sep 2009 14:56:07 GMT Gubaer [2100]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)

	see #3463: Combine ways action breaks relations


Sat, 12 Sep 2009 14:39:20 GMT Gubaer [2099]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (modified)

	added auto completion to combine way dialog
	fixed #3461: Value ...


Sat, 12 Sep 2009 13:15:42 GMT Gubaer [2098]
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified)

	see #3347: patches by  singularita@gmail.com: Merging nodes, fixing ...


Sat, 12 Sep 2009 04:45:07 GMT Gubaer [2097]
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (added)

	applied #3318: patch by dmuecke: josm opens modal error dialog for ...


Sat, 12 Sep 2009 04:38:11 GMT Gubaer [2096]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified)

	applied #3455: patch by Claudius Henrichs: Incorrect closing html ...


Sat, 12 Sep 2009 04:21:30 GMT Gubaer [2095]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified)

	rewrite of MergeNodesAction
	new: new conflict resolution dialog for ...


Fri, 11 Sep 2009 08:24:41 GMT Gubaer [2094]
	* trunk/src/org/openstreetmap/josm/io/OsmDataParsingException.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)

	fixed #3449: action='modified' lost on file reopening


Thu, 10 Sep 2009 19:00:01 GMT Gubaer [2093]
	* trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified)

	fixed #2955: Better help text for the slippymap downloader map


Thu, 10 Sep 2009 18:48:39 GMT Gubaer [2092]
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)

	see #3446: JOSM throws an XML parsing error when opening an OSM file ...


Wed, 09 Sep 2009 18:51:45 GMT Gubaer [2090]
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)

	fixed #3440: unexpected exception when trying to tag a way


Wed, 09 Sep 2009 18:12:04 GMT Gubaer [2089]
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)

	see #3443: Illegal value for attribute 'version' when loading OSM
	file


Wed, 09 Sep 2009 17:38:48 GMT Gubaer [2088]
	* trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (modified)

	see #3393: loooong delay when using presets with a large osm file


Wed, 09 Sep 2009 16:01:53 GMT stoecker [2087]
	* trunk/data/restriction.osm (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)

	fixed #3306 - wrong handling of restriction via ways


Wed, 09 Sep 2009 15:46:09 GMT Gubaer [2086]
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)

	fixed #3443: Illegal value for attribute 'version' when loading OSM
	file


Wed, 09 Sep 2009 15:26:47 GMT stoecker [2085]
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)

	applied #3439 - patch by avar - fix broken language selection


Tue, 08 Sep 2009 22:46:01 GMT Gubaer [2083]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)

	Removed deprecated constructors in ExtendedDialog
	Turned most of the ...


Tue, 08 Sep 2009 21:10:09 GMT Gubaer [2082]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)

	Making uploadHooks private, providing register/unregister methods


Tue, 08 Sep 2009 20:56:02 GMT Gubaer [2081]
	* trunk/src/org/openstreetmap/josm/actions/AboutAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (added)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	fixed #3393: loooong delay when using presets with a large osm file - ...


Tue, 08 Sep 2009 15:38:25 GMT Gubaer [2080]
	* trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (modified)

	fixed #3436: "Open Location" broken


Mon, 07 Sep 2009 22:10:11 GMT Gubaer [2079]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)

	fixed #3433: New conflict resolution with way combining prevents any ...


Mon, 07 Sep 2009 21:58:54 GMT Gubaer [2078]
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	fixed #3413: ProgressException when uploading osmChange file


Mon, 07 Sep 2009 21:06:19 GMT Gubaer [2077]
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified)

	Had to replace DataSet:getPrimitiveById(id) with ...


Sun, 06 Sep 2009 22:14:47 GMT Gubaer [2075]
	* trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (modified)

	fixed #3418: JOSM spews gzip content in 400 error message from server


Sun, 06 Sep 2009 22:01:31 GMT Gubaer [2074]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	fixed #3422: Upload dialog allows modification of the created_by=* ...


Sun, 06 Sep 2009 21:16:11 GMT Gubaer [2073]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (modified)

	fixed #3382: Opening a /user/ page fails for usernames with a space ...


Sun, 06 Sep 2009 21:07:33 GMT Gubaer [2070]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Tag.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/User.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombineWaysConflictResolverDialog.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/util (added)
	* trunk/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java (added)
	* trunk/src/org/openstreetmap/josm/io/DiffResultReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/FileImporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/IllegalDataException.java (added)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmBzip2Importer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmGzipImporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmImporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (modified)

	new: rewrite of CombineWay action
	new: conflict resolution dialog ...


Sun, 06 Sep 2009 11:35:39 GMT stoecker [2068]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)

	improve search help a little bit


Sun, 06 Sep 2009 11:13:59 GMT stoecker [2067]
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (modified)

	added isUsable() to primitives to replace (!incomplete && !deleted) ...


Sat, 05 Sep 2009 18:29:48 GMT Gubaer [2066]
	* trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (modified)

	Removed stack trace


Sat, 05 Sep 2009 18:26:23 GMT Gubaer [2065]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (modified)

	fixed #3410: Size of new upload dialog


Sat, 05 Sep 2009 12:39:24 GMT Gubaer [2064]
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)

	applied #3384: patch by anonymous: Prevent modified status even if no ...


Sat, 05 Sep 2009 12:32:05 GMT Gubaer [2063]
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)

	applied #3396: patch by bastiK: Document some useful option
	(josm.home)


Sat, 05 Sep 2009 09:08:38 GMT Gubaer [2062]
	* trunk/src/org/openstreetmap/josm/io/GpxImporter.java (modified)

	fixed #3404: Regression: JOSM does not automatically zoom and center ...


Sat, 05 Sep 2009 09:00:10 GMT Gubaer [2061]
	* trunk/src/org/openstreetmap/josm/actions/StopChangesetAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	fixed #3398: Changeset tags should be editable in subsequent uploads


Fri, 04 Sep 2009 21:21:34 GMT Gubaer [2058]
	* trunk/src/org/openstreetmap/josm/actions/StopChangesetAction.java (added)
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)

	fixed in #3397: Upload not possible to opened changeset


Fri, 04 Sep 2009 19:34:28 GMT Gubaer [2057]
	* trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (modified)

	Gave PleaseWaitProgressMonitor its no-arg constructor back


Fri, 04 Sep 2009 18:25:51 GMT stoecker [2056]
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	close #3392


Fri, 04 Sep 2009 17:47:18 GMT Gubaer [2055]
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)

	fixed #3393: loooong delay when using presets with a large osm file ...


Fri, 04 Sep 2009 15:44:20 GMT Gubaer [2054]
	* trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified)

	applied #3389: patch by podolsir: "delete confirmation" message ...


Fri, 04 Sep 2009 15:33:27 GMT Gubaer [2053]
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainApplet.java (modified)

	fixed #2322: Regression in r2038 (patches "JOSM destroys its ...


Fri, 04 Sep 2009 15:30:13 GMT stoecker [2052]
	* trunk/src/org/openstreetmap/josm/gui/io/SaveFlagCellEditor.java (moved)

	renamed another file