#
# ChangeLog for trunk in josm
#
# Generated by Trac 1.6
# 2024-12-02T15:05:39+01:00

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 18:58:24 GMT ulfl [1723]
	* trunk/styles/standard/elemstyles.xml (modified)

	add rules for:
	public_transport=stop_position
	public_transport=platform


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 ...


Wed, 01 Jul 2009 21:06:56 GMT ulfl [1719]
	* trunk/styles/standard/elemstyles_gb.xml (modified)

	fix a syntax bug


Wed, 01 Jul 2009 20:33:17 GMT ulfl [1718]
	* trunk/styles/standard/elemstyles_gb.xml (added)

	add a file with GB specific rules that can act as an "overlay" to the ...


Wed, 01 Jul 2009 20:01:40 GMT ulfl [1717]
	* trunk/styles/standard/elemstyles.xml (modified)

	add (commented out) rules for ireland specific turn restriction and ...


Wed, 01 Jul 2009 19:24:08 GMT ulfl [1716]
	* trunk/styles/standard/elemstyles.xml (modified)

	fix #2770: add realwidth values for trunk and some xy_link rules


Wed, 01 Jul 2009 19:07:19 GMT ulfl [1715]
	* trunk/styles/standard/elemstyles.xml (modified)

	fix #1559: remove rules for foot=designated, horse=designated and ...


Wed, 01 Jul 2009 18:46:11 GMT ulfl [1714]
	* trunk/styles/standard/elemstyles.xml (modified)

	fix #2516: display railway=abandoned or railway=disused in ...


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 13:59:15 GMT stoecker [1708]
	* trunk/lib/josm-translation.jar (modified)

	updated i18n, added chinese


Sat, 27 Jun 2009 12:03:30 GMT Gubaer [1707]
	* trunk/test/functional/org/openstreetmap/josm/gui (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags/TagMergerTest.java (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/dialogs (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/history (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (added)
	* trunk/test/lib (added)
	* trunk/test/lib/fest (added)
	* trunk/test/lib/fest/LICENSE-2.0.txt (added)
	* trunk/test/lib/fest/MRJToolkitStubs-1.0.jar (added)
	* trunk/test/lib/fest/README.txt (added)
	* trunk/test/lib/fest/debug-1.0.jar (added)
	* trunk/test/lib/fest/fest-assert-1.0.jar (added)
	* trunk/test/lib/fest/fest-reflect-1.1.jar (added)
	* trunk/test/lib/fest/fest-swing-1.1.jar (added)
	* trunk/test/lib/fest/fest-util-1.0.jar (added)
	* trunk/test/lib/fest/jcip-annotations-1.0.jar (added)
	* trunk/test/lib/junit (added)
	* trunk/test/lib/junit/README.txt (added)
	* trunk/test/lib/junit/cpl-v10.html (added)
	* trunk/test/lib/junit/junit-4.6.jar (added)
	* trunk/test/unit/build.xml (added)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	test cases and test libraries (JUnit 4.6 and FEST)


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


Sat, 27 Jun 2009 09:52:56 GMT stoecker [1705]
	* trunk/src/org/openstreetmap/josm/io/CacheFiles.java (modified)

	fix #2706 - patch by bilbo - allow to set WMS cache path again


Sat, 27 Jun 2009 09:46:17 GMT stoecker [1704]
	* trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified)

	fix  #2674, #765 - patch by jttt - reworked GeoImage stuff


Sat, 27 Jun 2009 09:05:23 GMT Gubaer [1703]
	* trunk/test/functional (added)
	* trunk/test/functional/org (added)
	* trunk/test/functional/org/openstreetmap (added)
	* trunk/test/functional/org/openstreetmap/josm (added)
	* trunk/test/functional/org/openstreetmap/josm/io (added)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (added)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (added)
	* trunk/test/functional/test-functional-env.properties (added)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties (added)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (added)

	added test cases


Sat, 27 Jun 2009 00:30:28 GMT Gubaer [1702]
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	cosmetics


Sat, 27 Jun 2009 00:14:00 GMT Gubaer [1701]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor (added)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (added)
	* trunk/test/unit/test-unit-env.properties (added)

	updated merge logic and unit tests for MergeVisitor


Sat, 27 Jun 2009 00:12:55 GMT Gubaer [1700]
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)

	enable new InfoAction


Fri, 26 Jun 2009 23:52:57 GMT Gubaer [1699]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)

	updated merge rules. deleted state of my version has precedence over ...


Fri, 26 Jun 2009 23:23:34 GMT Gubaer [1698]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)

	fixed #2759: OsmApiException message is crippled by showMessageDialog


Fri, 26 Jun 2009 23:15:36 GMT Gubaer [1697]
	* trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (added)
	* trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/InfoAction.java (added)

	#2779: patch by avar (slightly refactored in order to avoid ...


Fri, 26 Jun 2009 23:06:24 GMT stoecker [1696]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxImporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmImporter.java (modified)

	fixed mappaint area style handling for closed ways a little bit again


Fri, 26 Jun 2009 22:28:57 GMT stoecker [1695]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified)

	fix #2767 - some area-style-ways are not displayed properly


Wed, 24 Jun 2009 20:07:18 GMT Gubaer [1694]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)

	fixed #2769: Download members is broken


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:33:35 GMT Gubaer [1683]
	* trunk/build.xml (modified)

	reverting build.xml - should not have been comitted in r1682


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:06:10 GMT stoecker [1678]
	* trunk/presets/presets.xml (modified)

	close #2745 - add shelter to bus stop


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:21:49 GMT stoecker [1660]
	* trunk/build.xml (modified)

	fix #2708 - patch by jpstotz - cleanup build


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


Tue, 09 Jun 2009 17:03:10 GMT stoecker [1657]
	* trunk/lib/josm-translation.jar (modified)

	updated i18n


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:17:01 GMT Gubaer [1651]
	* trunk/build.xml (modified)

	removed local target (should not have been committed in r1650)


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 ...