# # ChangeLog for trunk/src/org/openstreetmap/josm/data/conflict in josm # # Generated by Trac 1.6 # 2024-04-20T02:18:56+02:00 Tue, 23 Feb 2010 07:58:12 GMT jttt [3034] * trunk/src/org/openstreetmap/josm/command/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java (modified) * 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/data/conflict/Conflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/User.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.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/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/RelationMemberMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java (modified) * trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) * trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) Fix #4467 Don't silently drop locally deleted member primitives from ... Sun, 14 Feb 2010 12:07:03 GMT Gubaer [2979] * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (modified) fixed #4386: "There are unsolved conflicts in layer X" holds up any ... Sun, 07 Feb 2010 21:54:58 GMT jttt [2949] * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified) Show only one message box in conflicts dialog when multiple members ... Sun, 31 Jan 2010 17:15:15 GMT stoecker [2915] * trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (modified) * trunk/src/org/openstreetmap/josm/io/Capabilities.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (modified) * trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy (moved) close #4458 - text fixes - patch by Andre Sat, 23 Jan 2010 13:24:03 GMT jttt [2881] * trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified) Fixed #4412 after confict management: selecting a relation does not ... Wed, 13 Jan 2010 18:55:07 GMT mjulius [2845] * trunk/src/org/openstreetmap/josm/data/Bounds.java (modified) * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) * trunk/src/org/openstreetmap/josm/data/Version.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Filters.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/TagCollection.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/HistoryOsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java (modified) fix messages for data Sat, 19 Dec 2009 09:47:49 GMT jttt [2655] * trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java (added) * trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListener.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.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/conflict/tags/MultiValueCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetsInActiveDataLayerListModel.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/gui/history/HistoryBrowserModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveFlagCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java (modified) * trunk/src/org/openstreetmap/josm/io/NmeaReader.java (modified) Fixed #4161 Major slowdown in recent versions, used correct pattern ... Tue, 24 Nov 2009 09:45:04 GMT stoecker [2512] * trunk/lib/josm-translation.jar (modified) * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified) * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/InfoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/JosmAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.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/RenameLayerAction.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/UnGlueAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.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/UploadSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.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/SelectionWebsiteLoader.java (modified) * trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (modified) * trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (modified) * trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (modified) * trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java (modified) * trunk/src/org/openstreetmap/josm/actions/upload/UploadParameterHook.java (modified) * trunk/src/org/openstreetmap/josm/command/Command.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified) * 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/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/corrector/CorrectionTable.java (modified) * trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (modified) * trunk/src/org/openstreetmap/josm/data/APIDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/Bounds.java (modified) * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) * trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (modified) * trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified) * trunk/src/org/openstreetmap/josm/data/Version.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Changeset.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/DateFormatter.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Filter.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Hash.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/NameFormatter.java (modified) * 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/OsmPrimitiveType.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Storage.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Tag.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Tagged.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/User.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/UserInfo.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.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/HistoryNode.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.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/projection/NTV2Util.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Puwg.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java (modified) * trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (modified) * trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/FileDrop.java (modified) * trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (modified) * trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.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/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java (modified) * trunk/src/org/openstreetmap/josm/gui/MultiSplitPane.java (modified) * trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified) * trunk/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java (modified) * trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (modified) * trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java (modified) * 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/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/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/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/conflict/tags/CombinePrimitiveResolverDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueDecisionType.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.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/FilterDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.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/ToggleDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.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/IMemberModelListener.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.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/MemberTableLinkedCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableRoleCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/SizeButton.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpApplication.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/Helpful.java (modified) * trunk/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.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/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveFlagCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadOrSaveState.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.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/MapViewPaintable.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) * trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/progress/ProgressRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java (modified) * trunk/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java (modified) * trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java (modified) * trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java (modified) * trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) * trunk/src/org/openstreetmap/josm/io/CacheFiles.java (modified) * trunk/src/org/openstreetmap/josm/io/Capabilities.java (modified) * trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java (modified) * trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (modified) * trunk/src/org/openstreetmap/josm/io/CredentialsManager.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) * trunk/src/org/openstreetmap/josm/io/IllegalDataException.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApiException.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApiInitializationException.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmConnection.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmDataParsingException.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginException.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) * trunk/src/org/openstreetmap/josm/tools/AudioUtil.java (modified) * trunk/src/org/openstreetmap/josm/tools/CopyList.java (modified) * trunk/src/org/openstreetmap/josm/tools/DateParser.java (modified) * trunk/src/org/openstreetmap/josm/tools/DateUtils.java (modified) * trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (modified) * trunk/src/org/openstreetmap/josm/tools/FallbackDateParser.java (modified) * trunk/src/org/openstreetmap/josm/tools/I18n.java (modified) * trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) * trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (modified) * trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) * trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java (modified) * trunk/src/org/openstreetmap/josm/tools/PrimaryDateParser.java (modified) * trunk/src/org/openstreetmap/josm/tools/UrlLabel.java (modified) * trunk/src/org/openstreetmap/josm/tools/WikiReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (modified) i18n updated, fixed files to reduce problems when applying patches, ... 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 ... Sun, 27 Sep 2009 14:29:21 GMT Gubaer [2198] * trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/Conflict.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/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java (added) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) fixed #3249: Resolve conflicts between invisible and deleted ... Tue, 22 Sep 2009 13:34:19 GMT stoecker [2181] * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.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/command/CoordinateConflictResolveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.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/OsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.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/history/History.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.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/VersionInfoPanel.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (modified) * trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (modified) * trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java (modified) * trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java (modified) * trunk/src/org/openstreetmap/josm/io/FileExporter.java (modified) * trunk/src/org/openstreetmap/josm/io/FileImporter.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxExporter.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxReader.java (modified) * trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApi.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmApiException.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmExporter.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmImporter.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) * trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) * trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java (modified) lots of i18n fixes Sun, 30 Aug 2009 17:07:24 GMT Gubaer [2017] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/AboutAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.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/CreateCircleAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DistributeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.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/OpenFileAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveAsAction.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/audio/AudioFasterAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (modified) * trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/RotateCommand.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/corrector/TagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/data/Bounds.java (modified) * trunk/src/org/openstreetmap/josm/data/DataSetChecker.java (modified) * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) * trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java (modified) * trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java (modified) * 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/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/history/History.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/visitor/Visitor.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/LambertEST.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Mercator.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Projection.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/UTM.java (modified) * trunk/src/org/openstreetmap/josm/gui/BookmarkList.java (modified) * trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (modified) * trunk/src/org/openstreetmap/josm/gui/FileDrop.java (modified) * trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java (modified) * trunk/src/org/openstreetmap/josm/gui/MainApplet.java (modified) * trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) * trunk/src/org/openstreetmap/josm/gui/MapFrame.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/OptionPaneUtil.java (deleted) * trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/SideButton.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/tags/MineTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.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/ReferringRelationsBrowser.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java (modified) * trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.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/Marker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) * trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/StyleSources.java (modified) * trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java (modified) * trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java (modified) * trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java (modified) * trunk/src/org/openstreetmap/josm/io/GpxExporter.java (modified) * trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java (modified) * trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (modified) * trunk/src/org/openstreetmap/josm/io/OsmExporter.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) * trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java (modified) * trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (modified) * trunk/src/org/openstreetmap/josm/tools/AudioUtil.java (modified) * trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (modified) * trunk/src/org/openstreetmap/josm/tools/I18n.java (modified) * trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) * trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (modified) * trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified) * trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) * trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (modified) * trunk/src/org/openstreetmap/josm/tools/Shortcut.java (modified) * trunk/src/org/openstreetmap/josm/tools/WikiReader.java (modified) * trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) removed OptionPaneUtil cleanup of deprecated Layer API cleanup of ... Wed, 05 Aug 2009 08:05:50 GMT Gubaer [1911] * trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (modified) * trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) * trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) * trunk/src/org/openstreetmap/josm/gui/FileDrop.java (modified) * trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) * trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) fixed #3193: No layer is left highlighted when the bottom most one is ... Sun, 26 Jul 2009 20:52:23 GMT Gubaer [1857] * trunk/src/org/openstreetmap/josm/Main.java (modified) * trunk/src/org/openstreetmap/josm/actions/GpxExportAction.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/OrthogonalizeAction.java (modified) * trunk/src/org/openstreetmap/josm/actions/SaveActionBase.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/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/search/SelectionWebsiteLoader.java (modified) * trunk/src/org/openstreetmap/josm/command/AddCommand.java (modified) * trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (added) * trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (modified) * trunk/src/org/openstreetmap/josm/data/DataSetChecker.java (modified) * trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) * trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (modified) * trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (modified) * trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.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/RelationDialogManager.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (modified) * trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java (modified) * trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (modified) * trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (modified) replaced JOptionDialog.show... by OptionPaneUtil.show.... improved ... 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, ...