#
# ChangeLog for trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags in josm
#
# Generated by Trac 1.6
# 2024-04-16T17:40:33+02:00

Thu, 24 Dec 2009 07:48:40 GMT jttt [2676]
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.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/data/osm/Changeset.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Filter.java (modified)
	* trunk/src/org/openstreetmap/josm/data/projection/Puwg.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/FileDrop.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/help/HelpApplication.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified)
	* trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java (modified)

	Fix some of the warnings found by FindBugs


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


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


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.