#
# ChangeLog for trunk/test/unit/org/openstreetmap/josm/data/osm in josm
#
# Generated by Trac 1.6
# 2024-04-19T03:19:38+02:00

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


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