#
# ChangeLog for trunk/src/org in josm
#
# Generated by Trac 1.6
# 2024-09-20T01:22:54+02:00

Wed, 22 Jul 2009 18:33:41 GMT stoecker [1823]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.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/gui/MapSlider.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)

	some projection and zoom cleanups - projection classes still need ...


Tue, 21 Jul 2009 18:42:50 GMT Gubaer [1822]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableRoleCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java (modified)

	applied #2953: patch by cjw - Sorting a relation adds new members or ...


Tue, 21 Jul 2009 18:11:17 GMT Gubaer [1821]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)

	fixed  #3024: NPE on start on press of "N" key


Tue, 21 Jul 2009 17:52:53 GMT Gubaer [1820]
	* trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.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/CreateCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DistributeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/JosmAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.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/RedoAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SelectAllAction.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/UndoAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)

	JosmAction is now a LayerChangeListener and a SelectionChangeListener ...


Tue, 21 Jul 2009 05:35:17 GMT Gubaer [1819]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	fixed #3020: Duplicating relation does not work


Mon, 20 Jul 2009 19:43:37 GMT jttt [1818]
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)
	* trunk/test (modified)

	Fix #3010 - NPE at PluginSelection


Mon, 20 Jul 2009 18:19:22 GMT Gubaer [1817]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)

	fixed #3018: NullPointerException when starting JOSM & pressing "C"


Mon, 20 Jul 2009 04:57:56 GMT Gubaer [1816]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	fixed #2998: Variable collum-with in relations editor


Sun, 19 Jul 2009 19:35:34 GMT Gubaer [1815]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)

	fixed NPEs


Sun, 19 Jul 2009 17:04:49 GMT Gubaer [1814]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.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/CreateCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DistributeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/JosmAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.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/ReverseWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SelectAllAction.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/UnselectAllAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.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/actions/search/SelectionWebsiteLoader.java (modified)
	* trunk/src/org/openstreetmap/josm/command/AddCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/Command.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/data/DataSetChecker.java (modified)
	* trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.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/OsmPrimitiveType.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java (deleted)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java (deleted)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (deleted)
	* trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java (added)
	* trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.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/dialogs/SelectionListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxImporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	removed dependencies to Main.ds, removed Main.ds
	removed AddVisitor, ...


Sun, 19 Jul 2009 16:19:44 GMT jttt [1812]
	* trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java (modified)

	Add getTickCount method to ProgressMonitor


Sun, 19 Jul 2009 15:38:55 GMT jttt [1811]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (modified)
	* 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/DownloadGpsTask.java (modified)
	* 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/actions/search/SelectionWebsiteLoader.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/progress (added)
	* trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (added)
	* trunk/src/org/openstreetmap/josm/gui/progress/CancelHandler.java (added)
	* trunk/src/org/openstreetmap/josm/gui/progress/ChildProgress.java (added)
	* trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java (added)
	* trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (added)
	* trunk/src/org/openstreetmap/josm/gui/progress/ProgressException.java (added)
	* trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java (added)
	* trunk/src/org/openstreetmap/josm/gui/progress/StackableProgress.java (added)
	* trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/DiffResultReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.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/OsmServerHistoryReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified)

	PleaseWait refactoring. Progress is now reported using ...


Sun, 19 Jul 2009 12:57:34 GMT Gubaer [1810]
	* trunk/images/downloadreferrers.png (added)
	* trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (added)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)

	new: DownloadReferrersAction - downloads the set of primitives ...


Sun, 19 Jul 2009 08:39:10 GMT Gubaer [1809]
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)

	fixed #2975: Error message while trying to split way with relation ...


Sun, 19 Jul 2009 08:31:27 GMT Gubaer [1808]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.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/SaveAsAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified)

	improved enabling/disabling of menu entries and action buttons ...


Sat, 18 Jul 2009 22:06:29 GMT Gubaer [1807]
	* trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified)

	fixed #2987: Can't add Point


Sat, 18 Jul 2009 21:31:42 GMT Gubaer [1806]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (added)
	* trunk/test/config/test-functional-env.properties (moved)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (added)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (added)

	added OsmServerBackreferenceReader - reads primitives referring to a ...


Sat, 18 Jul 2009 19:38:54 GMT stoecker [1805]
	* trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.java (modified)

	fixed #2988 - typo


Sat, 18 Jul 2009 13:49:59 GMT Gubaer [1804]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.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/SelectionTableColumnModel.java (modified)

	improved window management for relation editor windows
	added ...


Fri, 17 Jul 2009 18:53:35 GMT stoecker [1802]
	* trunk/CONTRIBUTION (modified)
	* trunk/LICENSE (modified)
	* trunk/src/org/openstreetmap/josm/actions/AboutAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/I18n.java (modified)

	cleanup license and contributions a bit


Fri, 17 Jul 2009 18:31:25 GMT Gubaer [1801]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (modified)

	fixed #2980: selected objects not in relation editor


Fri, 17 Jul 2009 12:01:45 GMT Gubaer [1800]
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified)

	#2962: applied patch by plaicy - Download always increment number for ...


Thu, 16 Jul 2009 17:23:24 GMT Gubaer [1799]
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified)

	#2963 : applied patch by plaicy - DownloadOsmTask.Task does not need ...


Thu, 16 Jul 2009 17:19:05 GMT Gubaer [1798]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified)

	ticket #2954: patch by plaicy - Creating new relations doesn't work


Wed, 15 Jul 2009 22:41:38 GMT framm [1797]
	* trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified)

	- minor changes in conjunction with the Walking Papers plugin.


Wed, 15 Jul 2009 16:44:58 GMT Gubaer [1795]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified)

	fixed #2901: Relation editor producing errors


Wed, 15 Jul 2009 16:28:23 GMT Gubaer [1794]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)

	implemented #2664: Set the role for multiple members at the same time


Wed, 15 Jul 2009 15:58:37 GMT Gubaer [1793]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)

	fixed #2638: Relation editor should show double entries better


Wed, 15 Jul 2009 15:47:09 GMT Gubaer [1792]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/IMemberModelListener.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)

	fixed  #2647: Relation editor: moving members should keep them in
	view


Wed, 15 Jul 2009 15:39:54 GMT framm [1791]
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)

	- remove unused variable from PluginDownloader
	- fix MultiFetch test ...


Wed, 15 Jul 2009 15:22:56 GMT Gubaer [1790]
	* trunk/src/org/openstreetmap/josm/actions/NewAction.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/SideButton.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java (added)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.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/OsmServerHistoryReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (modified)

	Relation Editor: complete rework
	Relation Editor: had to temporarily ...


Wed, 15 Jul 2009 13:31:06 GMT stoecker [1789]
	* trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified)

	fixed charset issue


Tue, 14 Jul 2009 14:26:06 GMT stoecker [1787]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)

	unify design


Tue, 14 Jul 2009 14:04:01 GMT stoecker [1786]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)

	close #2802 - patch by dmuecke - Exception fixed


Tue, 14 Jul 2009 08:26:31 GMT stoecker [1785]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java (added)

	applied #2941 - patch by cjw - improve relation sorting


Mon, 13 Jul 2009 16:54:19 GMT Gubaer [1784]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (modified)

	removing debug output


Mon, 13 Jul 2009 16:47:57 GMT Gubaer [1783]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified)

	fixed #2929: Relation Editor: Cancel button does not cancel edits


Mon, 13 Jul 2009 13:43:40 GMT stoecker [1782]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified)

	fixed #2928 - patch by Michi - unify GUI


Mon, 13 Jul 2009 13:40:50 GMT stoecker [1781]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java (modified)

	fix #2927 - patch my Michi - fix mouse position


Mon, 13 Jul 2009 12:41:19 GMT stoecker [1780]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)

	fix #2935 - selected relation wrong


Sun, 12 Jul 2009 17:50:32 GMT Gubaer [1779]
	* trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified)

	fixed #2923: Info/History dialog (C-i / C-h) links to ...


Sun, 12 Jul 2009 17:38:18 GMT Gubaer [1778]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)

	fixed #2925: Double-clicking on relation in relation dialog doesn't ...


Sun, 12 Jul 2009 12:38:43 GMT stoecker [1777]
	* trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java (modified)

	fixed style selection box


Sun, 12 Jul 2009 11:40:41 GMT Gubaer [1775]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	removed debugging code


Sun, 12 Jul 2009 11:18:56 GMT stoecker [1774]
	* trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified)

	i18n fix


Sun, 12 Jul 2009 11:16:35 GMT Gubaer [1773]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified)

	removed debugging code


Sun, 12 Jul 2009 11:11:06 GMT Gubaer [1772]
	* 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/dialogs/relation/GenericRelationEditor.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/layer/Layer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.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/OsmServerLocationReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java (modified)

	fixed #2911: Relation editor doesn't notice all members downloaded ...


Sun, 12 Jul 2009 08:40:30 GMT Gubaer [1771]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagFieldEditor.java (modified)

	fixed #2914: Re-edits in relation-editor impossible


Sun, 12 Jul 2009 07:37:16 GMT Gubaer [1770]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java (modified)

	fixed #2915: relation-editor: relation-only edit does not trigger ...


Sat, 11 Jul 2009 16:09:30 GMT stoecker [1769]
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	fix #2902 - patch by jttt - plugin update


Sat, 11 Jul 2009 13:37:10 GMT stoecker [1768]
	* trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified)

	close #2781 - patch by Landwirt - fix align in circle


Sat, 11 Jul 2009 12:52:02 GMT stoecker [1767]
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	fix #2859 - better plugin support for older versions


Sat, 11 Jul 2009 11:17:55 GMT stoecker [1766]
	* trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified)

	fixed i18n issues


Sat, 11 Jul 2009 11:07:47 GMT Gubaer [1765]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)

	fixed problem with hidden property edit dialog


Sat, 11 Jul 2009 10:33:24 GMT Gubaer [1764]
	* trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	fixed #1361: Relation dialog: "Download inclomplete..." blocks JOSM ...


Sat, 11 Jul 2009 08:06:41 GMT Gubaer [1763]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)

	fixed #2238: Calling Relation editor using properties dialog should ...


Sat, 11 Jul 2009 07:32:42 GMT Gubaer [1762]
	* trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.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/Way.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellEditor.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagFieldEditor.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionCache.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionItemPritority.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionList.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionListItem.java (added)

	added: improved tag editor grid in relation editor (borrowed code ...


Sat, 11 Jul 2009 04:50:58 GMT Gubaer [1761]
	* trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified)

	fixed #2886: Make slippymap downloader hint text translatable


Sat, 11 Jul 2009 04:38:06 GMT Gubaer [1760]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApiException.java (modified)

	fixed #2882: Handling error message


Fri, 10 Jul 2009 18:32:09 GMT stoecker [1759]
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)

	don't show preset dialog if there is nothing to show


Thu, 09 Jul 2009 16:59:25 GMT stoecker [1757]
	* trunk/src/org/openstreetmap/josm/gui/preferences/StyleSources.java (modified)

	fixed translation error


Thu, 09 Jul 2009 16:54:09 GMT Gubaer [1756]
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)

	fixed #2888: Check for deleted elements should ignore incomplete
	elements


Thu, 09 Jul 2009 08:53:33 GMT stoecker [1755]
	* trunk/lib/josm-translation.jar (modified)
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AboutAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/StyleSources.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (added)
	* trunk/src/org/openstreetmap/josm/tools/WikiReader.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified)

	fixed build error due to slippy map change, i18n update, added pt_BR


Thu, 09 Jul 2009 07:08:17 GMT stoecker [1754]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	cleanup relation sorting


Wed, 08 Jul 2009 20:58:37 GMT Gubaer [1753]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	fixed #2245: Merge layers doesn't update the "action" tags


Wed, 08 Jul 2009 19:50:32 GMT Gubaer [1750]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified)
	* 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/DownloadOsmTask.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/AddCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/Command.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (added)
	* trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.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/MoveCommand.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/SequenceCommand.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/conflict (added)
	* trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (added)
	* trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (added)
	* trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)
	* trunk/test/config (added)
	* trunk/test/config/unit-josm.home (added)
	* trunk/test/config/unit-josm.home/preferences (added)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	new: replaced global conflict list by conflict list per layer, ...


Wed, 08 Jul 2009 18:41:54 GMT stoecker [1749]
	* trunk/src/org/openstreetmap/josm/io/OsmApiException.java (modified)

	improved error messages


Wed, 08 Jul 2009 18:23:47 GMT stoecker [1748]
	* trunk/images/dialogs/sort.png (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified)

	applied relation sort - fix #27789 - patch by cjw


Wed, 08 Jul 2009 13:26:12 GMT stoecker [1747]
	* trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/Rule.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/StyleSources.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified)

	close #2874 (NPE), improved external style handling


Tue, 07 Jul 2009 18:51:26 GMT stoecker [1746]
	* trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (modified)

	fixed #2757 - josm reports wrong version


Tue, 07 Jul 2009 18:07:52 GMT stoecker [1744]
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)

	fixed #2823


Tue, 07 Jul 2009 17:54:54 GMT stoecker [1743]
	* trunk/src/org/openstreetmap/josm/data/projection/UTM.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/Rule.java (added)
	* trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/StyleSources.java (added)
	* trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified)

	added much improved preferences for external styles and presets


Tue, 07 Jul 2009 07:04:00 GMT stoecker [1742]
	* trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSettingFactory.java (added)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginPreferenceFactory.java (added)

	fixed #2849 - patch by jttt - fix memory leak


Mon, 06 Jul 2009 15:53:10 GMT stoecker [1741]
	* trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified)

	fixed #2847 - patch by Landwirt - better circle creation using two ...


Mon, 06 Jul 2009 14:35:08 GMT stoecker [1740]
	* trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified)

	fixed #2846 - wrong rounding


Mon, 06 Jul 2009 13:32:02 GMT stoecker [1739]
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	fixed NPE - #2836


Sun, 05 Jul 2009 17:42:18 GMT stoecker [1738]
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	plugin patch from jttt - close #2813


Sun, 05 Jul 2009 17:26:10 GMT stoecker [1737]
	* trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified)

	fixed NPE


Sun, 05 Jul 2009 14:16:30 GMT stoecker [1736]
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)

	fixed #2823 - NPE


Sun, 05 Jul 2009 09:01:33 GMT framm [1735]
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified)

	- do NOT drop created_by on changesets... duh!


Sun, 05 Jul 2009 08:50:56 GMT stoecker [1734]
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)

	close #2780 - patch by sbrunner - make hdop factor ...


Sun, 05 Jul 2009 08:48:09 GMT stoecker [1733]
	* trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	fixed #2821, #2775 - agpifojpicture position wrong, preferences ...


Sat, 04 Jul 2009 20:32:30 GMT stoecker [1732]
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified)

	close #2813 - updating plugins disabled plugins


Sat, 04 Jul 2009 20:10:43 GMT stoecker [1731]
	* trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified)

	fixed #2815 - NPE


Sat, 04 Jul 2009 18:33:36 GMT stoecker [1730]
	* trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified)

	fixed #2811 - NPE in GeoImageLayer


Sat, 04 Jul 2009 12:53:24 GMT stoecker [1729]
	* trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java (modified)

	fix #2731 - Einstein values no longer ignored


Sat, 04 Jul 2009 12:04:08 GMT stoecker [1728]
	* trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java (modified)
	* trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)

	fixed #2804 - move mode not working


Fri, 03 Jul 2009 22:03:39 GMT stoecker [1727]
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified)

	fixed last fix


Fri, 03 Jul 2009 21:50:09 GMT stoecker [1726]
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified)

	missing button markers for layer switches (e.g. for audio tracks)
	fixed


Fri, 03 Jul 2009 21:15:39 GMT stoecker [1725]
	* trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.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/NavigatableComponent.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified)

	some cleanups


Fri, 03 Jul 2009 20:19:22 GMT stoecker [1724]
	* trunk/src/org/openstreetmap/josm/data/Bounds.java (modified)
	* trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java (modified)
	* trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java (added)
	* trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java (modified)
	* trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified)
	* trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.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/SwissGrid.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/UTM.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/DateUtils.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified)

	some more changes and bug fixes related to new projection stuff - GPX ...


Fri, 03 Jul 2009 10:33:32 GMT stoecker [1722]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ZoomInAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ZoomOutAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Bounds.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java (added)
	* trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified)
	* trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.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 (added)
	* trunk/src/org/openstreetmap/josm/gui/MapMover.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapScaler.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapSlider.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapStatus.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified)

	Large rework in projection handling - now allows only switching and ...


Thu, 02 Jul 2009 16:02:27 GMT david [1721]
	* trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified)

	trac 2784: properly take account of timezones in GPX files. ...


Thu, 02 Jul 2009 00:04:40 GMT framm [1720]
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified)

	+ silently drop created_by tag on upload of any object (we have them ...


Sun, 28 Jun 2009 20:41:25 GMT stoecker [1713]
	* trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified)

	fix #2781 - patch by pov - better calculations for align in circle


Sun, 28 Jun 2009 13:28:36 GMT stoecker [1712]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified)

	added security check for unwanted moves


Sun, 28 Jun 2009 12:40:12 GMT stoecker [1711]
	* trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified)

	support URL's for preset images


Sun, 28 Jun 2009 10:08:30 GMT Gubaer [1710]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified)

	Deleted strange comment


Sun, 28 Jun 2009 09:37:21 GMT Gubaer [1709]
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history (added)
	* trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (modified)

	new: history feature implemented


Sat, 27 Jun 2009 10:37:10 GMT stoecker [1706]
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	fixed some design issues