#
# ChangeLog for trunk/test in josm
#
# Generated by Trac 1.6
# 2024-12-22T06:00:59+01:00

Wed, 18 Nov 2009 17:50:38 GMT Gubaer [2471]
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/User.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified)

	fixed #3963: Synchronize does not work


Sat, 14 Nov 2009 16:59:10 GMT Gubaer [2448]
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/history/History.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSetListener.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/dialogs/relation/MemberTable.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (modified)

	fixed #3352: History doesn't get invalidated on upload?
	fixed #3912: ...


Fri, 13 Nov 2009 09:24:58 GMT Gubaer [2443]
	* trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (moved)

	Fixes problems with merging


Tue, 10 Nov 2009 20:25:40 GMT Gubaer [2433]
	* trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (moved)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	Improved test cases for MergeVisitor.
	Moved MergeVisitor and removed ...


Mon, 09 Nov 2009 00:03:08 GMT Gubaer [2417]
	* 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/Way.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	Had to update MergeVisitor as a consequence of the note in r2406 and ...


Sun, 08 Nov 2009 12:38:44 GMT jttt [2407]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.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/Way.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (added)

	Added support for referrers


Sat, 07 Nov 2009 16:10:51 GMT jttt [2401]
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)

	Changes in selection handling:
	 - selection is passed as PrimitiveId ...


Sat, 07 Nov 2009 13:41:34 GMT jttt [2399]
	* trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataIntegrityProblemException.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Hash.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/NodeData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/PrimitiveId.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/RelationData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/SimplePrimitiveId.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/Storage.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/WayData.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	Added map of primitives to dataset to make search by id faster
	check ...


Sat, 07 Nov 2009 06:26:15 GMT Gubaer [2396]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmExporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.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/MergeVisitorTest.java (modified)

	Made nodes, ways, and relations in DataSet private. Plugin updates to ...


Mon, 02 Nov 2009 20:04:32 GMT jttt [2388]
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified)

	Replace Dataset.nodes with getNodes(), etc


Mon, 02 Nov 2009 06:51:28 GMT jttt [2381]
	* trunk/.classpath (modified)
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.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/TagCollection.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.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/PropertiesDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.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/tagging/ac/AutoCompletionCache.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.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/APIDataSetTest.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)

	Change most occurrences of Dataset.nodes/ways/relations with ...


Thu, 15 Oct 2009 20:24:12 GMT Gubaer [2292]
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	Updated test case


Mon, 05 Oct 2009 22:07:00 GMT Gubaer [2252]
	* trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Way.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/NavigatableComponent.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/ToggleDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/help (added)
	* trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (added)
	* trunk/src/org/openstreetmap/josm/gui/help/HelpBuilder.java (added)
	* trunk/src/org/openstreetmap/josm/gui/help/Helpful.java (added)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	Refactored JOSM help system, slightly extended
	Fixed problem with ...


Sun, 27 Sep 2009 14:29:58 GMT Gubaer [2199]
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	Updated test cases


Sun, 20 Sep 2009 09:46:08 GMT Gubaer [2168]
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/upload (added)
	* trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (moved)
	* trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (added)
	* trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (added)
	* trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java (added)
	* trunk/src/org/openstreetmap/josm/actions/upload/UploadParameterHook.java (added)
	* trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (added)

	fixed #3304: Upload failed - Placeholder Relation not found
	fixed ...


Wed, 16 Sep 2009 19:40:09 GMT Gubaer [2150]
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	Updating test cases


Wed, 16 Sep 2009 19:38:48 GMT Gubaer [2149]
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	Updating test cases


Mon, 07 Sep 2009 21:06:19 GMT Gubaer [2077]
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.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)

	Had to replace DataSet:getPrimitiveById(id) with ...


Sun, 06 Sep 2009 21:13:08 GMT Gubaer [2072]
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	Updated functional tests


Sun, 06 Sep 2009 21:12:51 GMT Gubaer [2071]
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	Updated unit test


Thu, 03 Sep 2009 16:51:56 GMT Gubaer [2041]
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair (added)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes (moved)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java (copied)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties (moved)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (copied)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation (moved)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java (copied)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags (copied)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java (moved)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	Update of test classes


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


Mon, 10 Aug 2009 18:36:40 GMT jttt [1951]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.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)

	Replace some occurrences of RelationMember.member with getters


Mon, 10 Aug 2009 11:13:31 GMT Gubaer [1948]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	fixed #3234: Update selection is broke for relations


Sat, 08 Aug 2009 20:39:04 GMT jttt [1938]
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.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/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	Replace some occurrences of RelationMember.member with getters


Sat, 08 Aug 2009 09:32:27 GMT jttt [1928]
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/RelationMember.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	Make parameterless RelationMember constructor deprecated


Sat, 08 Aug 2009 07:22:24 GMT jttt [1926]
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.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)

	Replaced Relation.members with Relation.getMember() or ...


Sat, 08 Aug 2009 06:52:03 GMT jttt [1925]
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.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/visitor/AllNodesVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionCache.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	Replaced Relation.members with Relation.getMembers()


Wed, 05 Aug 2009 08:25:23 GMT Gubaer [1912]
	* trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified)

	Updated w.getNodes().contains(..) to w.containsNode(...)


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


Mon, 03 Aug 2009 19:18:50 GMT jttt [1898]
	* trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.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/command/DeleteCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.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/conflict/nodes/NodeListMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmWriter.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	Way refactoring - rewritten another parts of code to the new nodes
	api


Sun, 02 Aug 2009 21:15:26 GMT Gubaer [1890]
	* trunk/images/overlay/active.png (added)
	* trunk/images/overlay/active.svg (added)
	* trunk/images/overlay/invisiblenew.png (added)
	* trunk/images/overlay/invisiblenew.svg (added)
	* trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (added)
	* trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (added)
	* trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (added)
	* trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.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/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)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (added)

	update: rewrite of layer dialog
	new: allows multiple selection of ...


Mon, 20 Jul 2009 19:43:37 GMT jttt [1818]
	* trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified)
	* trunk/test (modified)

	Fix #3010 - NPE at PluginSelection


Sun, 19 Jul 2009 17:04:49 GMT Gubaer [1814]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DistributeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/JosmAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MirrorAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.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/SelectAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java (modified)
	* trunk/src/org/openstreetmap/josm/command/AddCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/Command.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified)
	* trunk/src/org/openstreetmap/josm/data/DataSetChecker.java (modified)
	* trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.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/OsmPrimitiveType.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java (deleted)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java (deleted)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java (deleted)
	* 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/OsmPrimitivRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java (added)
	* 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/dialogs/HistoryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.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/UserListDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified)
	* trunk/src/org/openstreetmap/josm/io/GpxImporter.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)
	* trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)

	removed dependencies to Main.ds, removed Main.ds
	removed AddVisitor, ...


Sun, 19 Jul 2009 16:31:22 GMT jttt [1813]
	* trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	Make tests compile using new ProgressMonitor API


Sat, 18 Jul 2009 21:31:42 GMT Gubaer [1806]
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (added)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (added)
	* trunk/test/config/test-functional-env.properties (moved)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (added)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java (added)

	added OsmServerBackreferenceReader - reads primitives referring to a ...


Wed, 15 Jul 2009 18:51:12 GMT framm [1796]
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)

	- comment out "getSkippedWays" references in MultiFetch test, did not ...


Wed, 15 Jul 2009 15:39:54 GMT framm [1791]
	* trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)

	- remove unused variable from PluginDownloader
	- fix MultiFetch test ...


Wed, 08 Jul 2009 20:58:37 GMT Gubaer [1753]
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	fixed #2245: Merge layers doesn't update the "action" tags


Wed, 08 Jul 2009 20:10:42 GMT Gubaer [1752]
	* trunk/test/config/test-unit-env.properties (added)
	* trunk/test/unit/build.xml (deleted)

	clean up in unit test environment


Wed, 08 Jul 2009 20:06:58 GMT Gubaer [1751]
	* trunk/build.xml (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)
	* trunk/test/unit/test-unit-env.properties (deleted)

	patch by dmuecke - improved unit tests and test targets in build.xml


Wed, 08 Jul 2009 19:50:32 GMT Gubaer [1750]
	* trunk/src/org/openstreetmap/josm/Main.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/CopyAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/MoveAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/PasteAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java (modified)
	* trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (modified)
	* 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/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/SelectAction.java (modified)
	* trunk/src/org/openstreetmap/josm/command/AddCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/Command.java (modified)
	* trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (added)
	* trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/RotateCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.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/command/WayNodesConflictResolverCommand.java (modified)
	* trunk/src/org/openstreetmap/josm/data/conflict (added)
	* trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (added)
	* trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (added)
	* trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java (added)
	* trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified)
	* trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/MapView.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java (modified)
	* trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified)
	* trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified)
	* trunk/test/config (added)
	* trunk/test/config/unit-josm.home (added)
	* trunk/test/config/unit-josm.home/preferences (added)
	* trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java (modified)
	* trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified)

	new: replaced global conflict list by conflict list per layer, ...


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