#
# ChangeLog for trunk/test/unit in josm
#
# Generated by Trac 1.6
# 2024-11-28T05:02:07+01:00

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


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


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


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.