#
# ChangeLog for trunk/src/org in josm
#
# Generated by Trac 1.6
# 2024-11-25T01:32:15+01:00

Wed, 24 Jun 2009 19:08:29 GMT Gubaer [1693]
	* trunk/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java (added)

	forgot to add to SVN in r1691


Wed, 24 Jun 2009 19:03:17 GMT Gubaer [1692]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java (modified)




Wed, 24 Jun 2009 18:42:27 GMT Gubaer [1691]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/io/Capabilities.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	#2703:  patch (slightly extended) by dmuecke
	clean up: few issues in ...


Tue, 23 Jun 2009 20:03:37 GMT Gubaer [1690]
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.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/UndeletePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.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/Way.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/OperationCancelledException.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)

	new: MultiFetchServerObjectReader using APIs Multi Fetch method ...


Mon, 22 Jun 2009 15:37:36 GMT stoecker [1689]
	* trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified)

	fixed URL parsing a bit


Mon, 22 Jun 2009 09:48:41 GMT stoecker [1688]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)

	fixed #2744 - server url defaults


Mon, 22 Jun 2009 08:55:12 GMT framm [1687]
	* trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified)

	fix lat/lon mix-up in slippy map chooser introduced with latest
	revision


Sun, 21 Jun 2009 16:29:16 GMT Gubaer [1686]
	* trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified)

	fixed update in JMapViewer code


Sun, 21 Jun 2009 10:02:15 GMT stoecker [1685]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.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/markerlayer/AudioMarker.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/AudioUtil.java (modified)

	fixed audio handling a bit


Sat, 20 Jun 2009 20:42:53 GMT Gubaer [1684]
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)

	fixed #2753: Cannot parse valid node from xml string


Sat, 20 Jun 2009 07:31:00 GMT Gubaer [1682]
	* trunk/.settings/org.eclipse.jdt.ui.prefs (modified)
	* trunk/build.xml (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (deleted)
	* trunk/src/org/openstreetmap/josm/data/conflict (deleted)
	* trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java (deleted)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	removed old conflict resolution code
	fixed bug in OsmApi (missing ...


Fri, 19 Jun 2009 19:55:45 GMT stoecker [1681]
	* trunk/lib/josm-translation.jar (modified)
	* trunk/src/org/openstreetmap/josm/Main.java (modified)

	updated i18n


Fri, 19 Jun 2009 09:32:35 GMT stoecker [1680]
	* trunk/images/world.jpg (deleted)
	* trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/WorldChooser.java (deleted)

	removed old style world chooser - interactive map is much better


Wed, 17 Jun 2009 16:21:46 GMT Gubaer [1679]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)

	fixes #2748: I tried to upload a road with about 100 nodes. I got a ...


Wed, 17 Jun 2009 08:04:22 GMT stoecker [1677]
	* trunk/src/org/openstreetmap/josm/actions/ExitAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.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/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/MapMode.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/gpx/GpxData.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/Relation.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/AbstractVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/CreateOsmChangeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapMover.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/ScrollViewport.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.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/relation/RelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/OsmMapControl.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/SourceButton.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/historycombobox/ComboBoxHistory.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/historycombobox/EventConsumingPlainDocument.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/historycombobox/HistoryChangedListener.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/historycombobox/SuggestionListener.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/XmlWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/AudioUtil.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java (modified)

	remove all these ugly tab stops introduced in the last half year


Wed, 17 Jun 2009 07:02:25 GMT stoecker [1676]
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (modified)

	fix typos


Tue, 16 Jun 2009 17:06:00 GMT Gubaer [1675]
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)

	fixes #2743: crashes after "update data"


Tue, 16 Jun 2009 08:40:40 GMT stoecker [1674]
	* trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (modified)

	add memory size to bug report


Tue, 16 Jun 2009 07:08:14 GMT stoecker [1673]
	* trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java (modified)

	fix #2738 - patch by avar - improve prefs search a bit


Tue, 16 Jun 2009 07:06:47 GMT stoecker [1672]
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	fix #2726 - patch by Bananeweizen - minor UI design issue


Tue, 16 Jun 2009 06:38:42 GMT stoecker [1671]
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	fix #2741 - NPE


Mon, 15 Jun 2009 18:22:46 GMT Gubaer [1670]
	* trunk/images/updateselection.png (added)
	* trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (added)
	* 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/search/SelectionWebsiteLoader.java (modified)
	* trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (added)
	* trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (added)
	* trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/history (added)
	* trunk/src/org/openstreetmap/josm/data/osm/history/History.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java (added)
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.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 (added)
	* trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (added)
	* 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/OsmWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data (added)
	* trunk/test/unit/org/openstreetmap/josm/data/osm (added)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/history (added)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (added)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (added)

	fixed: bug in OsmApi.getOsmApi()
	cleanup: exception handling in ...


Sun, 14 Jun 2009 15:34:52 GMT stoecker [1669]
	* trunk/lib/josm-translation.jar (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java (modified)

	updated i18n


Sat, 13 Jun 2009 19:07:20 GMT stoecker [1668]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)

	fixed typo


Sat, 13 Jun 2009 08:24:56 GMT stoecker [1667]
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)

	fixed typo


Sat, 13 Jun 2009 05:26:19 GMT Gubaer [1666]
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java (modified)

	bug fix: wrong merge state


Thu, 11 Jun 2009 21:07:20 GMT Gubaer [1665]
	* trunk/src/org/openstreetmap/josm/io/Capabilities.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)

	fixed #2656 - JOSM makes excessive capabilities requests to the
	server


Thu, 11 Jun 2009 21:04:51 GMT Gubaer [1664]
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	fixed #2656 - JOSM makes excessive capabilities requests to the
	server


Wed, 10 Jun 2009 21:15:32 GMT Gubaer [1663]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApiException.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmApiInitializationException.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	#2437: cleaned up code for uploading and improved user feedback in ...


Wed, 10 Jun 2009 16:01:55 GMT stoecker [1662]
	* trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)

	fix #2344 - zooming to single GPS point


Wed, 10 Jun 2009 14:23:33 GMT stoecker [1661]
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)

	minor fix to dialog - patch by xeen


Wed, 10 Jun 2009 14:19:41 GMT stoecker [1659]
	* trunk/src/org/openstreetmap/josm/actions/SaveAction.java (modified)

	fix #2594 - patch by dmuecke - don't lose work when unmounting
	devices


Wed, 10 Jun 2009 14:16:01 GMT stoecker [1658]
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java (modified)

	fix some usability issues - see #2460


Mon, 08 Jun 2009 19:30:19 GMT Gubaer [1656]
	* trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified)

	fixed #2707: Deleting a way with new nodes produces invalid osm file


Mon, 08 Jun 2009 15:34:50 GMT stoecker [1655]
	* trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java (modified)

	better i18n of new conflict stuff


Sun, 07 Jun 2009 21:22:54 GMT Gubaer [1654]
	* trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (added)
	* trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (added)
	* trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.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/gui/conflict/ConflictResolver.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/MergeDecisionType.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified)

	added merge support for coordinate conflicts
	added merge support for ...


Sun, 07 Jun 2009 14:18:31 GMT stoecker [1653]
	* trunk/src/org/apache (added)
	* trunk/src/org/apache/tools (added)
	* trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmBzip2Importer.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmGzipImporter.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmImporter.java (modified)

	add support for compressed OSM files (bzip2, gzip)


Sun, 07 Jun 2009 13:28:38 GMT stoecker [1652]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)

	make extended conflict resolving default


Sun, 07 Jun 2009 13:04:28 GMT Gubaer [1650]
	* trunk/.classpath (modified)
	* trunk/.settings/org.eclipse.jdt.core.prefs (modified)
	* trunk/.settings/org.eclipse.jdt.ui.prefs (modified)
	* trunk/build.xml (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairListCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ListRole.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified)

	added concept of "merge pairs" (my vs. merged, my vs. their, their ...


Sun, 07 Jun 2009 09:22:20 GMT stoecker [1649]
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	fix #1946 - plugin update


Sun, 07 Jun 2009 08:10:06 GMT stoecker [1648]
	* trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified)

	prevent overwriting of GPX files


Sun, 07 Jun 2009 00:56:33 GMT stoecker [1647]
	* trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/GettingStarted.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/plugins/PluginDownloader.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	fixed plugin handling a bit


Sat, 06 Jun 2009 19:39:12 GMT stoecker [1646]
	* trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.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/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)
	* trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified)

	cleanup in file access


Sat, 06 Jun 2009 19:38:10 GMT stoecker [1645]
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)

	fix #1903 - don't download plugins for newer JOSM versions


Sat, 06 Jun 2009 19:29:33 GMT stoecker [1644]
	* trunk/src/org/openstreetmap/josm/data/projection/Mercator.java (modified)

	fix #2685 - changed Mercator code


Sat, 06 Jun 2009 15:14:03 GMT stoecker [1643]
	* trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified)

	fix #2331 - patch by dmuecke - zoom under MacOs


Sat, 06 Jun 2009 14:25:25 GMT Gubaer [1642]
	* trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified)

	added row numbers and synchronized scrolling in conflict resolution ...


Sat, 06 Jun 2009 12:37:14 GMT stoecker [1641]
	* trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)

	fix #2673 - patch by jttt - key=value operator for search action


Sat, 06 Jun 2009 12:30:21 GMT stoecker [1640]
	* trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.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/JoinNodeWayAction.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/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/DeleteCommand.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/conflict/PositionConflict.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/osm/visitor/MergeVisitor.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/conflict/nodes/NodeListTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified)

	little bit more refactoring of coordinate access - patch by jttt


Sat, 06 Jun 2009 12:28:11 GMT stoecker [1639]
	* trunk/images/mirror.png (added)
	* trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (added)
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)

	fix #2024 - patch by Daeron - added Mirror action


Sat, 06 Jun 2009 11:47:56 GMT stoecker [1638]
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)

	fixed 2421 - patch by jttt - negative HDOP


Sat, 06 Jun 2009 11:43:30 GMT stoecker [1637]
	* trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/io/FileImporter.java (added)
	* trunk/src/org/openstreetmap/josm/io/GpxImporter.java (added)
	* trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (added)
	* trunk/src/org/openstreetmap/josm/io/OsmImporter.java (added)

	applied new file io from #2064 - patch by dmuecke


Sat, 06 Jun 2009 11:38:32 GMT stoecker [1636]
	* trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.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/command/MoveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified)

	fix #2302 - patch by jttt - some code cleanup for better
	encapsulation


Sat, 06 Jun 2009 11:33:27 GMT stoecker [1635]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (modified)
	* trunk/styles/standard/elemstyles.xml (modified)

	fix #2667 - patch by Daeron - Add support for dash patterns in
	mappaint


Sat, 06 Jun 2009 11:26:19 GMT stoecker [1634]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified)

	fix #2483 - patch by dmuecke - rotate does not work under Mac OS X


Sat, 06 Jun 2009 11:21:56 GMT stoecker [1633]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)

	fix #2688 - patch by jttt - solve NPE


Tue, 02 Jun 2009 11:44:16 GMT stoecker [1632]
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)

	fixed #2683 - preset loading error


Mon, 01 Jun 2009 20:20:03 GMT Gubaer [1631]
	* trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ListMerger.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMerger.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellEditor.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified)

	added support for merging member lists of relations in extended ...


Sun, 31 May 2009 22:07:28 GMT stoecker [1630]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)
	* trunk/styles/standard/elemstyles.xml (modified)

	close #2677 - NPE on upload


Sat, 30 May 2009 15:24:29 GMT stoecker [1629]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified)
	* trunk/styles/standard/elemstyles.xml (modified)

	close #2426 - now mappaint handles area types which require closed ...


Sat, 30 May 2009 11:58:30 GMT stoecker [1628]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/historycombobox/JHistoryComboBox.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/historycombobox/StringUtils.java (deleted)
	* trunk/src/org/openstreetmap/josm/gui/historycombobox/SuggestingJHistoryComboBox.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	cleanup group settings in preferences


Fri, 29 May 2009 17:23:57 GMT ce [1627]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified)

	removed two @Override to make it compile with java 1.5


Fri, 29 May 2009 08:47:02 GMT stoecker [1626]
	* trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java (modified)

	fixed Java 1.5 problems


Thu, 28 May 2009 15:55:57 GMT stoecker [1625]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)

	fix #2663 - patch by jttt - better errors for illegal searches


Thu, 28 May 2009 15:49:08 GMT stoecker [1624]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	fix #2654 - patch by Daeron - Infinite loop in relation editor


Thu, 28 May 2009 15:45:04 GMT stoecker [1623]
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	closed #2596 - wrong texts in plugin information


Tue, 26 May 2009 19:44:31 GMT Gubaer [1622]
	* trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (added)
	* trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (added)
	* trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMerger.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MergeDecisionType.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/tags/UndecidedTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (added)
	* trunk/test (added)
	* trunk/test/unit (added)
	* trunk/test/unit/org (added)
	* trunk/test/unit/org/openstreetmap (added)
	* trunk/test/unit/org/openstreetmap/josm (added)
	* trunk/test/unit/org/openstreetmap/josm/gui (added)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict (added)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes (added)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (added)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags (added)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java (added)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (added)

	first version of extended conflict resolution dialog.


Mon, 25 May 2009 15:08:44 GMT stoecker [1621]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)

	fix #2655 - NPE with empty role


Sun, 24 May 2009 16:35:56 GMT stoecker [1619]
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified)

	hopefully fixed UTF-8 problems in plugin info - #2596


Sun, 24 May 2009 10:53:58 GMT stoecker [1618]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	close #2643 - patch by Teemu Koskinen - Better linkedness support for ...


Sun, 24 May 2009 10:21:41 GMT stoecker [1617]
	* trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (added)
	* trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified)

	fix #2645 - patch by Teemu Koskinen - cleanup relation role handling ...


Sun, 24 May 2009 10:18:25 GMT stoecker [1616]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)

	fix #2646 - illegal variable acces in relation editor


Sat, 23 May 2009 19:54:50 GMT stoecker [1614]
	* trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/RoleCorrection.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified)

	fix #2642 - patch by Teemu Koskinen - TagCorrector didn't work ...


Sat, 23 May 2009 18:24:40 GMT stoecker [1613]
	* trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)

	fixed #2172 - Teemu Koskinen - ReverseWayTagCorrector's role ...


Sat, 23 May 2009 11:38:47 GMT stoecker [1612]
	* trunk/src/org/openstreetmap/josm/io/GpxWriter.java (modified)

	fix classcast exception


Sat, 23 May 2009 10:03:21 GMT stoecker [1611]
	* trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified)

	fix #2578 - exception on zero length ways


Sat, 23 May 2009 09:53:37 GMT stoecker [1610]
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)
	* trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java (modified)
	* trunk/src/org/openstreetmap/josm/io/CacheFiles.java (added)

	add generic caching class (e.g. for WMS plugin) - patch by xeen


Sat, 23 May 2009 09:49:09 GMT stoecker [1609]
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)

	fix #2630 - patch by Teemu Koskinen - Split backward-role ways
	correctly


Sat, 23 May 2009 09:36:04 GMT stoecker [1608]
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)

	close #2633 - patch by Gubaer - better error message for server
	aborts


Wed, 20 May 2009 14:08:00 GMT stoecker [1607]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)

	fix #2612 - changed patch by avar - Cleanup regex search


Wed, 20 May 2009 13:59:44 GMT stoecker [1606]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)

	close #2226 - patch by xeen - make presets in right menu clickable


Tue, 19 May 2009 17:11:56 GMT stoecker [1605]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/data/Preferences.java (modified)

	fixed #2425. set default projection to Mercator. It looks much better ...


Tue, 19 May 2009 17:05:10 GMT stoecker [1604]
	* trunk/src/org/openstreetmap/josm/data/osm/User.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified)

	fixed #2545 - patch by Gubaer - JOSM has problems with files from
	XAPI


Tue, 19 May 2009 17:01:13 GMT stoecker [1603]
	* 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/plugins/PluginSelection.java (modified)

	fixed #2602 - patch by Matt,avar - Search keywords child and parent


Tue, 19 May 2009 16:53:16 GMT stoecker [1602]
	* trunk/src/org/openstreetmap/josm/gui/download/OsmMapControl.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified)

	better keyboard support for slippy map chooser - patch by jpstotz


Tue, 19 May 2009 16:45:54 GMT stoecker [1601]
	* 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/io/GpxWriter.java (modified)

	fix #2547 - patch by Henrik Niehaus - Audio/picture markers no longer ...


Tue, 19 May 2009 16:43:02 GMT stoecker [1600]
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)

	fixed #2607 - patch by Teemu Koskinen - Don't add splitted ways in ...


Mon, 18 May 2009 22:16:01 GMT framm [1599]
	* 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 (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (added)

	create framework for type-specific relation editors


Mon, 18 May 2009 17:47:22 GMT framm [1598]
	* trunk/src/org/openstreetmap/josm/actions/AboutAction.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/RelationEditor.java (modified)

	* secured all methods in Way class against breakage when used with ...


Mon, 18 May 2009 14:37:04 GMT stoecker [1597]
	* trunk/lib/josm-translation.jar (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified)

	fixed #2547, updated translations


Sun, 17 May 2009 22:07:01 GMT framm [1596]
	* trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java (modified)

	* added primitive code to relation editor that shows whether or not
	 ...


Fri, 15 May 2009 20:22:21 GMT stoecker [1594]
	* trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified)

	fixed missing import. closes #2585


Fri, 15 May 2009 16:13:02 GMT stoecker [1593]
	* trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified)

	fix compiling error #2585


Fri, 15 May 2009 08:05:37 GMT stoecker [1592]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified)

	fixed #2583 - patch by Michel Marti - fon't move objects when copying ...


Fri, 15 May 2009 07:38:39 GMT stoecker [1591]
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	improved plugin information download


Thu, 14 May 2009 16:02:02 GMT stoecker [1590]
	* trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified)

	fixed #2572 - patch by Gubaer - fixed illegal access on nonexisting
	files


Thu, 14 May 2009 15:57:49 GMT stoecker [1589]
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified)

	fixed #2575 - illegal defaults for gps line drawing


Tue, 12 May 2009 16:05:11 GMT stoecker [1588]
	* trunk/src/org/openstreetmap/josm/plugins/PluginDescription.java (deleted)
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified)
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)

	fixed plugin handling. closes #2530 and #762


Tue, 12 May 2009 14:49:45 GMT stoecker [1587]
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified)

	fixed #2420 - patch by Gubaer - Saved OSM file can contain empty API ...


Mon, 11 May 2009 15:33:36 GMT stoecker [1586]
	* trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (modified)

	fix hardcoded URL - patch by Gubaer