#
# ChangeLog for trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes in josm
#
# Generated by Trac 1.6
# 2024-04-19T22:53:01+02:00

Tue, 11 Aug 2009 11:23:06 GMT Gubaer [1954]
	* trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/OptionPaneUtil.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair (added)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/OperationCancelledException.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags (moved)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags/TagMergerTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.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)

	Moved package org.openstreetmap.josm.gui.conflict to ...


Wed, 05 Aug 2009 06:19:02 GMT jttt [1910]
	* trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (modified)

	Way refactoring - finish replacing Way.nodes with the new api


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)